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

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

7 files changed, 52 insertions, 30 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/Manifest b/app-emulation/xen-tools/Manifest
index 7f6eec364c32..793311df1626 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -31,27 +31,27 @@ DIST ipxe-git-v1.0.0.tar.gz 1996881 RMD160 dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5
 DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 SHA1 3cd2cafacd52bbac2e2da1cfd846ee6260b43455 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 DIST xen-4.1.2.tar.gz 10365786 RMD160 457797ec4be286afbbcad940a9ce04e44f3f40d6 SHA1 db584cb0a0cc614888d7df3b196d514fdb2edd6e SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d
-EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f20f4a1 SHA1 e36b7900c84de2ca1f861af081678ff3c7eb943a SHA256 d1513d443231dd27cb0267acac47c00c9bf95c25aa296e90ee6bb21a134e1e51
-EBUILD xen-tools-3.4.2-r5.ebuild 7383 RMD160 b31318f590f2d563c036a7acffe65cecc9bf677f SHA1 34312c51b92c28dc7d7ab718c1b5f67b1554be61 SHA256 0ae0c406503dbc8342d5a4abc72d896ec0205317c9e6ec8690f71a40bd7bb8c4
-EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b858538d31e SHA1 f1af2fba3958c0813b37adc16c82d69d720f2458 SHA256 80485abdbcaf256d21289f0cf260de671d72bbcc023bf49df3bd99db99b23720
-EBUILD xen-tools-4.1.1-r6.ebuild 10651 RMD160 993111049c34acbbf59857b3794e68319a50e301 SHA1 4af2c578e12f6f9b29490dc04488a956d526af4c SHA256 4147a0918b80cda6c22cfe4219c4767a5b2a50b65790852de9f33ce0c16122fd
-EBUILD xen-tools-4.1.2-r2.ebuild 9749 RMD160 d8ffbfafd95b67ea166b13b8073a350519af99e2 SHA1 b65643985c1d5d13c5c40e828f46dabc54fd97f2 SHA256 246a988ff94b35d1211021c7c1fbeb42ae241896275c67bc032e5d697949063c
-MISC ChangeLog 26857 RMD160 3686a662851e1cd25c128e8a976c17628218523e SHA1 721de030710ff627a934cb41f85b671b7d7a58be SHA256 45cdbc71167f12d615fe391502a8331614d9d5be08c853f376e3fb9204d5edb7
+EBUILD xen-tools-3.4.2-r3.ebuild 7151 RMD160 cbcb92d57d6c8354c3114ebde371f36ebde0f8c0 SHA1 ed2dcbcf698c31e5df23fd3a4ef0bdcdf2ab582a SHA256 1f942f2d0c552489fea251079c7e23e68e255bf3cc46e9fc227cd8aa7ae319f0
+EBUILD xen-tools-3.4.2-r5.ebuild 7484 RMD160 3f5e096c3bee115af9697a1e056f65da27e05360 SHA1 b8f4750bf604856c9f09269f6f42dbb5205b2adc SHA256 4a9bc0354a307e0385e0d2144b04492187e38fae4cb1790a782462b1a2f5dbba
+EBUILD xen-tools-4.1.1-r5.ebuild 10417 RMD160 feb8a25f944a9303d263f2246ade3c2fd9e93353 SHA1 59e18e73357c2197b9d12cb3eba36d24e638661d SHA256 39265db51b8e9144da628818ce719eb8b8406c23c254455b6862a5f4686ceb8f
+EBUILD xen-tools-4.1.1-r6.ebuild 10750 RMD160 27067e59fc9abf829dd017cf8fb39d57959061f7 SHA1 4d76f4a1abbfa01a26bced3794b8afd53fe3113a SHA256 c0d4e552e261067c71eed24a706e57a2234ae5a42de8192f6afb5781c8b89142
+EBUILD xen-tools-4.1.2-r2.ebuild 9850 RMD160 9f7c52fb4902ded9efb80487f8a41eea9070c198 SHA1 6ba6a651822b24caead235914fb5961758c2fd99 SHA256 1f5cdd6572a4f6a1bec56365e1e060306b9285394011f39bcd988df9249707dc
+MISC ChangeLog 27227 RMD160 e99b635c27577c909381242cc3785b1f7d0ee3b6 SHA1 c60cfd73853a69cfa568fe1ba0ed89f7d2c19702 SHA256 841cdda92307b9f65f88bba38135ae593777a8a2d83914d660cd02c9d7da95ac
 MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPDuK0AAoJEOf+E+/4L5Lmd08QAIr8PcR2iZ3edZOP9SA5UvoC
