Fix building with "static" USE flag (bug #316065).

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

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 6ac600f6f34940484a00d18f311e07ec5b8819e9..a2b5b13e6856f50d0f1500761659ec7750ff0c8e 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.368 2010/04/02 22:38:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.369 2010/05/19 11:04:52 arfrever Exp $
+
+  19 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gnupg-2.0.15.ebuild:
+  Fix building with "static" USE flag (bug #316065).
 
 *gnupg-1.4.10-r1 (02 Apr 2010)
 

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2f6a4aac87a4a93f7459674e6f159b0f082fec78..f7c5cec336b8879b90a974e66fb5dd220f619794 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -12,6 +12,6 @@ EBUILD gnupg-2.0.11.ebuild 2761 RMD160 a9979ae493727d5a6b350d518fc34d0ac13b042c
 EBUILD gnupg-2.0.12.ebuild 3185 RMD160 325056f1fcef665a1e1e8ae17097278a52c8354c SHA1 bf516692f1c5a8923e32d7b811879c954507b527 SHA256 0fa806394956a2f885b3066ae91a3cb31bf8390f89425fd4271a7a5a53243300
 EBUILD gnupg-2.0.13.ebuild 3158 RMD160 ab01ac93f92c3929437feb1a9581d0035f83d87b SHA1 1c8ec29aceb414e0c8f604b5b46220278b9a566c SHA256 e906bf2ef3bc84fca0063d035422772fb5302aa86fe81f57be22ac196b75d762
 EBUILD gnupg-2.0.14.ebuild 3239 RMD160 e8491e8882552bc24db50356dc8849e36d13236c SHA1 4554fa53adf6c4c6fec0430b7b406dd2f50155a8 SHA256 8ffdaefb4e605547073c6dfda0caf2f31f485be4da911fb98de36b0280226615
-EBUILD gnupg-2.0.15.ebuild 3250 RMD160 d9241f7564748206f55ac6c76f169d963e4b68c7 SHA1 58bb331679710e34b83a8ccb6bb3ace6b972db87 SHA256 bd8f2bf4558a6d73985bff561bcfdb9d009f2e5c4f6fa9ab124ba446f719e067
-MISC ChangeLog 56328 RMD160 c8da8bf181d0850db703b869a2421c7ba9945adf SHA1 bdf1f7ec384a49e992d29261b914b2bd51e2e787 SHA256 8d238c6e1c23aca78f36e98ce3e6ad80b7805d9fb48d5241be176d0a11e49eea
+EBUILD gnupg-2.0.15.ebuild 3303 RMD160 c25e28dc5a8902f031afba3d536d3c2dcb5e73f4 SHA1 1600fac25c7a9423fae02781d1f8ef9f230ddd8d SHA256 a64dd347541c9828ad96734f440157184464fa30782cd5a888926142a7ddfc63
+MISC ChangeLog 56479 RMD160 ac9b4fe680d4369b4b0574acd4a5825300baa7f6 SHA1 f4b63bb5292fbb4ee4c52b2650cbcf9d5a57160b SHA256 dda32130694791b823fd08d432548a3d91661c8d0689828035c069d067e52cbc
 MISC metadata.xml 698 RMD160 8c3577ffbf64da24c47d181ef24f8f7e9e09a224 SHA1 92579ce4870e7bbee4bf596bb466b3f9ce587157 SHA256 8f18f677d1d437d3033b367e8a7514b745a762d518af7a3afdc44e1ddbf2b31e

diff --git a/app-crypt/gnupg/gnupg-2.0.15.ebuild b/app-crypt/gnupg/gnupg-2.0.15.ebuild
index d72662ebf6ca4e18959a147934f85a763ed8ae22..a3a1c7eec3e0c40ea33bb152030dc3445e44272c 100644 (file)
--- a/app-crypt/gnupg/gnupg-2.0.15.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.2 2010/04/01 21:28:21 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.3 2010/05/19 11:04:52 arfrever Exp $
 
 EAPI="3"
 
@@ -18,9 +18,10 @@ IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
 
 COMMON_DEPEND_LIBS="
        >=dev-libs/pth-1.3.7
+       >=dev-libs/libassuan-2
        >=dev-libs/libgcrypt-1.4
-       >=dev-libs/libksba-1.0.2
        >=dev-libs/libgpg-error-1.7
+       >=dev-libs/libksba-1.0.2
        >=net-misc/curl-7.10
        adns? ( >=net-libs/adns-1.4 )
        bzip2? ( app-arch/bzip2 )
@@ -33,7 +34,7 @@ COMMON_DEPEND_BINS="app-crypt/pinentry"
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
        ${COMMON_DEPEND_BINS}
-       >=dev-libs/libassuan-2
+       static? ( >=dev-libs/libassuan-2[static-libs] )
        nls? ( sys-devel/gettext )
        doc? ( sys-apps/texinfo )"