[app-emulation/xen] Drop old. Alternate fix to -Werror, fixes bug 362303, patch by Markus Peloquin

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

5 files changed, 53 insertions, 120 deletions

diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 3fba453caaf9..585600705f97 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST lwip-1.3.0.tar.gz 398933 RMD160 72c63bf5e3b29e185c46a5fc116146ea902def83 SHA1 241f917ba9dffc614346472e3c5871217ad0a91c SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f
@@ -8,14 +8,24 @@ DIST ocaml-3.11 11661 RMD160 55a9e2ce44a34d441bdce70dbd0b90df29c8b44d SHA1 4557b
 DIST pciutils-2.2.9.tar.bz2 212265 RMD160 781a3d30c5c429a0d92110a46711144f74acde06 SHA1 2871be0890f0406c7f86fa01646e23935fda789e SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 DIST zlib-1.2.3.tar.gz 496597 RMD160 89a57e336c24f7f6eebda3a1724e14b71187e117 SHA1 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
-EBUILD xen-pvgrub-4.1.1-r1.ebuild 4238 RMD160 7329b9a1b8115e82da9cdd44f93da6da8964144d SHA1 79277f32ba0ae8cd9ec2ae83cf4c12b07c3e7b16 SHA256 0575a5616a32c0dd390c723dfff5176e3c9e0ad7c4843a3e825ccb8798c8c062
+EBUILD xen-pvgrub-4.1.1-r1.ebuild 4348 RMD160 edb56552d3f5984687a67475eee029d59bea00c1 SHA1 c7e4ed3ab338cf93e1e6f0d0c2d4707375639e2d SHA256 2e54d127bbd78ebdd9d4e08ff2468b712156ebdd3ae24fad7baaa5b760543fcd
 EBUILD xen-pvgrub-9999.ebuild 3466 RMD160 68770effb33a802ee204b3f4f05316a2b104435a SHA1 c93c306847180ae3ad1ac1dade6323519e12faf0 SHA256 4e41e7a47c381e9dc11800bfa9838f45432efafd6dbc1d482810d17830eaf888
-MISC ChangeLog 1357 RMD160 fb7da6b604a77beb3ab39d3f14a34fb8ce3a1a5e SHA1 6cf1b9f8ce6c651e18afd81671e25f81449cb415 SHA256 d5050788607c23304b1c7b6222fc994ac19677f558b9171cc542abd2396027d8
+MISC ChangeLog 1611 RMD160 fc935dd3bc0b68dca2e2cbefe7e248e85be1bafc SHA1 7dd3a6730c8b1e30fcaf431259840dc4528abb1b SHA256 92578a8400856a9294d355d9cc24089bfc331bfdaae13ffb485eee9abc2f8878
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5+h8UACgkQuUQtlDBCeQJoZgCePL+ziGyWkZXhJZC3XZm23CIw
-pzMAn19WuFys7pSRxKEDoJNs22+Uzka/
-=1DtN
+iQIcBAEBCAAGBQJOlzq4AAoJEOf+E+/4L5LmT1QP/1jbCb1CU9uRMREiJIgZoAVt
+5JdVgOGZo3gZ+HVRC7UvhlDC5D0qZEyLnqtgPn9O4BS2K11H1viiuR5+WbZV2kG7
+r2G6N03ipjYBwej4oe3kTGT5cpQ32mhzYnkvSSpp6iMP5A2vfG8kdYCcPeulWpCM
+AVx2WmJ9n+osSYdh8mQ9ygteoLvCNNDM1mBTYjXhYc+EZDeruaWBl8LvrDpWAUNO
+tkvMvBYYOuCQU26yD+rgR8fFRYoGGOP6vFWBVDhV4lo0D2ty5lHe4bWZoDsz1MOg
+HY34pnECl88w6SefaaXRbCDz2Zc6nPh+33aU5QgD3ADUfLfaEowXfQXVgK8lJSvU
+rfJyl4wogLFD2HTeNdxlye98qjMEEJqJoNtIJAnXDhdy5jUMwmm1KUZYM0smAiXd
+cGgLjzqUrsA4CCK1cly0th4kB0wvJUixuOYWN45WzBiIfPGNeVaj70qipJD1tPll
+Obo6JrmKrq3F36QUuvrq/2FU2ngNunvWkDdJRWWeGdWext42yB9Ok0NbGhNwhEuv
+MNYwymxB+g2yADqVpCgccFy3xJb9ZrwvKiiDR9c597WAZOEl7B6QouO9cI3TB1vd
+75Nl/Xvg6go/VAO0L6ryZEuJvYI4gKuOCt5LRfjckPGP5miLj2//O95ULXMH0Gn+
+NBYM8W+LTpzesiQjAozN
+=OtJ6
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 4fff1bb008f9..c4bbb08c7745 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.86 2011/10/11 20:25:50 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.87 2011/10/13 19:21:06 alexxy Exp $
+
+  13 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-3.4.2-r1.ebuild,
+  xen-4.1.1-r2.ebuild:
+  Drop old. Alternate fix to -Werror, fixes bug 362303, patch by Markus
+  Peloquin
 
 *xen-3.4.2-r4 (11 Oct 2011)
 
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 70e45e0dd943..0a4d7a3d0024 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xen-3.3.0-unexported-target-fix.patch 788 RMD160 4b30444c021479cbd3969493639533fc1e43e781 SHA1 9119f06b4a005c385ac27e085e2d96ccf9cd4dc9 SHA256 e46f5fbe4c579b84f895f0ac6e05589553a11305ca30e69405082d58abd9ee07
 AUX xen-3.4.2-CVE-2011-1583.patch 2893 RMD160 c6ae9661202dafc2abdcf3aaf939464d14ded9fd SHA1 b2140fe7d615b542a96dadaaf8ace382e528d2cb SHA256 809c1744aee7569db31e9959c1e2c433ef6f4067134b26f70a689e056a024df9
 AUX xen-3.4.2-dump_registers-watchdog-fix.patch 533 RMD160 766249003d91cbec3b0014a8446e1a4d01cd847a SHA1 6306250671976c638f814a4958211af4bacb53b4 SHA256 17d18f268efd302085bdfa0673e2d9478e84206b6d060d0a63854441233a81c6
