Version bump. Fix automagic dependency on net-libs/adns (bug #265570).

Package-Manager: portage-13659-svn/cvs/Linux x86_64

7 files changed, 56 insertions, 219 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index fbfb94ddf2c7..0abfe7afaa69 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.347 2009/05/16 07:48:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.348 2009/06/21 02:36:54 arfrever Exp $
+
+*gnupg-2.0.12 (21 Jun 2009)
+
+  21 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -gnupg-2.0.9.ebuild, -gnupg-2.0.9-r1.ebuild,
+  -files/gnupg-2.0.9-gcc-4.3.patch, -gnupg-2.0.10.ebuild,
+  +gnupg-2.0.12.ebuild, +files/gnupg-2.0.12-adns.patch:
+  Version bump. Fix automagic dependency on net-libs/adns (bug #265570).
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org> gnupg-1.4.9.ebuild,
   gnupg-2.0.11.ebuild:
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 1b47d26de180..da4581f1a5bb 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,16 +1,13 @@
 AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 SHA1 8423f2fb9e41fdfbcb4b1eae2c5a99b0c9e045bb SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5
 AUX gnupg-1.4.9-gcc43.patch 2025 RMD160 104a1f5f08546ab34ee78d117b12611f8ecffb25 SHA1 5dd6f29b374c187751041289e2e7350c3b04f2e1 SHA256 cb0139f18477e545c861581daa8431242a91f837512118a3afbc565818658b53
-AUX gnupg-2.0.9-gcc-4.3.patch 437 RMD160 44717ceb9cec62b0962c0ee1a533bbf24a6e8658 SHA1 42531c856bd885c76683cfdb312f4a0985b94ea4 SHA256 5fda371998ebf521b57c36ac8b47d0f9069a9d43238850520370f8fab55fa171
+AUX gnupg-2.0.12-adns.patch 818 RMD160 5d1b0a267cfd290c0e3b68c58f2fe5a5286c52c2 SHA1 fe3f7a1468a70768f36ef7e8f20b6d8fb8406366 SHA256 cb7b9dcf8019db1afc5aeee0a16659f53c7b41660278c8ecc056f874c22ceea6
 DIST gnupg-1.4.8-ecc0.2.0.diff.bz2 17878 RMD160 532e43cfea00187c72d7d2784decee31b105a5a5 SHA1 822602c76c69160463d7ae3378e8da1b42e6efb2 SHA256 e03a180a95bb3c4c72f4ca97d1038c390b59da1f4d12d97f91ef7932dd01a5c1
 DIST gnupg-1.4.9.tar.bz2 3328743 RMD160 21274c6638bb1bc1983a9b5bccfa1ad9cf708edc SHA1 826f4bef1effce61c3799c8f7d3cc8313b340b55 SHA256 3ca5abcd93eeed4ed832995463db3308bfa552a072ef86fab4940e195fab06dd
-DIST gnupg-2.0.10.tar.bz2 3825638 RMD160 a46c6d7230f259448d9c4ae6ac0956ee88542112 SHA1 d25e41a8cc607334b707d13af819ceaa217800b5 SHA256 d488b7bcb9a67a8416cdd49e74d3f95912f31aa98b60580bad125ecbde14df23
 DIST gnupg-2.0.11.tar.bz2 3852869 RMD160 f532a2c41a4fdcf9bd5130f8d382348f6774ba18 SHA1 9f71a342c5be686b0dcef082078af693802a558f SHA256 8c40148ad471f4a7e583bc5f84ebf652c395b303deaf2583b11e51f43fa8b47c
-DIST gnupg-2.0.9.tar.bz2 3718925 RMD160 175f8d4e83dd6ae8e186b7c09bb8bdbb001a5799 SHA1 959bdb934e3a72d256bfbd0122d996a73adb5d1f SHA256 2dc124908a1dfa3b79d2b0a82aa1a31817128feb14e84a26226beaab13179686
+DIST gnupg-2.0.12.tar.bz2 3924196 RMD160 17edbd6bac5210933ef0cc2ce70820d38ce970ef SHA1 91856f917c13a1a12622ef39995eaf59c46f7502 SHA256 9633e104c519fade1c9fce5843d1f70439b156bcc446aa270ea8192d461d9cce
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.9.ebuild 5315 RMD160 bfeff539e1a52e29a4817d8ebeb5588ba67f002c SHA1 647c6aa972e86b5877459c285a0815a43f752616 SHA256 eca1ba99ed0e1b293587aa66016a3cc131e000d982455bb8e55877f7a7f34298
-EBUILD gnupg-2.0.10.ebuild 2696 RMD160 76931dcd4ef450c0a629450006a14ea4b62e36e8 SHA1 b0facd768a6779efc2708c926bfa6e33aa8c6b98 SHA256 c51d6ec4dd9d1e754d1f2705a22756dbc41c9b1235b738146cbaf17d5555fa19
 EBUILD gnupg-2.0.11.ebuild 2764 RMD160 92234c72463708c7001ce255a6c691be673b110f SHA1 d15a046514a4715078320c7eeb21e6b1edaa80f6 SHA256 f85350d554b2d6c0d370f71b080af8a10e9e2e7b55895546f9e752c5e3fbe0d5
-EBUILD gnupg-2.0.9-r1.ebuild 2765 RMD160 da7f4271f63de67d92b209b8d02f82e94fe1297a SHA1 9e6dd59c21f1c17ea4bf8d72b3b9eb7dd5f0ac7d SHA256 03027be10f972f1d963283355f8aa113f53b8c5018cb7f65e12aed1a08a32fee
-EBUILD gnupg-2.0.9.ebuild 2454 RMD160 473228744b544e195b44c4033203cfe97e04c782 SHA1 61bc3471a26997ce52f52a7cec11b8dbc742125f SHA256 c6d73b76584c19cb07c3426a9ac8c51c7a18596720f00631214f4952d5169c0d
-MISC ChangeLog 53320 RMD160 6bef8a1cf178c51ef99bd87e2088daaebbf1a939 SHA1 5713095b198aed301a4bd760919b830c1ad04143 SHA256 da2e6243d509f4cfc7df0530fdd2d81478a291e0330893e4038685e205c40e9c
+EBUILD gnupg-2.0.12.ebuild 2923 RMD160 579a0509ca83ac1ea3da1f6511eb06e3566cb549 SHA1 f804664f03967fdfcdac58e06559a427c67d1dc0 SHA256 488f48ebfe2a4685a6fa5e8ab1938ae81d43c44d835f7ebd8b8cc245d74e0c28
+MISC ChangeLog 53658 RMD160 23d9e009f02f0777527085ae69f7327b2ddaf770 SHA1 6b83830a7d4138c2e2eb759b35043ec614c81a24 SHA256 8a21839fb184eb29cc464253f669afdb582f96411c130f45cec46df549e25f7c
 MISC metadata.xml 761 RMD160 aa904a3aff174a600c65c12d5d3d542f74d7bd90 SHA1 667c54a392c0fa240742f532fc68480f2688c067 SHA256 d68c858e4e8d3134091cb07dad98f99fcf05589159359f0ac5ee51127f2918d8
diff --git a/app-crypt/gnupg/files/gnupg-2.0.12-adns.patch b/app-crypt/gnupg/files/gnupg-2.0.12-adns.patch
new file mode 100644
index 000000000000..7f62267e48ea
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.12-adns.patch
@@ -0,0 +1,21 @@
+--- configure.ac
++++ configure.ac
+@@ -820,11 +820,13 @@
+                CPPFLAGS="${CPPFLAGS} -I$withval/include"
+                LDFLAGS="${LDFLAGS} -L$withval/lib"
+              fi])
+-AC_CHECK_HEADERS(adns.h,
+-                AC_CHECK_LIB(adns, adns_init,
+-                             [have_adns=yes],
+-                             [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}]),
+-                [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}])
++if test "$with_adns" != "no"; then
++   AC_CHECK_HEADERS(adns.h,
++                   AC_CHECK_LIB(adns, adns_init,
++                                [have_adns=yes],
++                                [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}]),
++                   [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}])
++fi
+ if test "$have_adns" = "yes"; then
+   ADNSLIBS="-ladns" 
+ fi
diff --git a/app-crypt/gnupg/files/gnupg-2.0.9-gcc-4.3.patch b/app-crypt/gnupg/files/gnupg-2.0.9-gcc-4.3.patch
deleted file mode 100644
index 0cad7bc6d8de..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.9-gcc-4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- keyserver/gpgkeys_curl.c	2007-07-04 15:26:13.000000000 +0200
-+++ keyserver/gpgkeys_curl.c.new	2008-04-16 22:14:52.000000000 +0200
-@@ -300,7 +300,7 @@
-       curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
-     }
- 
--  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
-+  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER, opt->flags.check_cert != 0);
-   curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
- 
-   if(proxy)
diff --git a/app-crypt/gnupg/gnupg-2.0.10.ebuild b/app-crypt/gnupg/gnupg-2.0.12.ebuild
index 80c38ab5c808..30efd15f1730 100644
--- a/app-crypt/gnupg/gnupg-2.0.10.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.12.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.10.ebuild,v 1.4 2009/03/23 17:15:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.12.ebuild,v 1.1 2009/06/21 02:36:54 arfrever Exp $
 
