9 files changed, 10 insertions, 183 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 9a1b18a9c317..1305e056db44 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.29 2003/09/23 15:31:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.30 2003/10/02 18:32:31 taviso Exp $
+
+  02 Oct 2003; Tavis Ormandy <taviso@gentoo.org> gnupg-1.2.2-r1.ebuild,
+  gnupg-1.2.2.ebuild, gnupg-1.2.3-r1.ebuild, gnupg-1.2.3.ebuild:
+  cleaning up old ebuilds, amd64 managed to escape the security bump from 1.2.2
+  to -r1 somehow, fixed.
 
   16 Sep 2003; Tavis Ormandy <taviso@gentoo.org> gnupg-1.2.3-r2.ebuild:
   marking stable x86 and alpha.
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 7b4a1a4d5f94..838c858690a8 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,11 +1,5 @@
-MD5 13c8af5e22d9011f16d12c0e963e7790 ChangeLog 4377
-MD5 d3608d77ead27c5599c8b6f0b9f585b2 gnupg-1.2.2-r1.ebuild 1625
-MD5 baee9407222e66ea7d35126e2352c558 gnupg-1.2.2.ebuild 1621
-MD5 ed403f8b3d5b68d509030711f3a24ce2 gnupg-1.2.3-r1.ebuild 1696
 MD5 abf7875a6562ba15967b1fed7acac3ed gnupg-1.2.3-r2.ebuild 1629
-MD5 71e191db5d214ee48b6e9c39250e26b3 gnupg-1.2.3.ebuild 1625
-MD5 773ecd19392b8f793d7626c9814e1e0b files/digest-gnupg-1.2.2 65
+MD5 0ce668b4f406d3e477c4c25ac1854164 ChangeLog 4620
+MD5 5ffa87354a03beae320d15a7be997529 gnupg-1.2.2-r1.ebuild 1629
 MD5 773ecd19392b8f793d7626c9814e1e0b files/digest-gnupg-1.2.2-r1 65
-MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3 65
-MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r1 65
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.2 b/app-crypt/gnupg/files/digest-gnupg-1.2.2
deleted file mode 100644
index c9f5676d4406..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e1b357b22e1d45d14d340ce03d39b63 gnupg-1.2.2.tar.bz2 2225034
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.3 b/app-crypt/gnupg/files/digest-gnupg-1.2.3
deleted file mode 100644
index f63dbab6d49f..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdca1282d7901f9ddb52f9725b001af2 gnupg-1.2.3.tar.bz2 2294773
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.3-r1 b/app-crypt/gnupg/files/digest-gnupg-1.2.3-r1
deleted file mode 100644
index f63dbab6d49f..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdca1282d7901f9ddb52f9725b001af2 gnupg-1.2.3.tar.bz2 2294773
diff --git a/app-crypt/gnupg/gnupg-1.2.2-r1.ebuild b/app-crypt/gnupg/gnupg-1.2.2-r1.ebuild
index 0c730094fdfc..be476f8a5695 100644
--- a/app-crypt/gnupg/gnupg-1.2.2-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.2-r1.ebuild,v 1.3 2003/09/06 22:15:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.2-r1.ebuild,v 1.4 2003/10/02 18:32:31 taviso Exp $
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha arm hppa"
+KEYWORDS="x86 ppc sparc alpha arm hppa amd64"
 IUSE="X zlib ldap nls"
 
 DEPEND="dev-lang/perl
