Convert gmp[-nocxx] to gmp[cxx].

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 5fcd8c8dc89acf341962dee72bbb4e72b58e37c6..9b1977c00f5a77009131c04ba7c4fb119230cac9 100644 (file)
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/cgal
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.8 2010/11/01 21:43:15 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.9 2011/11/13 19:52:57 vapier Exp $
+
+  13 Nov 2011; Mike Frysinger <vapier@gentoo.org> cgal-3.6.1.ebuild,
+  cgal-3.7.ebuild:
+  Convert gmp[-nocxx] to gmp[cxx].
 
 *cgal-3.7 (01 Nov 2010)
 

diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 572adec690b9c67075a4ff3d76f99d6b8eccd993..edb9ed5e32bb1b4de040d506caf809607a7619b8 100644 (file)
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST CGAL-3.6.1-doc_html.tar.xz 21378232 RMD160 7379bb51b32c19c00ee64385d8ad358991bf395b SHA1 f471df42a80da6ad84360675d91f8df9cb0c860b SHA256 3e569025946f8c2b2d0463aa2a1b64f63ec1b391841f4bc171aea399153edfa2
 DIST CGAL-3.6.1.tar.xz 9710892 RMD160 680720b0ab58cfbbe1af908a444cd7cdbb230c6f SHA1 d2dafdfbb965b091c24be93decc593373e59c9c1 SHA256 ef32228c84c3493725d6fdc45585ee1db9c049cfb9e805d836dbca3d59da3eff
 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
-EBUILD cgal-3.6.1.ebuild 1802 RMD160 5bff372cead74bce7d3b0fe46c9ac90cb6fc3dd9 SHA1 b065c12d82398fa3d30918261849b05885d354fb SHA256 2d1d8582f38c559440113abb000da58a9f8b11f89949646ef85571f243b615ed
-EBUILD cgal-3.7.ebuild 1800 RMD160 e4534b7c1baa31c189b6ded73b0d6ad6c41a6c3d SHA1 a725eab8d6e2d51c0087a4754adaa8d93b7e1b92 SHA256 3045d438dc57af3e7960acdbbe6212a8999baa1b6d09445cd1f33d6c80d951da
-MISC ChangeLog 1500 RMD160 d4a71c2fb126d5faa8fcf75252eee249de4a8a70 SHA1 e3f079da358933526c1ff02e28acf02405f71164 SHA256 ead464dea9455ff821fb47f6879363ea1dd4e0b4a58327d6621a64129f2b0344
+EBUILD cgal-3.6.1.ebuild 1820 RMD160 b55e179b7c76e15f229e191cf9da468b4dfb91f7 SHA1 94f65003e1e3b74ba1779587918aa9d3f6c948e9 SHA256 3ad18fa123f674fe799ab7ccbaff5e9c1e2d65242473a5eb93e006e6abe8c737
+EBUILD cgal-3.7.ebuild 1818 RMD160 8bf7a096dad3dc0e46eab784895a63790ce50684 SHA1 7f8b6c709f18f6ca9efb1c283e96bc6875e464a4 SHA256 0f321b4daefc46a8735843d8e04f3a09782e9057e856dcd463c2c375ef02fb05
+MISC ChangeLog 1622 RMD160 6427a6ddddeda365a575f7a593d8badad20c5eea SHA1 c26d2e9d97c490ad395b69d524b96f1f519a7fb6 SHA256 dc1c0b7be88211f08fb4068474ac04c1b5fe37eb99f389f68a2d84321d551c06
 MISC metadata.xml 916 RMD160 1e3efe4abd679bae8f6a4c85dea67bd82968dfeb SHA1 8f8ea07fd33c62bfbe75a427984fbdfcf285a1f9 SHA256 37c0dcf6b8ff830f6b09db0403a15d18c625d442cb524a6cb2405960a6268557
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkzPNHwACgkQ1ycZbhPLE2ALUQCfTJzIJ2tc6O/heTi+dQks8/J1
-YuoAnjRmGgGoj6dUqo9yblUTUS/4fAXW
-=pJtH
+iF4EAREIAAYFAk7AIB8ACgkQaC/OocHi7JZp4QD/f9e5HINk47JLNAfaPQD+1d/1
+4i2NC3mKBrukqv5ZEmAA/0vksqQr5uO9tgpCimMeQcIpSHMifp4710iAnluRTOeZ
+=+5Ui
 -----END PGP SIGNATURE-----

diff --git a/sci-mathematics/cgal/cgal-3.6.1.ebuild b/sci-mathematics/cgal/cgal-3.6.1.ebuild
index 63255b329de21a7f47b27fa7a43965f3e771e0f5..65f1524f6b48ce1238a1dd415e733d0f2a0c524e 100644 (file)
--- a/sci-mathematics/cgal/cgal-3.6.1.ebuild
+++ b/sci-mathematics/cgal/cgal-3.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.6.1.ebuild,v 1.1 2010/07/12 17:08:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.6.1.ebuild,v 1.2 2011/11/13 19:52:57 vapier Exp $
 
 EAPI=3
 CMAKE_BUILD_TYPE=Release
@@ -25,8 +25,10 @@ RDEPEND="dev-libs/boost
        sys-libs/zlib
        x11-libs/libX11
        virtual/opengl
-       gmp? ( dev-libs/gmp
-               cxx? ( dev-libs/gmp[-nocxx] ) )
+       gmp? (
+               dev-libs/gmp
+               || ( dev-libs/gmp[cxx=] dev-libs/gmp[-nocxx] )
+       )
        lapack? ( virtual/lapack )
        qt4? ( x11-libs/qt-gui:4
                x11-libs/qt-opengl:4 )"

diff --git a/sci-mathematics/cgal/cgal-3.7.ebuild b/sci-mathematics/cgal/cgal-3.7.ebuild
index 29ff892e270d9270caa0f9851ee02aa19858d402..603f1d7664eeaf42feb3b4b79c4274508b6edbf8 100644 (file)
--- a/sci-mathematics/cgal/cgal-3.7.ebuild
+++ b/sci-mathematics/cgal/cgal-3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.7.ebuild,v 1.1 2010/11/01 21:43:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.7.ebuild,v 1.2 2011/11/13 19:52:57 vapier Exp $
 
 EAPI=3
 CMAKE_BUILD_TYPE=Release
@@ -25,8 +25,10 @@ RDEPEND="dev-libs/boost
        sys-libs/zlib
        x11-libs/libX11
        virtual/opengl
-       gmp? ( dev-libs/gmp
-               cxx? ( dev-libs/gmp[-nocxx] ) )
+       gmp? (
+               dev-libs/gmp
+               || ( dev-libs/gmp[cxx=] dev-libs/gmp[-nocxx] )
+       )
        lapack? ( virtual/lapack )
        qt4? ( x11-libs/qt-gui:4
                x11-libs/qt-opengl:4 )"