Fix GNU Info files, bug 249168.

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 i686)

3 files changed, 46 insertions, 2 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index ae019107bd8e..351b1b4e2d15 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.140 2008/10/26 00:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.141 2008/11/28 22:41:19 ulm Exp $
+
+  28 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/2.2.6a/libtool-2.2.6a-gnuinfo.patch, libtool-2.2.6a.ebuild:
+  Fix GNU Info files, bug 249168.
 
   26 Oct 2008; Mike Frysinger <vapier@gentoo.org> libtool-2.2.6a.ebuild:
   Force automake-1.10.1+ #243174.
diff --git a/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-gnuinfo.patch b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-gnuinfo.patch
new file mode 100644
index 000000000000..3027dd964503
--- /dev/null
+++ b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-gnuinfo.patch
@@ -0,0 +1,39 @@
+Fix broken Info files produced by texinfo 4.11
+http://bugs.gentoo.org/249168
+
+--- libtool-2.2.6/doc/libtool.info
++++ libtool-2.2.6/doc/libtool.info
+@@ -1,7 +1,7 @@
++This is libtool.info, produced by makeinfo version 4.11 from /Users/gary/Devo/libtool/doc/libtool.texi.
++
+ INFO-DIR-SECTION GNU programming tools
+ START-INFO-DIR-ENTRY
+-This is libtool.info, produced by makeinfo version 4.11 from /Users/gary/Devo/libtool/doc/libtool.texi.
+-
+ * Libtool: (libtool).           Generic shared library support script.
+ END-INFO-DIR-ENTRY
+ 
+--- libtool-2.2.6/doc/libtool.info-1
++++ libtool-2.2.6/doc/libtool.info-1
+@@ -1,7 +1,7 @@
++This is libtool.info, produced by makeinfo version 4.11 from /Users/gary/Devo/libtool/doc/libtool.texi.
++
+ INFO-DIR-SECTION GNU programming tools
+ START-INFO-DIR-ENTRY
+-This is libtool.info, produced by makeinfo version 4.11 from /Users/gary/Devo/libtool/doc/libtool.texi.
+-
+ * Libtool: (libtool).           Generic shared library support script.
+ END-INFO-DIR-ENTRY
+ 
+--- libtool-2.2.6/doc/libtool.info-2
++++ libtool-2.2.6/doc/libtool.info-2
+@@ -1,7 +1,7 @@
++This is libtool.info, produced by makeinfo version 4.11 from /Users/gary/Devo/libtool/doc/libtool.texi.
++
+ INFO-DIR-SECTION GNU programming tools
+ START-INFO-DIR-ENTRY
+-This is libtool.info, produced by makeinfo version 4.11 from /Users/gary/Devo/libtool/doc/libtool.texi.
+-
+ * Libtool: (libtool).           Generic shared library support script.
+ END-INFO-DIR-ENTRY
+ 
diff --git a/sys-devel/libtool/libtool-2.2.6a.ebuild b/sys-devel/libtool/libtool-2.2.6a.ebuild
index d1edd991ce08..fa5c5e593d92 100644
--- a/sys-devel/libtool/libtool-2.2.6a.ebuild
+++ b/sys-devel/libtool/libtool-2.2.6a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.6a.ebuild,v 1.2 2008/10/26 00:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.6a.ebuild,v 1.3 2008/11/28 22:41:19 ulm Exp $
 
 LIBTOOLIZE="true" #225559
 inherit eutils autotools
@@ -26,6 +26,7 @@ S=${WORKDIR}/${P%a}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${PV}/${P}-gnuinfo.patch #249168
 
 	if ! use vanilla ; then
 		epunt_cxx