1.9.20 version bump for bug 117717. Add DEPEND to RDEPEND. Use RESTRICT=test and remove src_test

(Portage version: 2.0.53)

7 files changed, 19 insertions, 145 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index fd0ede318dfd..a38fcd39c676 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.152 2005/12/25 14:44:07 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.153 2006/01/14 18:36:40 vanquirius Exp $
+
+*gnupg-1.9.20 (14 Jan 2006)
+
+  14 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -gnupg-1.9.18.ebuild,
+  -gnupg-1.9.19.ebuild, +gnupg-1.9.20.ebuild:
+  1.9.20 version bump for bug 117717. Add DEPEND to RDEPEND. Use RESTRICT=test
+  and remove src_test. Thanks to Stefan Schweizer <genstef at gentoo dot org>.
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> gnupg-1.4.2-r3.ebuild,
   gnupg-1.9.19.ebuild:
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 3bdb476d6597..dd619e38d574 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b289dc3d588da5d3909e26c4dd7a490a ChangeLog 24634
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
@@ -8,8 +5,7 @@ MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r2 190
 MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r3 190
-MD5 7247c8f0379977f0a3dd13568bf283c7 files/digest-gnupg-1.9.18 66
-MD5 28ad3af724b879fe86743d59ae4447dd files/digest-gnupg-1.9.19 66
+MD5 15f59d2129cdfb1c8e6121d45a1e61ca files/digest-gnupg-1.9.20 66
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
 MD5 e893ac3e7a6b11ab9806e16d3a8582fd files/gnupg-1.4.2-badruman.patch 463
@@ -23,13 +19,5 @@ MD5 6f5e7ed6dfb1ae31f877486a9ff7e441 gnupg-1.4.1.ebuild 6186
 MD5 ffd1a6a73df273ee13e112dc428eb06c gnupg-1.4.2-r1.ebuild 6241
 MD5 314fb0111680f30cd551152636225ea9 gnupg-1.4.2-r2.ebuild 6795
 MD5 b723494957d3a13a8281999f582f5416 gnupg-1.4.2-r3.ebuild 6843
-MD5 3fd02f30190d0919bf9a5972d40182c2 gnupg-1.9.18.ebuild 3205
-MD5 8c676ec2c88ae9ce2e9041efb5de10ac gnupg-1.9.19.ebuild 3193
+MD5 441c09e66204d2d16de527dd87a3dc43 gnupg-1.9.20.ebuild 3190
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrrBDAiZjviIA2XgRApzwAJ4t3a1K5/5t+LUBUs0z3tTHSkpQMQCgpdTS
-zEtZ9yurto03J5fxB7yu+mA=
-=qnH5
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.18 b/app-crypt/gnupg/files/digest-gnupg-1.9.18
deleted file mode 100644
index 75225acad957..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 1754957
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.19 b/app-crypt/gnupg/files/digest-gnupg-1.9.19
deleted file mode 100644
index 2be41931ad90..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8084256a61aa90e0173d436bf1e6f82b gnupg-1.9.19.tar.bz2 1760576
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20 b/app-crypt/gnupg/files/digest-gnupg-1.9.20
new file mode 100644
index 000000000000..f4a47876888d
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.20
@@ -0,0 +1 @@
+MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/gnupg-1.9.18.ebuild b/app-crypt/gnupg/gnupg-1.9.18.ebuild
deleted file mode 100644
index 2ff9be4b94f5..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.18.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.18.ebuild,v 1.3 2005/09/29 01:59:06 vanquirius Exp $
-
-inherit eutils flag-o-matic
-
-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 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard selinux"
-
-DEPEND="
-	nls? ( sys-devel/gettext )
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libc
-	>=dev-libs/pth-1.3.7
-	smartcard? ( >=dev-libs/opensc-0.8.0 )
-	>=dev-libs/libgcrypt-1.1.94
-	>=dev-libs/libksba-0.9.12
-	>=dev-libs/libgpg-error-1.0
-	=dev-libs/libassuan-0.6.10
-	ldap? ( net-nds/openldap )
-	caps? ( sys-libs/libcap )"
-
-RDEPEND="
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	virtual/mta
-	selinux? ( sec-policy/selinux-gnupg )"
-
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use smartcard && ! built_with_use dev-libs/opensc pcsc-lite ; then
-		sed -i -e 's:OPENSC_LIBS="\$OPENSC_LIBS -lpcsclite -lpthread":OPENSC_LIBS="\$OPENSC_LIBS -lopenct -lpthread":' \
-		acinclude.m4 || die "openct patching failed."
-		./autogen.sh
-	fi
-	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
-}
-
-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
-
-	use ppc-macos || append-ldflags -Wl,-z,now
-
-	econf \
-		--disable-agent \
-		--enable-symcryptrun \
-		--enable-gpg \
-		$(use_enable smartcard scdaemon) \
-		$(use_enable nls) \
-		$(use_enable ldap) \
-		$(use_with caps capabilities) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_test() {
-	einfo "self tests can't work since it depends on gpg-agent"
-	einfo "Gentoo has put this in its own package (app-crypt/gpg-agent"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README THANKS TODO VERSION
-
-	if ! use caps ; then
-		fperms u+s,go-r /usr/bin/gpg2
-	fi
-}
-
-pkg_postinst() {
-	if ! use caps; then
-		einfo "gpg is installed suid root to make use of protected memory space"
-		einfo "This is needed in order to have a secure place to store your"
-		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
-	fi
-	echo
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
-	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE"
-	ewarn "	IN A PRODUCTION ENVIRONMENT."
-	ewarn
-	ewarn "	This ebuild is provided for those who wish to experiment with this"
-	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
-	ewarn "	by non-developers"
-	ewarn
-	ewarn "	Please see #37109"
-	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
-
-	einfo
-	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
-
-	einfo
-	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	einfo
-}
diff --git a/app-crypt/gnupg/gnupg-1.9.19.ebuild b/app-crypt/gnupg/gnupg-1.9.20.ebuild
index d6876d1b6ee7..f16c7026155e 100644
--- a/app-crypt/gnupg/gnupg-1.9.19.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.19.ebuild,v 1.3 2005/12/25 14:44:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20.ebuild,v 1.1 2006/01/14 18:36:40 vanquirius Exp $
 
 inherit eutils flag-o-matic
 
@@ -27,16 +27,18 @@ DEPEND="
 	ldap? ( net-nds/openldap )
 	caps? ( sys-libs/libcap )"
 
-RDEPEND="
+RDEPEND="${DEPEND}
 	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 	virtual/mta
 	selinux? ( sec-policy/selinux-gnupg )"
 
-
+RESTRICT="test"
+# self tests can't work since it depends on gpg-agent
+# Gentoo has put this in its own package (app-crypt/gpg-agent)
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	if use smartcard && ! built_with_use dev-libs/opensc pcsc-lite ; then
 		sed -i -e 's:OPENSC_LIBS="\$OPENSC_LIBS -lpcsclite -lpthread":OPENSC_LIBS="\$OPENSC_LIBS -lopenct -lpthread":' \
 		acinclude.m4 || die "openct patching failed."
@@ -75,11 +77,6 @@ src_compile() {
 	emake || die
 }
 
-src_test() {
-	einfo "self tests can't work since it depends on gpg-agent"
-	einfo "Gentoo has put this in its own package (app-crypt/gpg-agent"
-}
-
 src_install() {
 	make DESTDIR="${D}" install || die
 	dodoc ChangeLog NEWS README THANKS TODO VERSION