keyword/use flag cleanup with arm stable xli (bug #76234). remove 1.9.15

(Portage version: 2.0.51.22-r2)

7 files changed, 31 insertions, 165 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index fcd1e57700cb..3ba325655115 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2005/08/06 03:53:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.127 2005/08/16 10:55:19 dragonheart Exp $
+
+  16 Aug 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.4.1.ebuild,
+  gnupg-1.4.1-r1.ebuild, gnupg-1.4.2-r1.ebuild, -gnupg-1.9.15-r1.ebuild:
+  keyword/use flag cleanup with arm stable xli (bug #76234). remove 1.9.15
 
 *gnupg-1.9.18 (06 Aug 2005)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5b15e7d607ec..bcc890dbcbd3 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,27 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9e3d878e3e7fb2da2653018e16484a82 gnupg-1.9.18.ebuild 3205
-MD5 395da14250e78e240bf68b189c7ac3bb ChangeLog 20719
-MD5 a4ea45e72f2e6ee9f54b9809c41d7797 gnupg-1.4.2-r1.ebuild 6272
+MD5 fb3938e888a1dd79e05921903c769c8a ChangeLog 20941
+MD5 96ccbe89f4f259e48f458f6bff86b85b gnupg-1.4.2-r1.ebuild 6171
 MD5 921f00a83ce6b1d77190396b4456f05f gnupg-1.2.6.ebuild 3800
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
-MD5 cfe5a67b1204af18a6b03edbdbaa5363 gnupg-1.4.1.ebuild 6292
-MD5 65762289b0895c03fa47da7283a216a6 gnupg-1.9.15-r1.ebuild 3050
-MD5 25cc01bef564eb349af85dbb81aa06dc gnupg-1.4.1-r1.ebuild 6365
+MD5 e659f80a3b91e91e42f8853341d14da3 gnupg-1.4.1.ebuild 6191
+MD5 967ca56c634c977102dbd075aaaad788 gnupg-1.4.1-r1.ebuild 6277
 MD5 7247c8f0379977f0a3dd13568bf283c7 files/digest-gnupg-1.9.18 66
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
-MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
 MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC9Fg/mdTrptrqvGERAgJVAJ47A1r7OX80DbSu2N/X8P7sDeTy4ACdGT9p
-fK6fiLEMVz3vPUSlUyVlSEs=
-=5POo
------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
deleted file mode 100644
index bc188f89d378..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b1d0562b66b1853b77d511feb786629 gnupg-1.9.15.tar.bz2 1636927
diff --git a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
index f851bdebb2be..cc993cde48a8 100644
--- a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1-r1.ebuild,v 1.5 2005/08/03 11:48:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.6 2005/08/16 10:55:19 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,9 +37,9 @@ RDEPEND="
 	smartcard? ( dev-libs/libusb )
 	selinux? ( sec-policy/selinux-gnupg )
 	usb? ( dev-libs/libusb )"
-# waiting on arm arch - bug #76234
+
 RDEPEND="${RDEPEND}
-	!arm? ( X? ( || ( media-gfx/xloadimage media-gfx/xli ) ) )"
+	X? ( || (  media-gfx/xloadimage media-gfx/xli ) )"
 
 DEPEND="${RDEPEND}
 	dev-lang/perl"
@@ -92,26 +92,25 @@ src_compile() {
 	# configure doesn't trean --disable-asm correctly
 	use x86 && myconf="${myconf} --enable-asm"
 
-	# waiting on arm bug #76234
-	use arm || myconf="${myconf} `use_enable X photo-viewers`"
 
 	# fix compile problem on ppc64
 	use ppc64 && myconf="${myconf} --disable-asm"
 
 	econf \
-		`use_enable ldap` \
+		$(use_enable ldap) \
 		--enable-mailto \
 		--enable-hkp \
 		--enable-finger \
-		`use_with !zlib included-zlib` \
-		`use_with curl libcurl /usr` \
-		`use_enable nls` \
-		`use_enable bzip2` \
-		`use_enable smartcard card-support` \
-		`use_enable selinux selinux-support` \
-		`use_with caps capabilities` \
-		`use_with readline` \
-		`use_with usb libusb /usr` \
+		$(use_with !zlib included-zlib) \
+		$(use_with curl libcurl /usr) \
+		$(use_enable nls) \
+		$(use_enable bzip2) \
+		$(use_enable smartcard card-support) \
+		$(use_enable selinux selinux-support) \
+		$(use_with caps capabilities) \
+		$(use_with readline) \
+		$(use_with usb libusb /usr) \
+		$(use_enable X photo-viewers) \
 		--enable-static-rnd=linux \
 		--libexecdir=/usr/libexec \
 		--enable-sha512 \
diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
index f8d40cbcb718..7c1324cc3279 100644
--- a/app-crypt/gnupg/gnupg-1.4.1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1.ebuild,v 1.17 2005/08/03 11:48:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.18 2005/08/16 10:55:19 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,9 +36,9 @@ RDEPEND="
 	readline? ( sys-libs/readline )
 	smartcard? ( dev-libs/libusb )
 	selinux? ( sec-policy/selinux-gnupg )"
-# waiting on arm arch - bug #76234
+
 RDEPEND="${RDEPEND}
-	!arm? ( X? ( || ( media-gfx/xloadimage media-gfx/xli ) ) )"
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )"
 
 DEPEND="${RDEPEND}
 	dev-lang/perl"
@@ -91,9 +91,6 @@ src_compile() {
 	# configure doesn't trean --disable-asm correctly
 	use x86 && myconf="${myconf} --enable-asm"
 
-	# waiting on arm bug #76234
-	use arm || myconf="${myconf} `use_enable X photo-viewers`"
-
 	# fix compile problem on ppc64
 	use ppc64 && myconf="${myconf} --disable-asm"
 
@@ -110,6 +107,7 @@ src_compile() {
 		`use_enable selinux selinux-support` \
 		`use_with caps capabilities` \
 		`use_with readline` \
+		`use_enable X photo-viewers` \
 		--enable-static-rnd=linux \
 		--libexecdir=/usr/libexec \
 		--enable-sha512 \
diff --git a/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
index 96f38500e8d4..e243573a2114 100644
--- a/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2-r1.ebuild,v 1.2 2005/08/06 06:26:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r1.ebuild,v 1.3 2005/08/16 10:55:19 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,9 +37,9 @@ RDEPEND="
 	smartcard? ( dev-libs/libusb )
 	selinux? ( sec-policy/selinux-gnupg )
 	usb? ( dev-libs/libusb )"
-# waiting on arm arch - bug #76234
+
 RDEPEND="${RDEPEND}
-	!arm? ( X? ( || ( media-gfx/xloadimage media-gfx/xli ) ) )"
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )"
 
 DEPEND="${RDEPEND}
 	dev-lang/perl"
@@ -92,9 +92,6 @@ src_compile() {
 	# configure doesn't trean --disable-asm correctly
 	use x86 && myconf="${myconf} --enable-asm"
 
-	# waiting on arm bug #76234
-	use arm || myconf="${myconf} $(use_enable X photo-viewers)"
-
 	# fix compile problem on ppc64
 	use ppc64 && myconf="${myconf} --disable-asm"
 
@@ -112,6 +109,7 @@ src_compile() {
 		$(use_with caps capabilities) \
 		$(use_with readline) \
 		$(use_with usb libusb /usr) \
+		$(use_enable X photo-viewers) \
 		--enable-static-rnd=linux \
 		--libexecdir=/usr/libexec \
 		--enable-sha512 \
diff --git a/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild b/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
deleted file mode 100644
index f624b3a1b5c3..000000000000
--- a/app-crypt/gnupg/gnupg-1.9.15-r1.ebuild
+++ /dev/null
@@ -1,120 +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.15-r1.ebuild,v 1.4 2005/08/03 11:48:09 seemant 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="mirror://gnupg/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,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
-}