examples are not configured, only installed (fixing bug #415349) together with demos. lapack dependency is removed, only used for examples.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 16 insertions, 94 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 692d752bb0e5..4cb1d8b5beb3 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.15 2012/05/08 18:27:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.16 2012/05/10 17:48:10 bicatali Exp $
+
+  10 May 2012; Sébastien Fabbro <bicatali@gentoo.org> -cgal-3.7.ebuild,
+  cgal-4.0.ebuild:
+  examples are not configured, only installed (fixing bug #415349) together
+  with demos. lapack dependency is removed, only used for examples.
 
   08 May 2012; Sébastien Fabbro <bicatali@gentoo.org> cgal-4.0.ebuild,
   +files/cgal-4.0-gcc47.patch:
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 9981c34945fc..82e34a24bc17 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -2,21 +2,18 @@
 Hash: SHA1
 
 AUX cgal-4.0-gcc47.patch 502 RMD160 dff40eeaba8175b57bd3c290a8c923374a2776af SHA1 b818d1b0b4f0691f82c6d129982e4df03fba7b87 SHA256 33fc60b21d6899908125af0aa4ee9d2c35d3fe978d7be9d0821efd15be3adbaa
-DIST CGAL-3.7-doc_html.tar.xz 16513316 RMD160 4411726b7b05346bfd8588fd1d86c10745ffd015 SHA1 a1ddb76c2c50257c3abf42bab9cf4b5777fe41ee SHA256 6113051e60db83f61d6f9213906a3440ee8c044979370daa244fdcabb5667326
-DIST CGAL-3.7.tar.xz 9548960 RMD160 1e160200aebabea1e2cd3a70785d20407b8b91cb SHA1 5d3ab3d98495d4833f0e1211663df328649ab58e SHA256 3287793e1f1abf27575be30207647a0aef7229e0ea56bd408587000077f1c287
 DIST CGAL-3.9-doc_html.tar.xz 17943040 RMD160 d7ad3d7e1ed0a3a21ff2c5a326a3f40c95ef5fae SHA1 47fbb255f117075634b885c1ab9dce1e83639ac9 SHA256 5f22c62365540a036fa66e18a3abe55fc4f5cb36a60717711c54029c032f8120
 DIST CGAL-3.9.tar.xz 9853500 RMD160 0340837bb57824dbf08361e25bfbb91bd01a1668 SHA1 48bff87ab26e013b583ee34f021a6025c4b81cdf SHA256 a5d50f3788b1acd34a20ef84c071f8eb66eeacc5e12760292d6f7c0ff041022c
 DIST CGAL-4.0-doc_html.tar.xz 18465688 RMD160 1c8fbf803e6d9b6bc858c8e4e08d5beabc9a1ba7 SHA1 66bbf2626c8b9a5a48cea68b389f2205dce39406 SHA256 247501ba4fdcaf459ceb3066f79a9cba8cae27d7b5ddd622b3409f20a8e9a244
 DIST CGAL-4.0.tar.xz 9875796 RMD160 655b425335da05537f208b8d4e3a00bcad0f6dd2 SHA1 d1f3f328bc5cb026ddb825cb585c7ae27a8856f7 SHA256 a64f0d4b387b9db4cb76410776b93b4c6c86d1b0c5d049ed00386951ca72a5f3
-EBUILD cgal-3.7.ebuild 1771 RMD160 e1660de865d877ea1a324e926824e285f8420a2b SHA1 c7dffa41cf9fccb2a5795eb8c0730d903c6581d0 SHA256 3e9a0d84b7249efcf05ac7d055f9c569aad87981b11147407bbce907be7c7f53
 EBUILD cgal-3.9.ebuild 1813 RMD160 ce14d88c192bff91703a00751d1da3f317c9b064 SHA1 db15af69e81413879be7ef2e349436eadb024860 SHA256 7ac762d0bc0ead47c586c9a2eaed3133d3b8409394df6e38da5bdbbc9131de00
-EBUILD cgal-4.0.ebuild 1811 RMD160 23ebb531c18f49641b52efddd0fad188a2feae46 SHA1 7e47cdca311a5ea14ea4f2d17e64515e0f9a42e7 SHA256 870b0cbb31c9cf64c40f0f2f08cdc06fdf95b61e4eb502f75ca2bcd5caa309cc
-MISC ChangeLog 2464 RMD160 e133de16e88ddfee3e05171b222cc7387a191d44 SHA1 c719200902c1bb22fa082e96852aced1a5f64a59 SHA256 18dbad13b11c1c30694f87f80acb83664f5ed5455ac74c05763e5f6a458292b3
+EBUILD cgal-4.0.ebuild 1696 RMD160 79f89c07b9b4a8e14c29eb8ae66f19cc185fe2c8 SHA1 bb45aea5946c972a60ced0ed3f43ae23fbddbaf0 SHA256 aabbe1ac5b55fbc9d495f1b4ba6665d833d5b631de4654362a8ad97fc339167c
+MISC ChangeLog 2701 RMD160 0c17db11cede6ed2ac35ff0987abd122c93b91a1 SHA1 c69d10768fdc85ff361e949fe9be47e43ac3dc92 SHA256 409c8e148295e5266a06f393a3dc50403fdb42e1befb7e35b14656a50a7e8925
 MISC metadata.xml 1049 RMD160 2ab153fc344d526d9f9fc12e285160f4ec5d8e60 SHA1 8680032349320bdfaf263551f7ad7f78676f64de SHA256 9b0ea9aa750cf2ca562d0b7e11e83f3b707455f7afb50052c35ca959d0966adb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+pZbYACgkQ1ycZbhPLE2BddQCdFiZH+gw+HLdZfLVNhHC8WwiI
-ML4AnAz2RQnEvbl0mrEESUtFZKTn5Arh
-=SbHp
+iEYEARECAAYFAk+r/2IACgkQ1ycZbhPLE2DrJgCgl2ApODdwm2+gF8UQFBN3G/PD
+LgMAn2Jrpmt4EWlM1d52Oamz4FsubSqS
+=9BpX
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cgal/cgal-3.7.ebuild b/sci-mathematics/cgal/cgal-3.7.ebuild
deleted file mode 100644
index b80700bf0424..000000000000
--- a/sci-mathematics/cgal/cgal-3.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.7.ebuild,v 1.4 2012/05/04 07:46:50 jdhore Exp $
-
-EAPI=3
-CMAKE_BUILD_TYPE=Release
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=27640
-DPID=27644
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/"
-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-2.1 MIT QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp lapack qt4"
-
-RDEPEND="dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx=] )
-	lapack? ( virtual/lapack )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	base_src_prepare
-	sed -i \
-		-e '/install(FILES AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs
-	if use gmp; then
-		mycmakeargs+=( $(cmake-utils_use_with cxx GMPXX) )
-	else
-		mycmakeargs+=( "-DWITH_GMPXX=OFF" )
-	fi
-	mycmakeargs+=(
-		"-DCGAL_INSTALL_LIB_DIR=$(get_libdir)"
-		"-DWITH_CGAL_Qt3=OFF"
-		"-DWITH_LEDA=OFF"
-		$(cmake-utils_use_with examples)
-		$(cmake-utils_use_with examples DEMOS)
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with lapack CPACK)
-		$(cmake-utils_use_with qt4 CGAL_Qt4)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-4.0.ebuild b/sci-mathematics/cgal/cgal-4.0.ebuild
index cb1d7fd6413d..73642255fb05 100644
--- a/sci-mathematics/cgal/cgal-4.0.ebuild
+++ b/sci-mathematics/cgal/cgal-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.ebuild,v 1.3 2012/05/08 18:27:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.ebuild,v 1.4 2012/05/10 17:48:10 bicatali Exp $
 
 EAPI=4
 CMAKE_BUILD_TYPE=Release
@@ -15,10 +15,10 @@ HOMEPAGE="http://www.cgal.org/"
 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"
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp lapack mpfi qt4"
+IUSE="+cxx doc examples +gmp mpfi qt4"
 
 RDEPEND="dev-libs/boost
 	dev-libs/mpfr
@@ -26,13 +26,11 @@ RDEPEND="dev-libs/boost
 	x11-libs/libX11
 	virtual/opengl
 	gmp? ( dev-libs/gmp[cxx=] )
-	lapack? ( virtual/lapack )
 	qt4? ( x11-libs/qt-gui:4
 		x11-libs/qt-opengl:4 )
 	mpfi? ( sci-libs/mpfi )"
 DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
+	app-arch/xz-utils"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -57,8 +55,6 @@ src_configure() {
 		"-DCGAL_INSTALL_LIB_DIR=$(get_libdir)"
 		"-DWITH_CGAL_Qt3=OFF"
 		"-DWITH_LEDA=OFF"
-		$(cmake-utils_use_with examples)
-		$(cmake-utils_use_with examples demos)
 		$(cmake-utils_use_with gmp)
 		$(cmake-utils_use_with qt4 CGAL_Qt4)
 		$(cmake-utils_use_with mpfi)
@@ -71,6 +67,6 @@ src_install() {
 	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples demo
 	fi
 }