From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34119138334 for ; Wed, 5 Jun 2019 06:56:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3122EE092A; Wed, 5 Jun 2019 06:56:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8265CE092A for ; Wed, 5 Jun 2019 06:56:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F8F0345737 for ; Wed, 5 Jun 2019 06:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB647607 for ; Wed, 5 Jun 2019 06:56:15 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1559717694.ed382a45a805bf94ad6c316b77000f7019bc3cd1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cgal/, sci-mathematics/cgal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/cgal/Manifest sci-mathematics/cgal/cgal-4.10.ebuild sci-mathematics/cgal/cgal-4.11.1.ebuild sci-mathematics/cgal/cgal-4.9.ebuild sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch X-VCS-Directories: sci-mathematics/cgal/files/ sci-mathematics/cgal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ed382a45a805bf94ad6c316b77000f7019bc3cd1 X-VCS-Branch: master Date: Wed, 5 Jun 2019 06:56:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e2e3eadf-507a-487f-ab38-72ce3bd8a144 X-Archives-Hash: 68a052f1d91ac84c3521aaf27cacd60f commit: ed382a45a805bf94ad6c316b77000f7019bc3cd1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 5 06:54:28 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 5 06:54:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed382a45 sci-mathematics/cgal: Drop old Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-mathematics/cgal/Manifest | 6 -- sci-mathematics/cgal/cgal-4.10.ebuild | 88 ---------------------- sci-mathematics/cgal/cgal-4.11.1.ebuild | 80 -------------------- sci-mathematics/cgal/cgal-4.9.ebuild | 86 --------------------- .../cgal/files/cgal-4.7-fix-buildsystem.patch | 19 ----- 5 files changed, 279 deletions(-) diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest index 4645979f664..249dc57f583 100644 --- a/sci-mathematics/cgal/Manifest +++ b/sci-mathematics/cgal/Manifest @@ -1,8 +1,2 @@ -DIST CGAL-4.10-doc_html.tar.xz 27147028 BLAKE2B ccdb77a497c2aef3004c3adfd81bf8f79a3322ed6cc071569d23666cf8ad00a94ce01f1bab21171eb461066e45a42c9c7003705d3d3d701879e7eb1e13af0eef SHA512 1c1c90c3ce07c5e4bf5a125cd5dccd0595f5c5d8fcf0f16df8a5506c6fe611c30440e034621c3477ae55670f96abbe389bfc2f3e0c88e099133b03cce6f2923d -DIST CGAL-4.10.tar.xz 14249804 BLAKE2B 4715449bebc45fe9270b4a336af964eda4c1a603a9a63b3f3b6922253e18f205e27d5d14dea7ae90ece4184c8b3bafb0ff2963311da7a95ab6d21d8961679ac1 SHA512 2029ad647e73692bb38b2ed9606aae61ec1d74df886bb6fd0f4e3388fb08a51de87a1e290df0dcc621a8abc2654915e2d331ec9f6d27ddd9a21f187a165fa09d -DIST CGAL-4.11.1-doc_html.tar.xz 30575368 BLAKE2B 088cedcde628520625a4494b261e3ae963b8f3688ce4c1117e70f925ff86d11606482d3ce04415d6f03d07a52dfbf041ee315a0e627eb2d7944d08223b51077c SHA512 b16ad29a2981fc72902cc2c850a02c0412eb2f09f5ec864d85c92230ffe1f996c45ae2558b472b0b239d6c7718ccc6da6d65e52b5a7b33d1b406eda4aad0bca5 -DIST CGAL-4.11.1.tar.xz 14650588 BLAKE2B 08a7a61d92fc5293eef194d4bb1a42c69cacd8bbc3ee3c1e803435d0d7e2c3cf6533ce5a8f40fb4bf4e6b2ba34ec2c74abd2c2cbdbddbb874caa75b7d80624ba SHA512 0687ddd52e7a7d5e437a57c06d6c1ad7b325a7d0055fc48ba11be6fbc3e4003e2b28a35a9caac0c69af4c73d7d85553502e777714fa56c64580131b04dbe563e DIST CGAL-4.11.3-doc_html.tar.xz 30576756 BLAKE2B 6d32f3bca1c5aee4ed09eb96a35113a8a71bf14679e204683268ccee56f4a4799ef696bebd5ec0fd6add964e23273efc87167c122a5dc781c9cc7b2f5b938c29 SHA512 a729bea11a9b853a8197cc7ebb089005f98868e393e91142946d45a485e2e9ac9eacce1b230d91240080033b5c31bfd0195820ee5ae7f621bdd75f1abf19244f DIST CGAL-4.11.3.tar.xz 14657412 BLAKE2B a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0 SHA512 44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e -DIST cgal-4.9-doc_html-1.tar.xz 26612436 BLAKE2B 17ea9c6e7bd9c981c0b8282b4e4dd3606e1939902c131947e05eccd1760d743740bc9bc385052954c3e60a49a7d5f1d961b4f954892d172095e3a2cf86e8887e SHA512 df9855ff2b152a32dfb584c68b861e2cd480c073cd8cfddc494295455aff8d96e00ba6424b7a7f460e2f9e8db0fcefe858a656f4834821dd5466f61eb3d555b2 -DIST cgal-4.9.tar.xz 13749292 BLAKE2B fc6f44dec7c4cfd6ec13911cd668f0c6df7e73cd85540678f43c95b6fd9130449ca2597222e6b668b05072194302b95d63ff775ca82380aedc4fb8c439967c5b SHA512 6f55e061917869dea1083e6fccac132a5232c2de4c01d0ed052bbb31789a23cc66334f12a884ed1e8a1b84af0e2a7186000964dd12e4b41914ee7fd5e36baca8 diff --git a/sci-mathematics/cgal/cgal-4.10.ebuild b/sci-mathematics/cgal/cgal-4.10.ebuild deleted file mode 100644 index 7d4bbdec8af..00000000000 --- a/sci-mathematics/cgal/cgal-4.10.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -MY_P=CGAL-${PV} - -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="http://www.cgal.org/" -SRC_URI=" - https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz - doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )" - -LICENSE="LGPL-3 GPL-3 Boost-1.0" -SLOT="0/13" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples +gmp mpfi ntl qt5" - -RDEPEND=" - >=dev-cpp/eigen-3.1 - dev-libs/boost:= - dev-libs/mpfr:0 - sys-libs/zlib:= - x11-libs/libX11:= - virtual/glu:= - virtual/opengl:= - gmp? ( dev-libs/gmp:=[cxx] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - mpfi? ( sci-libs/mpfi ) - ntl? ( dev-libs/ntl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7-fix-buildsystem.patch" -) - -src_prepare() { - cmake-utils_src_prepare - # modules provided by dev-util/cmake and dev-cpp/eigen - rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die - sed -e '/install(FILES AUTHORS/d' \ - -i CMakeLists.txt || die - - # use C++11 threads instead of boost::thread - append-cxxflags -std=c++11 -} - -src_configure() { - local mycmakeargs=( - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)" - -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake" - -DWITH_CGAL_Qt3=OFF - -DWITH_LEDA=OFF - -DWITH_Eigen3=ON - -DWITH_ZLIB=ON - -DWITH_GMP="$(usex gmp)" - -DWITH_GMPXX="$(usex gmp)" - -DWITH_CGAL_Qt5="$(usex qt5)" - -DWITH_MPFI="$(usex mpfi)" - -DWITH_NTL="$(usex ntl)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if use examples; then - dodoc -r examples demo - docompress -x /usr/share/doc/${PF}/{examples,demo} - fi - if use doc; then - docinto html/ - dodoc -r "${WORKDIR}"/doc_html/* - docompress -x /usr/share/doc/${PF}/html - fi -} diff --git a/sci-mathematics/cgal/cgal-4.11.1.ebuild b/sci-mathematics/cgal/cgal-4.11.1.ebuild deleted file mode 100644 index 97da0b221e6..00000000000 --- a/sci-mathematics/cgal/cgal-4.11.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -MY_P=CGAL-${PV} - -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="https://www.cgal.org/" -SRC_URI=" - https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz - doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )" - -LICENSE="LGPL-3 GPL-3 Boost-1.0" -SLOT="0/13" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples +gmp mpfi ntl qt5" - -RDEPEND=" - >=dev-cpp/eigen-3.1 - dev-libs/boost:=[threads] - dev-libs/mpfr:0= - sys-libs/zlib:= - x11-libs/libX11:= - virtual/glu:= - virtual/opengl:= - gmp? ( dev-libs/gmp:=[cxx] ) - mpfi? ( sci-libs/mpfi ) - ntl? ( dev-libs/ntl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.11.1-fix-buildsystem.patch" -) - -src_prepare() { - cmake-utils_src_prepare - # modules provided by dev-util/cmake and dev-cpp/eigen - rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die - sed -e '/install(FILES AUTHORS/d' \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)" - -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake" - -DWITH_LEDA=OFF - -DWITH_Eigen3=ON - -DWITH_ZLIB=ON - -DWITH_GMP="$(usex gmp)" - -DWITH_GMPXX="$(usex gmp)" - -DWITH_MPFI="$(usex mpfi)" - -DWITH_NTL="$(usex ntl)" - -DWITH_CGAL_Qt5="$(usex qt5)" - ) - cmake-utils_src_configure -} - -src_install() { - use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. ) - cmake-utils_src_install - if use examples; then - dodoc -r examples demo - docompress -x /usr/share/doc/${PF}/{examples,demo} - fi -} diff --git a/sci-mathematics/cgal/cgal-4.9.ebuild b/sci-mathematics/cgal/cgal-4.9.ebuild deleted file mode 100644 index b8c9051efda..00000000000 --- a/sci-mathematics/cgal/cgal-4.9.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -MY_P=CGAL-${PV} - -DESCRIPTION="C++ library for geometric algorithms and data structures" -HOMEPAGE="http://www.cgal.org/" -SRC_URI=" - https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz -> ${P}.tar.xz - doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz -> ${P}-doc_html-1.tar.xz )" - -LICENSE="LGPL-3 GPL-3 Boost-1.0" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples +gmp mpfi ntl qt5" - -RDEPEND=" - >=dev-cpp/eigen-3.1 - dev-libs/boost:= - dev-libs/mpfr:0 - sys-libs/zlib - x11-libs/libX11 - virtual/glu - virtual/opengl - gmp? ( dev-libs/gmp[cxx] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - mpfi? ( sci-libs/mpfi ) - ntl? ( dev-libs/ntl )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}/${PN}-4.7-fix-buildsystem.patch" -) - -src_prepare() { - cmake-utils_src_prepare - # modules provided by dev-util/cmake and dev-cpp/eigen - rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die - sed \ - -e '/install(FILES AUTHORS/d' \ - -i CMakeLists.txt || die - - # use C++11 threads instead of boost::thread - append-cxxflags -std=c++11 -} - -src_configure() { - local mycmakeargs=( - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)" - -DCGAL_INSTALL_CMAKE_DIR="lib/cmake" - -DWITH_CGAL_Qt3=OFF - -DWITH_LEDA=OFF - -DWITH_Eigen3=ON - -DWITH_ZLIB=ON - -DWITH_GMP="$(usex gmp)" - -DWITH_GMPXX="$(usex gmp)" - -DWITH_CGAL_Qt5="$(usex qt5)" - -DWITH_MPFI="$(usex mpfi)" - -DWITH_NTL="$(usex ntl)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if use examples; then - dodoc -r examples demo - fi - if use doc; then - docinto html/ - dodoc -r "${WORKDIR}"/doc_html/* - fi -} diff --git a/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch b/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch deleted file mode 100644 index 6aabdc39539..00000000000 --- a/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove customized handling of ${CMAKE_BUILD_TYPE} which conflicts with -how Gentoo handles ${CMAKE_BUILD_TYPE}: -* CMake Error at cmake/modules/CGAL_SetupFlags.cmake:65 (message): -* Gentoo is not a valid build type: only Release or Debug is allowed -* Call Stack (most recent call first): -* CMakeLists.txt:519 (include) - ---- CGAL-4.7/cmake/modules/CGAL_SetupFlags.cmake -+++ CGAL-4.7/cmake/modules/CGAL_SetupFlags.cmake -@@ -61,9 +61,6 @@ - add_definitions(-DCGAL_TEST_SUITE) - endif() - --if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) -- message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release or Debug is allowed" ) --endif() - - message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" ) -