Fix qualified.txt syntax

Package-Manager: portage-2.1.4

5 files changed, 47 insertions, 14 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 046b3e2b4e58..312f77ce324e 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.313 2008/01/10 16:34:51 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.314 2008/01/15 18:55:07 alonbl Exp $
+
+*gnupg-2.0.8-r1 (15 Jan 2008)
+
+  15 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-2.0.8-qualified.patch, -gnupg-2.0.8.ebuild,
+  +gnupg-2.0.8-r1.ebuild:
+  Fix qualified.txt syntax
 
 *gnupg-1.4.8-r1 (10 Jan 2008)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 04727ccc2551..0c230c39de48 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -14,6 +14,10 @@ AUX gnupg-2.0.4-idea.patch 906 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b S
 MD5 55421c980c3f87eb781b2a0d57e1b5b9 files/gnupg-2.0.4-idea.patch 906
 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b files/gnupg-2.0.4-idea.patch 906
 SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976 files/gnupg-2.0.4-idea.patch 906
+AUX gnupg-2.0.8-qualified.patch 1152 RMD160 48706e52c726c80aacc40472b9405e3ff9758333 SHA1 abfad7c7aba25d46823ea98a1c9702c7b37293c0 SHA256 bd6fe6d341385f3693384cbce1374908607b569fd2e70986bcc5fd0b4636e448
+MD5 0e1406f916dc856b5b3a150d00b65a93 files/gnupg-2.0.8-qualified.patch 1152
+RMD160 48706e52c726c80aacc40472b9405e3ff9758333 files/gnupg-2.0.8-qualified.patch 1152
+SHA256 bd6fe6d341385f3693384cbce1374908607b569fd2e70986bcc5fd0b4636e448 files/gnupg-2.0.8-qualified.patch 1152
 DIST gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 SHA1 ab9e902539a1be746d3c25d969a4ae044a74f44c SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe
 DIST gnupg-1.4.7.tar.bz2 3200642 RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b SHA1 22149105845c79068771837c8deb7d5ba0854927 SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d
 DIST gnupg-1.4.8-ecc0.2.0.diff.bz2 17878 RMD160 532e43cfea00187c72d7d2784decee31b105a5a5 SHA1 822602c76c69160463d7ae3378e8da1b42e6efb2 SHA256 e03a180a95bb3c4c72f4ca97d1038c390b59da1f4d12d97f91ef7932dd01a5c1
@@ -33,14 +37,14 @@ EBUILD gnupg-2.0.7.ebuild 2125 RMD160 446354e43bb1ce001ee3cd87545cff72af0b2685 S
 MD5 92d7ff90131cc1bfce2fb5bcfe037220 gnupg-2.0.7.ebuild 2125
 RMD160 446354e43bb1ce001ee3cd87545cff72af0b2685 gnupg-2.0.7.ebuild 2125
 SHA256 06ddca99f39634fe966d9288023296f51d08e3ae0ea1cb2488b7be0d4a58153f gnupg-2.0.7.ebuild 2125
-EBUILD gnupg-2.0.8.ebuild 2136 RMD160 22533292d4dda4f5482e74c659fb64a9ff8728ad SHA1 7694b20e007a09b70746be4c8584161c00f15926 SHA256 089701bbe84aa0b96a0b693ff9948daed5973b8c6319d465366e032fe209db85
-MD5 bc39ffac44866e029ae5a8d1b6ea095a gnupg-2.0.8.ebuild 2136
-RMD160 22533292d4dda4f5482e74c659fb64a9ff8728ad gnupg-2.0.8.ebuild 2136
-SHA256 089701bbe84aa0b96a0b693ff9948daed5973b8c6319d465366e032fe209db85 gnupg-2.0.8.ebuild 2136
-MISC ChangeLog 48385 RMD160 c58e5d69e2e5da1dc6b0f3b44600f001107703f4 SHA1 521c74b94fb06186d09fd6f61d5e373f569ded6c SHA256 7aabf0cbf5a960cc5d297a85f631ad7d044a9cf37845904db97f0af0a4592387
-MD5 c88c6b039edc0c44f3b26ad41ff78248 ChangeLog 48385
-RMD160 c58e5d69e2e5da1dc6b0f3b44600f001107703f4 ChangeLog 48385
-SHA256 7aabf0cbf5a960cc5d297a85f631ad7d044a9cf37845904db97f0af0a4592387 ChangeLog 48385
+EBUILD gnupg-2.0.8-r1.ebuild 2182 RMD160 27b20d10d7e681f80ac62681e6a52712257163ba SHA1 f18e13486d4984e7897a02a315f8d27c3a74f099 SHA256 195eb63707240a5d1d015218c408846c434652112412bf7ddd577db345282ffc
+MD5 ded90695276f321f971370cb64869dea gnupg-2.0.8-r1.ebuild 2182
+RMD160 27b20d10d7e681f80ac62681e6a52712257163ba gnupg-2.0.8-r1.ebuild 2182
+SHA256 195eb63707240a5d1d015218c408846c434652112412bf7ddd577db345282ffc gnupg-2.0.8-r1.ebuild 2182
+MISC ChangeLog 48577 RMD160 82d9f17464f75a81e377e41f88b5e3be56db8ee5 SHA1 20144177c12bc58e3aad44e6694d8db55785b2c1 SHA256 4b18120313bce797c2175224a4c027a27cff913fab7d10a0b997490cdcf95f60
+MD5 c34dd6698d8106b6c3ef8e544f850ce8 ChangeLog 48577
+RMD160 82d9f17464f75a81e377e41f88b5e3be56db8ee5 ChangeLog 48577
+SHA256 4b18120313bce797c2175224a4c027a27cff913fab7d10a0b997490cdcf95f60 ChangeLog 48577
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
@@ -54,6 +58,6 @@ SHA256 72e7f8aa0dae1cf941801ebc5b13f9a7c04eb5fe67bec7a460953c21e87079d5 files/di
 MD5 b859fd902e340b13f7e5882ba9a7d2d7 files/digest-gnupg-2.0.7 241
 RMD160 580bbe23a2c13d185790a5b030e5f0fc399d3c0a files/digest-gnupg-2.0.7 241
 SHA256 f11361f64a678c762239f3f6c1dcd1a93ddbbff5cb0819251e87e3022cd9113f files/digest-gnupg-2.0.7 241
