commit: 2ca940aa204ee4691f05216279c9dd03d8fca69b
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 17:26:18 2017 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 17:37:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca940aa
sci-mathematics/cgal: version bump
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-mathematics/cgal/Manifest | 6 +-
.../cgal/{cgal-4.8-r1.ebuild => cgal-4.10.ebuild} | 27 ++++----
sci-mathematics/cgal/cgal-4.3-r1.ebuild | 75 ----------------------
.../cgal/files/cgal-4.3-cmake-3.3.patch | 24 -------
4 files changed, 17 insertions(+), 115 deletions(-)
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 87f2d9d0d74..f8ae314aebb 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,6 +1,4 @@
-DIST CGAL-4.3-doc_html.tar.xz 15582924 SHA256
dd28989ee950178b3f22d8b14111510312586c1a2c0b29a73a2a14d7d7eb5059 SHA512
41125ab3b5135ae539365e6c128f79119a679292e734e1669cc43a35996363951f5a5d494f8c25c3b1eab75a69137ed51bf7b65ad6d47e56756212565ec245ec
WHIRLPOOL
961c4fea224e2c94a65a7dd07b16326159e9fe95f9176abd0cc96be3cb53060c076a80d5efd2d9c640c2aa2eea0d3d06ce64839961906a588706647830849972
-DIST CGAL-4.3.tar.xz 10108992 SHA256
cc475885b4ca4b15ab5d446c0e554b7b69f6980969bc3a8c5b83f8da4ee1bb04 SHA512
dcf329232f6511be6b7eecef7afbfd505529385cb29a3717b762068a3dac52b3706b1d55c6e30b677c6cf2f99aae937de7d730d30cc33680fc39df0f0ff76e70
WHIRLPOOL
862d5bc3387afa1b6702974b7fab3b7d4c35334023eb813bb52a6c7092d6f89104db8c7b851fd7ebb7dfdd38392f9d6459e9afab34bf237b0484f7d395035873
-DIST cgal-4.8-doc_html-1.tar.xz 25996928 SHA256
27e63a868d6103fbedf43d4adf518de94dd8209d65e352aa60b8773a0e3ee1a2 SHA512
f2363b3a21065b079ee192235cfeac66e87466a5f9646b33cf880f12ea646f87caf957dafd1d22199d5414f0ee378e540db42617641b4627106490ed33f21a80
WHIRLPOOL
34e830e0aad057108d9cb16cc12db0a1477351e866ae50b9af5d268b74bc15037c306f869c3f76406c8d8fa88192e3c5471517806589691b8b6502d8a306326f
-DIST cgal-4.8.tar.xz 13509916 SHA256
2483ccf34ae41e830a3e33f2f471aadecf43316fb56bf632e403765ad035ce25 SHA512
9640ba855b968f812876a694502c678737046d1c5ed30c766ceba7ae91ca2731d07b31841aa62c6817b0bacbd36f3bf492f71e0a709ef56cab7ad66ffbfee8d5
WHIRLPOOL
7747ef95005c2f93cef7442becc5a1e6209ad04b9d45ff187b919ea7f3cadf8087634865e177aa2129bb6d8ff054859197d76234b7f55a636eee6fe1dc7dbfce
+DIST CGAL-4.10-doc_html.tar.xz 27147028 SHA256
a65471afa68e34f2fdd607c60625db941de34d5d8c5759b3f3cb3aae3c563a6a SHA512
1c1c90c3ce07c5e4bf5a125cd5dccd0595f5c5d8fcf0f16df8a5506c6fe611c30440e034621c3477ae55670f96abbe389bfc2f3e0c88e099133b03cce6f2923d
WHIRLPOOL
82bd1988915c1fc89d98ac11270e00a573b2885df3404deb2166fcdaf7d4d0a663bbdc5e56acfe00fbb401314b0f6a097847ea703c188522a6112f2d4c4f3eb0
+DIST CGAL-4.10.tar.xz 14249804 SHA256
eb56e17dcdecddf6a6fb808931b2142f20aaa182916ddbd912273c51e0f0c045 SHA512
2029ad647e73692bb38b2ed9606aae61ec1d74df886bb6fd0f4e3388fb08a51de87a1e290df0dcc621a8abc2654915e2d331ec9f6d27ddd9a21f187a165fa09d
WHIRLPOOL
df96d9d9820214d7ddacd86eda1edeecf92ab0022203a26ca21ba61f65ba1872e62004761f97aee01dcc1f9dfcf32659ec025c43d44e434d578c68b012c495d9
DIST cgal-4.9-doc_html-1.tar.xz 26612436 SHA256
f02d18177eac67b602f44a6aa26e8c6ccce1cf32d2b1928dc2456488fa7b06a3 SHA512
df9855ff2b152a32dfb584c68b861e2cd480c073cd8cfddc494295455aff8d96e00ba6424b7a7f460e2f9e8db0fcefe858a656f4834821dd5466f61eb3d555b2
WHIRLPOOL
6b8ae1a88bf546eb54b8b6777f3e9a67688ae51003018ded145e168353020ba6b250a3702c4065e6bcb64bd291b492dffc5a68d4f7cc75670b20cee1aa2b3347
DIST cgal-4.9.tar.xz 13749292 SHA256
63ac5df71f912f34f2f0f2e54a303578df51f4ec2627db593a65407d791f9039 SHA512
6f55e061917869dea1083e6fccac132a5232c2de4c01d0ed052bbb31789a23cc66334f12a884ed1e8a1b84af0e2a7186000964dd12e4b41914ee7fd5e36baca8
WHIRLPOOL
a0554c118b02f23f07c6625f26fe37b0c2fddf0464f06b6c2be27be16bb0e796a8167a5380406a8e15d0f10f2f0f2dd1c1a51dcf6b3339a7234c189b8203e2ce
diff --git a/sci-mathematics/cgal/cgal-4.8-r1.ebuild
b/sci-mathematics/cgal/cgal-4.10.ebuild
similarity index 78%
rename from sci-mathematics/cgal/cgal-4.8-r1.ebuild
rename to sci-mathematics/cgal/cgal-4.10.ebuild
index 8d6fe04ee78..7d4bbdec8af 100644
--- a/sci-mathematics/cgal/cgal-4.8-r1.ebuild
+++ b/sci-mathematics/cgal/cgal-4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,11 +10,11 @@ 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 )"
+
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"
+SLOT="0/13"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples +gmp mpfi ntl qt5"
@@ -22,11 +22,11 @@ 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] )
+ sys-libs/zlib:=
+ x11-libs/libX11:=
+ virtual/glu:=
+ virtual/opengl:=
+ gmp? ( dev-libs/gmp:=[cxx] )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
+
PATCHES=(
"${FILESDIR}/${PN}-4.7-fix-buildsystem.patch"
)
@@ -49,8 +50,7 @@ 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' \
+ sed -e '/install(FILES AUTHORS/d' \
-i CMakeLists.txt || die
# use C++11 threads instead of boost::thread
@@ -59,7 +59,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCGAL_INSTALL_LIB_DIR=$(get_libdir)
+ -DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
+ -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake"
-DWITH_CGAL_Qt3=OFF
-DWITH_LEDA=OFF
-DWITH_Eigen3=ON
@@ -77,9 +78,11 @@ 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.3-r1.ebuild
b/sci-mathematics/cgal/cgal-4.3-r1.ebuild
deleted file mode 100644
index 575e429f198..00000000000
--- a/sci-mathematics/cgal/cgal-4.3-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_BUILD_TYPE=Release
-
-inherit multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=32995
-DPID=33000
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/";
-SRC_URI="
- http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
- doc? (
http://gforge.inria.fr/frs/download.php/${DPID}/${MY_P}-doc_html.tar.xz )"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi qt4"
-
-RDEPEND="
- dev-libs/boost
- dev-libs/mpfr:0
- sys-libs/zlib
- x11-libs/libX11
- virtual/glu
- virtual/opengl
- gmp? ( dev-libs/gmp[cxx] )
- qt4? (
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- )
- mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cmake-3.3.patch
-
- cmake-utils_src_prepare
- sed \
- -e '/install(FILES AUTHORS/d' \
- -i CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCGAL_INSTALL_LIB_DIR=$(get_libdir)
- -DWITH_CGAL_Qt3=OFF
- -DWITH_LEDA=OFF
- $(cmake-utils_use_with gmp)
- $(cmake-utils_use_with gmp GMPXX)
- $(cmake-utils_use_with qt4 CGAL_Qt4)
- $(cmake-utils_use_with mpfi)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${WORKDIR}"/doc_html/. )
- cmake-utils_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples demo
- fi
-}
diff --git a/sci-mathematics/cgal/files/cgal-4.3-cmake-3.3.patch
b/sci-mathematics/cgal/files/cgal-4.3-cmake-3.3.patch
deleted file mode 100644
index b1490454e55..00000000000
--- a/sci-mathematics/cgal/files/cgal-4.3-cmake-3.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- CGAL-4.3/CMakeLists.txt
-+++ CGAL-4.3/CMakeLists.txt
-@@ -19,6 +19,10 @@
- cmake_policy(VERSION 2.6)
- endif()
-
-+if(POLICY CMP0026)
-+ cmake_policy(SET CMP0026 OLD)
-+endif()
-+
-
#--------------------------------------------------------------------------------------------------
- #
- # -= PACKAGE SETUP =-
---- CGAL-4.3/src/CMakeLists.txt
-+++ CGAL-4.3/src/CMakeLists.txt
-@@ -116,7 +116,7 @@
- file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
- foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
- string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
-- string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME
${libconfigfile})
-+ string(REPLACE "/CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME
${libconfigfile})
- if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
-
- message(STATUS "Sources for CGAL component library
'${CGAL_CONFIGURED_LIBRARY_NAME}' detected")
