new version, #61751

6 files changed, 31 insertions, 44 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 9302d19e26a7..5ad10236cff6 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.72 2004/08/15 02:35:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.73 2004/08/29 08:12:10 taviso Exp $
+
+  29 Aug 2004; Tavis Ormandy <taviso@gentoo.org> +gnupg-1.2.6.ebuild:
+  new version, #61751
 
 *gnupg-1.9.10 (14 Aug 2004)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index dbdf7a6a483a..b6c36b8123cc 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,30 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9698f107eb75dde63201c66f4614fedd ChangeLog 10634
-MD5 e67585ea4e6025b1918462ba737c8e2a gnupg-1.2.3-r2.ebuild 1659
 MD5 ff47ed97d51df4d1b7030dc173048956 gnupg-1.2.3-r5.ebuild 3628
-MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484
+MD5 ec05713c13e7b15b1d33011ba7724757 gnupg-1.9.10.ebuild 2749
 MD5 5cf952300c6e6d393425894853e1b766 gnupg-1.2.4.ebuild 4173
-MD5 df041bf7bc487bd26079fc500e65925a gnupg-1.9.0.ebuild 2730
+MD5 e67585ea4e6025b1918462ba737c8e2a gnupg-1.2.3-r2.ebuild 1659
 MD5 eb6cc5be23c0c4842e94538a7d6daf2b gnupg-1.9.8.ebuild 2745
-MD5 a97f38906711c68f603849e950168057 gnupg-1.2.5.ebuild 4161
-MD5 ec05713c13e7b15b1d33011ba7724757 gnupg-1.9.10.ebuild 2749
+MD5 9c39323b77438660776d942e556be8de gnupg-1.2.6.ebuild 3807
+MD5 df041bf7bc487bd26079fc500e65925a gnupg-1.9.0.ebuild 2730
+MD5 a9081a9628c53386325d5f551211455f gnupg-1.2.5.ebuild 4018
+MD5 9698f107eb75dde63201c66f4614fedd ChangeLog 10634
+MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65
-MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
-MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922
 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 f9d1684c9a72a84146163170439892b1 files/digest-gnupg-1.2.5 117
+MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 df557d150f1c32564de9c0f66b47997a files/digest-gnupg-1.9.0 116
-MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 b19d6b7e508333e5b1fd007ae4334ec2 files/digest-gnupg-1.9.8 64
-MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
-MD5 f9d1684c9a72a84146163170439892b1 files/digest-gnupg-1.2.5 117
 MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBHs/wHTu7gpaalycRAjZgAJ9+IwUG3yqnAppRzXk/jf/YTrdEiQCg7D5M
-NiqwSNq2wOrmH3vUjwnL86E=
-=mY3Y
------END PGP SIGNATURE-----
+MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922
+MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
+MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
+MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.5 b/app-crypt/gnupg/files/digest-gnupg-1.2.5
deleted file mode 100644
index a1bf44f4e3cc..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e4991e46fde52b216410ef0f485b4217 gnupg-1.2.5.tar.bz2 2488670
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.6 b/app-crypt/gnupg/files/digest-gnupg-1.2.6
new file mode 100644
index 000000000000..80141be29fe1
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.2.6
@@ -0,0 +1,2 @@
+MD5 b1890f5dfacd2ba7ab15448c5ff08a4e gnupg-1.2.6.tar.bz2 2550665
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/gnupg-1.2.5.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index 387697907a3a..abb8b5c47ac1 100644
--- a/app-crypt/gnupg/gnupg-1.2.5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.5.ebuild,v 1.3 2004/08/05 18:34:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.1 2004/08/29 08:12:10 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,19 +17,17 @@ IUSE="X ldap nls static idea"
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
 		app-arch/bzip2
 		sys-libs/zlib )
-	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	nls? ( sys-devel/gettext )
-	dev-lang/perl
-	virtual/libc"
-# XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
-#	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
-#				!static? ( sys-libs/libcap ) )
+		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+		nls? ( sys-devel/gettext )
+		dev-lang/perl
+		virtual/libc"
+
 DEPEND="ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	!static? ( sys-libs/zlib )
-	app-arch/bzip2
-	dev-lang/perl
-	virtual/libc"
+		nls? ( sys-devel/gettext )
+		!static? ( sys-libs/zlib )
+		app-arch/bzip2
+		dev-lang/perl
+		virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -46,12 +44,6 @@ src_unpack() {
 	fi
 
 	use ppc64 && epatch ${FILESDIR}/gnupg-1.2.4.ppc64.patch
-
-	# trying to fix the install logic that breaks when nls
-	# is enabled. #59012
-	sed -i \
-	 's#\(\(mkinstalldirs\) = \).*#\1\$(SHELL) \$(top_srcdir)/scripts/\2#g' \
-	 ${S}/po/Makefile.in.in ${S}/intl/Makefile.in
 }
 
 src_compile() {
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 013a478e7bb2..d98c2406b566 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>crypto</herd>
 <maintainer>
   <email>taviso@gentoo.org</email>
   <name>Tavis Ormandy</name>