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

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

diff --git a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
index 0d95a4899a108815e9b8ded6a7c9357eb18978f7..e9b381733095aeacd879daee31aa75bdabd11eb2 100644 (file)
--- a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.1 2011/06/03 08:31:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.2 2011/11/13 19:30:50 vapier Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ IUSE="static-libs"
 
 DEPEND="
        sci-mathematics/glpk[gmp]
-       dev-libs/gmp[-nocxx]"
+       || ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )"
 RDEPEND="${DEPEND}"
 
 AUTOTOOLS_IN_SOURCE_BUILD=1

diff --git a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild
index 65d27d1c8c32d2c3e61614136fb39cf1e30631a3..37b3a646b2fd8a66c0060fd78129ce962725897f 100644 (file)
--- a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2.ebuild,v 1.4 2011/06/03 08:31:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2.ebuild,v 1.5 2011/11/13 19:30:50 vapier Exp $
 
 EAPI=3
 
@@ -16,5 +16,5 @@ KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 DEPEND="sci-mathematics/glpk[gmp]
-       dev-libs/gmp[-nocxx]"
+       || ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )"
 RDEPEND="${DEPEND}"

diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog
index 0b366642500da71e6d835fd8d79818959af310b2..f95a9666314a81831b0d998a6f9e6830889b31af 100644 (file)
--- a/sci-mathematics/4ti2/ChangeLog
+++ b/sci-mathematics/4ti2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/4ti2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.4 2011/06/03 08:31:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.5 2011/11/13 19:30:50 vapier Exp $
+
+  13 Nov 2011; Mike Frysinger <vapier@gentoo.org> 4ti2-1.3.2.ebuild,
+  4ti2-1.3.2-r1.ebuild:
+  Convert gmp[-nocxx] to gmp[cxx].
 
 *4ti2-1.3.2-r1 (03 Jun 2011)
 

diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index 55ee0d7014829d4bcd68f98bba9bb1caf9cc7dc5..bf0de5575bca5e451e7984140451d6f45ab4a3b9 100644 (file)
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 4ti2-1.3.2-gold.patch 966 RMD160 29aab8aa4e7f60d1671e24f1c4423282acf4ab22 SHA1 56d508636e59a0d135680b2095a9f1d8862c84e4 SHA256 ef27c3acb27b3cfed6d351662b633bac9c301bb11e5da4479f08b160d05baabc
 DIST 4ti2-1.3.2.tar.gz 4658600 RMD160 e3c5994f458912553988cd113fb9ce1f51c17fe6 SHA1 bb0bddb3a9de6f6ceeee7e296b5315b8b7e59ea5 SHA256 30f15696105b5cfa0784d2f7f9a310ef67d616d2367e064c85ba36ec9a20a066
-EBUILD 4ti2-1.3.2-r1.ebuild 711 RMD160 a5a88bc6550c8569c0b0e0ec00260c2a1361a20f SHA1 c860d144e5cafa5b20a0b4416136fde3fe6afa9a SHA256 dbae52ed28e02b84368ac70f50bb4d453b05800a282a0a92bd4e875aafd03736
-EBUILD 4ti2-1.3.2.ebuild 561 RMD160 d9a04280930d63ba76c24d638e1baf6649ae49e5 SHA1 52314f2490b6f20d0975a20381e0f5607befc41a SHA256 fe40033c10f820a5cfac4c3a93d47ff9b1edce6b1209aac1576070789444cfa6
-MISC ChangeLog 1220 RMD160 93758525d093628ec1a2eb33f7632155f70d7084 SHA1 63eb16a3c766052523e5daf00436e953b97cd17c SHA256 0e757f2944b6af8aa827e2fd0068f0c9c14ad47f44c5453baf5876f17fd1d679
+EBUILD 4ti2-1.3.2-r1.ebuild 738 RMD160 afed3da573073da20828003a6600cc004c751574 SHA1 bd90eb24bed0387d9248e60063947cdaf2c44372 SHA256 e463154477b34e6c7b581d5fea8bcc81b8d5dc3c73c3c560c64452a2b7816879
+EBUILD 4ti2-1.3.2.ebuild 588 RMD160 a7176a2d47c98b3d02e0b2c5690eeea91ae10bbd SHA1 071f8ac1981af2ee4667daf9afcf6f398cbaba5a SHA256 fe66771cd417ac4a5cc6e1e91bce036e015f82f780716b57afca4020f637f080
+MISC ChangeLog 1351 RMD160 f2f67e5535d112819a7615e8cb1a0c9181e5a66e SHA1 f29cf3fdcbd50cf0afff0518aa12c085c29950b4 SHA256 ba503f2847da0d378e88c33ad414290123752abf8c78cdc8f61246f6ed98774e
 MISC metadata.xml 426 RMD160 ef501b7737209ac4e49a8011f6d0778cc316f32f SHA1 a8fc342f767cb21a539261f32d51e42d4785fd4b SHA256 53c6fa4c1747a7089fca2db2d100fec2a592a254c37b081535d7d436b0fd8e8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3om+wACgkQgAnW8HDreRbjzQCgm2YwEstx8V8NDLTrPVXkspDv
-jfkAoIpg/BC91j1wTv54/eR4nD6Qj/9C
-=mKq/
+iF4EAREIAAYFAk7AGvEACgkQaC/OocHi7JaRjQEAi7659F+58wI4k0BNsyUfXPnf
+lhQlyfUrArBJjEOpX3QA/3M1Ns8mxaoMUEOnk4mogDA1qP/Cq/vEIW+SeXyHXex3
+=1ENv
 -----END PGP SIGNATURE-----