diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-03-05 05:21:04 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-03-05 05:21:04 +0000 |
| commit | 8dc22295f87d45beb9e0c6e98e41b205b71203d0 (patch) | |
| tree | 87dae1d4ea4b86f112e20420d860204be73277d9 | |
| parent | simplify SLOT logic (diff) | |
| download | historical-8dc22295f87d45beb9e0c6e98e41b205b71203d0.tar.gz historical-8dc22295f87d45beb9e0c6e98e41b205b71203d0.tar.bz2 historical-8dc22295f87d45beb9e0c6e98e41b205b71203d0.zip | |
Allow older zlib versions without the static-libs use flag to statisfy the dependency as well.
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
| -rw-r--r-- | app-crypt/gnupg/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/gnupg/Manifest | 18 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.0.18.ebuild | 4 |
3 files changed, 16 insertions, 12 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog index 8f838016392e..3b80d1c6992d 100644 --- a/app-crypt/gnupg/ChangeLog +++ b/app-crypt/gnupg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/gnupg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.424 2012/03/05 04:31:00 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.425 2012/03/05 05:21:04 radhermit Exp $ + + 05 Mar 2012; Tim Harder <radhermit@gentoo.org> gnupg-2.0.18.ebuild: + Allow older zlib versions without the static-libs use flag to statisfy the + dependency as well. 05 Mar 2012; Tim Harder <radhermit@gentoo.org> gnupg-2.0.18.ebuild: Add more dependencies required for static build (fixes bugs #395669 and diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 512cb99b8159..7db22bb62378 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -13,17 +13,17 @@ EBUILD gnupg-1.4.12.ebuild 4462 RMD160 5473ce49242acb579d3b530050d83a38e987cc1e EBUILD gnupg-2.0.17-r2.ebuild 4327 RMD160 a167179291f9719675ee320bb34baaeb7969e4d3 SHA1 d63e643734e36adc7fa3c3157076cc8af251a808 SHA256 6eb693b6c4e8ef9a550372c169e8d5cb106b7d6108ee290ad0bfc2acdadbd5e8 EBUILD gnupg-2.0.17-r3.ebuild 4381 RMD160 03bb8bb1b3d6db8f34abe23b47882303031fdbec SHA1 30e8b9678e47b9aa96486e8cf2f66f5a1dc7544b SHA256 53ebe10886402f800a8f34ace3d984f8e124a6f54cc5f64f0bfd2cac433f7061 EBUILD gnupg-2.0.17.ebuild 4545 RMD160 a5152e7221e229cc6802d892f6cef9b1416e2860 SHA1 17b2a367ce0871e2c49c9c7a6a9f94bf07f1c6a9 SHA256 98b9998a41717fa9a4203b0c7a547378f4285dd8f0fe4433818e0d2641659c1f -EBUILD gnupg-2.0.18.ebuild 4464 RMD160 79036876f4b40b0b149b5600cdfe32146e0902fd SHA1 c9a0bd50b46e180ca64da97d986a620c35966f6c SHA256 447b402000b455ce17a9c3bd46df1979e4e101dab96d21a9ab8d18eb027ccb53 -MISC ChangeLog 64611 RMD160 9756542a5b3acfbc3810f831a8b16e263ce83308 SHA1 b9c5545ca85e552be5d5d37988a34479c9cbe71c SHA256 37279137c5309b26cddf9c7e40a93096226a7ab7882247bde994dafe8d2048e7 +EBUILD gnupg-2.0.18.ebuild 4497 RMD160 602c378ab533d2572f8ea5d6a5ed7959d6e14a12 SHA1 9a66a9324988c4b17b90b5b5cbd1fc781aaed7b6 SHA256 ca304f4b0cbce8ddde64122de8a9019d39b12fcc62b270b7bd54869f53ca786f +MISC ChangeLog 64781 RMD160 32e4742d573bec0bc93cf523e5d4a950588f9c13 SHA1 75b5a0708a8cd95134f1bde007ce0cda0d08e209 SHA256 1dd46f846ef8c4fee0a8266a3bd9b697f9250222b8ce8098c65e494a4070d56d MISC metadata.xml 1389 RMD160 bdb5faec4d748978c3560b8d576fcf20644117be SHA1 e251d4c2c7b3e9ece77941ec2a0b6e85c2e6029a SHA256 533eecf8b1099f22d1fc298fcb0618bf5e243a77d0be9360aa56ff8397cb5fb0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJPVEGNAAoJEEqz6FtPBkyjzQoIAKJhyCeWnGtf9hQW3PgmmOVz -gbJlphKA5vXL+LWNWKWfg8mEFsE1fz83aJenB6pt5wVBLwaczU9DZGvCVlaEJYC/ -djPo4odKIte3U/aU1RWJpE9S6BFlZ6ZOfhDO48yla/gd2hmbIISpRp0a06kM8sLW -skExfQTFkb+LKoVVSmjBmMgd50oz+NUISfcm+9hCErZYNczdjUnVIKMAAcrIwEj+ -883NC/glylwXkqY06HDvrzHj6k8/rXQy8JdSu1lrfZ6ya4EbExE0XO5hE7X6vDLH -BdDE7kluzaB/vuCZy2hF/4kIZdw9mKClwulItLgrSXpOIy5pQiqyT2eqJZm2Zy4= -=qGqc +iQEcBAEBCgAGBQJPVE1GAAoJEEqz6FtPBkyjeQ8IAJ85I6OrgcM0LkUwfrtQ74jM +29ywHymwRYLpvQNwzz0WDt5XHgI6q0K2DoA80txKtaCmvS2Xfm4vuUsr5MWfuzA+ +9flZlxNsMlPfBKAJmSBEVhS+kF0mOi+VzLe0UUgX4asCBWlyKJjwmhMuK+P4+yVd +51olVnqf0IihtDQMXqtzbMhSTCquDqnhVsn6J2e5HdOtGWncUL7rvGCpXOQAyT0s +y4cp02O0v8nvq3kiZ7vaYUiAcOjCOCcpX3uLb8uqTUYwdpuESR4cKvu3TLBTOiUJ +U/iRKIhJVw5DT6cF7yZs5/rGajjRhfSLdYk63UBOzzQnOOLVoMFF+mBKDDciQeI= +=FoNw -----END PGP SIGNATURE----- diff --git a/app-crypt/gnupg/gnupg-2.0.18.ebuild b/app-crypt/gnupg/gnupg-2.0.18.ebuild index db87b4561dc5..32643fbeb4da 100644 --- a/app-crypt/gnupg/gnupg-2.0.18.ebuild +++ b/app-crypt/gnupg/gnupg-2.0.18.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/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.5 2012/03/05 04:31:00 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.18.ebuild,v 1.6 2012/03/05 05:21:04 radhermit Exp $ EAPI="4" @@ -40,7 +40,7 @@ DEPEND="${COMMON_DEPEND_LIBS} >=dev-libs/libgpg-error-1.7[static-libs] >=dev-libs/libksba-1.0.7[static-libs] >=dev-libs/pth-1.3.7[static-libs] - sys-libs/zlib[static-libs] + || ( sys-libs/zlib[static-libs] <sys-libs/zlib-1.2.5.1-r2 ) ) nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )" |