Version bump, also build HTML docs per bug #135028.

Package-Manager: portage-2.1.2_pre2-r3

4 files changed, 122 insertions, 5 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 9fe67299a245..50c0065df96e 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.230 2006/10/01 12:26:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.231 2006/10/05 03:58:15 robbat2 Exp $
+
+*gnupg-1.9.22 (05 Oct 2006)
+
+  05 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> +gnupg-1.9.22.ebuild:
+  Version bump, also build HTML docs per bug #135028.
 
   01 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> gnupg-1.9.21.ebuild:
   hppa stable, bug #149652
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 2a23a6fb4282..be2f2854adc3 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -65,6 +65,7 @@ DIST gnupg-1.4.4.tar.bz2 3047120 RMD160 b3807b3cf4fc577bf071261eff787c481bd4e0ca
 DIST gnupg-1.4.5.tar.bz2 3089617 RMD160 f27447b3aec1423ac10c3a5b4745ea3b13c5a5e5 SHA1 553fefe0da5a91108dd9468e381faf9487754f9a SHA256 f30a2679ed6bed71b4af6919cd9b963c896fca64e42eeb0536788cb41b2e1805
 DIST gnupg-1.9.20.tar.bz2 1810059 RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 SHA1 557be26c21c114a3b345ce6b177fcb088883f827 SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
+DIST gnupg-1.9.22.tar.bz2 1908546 RMD160 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3 SHA1 10b2a5c256598d9ed25c84d55ea111710b3f8906 SHA256 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
 EBUILD gnupg-1.4.2.2.ebuild 7080 RMD160 ad87f82e5a35536cd4bc882efab39dcedebf6b5b SHA1 877d3cf21118f61395aaa51e9044d1923fa4965b SHA256 de58d9fbda293860a1917eeffcf8a0d50d55d3d53e544c1aa69c40a5cca4202d
 MD5 90be1fab1a5b3ad1ec357aa5fba83c72 gnupg-1.4.2.2.ebuild 7080
@@ -94,10 +95,14 @@ EBUILD gnupg-1.9.21.ebuild 3062 RMD160 6478955493c9d97cfa1326403644b0c93d1a7c0b
 MD5 5bc0a1aef5721c6e2bf347f3834a8c1e gnupg-1.9.21.ebuild 3062
 RMD160 6478955493c9d97cfa1326403644b0c93d1a7c0b gnupg-1.9.21.ebuild 3062
 SHA256 f65f636475e090e9fb99a83f83f6b06c5d5b32ca2a479d34fdc7832d771e8ea9 gnupg-1.9.21.ebuild 3062
-MISC ChangeLog 36317 RMD160 cc2b134541877985d604568f5b4436b800e86e83 SHA1 6471c9b641fda8438f1f511b1fc115bb0b461eea SHA256 8675979b449a633126a782138d467830ae18523dbcc3cbe84cc86e034ac0e430
-MD5 1e04ba47710988c00a7df834ef6cb0fc ChangeLog 36317
-RMD160 cc2b134541877985d604568f5b4436b800e86e83 ChangeLog 36317
-SHA256 8675979b449a633126a782138d467830ae18523dbcc3cbe84cc86e034ac0e430 ChangeLog 36317
+EBUILD gnupg-1.9.22.ebuild 2642 RMD160 cb26ffefba25c3aa667e6582795bcf860e3893d2 SHA1 0ba3e31d0cfe142213948b46ea88358803603f19 SHA256 de49d84784e2887e2fa7dd0db03f78e85d13628bf3be0b0a06cbc0697431a35f
+MD5 80d6d53bf3fb4a957ff756d6c0e4286c gnupg-1.9.22.ebuild 2642
+RMD160 cb26ffefba25c3aa667e6582795bcf860e3893d2 gnupg-1.9.22.ebuild 2642
+SHA256 de49d84784e2887e2fa7dd0db03f78e85d13628bf3be0b0a06cbc0697431a35f gnupg-1.9.22.ebuild 2642
+MISC ChangeLog 36473 RMD160 5b2153efc0c837d8826fa73e36711055ecadb7e1 SHA1 01c72cb4d2f4c7bae364d5bae5197a68f2ec617f SHA256 4615cdc6f6f6d8c5c1b802c9c4324a1560348fc99e0202c5e61572420717366f
+MD5 a54abf775d66e93c96c203bf2575295e ChangeLog 36473
+RMD160 5b2153efc0c837d8826fa73e36711055ecadb7e1 ChangeLog 36473
+SHA256 4615cdc6f6f6d8c5c1b802c9c4324a1560348fc99e0202c5e61572420717366f ChangeLog 36473
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -123,3 +128,6 @@ SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/di
 MD5 3a094d262f7870e0d3148bf61e353a31 files/digest-gnupg-1.9.21-r1 244
 RMD160 85a121d64713e41d718ffaafc308776d580c0b9f files/digest-gnupg-1.9.21-r1 244
 SHA256 c07e9079f783809952704276a2cc8cded8ee07fa0a1f803d3cd5257fc9e62f76 files/digest-gnupg-1.9.21-r1 244