@@ -7,10 +10,26 @@ AUX xen-3.4.2-werror-idiocy.patch 16826 RMD160 14f4678c723fd9241c88786b5b07a8c25
 AUX xen-4.1.1-iommu_sec_fix.patch 2851 RMD160 4367178c10cdc1e752f3e9ffb70f42e6e7179242 SHA1 8487f85dbf81bf245deaccca5ff5b8f46e60d112 SHA256 3a0ab3cb5c18db91f4be457cbba36189a558da7b794e1a35795f4fed3d48a7c8
 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
-EBUILD xen-3.4.2-r1.ebuild 3058 RMD160 19a8baa3dbf87f4c5d4e5019f88ae4dc5ccc32e6 SHA1 aed8b48c47b8f713dbc17d67fa2d21c838f7f071 SHA256 719917cfbf0605d4951415d9f53c49262d92ba8e8921a3835aefcd549dd275bb
 EBUILD xen-3.4.2-r3.ebuild 3068 RMD160 a7823f95b67e2f237a5395a0063525794bf21820 SHA1 b7ea3ce1c4df92ee1d87101fda58765cc580168f SHA256 df35d173a9fbcd041e8d33f7edc5478c9e3ed5f64a1f3b17caf746f5bd92252b
 EBUILD xen-3.4.2-r4.ebuild 3249 RMD160 c00e2aa265dc4c37f8e09854af296b150bd46fb8 SHA1 84b162ac12b34afe544d6dcc232016e97fa95d0a SHA256 fa50d0fc5c8e6adb09b6db324cedf22d50abf2be09111ac25af20e31fffe3948
-EBUILD xen-4.1.1-r2.ebuild 3015 RMD160 2026eb17050ee40ae504b3f377b0e0895849d02a SHA1 2d505aa3cf488a79c3518d9d5bf4d70d6c84f9c7 SHA256 4ae066db6bbdd5ca3c377944b9b3c2abc94d2095c075cb20485908bc954fdf78
+EBUILD xen-4.1.1-r2.ebuild 3247 RMD160 a427e6bf0195f711c00a2487065dc0ee15c53921 SHA1 b485f3227820be797917d425fefdbe0f9febff98 SHA256 8b7126c404e6b0d227606efccb3be2dde79a124138dc763545dd90f492676846
 EBUILD xen-9999.ebuild 2929 RMD160 34b61aa566948357bed2bde59d06e38fdc21249c SHA1 5dfa8cebff2f2b9a10e40b888e151baf8afb804c SHA256 62f131e504a87ab2e05b1109325167ae9f6d9747ae90d89536d49734c7445f0e
