Forward-port USE=static from gnupg1 since wschlich asked for it in bug #159623.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 110 insertions, 12 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 5303df40065c..1134503fa576 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.333 2008/07/24 21:18:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.334 2008/09/09 09:52:48 robbat2 Exp $
+
+*gnupg-2.0.9-r1 (09 Sep 2008)
+
+  09 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> +gnupg-2.0.9-r1.ebuild:
+  Forward-port USE=static from gnupg1 since wschlich asked for it in bug
+  #159623.
 
   24 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b92f8d2a51d7..9f1edb5f8462 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnupg-1.4.3-keyserver.patch 455 RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775aa9e SHA1 48818a3a333a4a8a7175f8c21ec2e811b3fd20c3 SHA256 242a8497230a75e2f4c9a34a91aef73560052925eff822d1e5e566faee8b27ec
 AUX gnupg-1.4.3-selftest.patch 1324 RMD160 0a8e6d50fde48a2e795907ca56e1e95261919f43 SHA1 0003ffe4d032ace008e6d6ebca364327225a097f SHA256 0ca949d63f7dbb882c0119344c47bfaa99132bb4c7f253194eea06c7472afa54
 AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 SHA1 8423f2fb9e41fdfbcb4b1eae2c5a99b0c9e045bb SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5
@@ -18,13 +15,7 @@ EBUILD gnupg-1.4.7-r1.ebuild 5999 RMD160 1e83a6250e2dabccca3204518128be1310415d7
 EBUILD gnupg-1.4.8-r1.ebuild 5915 RMD160 d5b4b589894b0ba279a880ed63b547309b638198 SHA1 af2df2742f372308376f0e7cc77dc5317d938221 SHA256 07e704755d89c8f3f783109a5a4450c87bbf15baedbe1e2d627bd77ae571c2bf
 EBUILD gnupg-1.4.9.ebuild 5286 RMD160 205e75820fef084e3199b169b4abe4cf0780b9da SHA1 26227769812c0bfd29337341f236bb3ed34d1ee9 SHA256 568824f824824e1f15fbde4af725257009f7b3c0a5c480c0b728afd7f4d2bd78
 EBUILD gnupg-2.0.7-r1.ebuild 2302 RMD160 c9aaeefb3c66868fe809deca0866958e7348ba6d SHA1 d312d98b966447b1d88f2e052c94f67a6a0e5065 SHA256 adbdc8f443b6445163a19f87111a647cc9e7b99f0fa276800d9c572b228e8161
+EBUILD gnupg-2.0.9-r1.ebuild 2776 RMD160 93881f9ec9bff859d8cfcc7731a7181c3d52bcce SHA1 0dd65255c877f7f543bb270141ff09a23f459b5f SHA256 cd369cf010ac529c854c39e475a87c70c06d0672e03a3c91a37658ce22a89e05
 EBUILD gnupg-2.0.9.ebuild 2461 RMD160 98f51e866193566bb5a6bff6f464f1b57e90b162 SHA1 fcf1af06615b3693f89493ad64663d78c85b34d2 SHA256 f8bed4946fe599453389889a77b9c71643bcd9b84c9f2bb8696ab1e85abe0dc5
-MISC ChangeLog 51173 RMD160 a93a3535fb5682599d85ae69e75d0bb1ba3a5b4d SHA1 de7bcb1291382438d39929145e74e20a709c9e42 SHA256 85a26b8cf69225b827ee5448cafa26e7e00e433c4eae0bb1bc0034c9deffd18e
+MISC ChangeLog 51367 RMD160 9ead523134919c6cf96abfff846e1afb5220d248 SHA1 69f7ba574e91c22b6bf94ef2ad6c389dbc196604 SHA256 3fd880a9c8a5506971a747a57cf873b16fb5ec1989f5df18d2a9a48d85a31c3b
 MISC metadata.xml 761 RMD160 aa904a3aff174a600c65c12d5d3d542f74d7bd90 SHA1 667c54a392c0fa240742f532fc68480f2688c067 SHA256 d68c858e4e8d3134091cb07dad98f99fcf05589159359f0ac5ee51127f2918d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiI8cMACgkQoeSe8B0zEfxDWACdG7Q0M2k83s0REOV2KNaV798n
-DfsAn1Nk3I0Vsljot2eG1E9o8WTRVTWp
-=CjSe
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..08e2deee20e8
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.9-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 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.1 2008/09/09 09:52:48 robbat2 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}"
+	prepalldocs
+
+	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"
+}