+MD5 c71d54c953041094fb93419fa49f39ce files/digest-gnupg-1.9.22 244
+RMD160 7ffd8abec034311fff60408839c73c6b6732d5d4 files/digest-gnupg-1.9.22 244
+SHA256 e8c7e316349c08cb0016be462482519b309a38f3bc92d0d88de752795005beda files/digest-gnupg-1.9.22 244
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.22 b/app-crypt/gnupg/files/digest-gnupg-1.9.22
new file mode 100644
index 000000000000..ed42b84a128d
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.22
@@ -0,0 +1,3 @@
+MD5 ccea28fbab26bcb01890f2687d71f900 gnupg-1.9.22.tar.bz2 1908546
+RMD160 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3 gnupg-1.9.22.tar.bz2 1908546
+SHA256 2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf gnupg-1.9.22.tar.bz2 1908546
diff --git a/app-crypt/gnupg/gnupg-1.9.22.ebuild b/app-crypt/gnupg/gnupg-1.9.22.ebuild
new file mode 100644
index 000000000000..59198c487b43
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.9.22.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.22.ebuild,v 1.1 2006/10/05 03:58:15 robbat2 Exp $
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X gpg2-experimental ldap nls openct pcsc-lite smartcard selinux"
+
+COMMON_DEPEND="
+	virtual/libc
+	>=dev-libs/pth-1.3.7
+	>=dev-libs/libgcrypt-1.1.94
+	>=dev-libs/libksba-0.9.15
+	>=dev-libs/libgpg-error-1.0
+	>=dev-libs/libassuan-0.9.2
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	ldap? ( net-nds/openldap )"
+# Needs sh and arm to be keyworded on pinentry
+#	X? ( app-crypt/pinentry )
+
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-crypt/gpg-agent
+	=app-crypt/gnupg-1.4*
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )
+	nls? ( virtual/libintl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
+
+	# this warning is only available on gcc4!
+	sed -i -e '/AM_CFLAGS/s!-Wno-pointer-sign!!g' ${S}/g10/Makefile.am
+	sed -i -e '/AM_CFLAGS/s!-Wno-pointer-sign!!g' ${S}/g10/Makefile.in
+
+	epatch "${FILESDIR}/${PN}-1.9.20-fbsd.patch"
+	#epatch "${FILESDIR}/${P}-fbsd-gcc41.patch"
+	AT_M4DIR="m4 gl/m4" eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	if use X; then
+		local viewer
+		if has_version 'media-gfx/xloadimage'; then
+			viewer=/usr/bin/xloadimage
+		else
+			viewer=/usr/bin/xli
+		fi
+		myconf="${myconf} --with-photo-viewer=${viewer}"
+	else
+		myconf="${myconf} --disable-photo-viewers"
+	fi
+
+	append-ldflags $(bindnow-flags)
+
+	econf \
+		--enable-agent \
+		--enable-symcryptrun \
+		$(use_enable gpg2-experimental gpg) \
+		--enable-gpgsm \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable nls) \
+		$(use_enable ldap) \
+		--disable-capabilities \
+		${myconf} \
+		|| die
+	emake || die
+	cd doc
+	emake html || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog NEWS README THANKS TODO VERSION
+
+	# neither of these should really be needed, please check
+	use gpg2-experimental && fperms u+s,go-r /usr/bin/gpg2
+	fperms u+s,go-r /usr/bin/gpg-agent
+	dohtml doc/gnupg.html/* doc/*jpg doc/*png
+}
+
+pkg_postinst() {
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
+}