From: Alexis Ballier Date: Fri, 9 Dec 2011 20:49:07 +0000 (+0000) Subject: require static-libs on gmp when building with static-libs but do not force to disable... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f7962e623c7cb89a9462c1707bcc8c3ff013b764;p=gentoo.git require static-libs on gmp when building with static-libs but do not force to disable them on gmp when not, bug #394141 Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog index ee434e7426e1..f6c732a7a0d6 100644 --- a/dev-libs/mpfr/ChangeLog +++ b/dev-libs/mpfr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/mpfr # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.144 2011/11/29 16:52:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.145 2011/12/09 20:49:07 aballier Exp $ + + 09 Dec 2011; Alexis Ballier mpfr-3.0.1_p4-r1.ebuild, + mpfr-3.1.0.ebuild: + require static-libs on gmp when building with static-libs but do not force to + disable them on gmp when not, bug #394141 29 Nov 2011; Mike Frysinger mpfr-3.1.0.ebuild: Drop fbsd KEYWORDS as this breaks gcc #390425 by Tibor Vago. diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest index 4ff2b82a267e..6f80e474e928 100644 --- a/dev-libs/mpfr/Manifest +++ b/dev-libs/mpfr/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX 2.4.2/patch01 7136 RMD160 e612c1f8013860bbe53354022700855fdbc804f2 SHA1 9c8a8325848b4331e5c032abee1c765ad2e56de2 SHA256 ff84b6a8626c79f869d5625d70900e1f99a37f623cb124fdd949dcbcf9f9757e AUX 2.4.2/patch02 2538 RMD160 9d68771b4e7b267d20140a6e7b6fb55ddf38ef80 SHA1 39d921bd8d9b9f6abbd7d0311bcceaab7e0b77a6 SHA256 b61b3ff4abaf93e031d446be201c659275d1b49d1a02ac0a2de45e5fafd47f0b @@ -19,15 +19,15 @@ EBUILD mpfr-2.4.2_p3-r1.ebuild 1102 RMD160 7937de41668c29bf50ceab92a9962e2e8d1e9 EBUILD mpfr-2.4.2_p3.ebuild 1601 RMD160 182b7d499557a2b0f5004ed102df868e0dabddd8 SHA1 3442767169eb53890a84fd60e93ae172d4787c88 SHA256 2d8ee53ec3386fbdbedd4612e4465c8d0a0a7c97368d78b9e68905d4ececaf4c EBUILD mpfr-3.0.0_p3.ebuild 1748 RMD160 e5bf93a0874bdb2fe5b7bf8f641d5d082785fba1 SHA1 11d26e3ea339c458a8eddcadc362e133162af027 SHA256 f161f9a16d002a5389ca48edd8678e1b44ccd00fda9b8c9a1c01981cfbe6ec11 EBUILD mpfr-3.0.1.ebuild 1756 RMD160 a666b47eb67175f557e2bef87cf7e55ea5efc7f6 SHA1 859fdb82ecfe04ab15042b905dc6573cef49b29f SHA256 652714b807aef27a9f57ebbae04a7d42faf9cf09f2759b53ba51e8c706da088b -EBUILD mpfr-3.0.1_p4-r1.ebuild 1906 RMD160 5f858466fb0fbd43eb02817600d84b9ef7a920d5 SHA1 4792d4cc91c1d99d8898f1d9c2602d62673db787 SHA256 cdec1f946a6144163555b57c348cb19bde2295ef775312b687af08c7809a4c0a +EBUILD mpfr-3.0.1_p4-r1.ebuild 1908 RMD160 46d7980cada0eb39a9d13142859e69ccdd6392d5 SHA1 65a2c45e7641fb1689487dbe83650718dab2d721 SHA256 aa8ae35c4f1c87abb8b05ff820d90b8babe959399ddb0c5d3f8d65929ed0f129 EBUILD mpfr-3.0.1_p4.ebuild 1750 RMD160 c4cb52e3b3c7151e83112376116317fbce66f536 SHA1 d198a4c63592cb5e2e6a91be6e1e35a5e9a0e2e7 SHA256 9800a6101a8052457713d1a4a42f25cb7d9b1818ad7deccb02fd0a8be68faca8 -EBUILD mpfr-3.1.0.ebuild 2016 RMD160 676e12482203c2271a5422aadef51c804d74eb4e SHA1 52dfa930d035680bbf3404d6d6b0869db3a45dad SHA256 bfd49dee7e5980b9268c28e37ae0e4e4d30dbc42264b782837e6b6b3fe06617e -MISC ChangeLog 17686 RMD160 342f4a48af93171b9cc9dc53d3ea4d253648a2f6 SHA1 2f9754a9d4ab092594e8a52eb1ab68c2cc88f392 SHA256 d9cfd4842bf808788fcd311d251155036d57962a3528d3caedc9b2d0d48e289e +EBUILD mpfr-3.1.0.ebuild 2018 RMD160 948a9e79434254cb3988d5b613d2dffcac46fef5 SHA1 e0288b79f227d01ba564a3bb793c0f5e21c08540 SHA256 cda4f86d00282b4e98f25ec92857998bec44983439fb8f4800c62e4c8ac52028 +MISC ChangeLog 17911 RMD160 4fcbd17d29845eaf11eb31d8ff192cd4d4d19d1f SHA1 47af551ae49c48bbca5ca942e002addd2a847a05 SHA256 55e319a0777449c4a553d2631e3d6884089a94c79f22934a9025593d5d5a6442 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7VDe0ACgkQaC/OocHi7JasXAD/bKPP7BOEpBzGyziPwT1zjCci -Jb45PzYGwdngQr8wTuoA/08yCmPpGJw6prYZNdQw/RYcaFVGf6or7oOHgngxy2PL -=9Kbq +iEYEARECAAYFAk7idEgACgkQvFcC4BYPU0oC8ACcCZM507ZxRGlUS1Iavn70lWz9 +CTwAnjdp8VXsIV4MQPSkH1avltciblXB +=Wpda -----END PGP SIGNATURE----- diff --git a/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild b/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild index f4e8740f9db9..4ed5b3f326ff 100644 --- a/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild +++ b/dev-libs/mpfr/mpfr-3.0.1_p4-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/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild,v 1.1 2011/08/25 19:44:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.0.1_p4-r1.ebuild,v 1.2 2011/12/09 20:49:07 aballier Exp $ EAPI="3" @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="static-libs" -RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs=]" +RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/dev-libs/mpfr/mpfr-3.1.0.ebuild b/dev-libs/mpfr/mpfr-3.1.0.ebuild index 085c51567f3f..2f86a13f9970 100644 --- a/dev-libs/mpfr/mpfr-3.1.0.ebuild +++ b/dev-libs/mpfr/mpfr-3.1.0.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/dev-libs/mpfr/mpfr-3.1.0.ebuild,v 1.2 2011/11/29 16:52:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.0.ebuild,v 1.3 2011/12/09 20:49:07 aballier Exp $ EAPI="3" @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd" IUSE="static-libs" -RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs=]" +RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P}