Drop old one. And fix minor syntax issues

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

4 files changed, 23 insertions, 129 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 4977f2f6319b..990e8f7f921d 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,10 @@
 # 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.92 2011/11/07 17:34:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.93 2011/11/07 17:49:55 alexxy Exp $
+
+  07 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-3.4.2-r3.ebuild,
+  xen-4.1.1-r2.ebuild:
+  Drop old one. And fix minor syntax issues
 
   07 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-4.1.1-r2.ebuild,
   xen-4.1.2.ebuild:
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 53b37b8d0957..5bc9d8d5b5bd 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -11,27 +11,26 @@ AUX xen-4.1.1-iommu_sec_fix.patch 2851 RMD160 4367178c10cdc1e752f3e9ffb70f42e6e7
 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-3.4.2-r3.ebuild 3068 RMD160 a7823f95b67e2f237a5395a0063525794bf21820 SHA1 b7ea3ce1c4df92ee1d87101fda58765cc580168f SHA256 df35d173a9fbcd041e8d33f7edc5478c9e3ed5f64a1f3b17caf746f5bd92252b
 EBUILD xen-3.4.2-r4.ebuild 3247 RMD160 73c91e87a06e83faee786268db656531a2dbe71f SHA1 94f6be18689fd09099ad062f829358bfa159d6ef SHA256 385ddd40121b1d415214e9adc619cb39825febcaec21b7cb70c2d2f2e4b60a04
-EBUILD xen-4.1.1-r2.ebuild 3333 RMD160 fbbd1874ffb65c785fff204386316006cc98410b SHA1 7170573942d51a675889e403994e05ef29e7867d SHA256 bbb364d8c891a2c7071d6c2917159814919be205f4330c0556d3e67b18f78c45
+EBUILD xen-4.1.1-r2.ebuild 3337 RMD160 ef91546df9b593d8a2eb72331f87fabf346f2dcd SHA1 235a2bc772eaf61cfa1c8cae110623c8ca31cea1 SHA256 43af990fc8c9020202a7b2cc0439f7ec575ed5943cc503a80594f9654f07b77d
 EBUILD xen-4.1.2.ebuild 3217 RMD160 0c5766606cf0b2f1dfd4bee454152db0ac07fb9f SHA1 9a170da39c3fda16445488aac1d884d78304c9d8 SHA256 374e77ab7aadd7bca98e6d668d0a9e26842c1582987b24bc5015424f2c194ad7
 EBUILD xen-9999.ebuild 2929 RMD160 34b61aa566948357bed2bde59d06e38fdc21249c SHA1 5dfa8cebff2f2b9a10e40b888e151baf8afb804c SHA256 62f131e504a87ab2e05b1109325167ae9f6d9747ae90d89536d49734c7445f0e
