Fix qualified.txt syntax

(Portage version: 2.1.4)

4 files changed, 32 insertions, 3 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/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() {