-DWzksaEkmvLhgXckeNLzE2JIqu9CEVrEdnLz88nsW4QeJvjgsNvlWBqRebBZbe1j
-R+/ZSaHGEoN+2TVam8NfBdSKHiznRt1zVYexsZajmPUMlHQ+NQOyUeHEyweVR1uG
-DhYpzU7/yq6g5XqB+0AOyHn4BP0p3JxmuU35+POjIYIOLwVEM6TLDXfa6hju39Ge
-5F2IPBmjgBhe2y6P2W6qaqfBeauXp18vhbJpNz7AXG0ndRh1YAR9uHCjHueeepD5
-UfDwa7CAxuhT8noOlmyeTZTlu+r9MqiAwmd9Z2uyguCUZ+RlvUOVikrM3/KPVbXK
-TilW6zNstVwIX/p7mpdpjztEIxhg6Q4wplatHd+vSsKHlRLJZGyH+hS7H5Xne/eo
-+nFaKhXT3jMXHnbCtCaJbgbsUU3UOhwhzIeaZ4z5o3Vd5gKgn/HpdGqamord6JP8
-ZhBsHNO18CVTPKXCf/N44Y15yiE8DHfxObsj5rsA0GA1Olf1jMC8KTBcJGFEqU3U
-Xm40Y8G74nqYg1QH0tY9RMvTjFepaCjzOfMQXt+HNtVwjpDSToHWrQsXl65Al8sU
-EbJrko5wt4AlP9PZehd1a6tLw+9+qSAyHrx3RZ3S9UOEsqLQ3f3wDfNFI8iMz3ch
-3k6uHtosR8EN7Hw/BrmJ
-=/nj1
+iQIcBAEBCAAGBQJPqUQqAAoJEF0huFKJUZL5HbMQAIX2GlPOMdnrHtxvSvIaonEM
+VNZgxJJf/8EiQl4Bacrxs1P0pYVyB5TNprxyQjLEJOyA+eqEai6NVOs8rIH0TJMH
+hQobyqUT7NHtkQan2Dhc0/JkgC8Cd7gRGxCzlapLBWq8RZVdVSsc0pyKZ4+B+nQW
+QcCYtQP8GpPUgkR3KS0j0AGDNeCPUpHHyQVeRq0t63RmDwJ6AN4FcxSLPr7+AoED
+QYpEwzSYDn7t3YBHHOGwlGD9HgsCHN22rPQNJ4l9/d/2375hLZM4ORpPsYxKVUH+
+4Q6c1w4+uEw2NQSVnYQDnz+hT7nr8B0VIUvYtUi6cV6Rzkb3sXr1YJ37ZoYpb7Di
+EgTAM4NxL62/jxkK8mrV8NK+ts/wf0UeNyrCRfwXJ04ynGuvSVpacc0FC/q0pEXx
+BjxtrS5iwxQUF4miRKsawkbxWP8TBj0D9Wxw7xfNi/ePaM40X5mfFGBNYEcTN0OW
+Ym1ISS6Fo4vAzVTnnA+MR8hx8Zab/E9XXbJFyKgKqPhs/ClYl+D5nNzm1D/cJ4s5
++UOSMVSONnJwPgUKIRWEz6aNnFL3AVw0tJG0uAxdzu1R8QSPny6UHuIdlphGTQgc
+EF2gKUjvh3R++SHQX++uhxCFrgEz5hdm15h2+sv1klqahZkQ6YdJFPH7l5ofguAh
+uywaTAkbK+/ZC+ep3AWh
+=Ziq8
 -----END PGP SIGNATURE-----
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() {