-MISC ChangeLog 14980 RMD160 3110bc772850243212236a244b9d19d60c4af66a SHA1 aed199e1d1c7c0ff3d5623e5288ea486f28bf0b3 SHA256 68b935e6b94f0ac335266811bd0e8443d556b8d77df1b6f73505d71dc12ff026
+MISC ChangeLog 15121 RMD160 5bf460eb5a03ad197472c542061d5e0ce610d88e SHA1 5f5bc3e66f947a9460df3eefb6e1c00423f6627b SHA256 c1d2fc82761fb9ad454edd9c4f3fd769c844926523940310181759eef784ec87
 MISC metadata.xml 581 RMD160 d22ffb491d9dad33425b97add683dd6b8b9139e1 SHA1 649f65e9fd2ab25e32394c555a24fc0f6b59c37f SHA256 1cf2cc4bb5b5278ac75e74910607518ddd2bd6454f18325319ce1ac102fab535
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOuBa7AAoJEOf+E+/4L5Lm+9gP/02J98O4+Xc1eeHITvWLcRW6
-YAr4tjpDRJQmjrtL9U/0TyRQ11wAV93wiAiI6do81+kzH699iRlfPblzwzfOxy2J
-VZT5kLXByMFlmXmogMmZq99hhdcEFZuFTcYWyMdWlYDFHILMj9EKkOJzgU1P7Z4c
-VyXuR6EOYw8+6gYsfXvcVl2rO9QTcv/PswQO5esBdeRg7k32ePfMpOCaFZZ6ldoE
-vW62BJ+zbWKT7x5sddNx/sYyrzcxmtXy0pXiNU6y0J+hJGHYIlcV9chIFW5SpSM5
-T45uu8ouRo0PVgPqBp+tkrpCY9wfS5F2b58ZptHvLzBUFNVH2d49SpfHOxxJ0Z8X
-hvSpiqaPTowaH22URg0PoO0/9fGdwkW4rHKwLf56W5Cke8tH9q2pMW7r4oVopHy0
-azMWRQC23ua76i+EMXJjSBblITbdaOBukMrojTAonFXtOnFDE0yRbhY85WNyotde
-CWEUbjxaYdn1YCtP3bKaaOnkoAscG3J5q/v1koWBri2U1Z/29kNKLr0hTz8y1HZU
-WJoQemkwXpBAXQ9S3VBnw4rBgu9KLo0B/MPNQjsZTaJwRIsFhBgBQqsVib2yZ8IE
-pFPH8mlPOYJpJTahw9UDKr1wbhRK36ccBo7YeiEjU9vSf1Er2EPvE71BxtIHam7M
-1Aehpwz3mMLa/4GaFjMO
-=3nW4
+iQIcBAEBCAAGBQJOuBo/AAoJEOf+E+/4L5Lm9MUQAI5BEpL99czXD69nlpq5Pb2o
+EaHLoJDlzjpvBN8+o5WE40DRNf2+r3gWG5UkcE0zUUJ2n/YtH6IHrE6VqF1e8DYx
+CccKXyU9TBA/YV6i5UhCHZP5ho7+YnADZL9Ptm8P8vK+q31QDJ2fso3d8MDEFjfg
+cg/E/HJsKOwkwTel6qmXEpoVxUWKbiu6UpijAVi4ZA8diPLUt2W9antADa5W+GVn
+Bmg+ClRO+WcVeb0azQoV+ly/TXnaKapiQMlMq9L4CoxZfK2YxiMmQAX5jHuPE6xt
+C+pyvSx/1MbJGnLsVYOJq7KA7MF5+aLYaEUnMLgHx7ne0DWcf0Avq2FOGTzGBV2e
+nHrzBSRWDLj49S5uAsERVXkUlaiOo6p7CaSLYAfboPna/RUFWkWbKvIBTqClcof5
+UAF2rgOl07NTKMTVNzvQZS5FU3z5pmFfN5Q1+kxdZtpk/f7IM0KEmH2xYjohHJKz
+Wtzyy173p9G0UMyAVBu3Gc2CQacdmAWck1McRqYQVXWS009Gpdw9nUMSN4xEHx6w
+Efv/XT0f+rEU4+m1r+gq4CDf+jyI9aiKf9AOi4u+KYgqh6vqbb8FGPjFS1IgOhgU
+jYCLOyiad47kzK5HWf9xm9DLpdMEG0K1tZYUvmNYDhlrqrCRRgWGLwO5IIm8lKfJ
+WOu7yc9SF2m6yB8Ver0a
+=1edr
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/xen-3.4.2-r3.ebuild b/app-emulation/xen/xen-3.4.2-r3.ebuild
deleted file mode 100644
index 8b80a9eb5733..000000000000
--- a/app-emulation/xen/xen-3.4.2-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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-3.4.2-r3.ebuild,v 1.3 2011/09/29 14:21:09 tomka Exp $
-
-EAPI=2
-
-inherit mount-boot flag-o-matic toolchain-funcs base
-
-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}"
-PATCHES=(
-	"${FILESDIR}/"${PN}-3.3.0-unexported-target-fix.patch
-	"${FILESDIR}/"${P}-dump_registers-watchdog-fix.patch
-	"${FILESDIR}/"${P}-no-DMA.patch
-	"${FILESDIR}/"${P}-werror-idiocy.patch
-)
-
-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_prepare() {
-	base_src_prepare
-
-	# 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 448764292071..30f19805481c 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.5 2011/11/07 17:34:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.6 2011/11/07 17:49:55 alexxy Exp $
 
 EAPI="4"
 
@@ -75,10 +75,10 @@ src_prepare() {
 	fi
 
 	# remove -Werror for gcc-4.6's sake
-	find ${S} -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+	find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
 		xargs sed -i 's/ *-Werror */ /' || die "failed to remove -Werror"
 	# not strictly necessary to fix this 
-	sed -i 's/, "-Werror"//' ${S}/tools/python/setup.py || die "failed to remove -Werror on setup.py"
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to remove -Werror on setup.py"
 
 	# Add sccurity fix bug #379241
 	epatch "${FILESDIR}/${P}-iommu_sec_fix.patch"