-inherit flag-o-matic toolchain-funcs
+EAPI="2"
+
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
@@ -10,18 +12,20 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
 
 COMMON_DEPEND_LIBS="
 	>=dev-libs/pth-1.3.7
 	>=dev-libs/libgcrypt-1.4
 	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.4
-	>=net-misc/curl-7.7.2
+	>=dev-libs/libgpg-error-1.7
+	>=net-misc/curl-7.10
+	adns? ( >=net-libs/adns-1.4 )
 	bzip2? ( app-arch/bzip2 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 	openct? ( >=dev-libs/openct-0.5.0 )
+	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
 COMMON_DEPEND_BINS="app-crypt/pinentry"
 
@@ -40,7 +44,12 @@ RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
 	selinux? ( sec-policy/selinux-gnupg )
 	nls? ( virtual/libintl )"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}-adns.patch"
+	eautoreconf
+}
+
+src_configure() {
 	# 'USE=static' support was requested:
 	# gnupg1: bug #29299
 	# gnupg2: bug #159623
@@ -52,13 +61,16 @@ src_compile() {
 		--enable-gpg \
 		--enable-gpgsm \
 		--enable-agent \
+		$(use_with adns) \
 		$(use_enable bzip2) \
 		$(use_enable smartcard scdaemon) \
 		$(use_enable nls) \
 		$(use_enable ldap) \
-		$(use_enable static) \
-		$(use_enable caps capabilities) \
+		$(use_with caps capabilities) \
 		CC_FOR_BUILD=$(tc-getBUILD_CC)
+}
+
+src_compile() {
 	emake || die "emake failed"
 	if use doc; then
 		cd doc
@@ -71,6 +83,7 @@ src_install() {
 	dodoc ChangeLog NEWS README THANKS TODO VERSION
 
 	mv "${D}/usr/share/gnupg"/help* "${D}/usr/share/doc/${PF}"
+	ecompressdir "/usr/share/doc/${P}"
 
 	dosym gpg2 /usr/bin/gpg
 	dosym gpgv2 /usr/bin/gpgv
diff --git a/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild
deleted file mode 100644
index 230302eff860..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild,v 1.3 2009/02/15 05:10:20 dragonheart Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc ldap nls openct pcsc-lite static selinux smartcard"
-
-COMMON_DEPEND_LIBS="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.4
-	>=net-misc/curl-7.7.2
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
-
-# existence of bins are checked during configure
-DEPEND="${COMMON_DEPEND_LIBS}
-	${COMMON_DEPEND_BINS}
-	>=dev-libs/libassuan-1.0.4
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
-	${COMMON_DEPEND_BINS}
-	virtual/mta
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-}
-
-src_compile() {
-	# 'USE=static' support was requested:
-	# gnupg1: bug #29299
-	# gnupg2: bug #159623
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_enable static) \
-		--disable-capabilities \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${D}/usr/share/gnupg"/{help*,faq*,FAQ} "${D}/usr/share/doc/${PF}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer"
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.9.ebuild b/app-crypt/gnupg/gnupg-2.0.9.ebuild
deleted file mode 100644
index a0d7dc3dcbd9..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.9.ebuild,v 1.11 2009/02/15 05:10:20 dragonheart Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 doc ldap nls openct pcsc-lite smartcard selinux"
-
-COMMON_DEPEND="
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libksba-1.0.2
-	>=dev-libs/libgpg-error-1.4
-	>=net-misc/curl-7.7.2
-	bzip2? ( app-arch/bzip2 )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
-	openct? ( >=dev-libs/openct-0.5.0 )
-	ldap? ( net-nds/openldap )
-	app-crypt/pinentry"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libassuan-1.0.4
-	nls? ( sys-devel/gettext )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/gpg-agent
-	!<=app-crypt/gnupg-2.0.1
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-}
-
-src_compile() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-symcryptrun \
-		--enable-gpg \
-		--enable-gpgsm \
-		--enable-agent \
-		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		--disable-capabilities \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		|| die
-	emake || die
-	if use doc; then
-		cd doc
-		emake html || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	mv "${D}/usr/share/gnupg"/{help*,faq*,FAQ} "${D}/usr/share/doc/${PF}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
-	echo ".so man1/gpg2.1" > "${D}/usr/share/man/man1/gpg.1"
-	echo ".so man1/gpgv2.1" > "${D}/usr/share/man/man1/gpgv.1"
-
-	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
-}
-
-pkg_postinst() {
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate"
-	elog "the right viewer"
-}