-MISC ChangeLog 14095 RMD160 ca58af04653c5017cb44648cd405ca940e5d1d37 SHA1 b64619008aac2f528a5ab268d26a4a8c686e22b4 SHA256 5a84a264a57918a9035c0255914539ccc67cfdf362e9e279eec375595c011cf0
+MISC ChangeLog 14273 RMD160 da189d0fff63a7bf64f09e43e8bda918b1541ec0 SHA1 437c4df77c8464f13e204019dfa001a1d9bc0de2 SHA256 2d520e97d82411b45040e6ede3f71ae9683c06177f084a701bec5982294ec7a3
 MISC metadata.xml 581 RMD160 d22ffb491d9dad33425b97add683dd6b8b9139e1 SHA1 649f65e9fd2ab25e32394c555a24fc0f6b59c37f SHA256 1cf2cc4bb5b5278ac75e74910607518ddd2bd6454f18325319ce1ac102fab535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOlznLAAoJEOf+E+/4L5LmlPYP/R1PnYjJC/UmBVfRkmQk6S5V
+hz8cbMm7YaX4+ZpyHWfUY/n3o9PF6/FJxGggEHn6ezCdblp8OP9/XO6YVkaehLLB
+es23tfvIECdRUU98FjqU8Hn4IjGsTtvBwmXMTunXDIf09dcsWRPi0WoVtQlNZxTP
+iR5eRvBAJcrJg7ijly67+wjepsFudbQ5gwmN3hZyKD+z4Tp0vgs6C/H+33xDTXj3
+58YA0D9NMlyI1W8htTjSb+fC7MObhh8Cjj1vcb7/PA7GZUx0OZEiC9uJMgqDTpi+
+tSj33n6uQtafWqbhEh6tr1CZModQ8R2Yc8itzBJ5iYkkvhmWLJF5//v9LuYxPzUS
+GSWLvXoCSUiE8wOkd0z0OhmoCxE9UVHmWmzqkPIub7wmgof2qLlIExCFbcTD7IBT
+9Vll+tPqbF58PvIeDpG1IEnR81+1w1GpiNPWHS60UnYHdAvD/21BIoTE+PHjVzMx
+EsfuyWIuBGI6KpJe/bULMXClK4o/Le0wRtiHd7OEvrThjSQnwTcMrGcQ+rpJgJIe
+/nRKuBSfFypMt4qGAlBpjw14bDRo+AEIXx2CNosB0ugHCJHZ2VtZaqeXzI/BuqNL
+E79HuWYwY+fC8AvWums0tPWQz4JmOxzOr/cEf5rpGTDBdouzBJQCUgsbF15FrOtu
+JBwrQnvb7s02y5OaimYM
+=J4AC
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-3.4.2-r1.ebuild b/app-emulation/xen/xen-3.4.2-r1.ebuild
deleted file mode 100644
index 2ebec44c6a75..000000000000
--- a/app-emulation/xen/xen-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.4.2-r1.ebuild,v 1.3 2010/06/24 01:40:04 angelos Exp $
-
-inherit mount-boot flag-o-matic toolchain-funcs
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug custom-cflags pae acm flask xsm"
-
-RDEPEND="|| ( sys-boot/grub
-		sys-boot/grub-static )
-		>=sys-kernel/xen-sources-2.6.18"
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-pkg_setup() {
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use xsm ; then
-		export "XSM_ENABLE=y"
-		use acm && export "ACM_SECURITY=y"
-		if use flask ; then
-			! use acm  && export "FLASK_ENABLE=y"
-			  use acm  && ewarn "Both acm and flask XSM specified, defaulting to acm."
-		fi
-	elif use acm || use flask ; then
-		ewarn "acm and flask require USE=xsm to be set, dropping use flags"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix unexport $target in xen-setup
-	epatch "${FILESDIR}/"${PN}-3.3.0-unexported-target-fix.patch
-
-	# Fix crash in xen console
-	epatch "${FILESDIR}/"${P}-dump_registers-watchdog-fix.patch
-
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	if use custom-cflags; then
-		filter-flags -fPIE -fstack-protector
-		replace-flags -O3 -O2
-	else
-		unset CFLAGS
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed"
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use pae && myopt="${myopt} pae=y"
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install || die "install failed"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the unoffical wiki page:"
-	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
-	elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
-	if use pae; then
-		echo
-		ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
-	fi
-}
diff --git a/app-emulation/xen/xen-4.1.1-r2.ebuild b/app-emulation/xen/xen-4.1.1-r2.ebuild
index b593d4d01415..d5d5ab1b7333 100644
--- a/app-emulation/xen/xen-4.1.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.2 2011/09/25 01:45:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.3 2011/10/13 19:21:06 alexxy Exp $
 
 EAPI="4"
 
@@ -73,6 +73,13 @@ src_prepare() {
 			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
 			-i {} \;
 	fi
+
+	# remove -Werror for gcc-4.6's sake
+	find ${S} -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+		xargs sed -i 's/ *-Werror */ /'
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' ${S}/tools/python/setup.py
+
 	# Add sccurity fix bug #379241
 	epatch "${FILESDIR}/${P}-iommu_sec_fix.patch"
 }