Added mpfi support, thanks Martin von Gagern, bug #393651. Switched to EAPI4

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

4 files changed, 21 insertions, 15 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 7d3e90292105..cb08f4f2fc77 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.11 2011/11/25 18:40:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.12 2011/12/17 03:31:49 bicatali Exp $
+
+  17 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> cgal-3.9.ebuild:
+  Added mpfi support, thanks Martin von Gagern, bug #393651. Switched to EAPI4
 
 *cgal-3.9 (25 Nov 2011)
 
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index ea23b5c120d0..94f1c597b77e 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -6,13 +6,13 @@ DIST CGAL-3.7.tar.xz 9548960 RMD160 1e160200aebabea1e2cd3a70785d20407b8b91cb SHA
 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
 EBUILD cgal-3.7.ebuild 1775 RMD160 7e42b832a0cb432fa28f9d6bb90b0304e7e30990 SHA1 82a77ff54ee93ae35357cb696f29236625c5c51b SHA256 c1e0fec1f10e71894f7c488e6bc51ff06ecc70d3c9a4bcd537331f97b10ccd8c
-EBUILD cgal-3.9.ebuild 1774 RMD160 5ff28b41391b4dc45a6fea1f37921d3e949888b8 SHA1 ea97f0982e281c0e5f7b6b2c8c6016091c26c90f SHA256 48efa9d40a059818ea0df818098e0f52fd3784c1c356e7e83c46c5f7015625a6
-MISC ChangeLog 1898 RMD160 0ecb68837935ee347959e263aadeff704b8c2a02 SHA1 5638fe4c69a3f83f5817414e6951df37b7612bbb SHA256 0ed8827d44cff90cabcbbd15dae2276890edcb9b5b1175b33f239b6c4b1efe98
-MISC metadata.xml 916 RMD160 1e3efe4abd679bae8f6a4c85dea67bd82968dfeb SHA1 8f8ea07fd33c62bfbe75a427984fbdfcf285a1f9 SHA256 37c0dcf6b8ff830f6b09db0403a15d18c625d442cb524a6cb2405960a6268557
+EBUILD cgal-3.9.ebuild 1816 RMD160 769959d4e6e3260e8a0d2c8e11c50e05d1fec189 SHA1 bbd63878d2f9c8f889d923e471dc56ea12593477 SHA256 9ebd3e1ae85f343af76bee5c2d023ab701e822c8576cae25d33203fbd1c512a0
+MISC ChangeLog 2050 RMD160 7decb2d7d715391b9e73a8bf4f00729feb56b2d5 SHA1 77537cd5969ec422d390c949e0e9b57b1e3d8f81 SHA256 3d4babd49b0e2e97ad3cd91dade7fd608860a9cd27e25e4ddfdc0b8317618922
+MISC metadata.xml 1049 RMD160 2ab153fc344d526d9f9fc12e285160f4ec5d8e60 SHA1 8680032349320bdfaf263551f7ad7f78676f64de SHA256 9b0ea9aa750cf2ca562d0b7e11e83f3b707455f7afb50052c35ca959d0966adb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7P4QoACgkQ1ycZbhPLE2D3UwCfb05OMMkci8vCm2KsHagVaX0F
-IG4An0YsmtmAPSed6T+q3ND0+5xrQJAi
-=Rlat
+iEYEARECAAYFAk7sDS4ACgkQ1ycZbhPLE2A+gACfWUcquXBZGBlS75J9TlFYz39y
+NSAAn13P2+x2810IFKsahKJvWSecXkqs
+=cijP
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cgal/cgal-3.9.ebuild b/sci-mathematics/cgal/cgal-3.9.ebuild
index c0486b920429..cea0973bd5c6 100644
--- a/sci-mathematics/cgal/cgal-3.9.ebuild
+++ b/sci-mathematics/cgal/cgal-3.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.9.ebuild,v 1.1 2011/11/25 18:40:02 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.9.ebuild,v 1.2 2011/12/17 03:31:49 bicatali Exp $
 
-EAPI=3
+EAPI=4
 CMAKE_BUILD_TYPE=Release
 inherit base multilib cmake-utils
 
@@ -18,7 +18,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
 LICENSE="LGPL-2.1 MIT QPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp lapack qt4"
+IUSE="+cxx doc examples +gmp lapack mpfi qt4"
 
 RDEPEND="dev-libs/boost
 	dev-libs/mpfr
@@ -28,7 +28,8 @@ RDEPEND="dev-libs/boost
 	gmp? ( dev-libs/gmp[cxx=] )
 	lapack? ( virtual/lapack )
 	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4 )"
+		x11-libs/qt-opengl:4 )
+	mpfi? ( sci-libs/mpfi )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	dev-util/pkgconfig"
@@ -60,17 +61,16 @@ src_configure() {
 		$(cmake-utils_use_with gmp)
 		$(cmake-utils_use_with lapack CPACK)
 		$(cmake-utils_use_with qt4 CGAL_Qt4)
+		$(cmake-utils_use_with mpfi)
 	)
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	fi
+	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die
+		doins -r examples
 	fi
 }
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index ede8b8ce8651..51bda3ad07d7 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -15,4 +15,7 @@
   * the Support Library which offers interfaces to other packages,
     e.g., for visualisation, and I/O, and other support facilities.
 </longdescription>
+<use>
+  <flag name='mpfi'>Enable support for multiple recision interval arithmetic via <pkg>sci-mathematics/mpfi</pkg></flag>
+</use>
 </pkgmetadata>