New revision: Merge with gpg-agent, allow tests, introduce self-depend on version 1.4* in order to unmask it, bug 117717, also remove old versions

(Portage version: 2.1_pre4-r1)

9 files changed, 3 insertions, 58 deletions

diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.6 b/app-crypt/gnupg/files/digest-gnupg-1.2.6
deleted file mode 100644
index 80141be29fe1..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.2.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b1890f5dfacd2ba7ab15448c5ff08a4e gnupg-1.2.6.tar.bz2 2550665
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.1 b/app-crypt/gnupg/files/digest-gnupg-1.4.1
deleted file mode 100644
index fa28828dd944..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdfc5553d0904cd65011e47a42a9532c gnupg-1.4.1.tar.bz2 2822791
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1
deleted file mode 100644
index fa28828dd944..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdfc5553d0904cd65011e47a42a9532c gnupg-1.4.1.tar.bz2 2822791
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1
deleted file mode 100644
index e9f46e0a9867..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7afd50c7d01fcfada229326b3958404 gnupg-1.4.2.tar.bz2 2891177
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
deleted file mode 100644
index 181255e43f2e..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
-MD5 c7afd50c7d01fcfada229326b3958404 gnupg-1.4.2.tar.bz2 2891177
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20 b/app-crypt/gnupg/files/digest-gnupg-1.9.20
deleted file mode 100644
index f4a47876888d..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1 b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1
new file mode 100644
index 000000000000..ba3b6d7aa814
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.20-r1
@@ -0,0 +1,3 @@
+MD5 93899203fc0530f03e146d49b65c1e28 gnupg-1.9.20.tar.bz2 1810059
+RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 gnupg-1.9.20.tar.bz2 1810059
+SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e gnupg-1.9.20.tar.bz2 1810059
diff --git a/app-crypt/gnupg/files/gnupg-1.2.6-ppc64.patch b/app-crypt/gnupg/files/gnupg-1.2.6-ppc64.patch
deleted file mode 100644
index 7f268a9ab796..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.2.6-ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mpi/config.links.orig	2004-12-31 08:35:14.690939440 +0000
-+++ mpi/config.links	2004-12-31 08:36:32.005901592 +0000
-@@ -215,7 +215,11 @@
- 	path="m68k/mc68020 m68k"
- 	;;
- 
--    powerpc*-*-linux*)
-+	powerpc64*-*-linux*)
-+	path="powerpc64"
-+	;;
-+
-+	powerpc*-*-linux*)
- 	echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
- 	echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
- 	cat   $srcdir/mpi/powerpc32/syntax.h	>>./mpi/asm-syntax.h
diff --git a/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch
deleted file mode 100644
index 4ae2d70b8d44..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gnupg-1.4.1/g10/openfile.c.orig	2004-10-14 17:11:56.000000000 +1000
-+++ gnupg-1.4.1/g10/openfile.c	2005-06-28 22:27:52.611861217 +1000
-@@ -392,8 +392,10 @@
-      * To cope with HOME, we do compare only the suffix if we see that
-      * the default homedir does start with a tilde.
-      */
-+#ifndef ENABLE_SELINUX_HACKS
-     if( opt.dry_run || opt.no_homedir_creation )
- 	return;
-+#endif
- 
-     if ( ( *defhome == '~'
-            && ( strlen(fname) >= strlen (defhome+1)
---- gnupg-1.4.1/checks/Makefile.in.orig	2005-03-16 01:52:20.000000000 +1000
-+++ gnupg-1.4.1/checks/Makefile.in	2005-06-29 00:04:24.613682330 +1000
-@@ -516,9 +516,11 @@
- 
- ./gpg_dearmor:
- 	echo '#!/bin/sh' >./gpg_dearmor
--	echo "../g10/gpg --no-options --no-greeting \
-+	echo "../g10/gpg --no-options --no-greeting --homedir . \
-              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
- 	chmod 755 ./gpg_dearmor
-+	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
-+	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
- 
- ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
- 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc