Fix texinfo-5 comatibility, per bug#464162, thanks to Denys Duchier and Ian Abbott

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

3 files changed, 46 insertions, 2 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 70214dbb524b..69fe0e753272 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.459 2013/04/07 18:18:37 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.460 2013/04/10 22:11:45 alonbl Exp $
+
+  10 Apr 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-2.0.19-texinfo-5.patch, gnupg-2.0.19-r2.ebuild:
+  Fix texinfo-5 comatibility, per bug#464162, thanks to Denys Duchier and Ian
+  Abbott
 
 *gnupg-2.0.19-r2 (07 Apr 2013)
 
diff --git a/app-crypt/gnupg/files/gnupg-2.0.19-texinfo-5.patch b/app-crypt/gnupg/files/gnupg-2.0.19-texinfo-5.patch
new file mode 100644
index 000000000000..836e2380fd55
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.19-texinfo-5.patch
@@ -0,0 +1,38 @@
+diff -ru gnupg-2.0.19.orig/doc/gpgsm.texi gnupg-2.0.19/doc/gpgsm.texi
+--- gnupg-2.0.19.orig/doc/gpgsm.texi	2012-03-27 10:03:23.000000000 +0200
++++ gnupg-2.0.19/doc/gpgsm.texi	2013-04-10 11:46:02.179960198 +0200
+@@ -760,8 +760,8 @@
+ This is the standard configuration file read by @command{gpgsm} on
+ startup.  It may contain any valid long option; the leading two dashes
+ may not be entered and the option may not be abbreviated.  This default
+-name may be changed on the command line (@pxref{option
+-  --options}).  You should backup this file.
++name may be changed on the command line (@pxref{option --options}).
++You should backup this file.
+ 
+ 
+ @item policies.txt
+diff -ru gnupg-2.0.19.orig/doc/gpl.texi gnupg-2.0.19/doc/gpl.texi
+--- gnupg-2.0.19.orig/doc/gpl.texi	2012-03-27 10:03:23.000000000 +0200
++++ gnupg-2.0.19/doc/gpl.texi	2013-04-10 12:45:20.988492453 +0200
+@@ -659,12 +659,14 @@
+ Program, unless a warranty or assumption of liability accompanies a
+ copy of the Program in return for a fee.
+ 
++@end enumerate
++
+ @iftex
+ @heading END OF TERMS AND CONDITIONS
+ @end iftex
+ @ifinfo
+ @center END OF TERMS AND CONDITIONS
+ @end ifinfo
+ @unnumberedsec How to Apply These Terms to Your New Programs
+ 
+ If you develop a new program, and you want it to be of the greatest
+@@ -721,5 +724,3 @@
+ applications with the library.  If this is what you want to do, use
+ the GNU Lesser General Public License instead of this License.  But
+ first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
+-
+-@end enumerate
diff --git a/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild
index dcb029ede32b..8bec34fd28ae 100644
--- a/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild,v 1.1 2013/04/07 18:18:37 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.19-r2.ebuild,v 1.2 2013/04/10 22:11:45 alonbl Exp $
 
 EAPI="4"
 
@@ -59,6 +59,7 @@ REQUIRED_USE="smartcard? ( !static )"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.17-gpgsm-gencert.patch
 	epatch -l "${FILESDIR}/${P}-support-sc-key-3072.patch"
+	epatch -l "${FILESDIR}/${P}-texinfo-5.patch"
 }
 
 src_configure() {