-MD5 d26ae3d7e8a8ff0df4234af0d6c60080 files/digest-gnupg-2.0.8 241
-RMD160 dd8415616f8130d6389f2968b03faa42c5351f19 files/digest-gnupg-2.0.8 241
-SHA256 b5fb516654b841fabc347c2f618a99496762872b608392efb33be84d9dc80d74 files/digest-gnupg-2.0.8 241
+MD5 d26ae3d7e8a8ff0df4234af0d6c60080 files/digest-gnupg-2.0.8-r1 241
+RMD160 dd8415616f8130d6389f2968b03faa42c5351f19 files/digest-gnupg-2.0.8-r1 241
+SHA256 b5fb516654b841fabc347c2f618a99496762872b608392efb33be84d9dc80d74 files/digest-gnupg-2.0.8-r1 241
diff --git a/app-crypt/gnupg/files/digest-gnupg-2.0.8 b/app-crypt/gnupg/files/digest-gnupg-2.0.8-r1
index d232924e9693..d232924e9693 100644
--- a/app-crypt/gnupg/files/digest-gnupg-2.0.8
+++ b/app-crypt/gnupg/files/digest-gnupg-2.0.8-r1
diff --git a/app-crypt/gnupg/files/gnupg-2.0.8-qualified.patch b/app-crypt/gnupg/files/gnupg-2.0.8-qualified.patch
new file mode 100644
index 000000000000..b79db0c2c9cd
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.8-qualified.patch
@@ -0,0 +1,21 @@
+diff -urNp gnupg-2.0.8.org/doc/qualified.txt gnupg-2.0.8/doc/qualified.txt
+--- gnupg-2.0.8.org/doc/qualified.txt	2007-12-13 17:13:10.000000000 +0200
++++ gnupg-2.0.8/doc/qualified.txt	2008-01-15 20:35:11.000000000 +0200
+@@ -193,7 +193,7 @@ E0:BF:1B:91:91:6B:88:E4:F1:15:92:22:CE:3
+ #[checked: 2007-12-13 via received ZIP file with qualified signature from 
+ #         /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag
+ #         /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg]
+-C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA
++C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA  de
+ 
+ #           ID: 0x3A7D979B
+ #          S/N: 00C4216083F35C54F67B09A80C3C55FE7D
+@@ -208,7 +208,7 @@ C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:7
+ #[checked: 2007-12-13 via received ZIP file with qualified signature from 
+ #         /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag
+ #         /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg"]
+-D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B
++D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B  de
+ 
+ 
+ #*******************************************
diff --git a/app-crypt/gnupg/gnupg-2.0.8.ebuild b/app-crypt/gnupg/gnupg-2.0.8-r1.ebuild
index ac6bc329c1f3..8191276fb524 100644
--- a/app-crypt/gnupg/gnupg-2.0.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.8.ebuild,v 1.1 2007/12/20 19:43:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.8-r1.ebuild,v 1.1 2008/01/15 18:55:08 alonbl Exp $
 
 inherit flag-o-matic eutils
 
@@ -42,6 +42,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.0.4-idea.patch"
+	epatch "${FILESDIR}/${P}-qualified.patch"
 }
 
 src_compile() {