Fix building with app-text/texi2html-5, commited on behalf of Ian Delaney. Fixes bug 409333. Thanks to Joerg Neikes <xenoist@midlandgate.de> for the report and patch

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

6 files changed, 32 insertions, 10 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 30b8b7a2bea9..0c271a9e4c22 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.110 2012/01/12 13:40:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.111 2012/05/08 16:04:46 xarthisius Exp $
+
+  08 May 2012; Kacper Kowalik <xarthisius@gentoo.org> xen-tools-3.4.2-r3.ebuild,
+  xen-tools-3.4.2-r5.ebuild, xen-tools-4.1.1-r5.ebuild,
+  xen-tools-4.1.1-r6.ebuild, xen-tools-4.1.2-r2.ebuild:
+  Fix building with app-text/texi2html-5, commited on behalf of Ian Delaney.
+  Fixes bug 409333. Thanks to Joerg Neikes <xenoist@midlandgate.de> for the
+  report and patch
 
   12 Jan 2012; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-4.1.2-r2.ebuild,
   files/xendomains.initd-r2:
diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild
index 82a9f449c37e..2d6e2fad74d0 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild,v 1.3 2011/09/29 14:22:28 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild,v 1.4 2012/05/08 16:04:46 xarthisius Exp $
 
 EAPI="3"
 
@@ -126,6 +126,9 @@ src_prepare() {
 	if ! use pygrub; then
 		sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
 	fi
+
+	sed -e '/texi2html/ s/-number/&-sections/' \
+		-i tools/ioemu-qemu-xen/Makefile || die #409333
 }
 
 src_compile() {
diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
index c31830b21501..0d451c09e75c 100644
--- a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.4 2011/10/25 18:40:28 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.5 2012/05/08 16:04:46 xarthisius Exp $
 
 EAPI="3"
 
@@ -133,6 +133,9 @@ src_prepare() {
 	if ! use pygrub; then
 		sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
 	fi
+
+	sed -e '/texi2html/ s/-number/&-sections/' \
+		-i tools/ioemu-qemu-xen/Makefile || die #409333
 }
 
 src_compile() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
index 7fe45567b7e9..6307a0801e0a 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.5 2011/10/13 19:30:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.6 2012/05/08 16:04:46 xarthisius Exp $
 
 EAPI="3"
 
@@ -192,6 +192,9 @@ src_prepare() {
 		-e 's:^\tfi:#\tfi:' -i \
 		-e 's:^\tmv _$T $T:#\tmv _$T $T:' \
 		-i tools/firmware/etherboot/Makefile || die
+
+	sed -e '/texi2html/ s/-number/&-sections/' \
+		-i tools/ioemu-qemu-xen/Makefile || die #409333
 }
 
 src_compile() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
index 84bd65697b9c..53afa97bb887 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.3 2011/11/01 10:14:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.4 2012/05/08 16:04:46 xarthisius Exp $
 
 EAPI="3"
 
@@ -203,6 +203,9 @@ src_prepare() {
 	if gcc-specs-pie ; then
 		epatch "${FILESDIR}/ipxe-nopie.patch" || die "Could not apply ipxe-nopie patch"
 	fi
+
+	sed -e '/texi2html/ s/-number/&-sections/' \
+		-i tools/ioemu-qemu-xen/Makefile || die #409333
 }
 
 src_compile() {
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
index 3ce8a54cf2f1..c53b614950bb 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.4 2012/05/08 16:04:46 xarthisius Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -195,6 +195,9 @@ src_prepare() {
 
 	# Fix create.py for pyxml Bug 367735
 	epatch "${FILESDIR}/xen-tools-4.1.2-pyxml.patch"
+
+	sed -e '/texi2html/ s/-number/&-sections/' \
+		-i tools/ioemu-qemu-xen/Makefile || die #409333
 }
 
 src_compile() {