cleanup files

(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 8 insertions, 60 deletions

diff --git a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch
index 88a95fac0072..1684097f4ea2 100644
--- a/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch
+++ b/app-crypt/gnupg/files/gnupg-2.0.17-gpgsm-gencert.patch
@@ -4,29 +4,15 @@ Date: Sun, 17 Apr 2011 01:34:39 +0200
 Subject: [PATCH] gpgsm-gencert.sh: make sure not to abort after creating temp
  file.
 
----
- tools/gpgsm-gencert.sh |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+Bug-Url: https://bugs.g10code.com/gnupg/issue1466
 
-diff --git a/tools/gpgsm-gencert.sh b/tools/gpgsm-gencert.sh
-index b209c8e..e7c812f 100755
---- a/tools/gpgsm-gencert.sh
-+++ b/tools/gpgsm-gencert.sh
-@@ -178,10 +178,10 @@ Key-Length: $KEY_LENGTH
- Key-Usage: $KEY_USAGE
- Name-DN: $NAME
- EOF
--[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP"
--[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES"
--[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES"
--[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES"
-+[ -n "$KEY_GRIP" ] && echo "Key-Grip: $KEY_GRIP" || true
-+[ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES" || true
-+[ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES" || true
-+[ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES" || true
+--- tools/gpgsm-gencert.sh.old	2013-01-19 23:00:25.719408353 +0200
++++ tools/gpgsm-gencert.sh	2013-01-19 23:00:31.636418255 +0200
+@@ -182,6 +182,7 @@ EOF
+ [ -n "$EMAIL_ADDRESSES" ] && echo "$EMAIL_ADDRESSES"
+ [ -n "$DNS_ADDRESSES" ] && echo "$DNS_ADDRESSES"
+ [ -n "$URI_ADDRESSES" ] && echo "$URI_ADDRESSES"
++true
  ) > "$file_parameter"
  
  
--- 
-1.7.5.rc1
-
diff --git a/app-crypt/gnupg/files/gnupg-2.0.17-libgrcrypt150-bugfix.patch b/app-crypt/gnupg/files/gnupg-2.0.17-libgrcrypt150-bugfix.patch
deleted file mode 100644
index 34f4348bcd4f..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.0.17-libgrcrypt150-bugfix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 13290b0e0fcf3a493e4848b29329d56b69bc4dd9 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Mon, 13 Jun 2011 14:35:30 +0200
-Subject: [PATCH] Fix a for a bug fix in the latest Libgcrypt.
-
-        * pkglue.c (mpi_from_sexp, pk_decrypt): Use GCRYMPI_FMT_USG for
-	gcry_sexp_nth_mpi.  This fixes a problem with a recent bug fix in
-	Libgcrypt.
-
-diff --git a/g10/pkglue.c b/g10/pkglue.c
-index cbfe21e..5c47511 100644
---- a/g10/pkglue.c
-+++ b/g10/pkglue.c
-@@ -34,10 +34,10 @@ mpi_from_sexp (gcry_sexp_t sexp, const char * item)
- {
-   gcry_sexp_t list;
-   gcry_mpi_t data;
--  
-+
-   list = gcry_sexp_find_token (sexp, item, 0);
-   assert (list);
--  data = gcry_sexp_nth_mpi (list, 1, 0);
-+  data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
-   assert (data);
-   gcry_sexp_release (list);
-   return data;
-@@ -293,7 +293,7 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
-   if (rc)
-     return rc;
- 
--  *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
-+  *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
-   gcry_sexp_release (s_plain);
-   if (!*result)
-     return -1;			/* oops */
--- 
-1.7.1
-