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

(Portage version: 13659-svn/cvs/Linux x86_64)

6 files changed, 52 insertions, 212 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/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"
-}