Fix DEPEND for bug #85984, and cleanup DEPEND structure to be easier to manage.

Package-Manager: portage-2.0.51.19

4 files changed, 141 insertions, 22 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 80ab9397404d..053ba964cf63 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2005/03/22 22:42:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.110 2005/03/24 10:11:18 robbat2 Exp $
+
+*gnupg-1.9.15-r1 (24 Mar 2005)
+
+  24 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +gnupg-1.9.15-r1.ebuild:
+  Fix DEPEND for bug #85984, and cleanup DEPEND structure to be easier to manage.
 
   22 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> gnupg-1.4.1.ebuild:
   Stable on alpha, bug 85547.
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 9c8c20e357d9..a0a7de59c776 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,29 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 73e87591d6d3ccdaf39979c0ba9deed2 gnupg-1.2.6.ebuild 3817
 MD5 bf8d77a7d64cc34b11da70edbc35e068 gnupg-1.9.15.ebuild 3231
-MD5 64182f539542ec33e240ccaae7bfd21f gnupg-1.4.0-r1.ebuild 4512
-MD5 3a1f62c964ac76351339413e63abf69f ChangeLog 17546
-MD5 6391139521c4b57aa07304010e27f643 gnupg-1.4.1.ebuild 6189
-MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
-MD5 84cf85e579f860997c9830a66eec8dd7 gnupg-1.4.0-r2.ebuild 5180
 MD5 7cf0ca92817de23e81cb83fbcb6e8754 gnupg-1.2.4.ebuild 4250
+MD5 73e87591d6d3ccdaf39979c0ba9deed2 gnupg-1.2.6.ebuild 3817
 MD5 aaaeeeff8a9b06ba7f0eb28f6bbf336d gnupg-1.9.14.ebuild 3077
+MD5 afbd0db2e66222db5fec6282c641ff3c gnupg-1.9.15-r1.ebuild 3070
+MD5 84cf85e579f860997c9830a66eec8dd7 gnupg-1.4.0-r2.ebuild 5180
+MD5 6391139521c4b57aa07304010e27f643 gnupg-1.4.1.ebuild 6189
+MD5 9afe334d57ed9f44c78a2a10236be2e8 ChangeLog 17742
+MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
+MD5 64182f539542ec33e240ccaae7bfd21f gnupg-1.4.0-r1.ebuild 4512
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
-MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
+MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
 MD5 9e4bb59ff6cbb14c85cf044408669ccd files/digest-gnupg-1.4.0-r2 190
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
+MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
+MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
 MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15 66
-MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
-MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
+MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQJ+AugEuf3OQ0akRAiq7AJ4vOWI3XBXf4Xb1bcoMbYsUjWG+bgCeMm80
-4xtnH2/ZLH7YSJBdD4v4zpw=
-=XcLH
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.15-r1 b/app-crypt/gnupg/files/digest-gnupg-1.9.15-r1
new file mode 100644
index 000000000000..bc188f89d378
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.15-r1
@@ -0,0 +1 @@
+MD5 7b1d0562b66b1853b77d511feb786629 gnupg-1.9.15.tar.bz2 1636927
diff --git a/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild b/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
new file mode 100644
index 000000000000..b782731fa67f
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
@@ -0,0 +1,120 @@
+# 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.15-r1.ebuild,v 1.1 2005/03/24 10:11:18 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER=0.1.6
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="X caps ldap nls smartcard static threads selinux"
+
+DEPEND_COMMON="
+	nls? ( sys-devel/gettext )
+	dev-lang/perl
+	sys-libs/zlib
+	virtual/libc
+	threads? ( >=dev-libs/pth-1.3.7 )
+	smartcard? ( >=dev-libs/opensc-0.8.0 )
+	>=dev-libs/libgcrypt-1.1.94
+	>=dev-libs/libksba-0.9.7
+	>=dev-libs/libgpg-error-1.0
+	=dev-libs/libassuan-0.6.9"
+
+RDEPEND="
+	${DEPEND_COMMON}
+	!static? (
+		ldap? ( net-nds/openldap )
+		caps? ( sys-libs/libcap )
+	)
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )"
+
+DEPEND="
+	${DEPEND_COMMON}
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )"
+
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e 's/PIC/__PIC__/g' ${S}/intl/relocatable.c
+}
+
+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 -Wl,-z,now
+
+	econf \
+		--disable-agent \
+		`use_enable smartcard scdaemon` \
+		`use_enable nls` \
+		`use_enable ldap` \
+		`use_with caps capabilities` \
+		`use_enable threads` \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dosym gpg2 /usr/bin/gpg
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
+
+	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
+
+	if ! use caps ; then
+		fperms u+s /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 ""
+}