diff --git a/app-crypt/gnupg/gnupg-1.2.2.ebuild b/app-crypt/gnupg/gnupg-1.2.2.ebuild
deleted file mode 100644
index d3ee66846983..000000000000
--- a/app-crypt/gnupg/gnupg-1.2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.2.ebuild,v 1.4 2003/07/18 19:29:16 tester Exp $
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha arm hppa amd64"
-IUSE="X zlib ldap nls"
-
-DEPEND="dev-lang/perl
-	X? ( x11-misc/xloadimage )
-	zlib? ( sys-libs/zlib )
-	ldap? ( net-nds/openldap )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use ldap || myconf="${myconf} --disable-ldap"
-	use zlib || myconf="${myconf} --with-included-zlib"
-	use X || myconf="${myconf} --disable-photo-viewers"
-
-	#Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	if [ "${ARCH}" != "sparc" -a "${ARCH}" != "sparc64" ]; then
-		myconf="${myconf} --enable-m-guard"
-	fi
-
-	econf ${myconf}
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS README THANKS TODO VERSION
-	docinto doc
-	cd doc
-	dodoc FAQ HACKING DETAILS ChangeLog OpenPGP
-	docinto sgml
-	dodoc gpg.sgml gpgv.sgml
-	dohtml faq.html
-	docinto txt
-	dodoc faq.raw
-	chmod +s "${D}/usr/bin/gpg"
-}
-
-pkg_postinst() {
-	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 passphrases,"
-	einfo "etc. at runtime but may make some sysadmins nervous"
-}
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r1.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r1.ebuild
deleted file mode 100644
index 1ca5d230ee0c..000000000000
--- a/app-crypt/gnupg/gnupg-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r1.ebuild,v 1.2 2003/09/06 22:15:09 msterret Exp $
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~sparc"
-IUSE="X zlib ldap nls"
-
-DEPEND="dev-lang/perl
-	X? ( x11-misc/xloadimage )
-	zlib? ( sys-libs/zlib )
-	ldap? ( net-nds/openldap )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable X photo-viewers`"
-	myconf="${myconf} `use_with zlib included-zlib`"
-
-	# Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	if ! use sparc; then
-		myconf="${myconf} --enable-m-guard"
-	fi
-
-	econf ${myconf} \
-		--libexecdir=/usr/lib/gnupg \
-		--enable-external-hkp || die "configure failed"
-	emake || die "compile problem"
-}
-
-src_install() {
-	einstall libexecdir="${D}/usr/lib/gnupg" || die
-
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS README \
-			THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	chmod u+s "${D}/usr/bin/gpg"
-}
-
-pkg_postinst() {
-	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 passphrases,"
-	einfo "etc. at runtime but may make some sysadmins nervous"
-}
diff --git a/app-crypt/gnupg/gnupg-1.2.3.ebuild b/app-crypt/gnupg/gnupg-1.2.3.ebuild
deleted file mode 100644
index bf98af8dc9b2..000000000000
--- a/app-crypt/gnupg/gnupg-1.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3.ebuild,v 1.2 2003/09/06 22:15:09 msterret Exp $
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha"
-IUSE="X zlib ldap nls"
-
-DEPEND="dev-lang/perl
-	X? ( x11-misc/xloadimage )
-	zlib? ( sys-libs/zlib )
-	ldap? ( net-nds/openldap )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf="--enable-external-hkp"
-	use nls || myconf="${myconf} --disable-nls"
-	use ldap || myconf="${myconf} --disable-ldap"
-	use zlib || myconf="${myconf} --with-included-zlib"
-	use X || myconf="${myconf} --disable-photo-viewers"
-
-	#Still needed?
-	# Bug #6387, --enable-m-guard causes bus error on sparcs
-	if [ "${ARCH}" != "sparc" -a "${ARCH}" != "sparc64" ]; then
-		myconf="${myconf} --enable-m-guard"
-	fi
-
-	econf ${myconf}
-	make || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS README THANKS TODO VERSION
-	docinto doc
-	cd doc
-	dodoc FAQ HACKING DETAILS ChangeLog OpenPGP
-	docinto sgml
-	dodoc gpg.sgml gpgv.sgml
-	dohtml faq.html
-	docinto txt
-	dodoc faq.raw
-	chmod u+s "${D}/usr/bin/gpg"
-}
-
-pkg_postinst() {
-	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 passphrases,"
-	einfo "etc. at runtime but may make some sysadmins nervous"
-}