bump

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 169 insertions, 6 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 1180ec3df240..c42dec8e9a31 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.100 2012/12/05 01:33:38 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.101 2013/01/24 09:18:34 idella4 Exp $
+
+*xen-4.2.1 (24 Jan 2013)
+
+  24 Jan 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-4-fix_dotconfig-gcc.patch, +xen-4.2.1.ebuild:
+  bump
 
   05 Dec 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Change maintainer tag (bug #390951).
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 83ce18d0f193..8790c52a2f70 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xen-4-fix_dotconfig-gcc.patch 1527 SHA256 ff14b537b72ca74f482e24626b041fbaffe6bb2744ac90968f9e50da8855eb13 SHA512 9e4691f435e4cd0874a19f75600578590968b1c477a5e16f606de58a54686da92faa29b7545e829220dc0dc8fb79e269232557444153b9e7dc814d3bf2e5349e WHIRLPOOL 64625ee28db1ab15002152066f1986326b7c6a55eaae2021e382885d968ded49f930a07a932f52a415da63cd8b3477042c7c7d7c8c5f2925a846b30c3f63d446
 AUX xen-4.1.1-iommu_sec_fix.patch 2851 SHA256 3a0ab3cb5c18db91f4be457cbba36189a558da7b794e1a35795f4fed3d48a7c8 SHA512 832ecee2dedeb13c3cc61298fa9dacd131623c84c06fa9d4ecbcc6be97d660c3fa025ae61654e0f31396b50d917de3c2ca77262ed18e006ec281a707a6cf662d WHIRLPOOL f787685f52f4bd27fa11e80f8025c4ea90cf831610d9ae69d34bb0eaee7a34017d7aa7868935e1936bc868503892ae923d8fdfc8eafea5fab8f33765452ea371
 DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
 DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
+DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
 EBUILD xen-4.1.1-r2.ebuild 3326 SHA256 938ca3d3f2ae8c775fe30fbaa4444c0fd7a86016080362d4e0636e0a7977ee74 SHA512 af1fe8ecc1adc5b353b219c150871ebbffe78c7abc57c34df197bfd5a7c7ba790f743adc7c3d2e2f0194c56e8539d2009c9907be95cf69a96779de950a777067 WHIRLPOOL e3fca98777fe12e99418be2e09cb290b858202d44542306914d00d6f424950b85eee6b81b0e994b30f3432b3759ea5a26a97850ed94ad8b32abbe1b1dd13004e
 EBUILD xen-4.1.2.ebuild 3217 SHA256 374e77ab7aadd7bca98e6d668d0a9e26842c1582987b24bc5015424f2c194ad7 SHA512 94dca833fb2439e175d0c4868c648fd0cf5cb54960f7a45664dcb449a3473d342d04f5235ee22abfaa13296e2a1d0e8935e23e01d7949ff99409e3034e5b0ebe WHIRLPOOL b85040d9da4af45a1bd383310546056ad186113f56b96ca756957b711cd9f51f42a8aff60b634efbec1756fa296dc54be152d3f2ba72bb7ec99d9e5110b99db3
 EBUILD xen-4.2.0.ebuild 3218 SHA256 ff3b187eed6d61e5c0526c9ac048ee73776dd5ee3324b80471b9ea7493134982 SHA512 b18f7fd057f45757ce22fed4f2b0346d80bda87ef6f181cef58c358802e48cb1cdf813c9da1880baf0c8b9b38ab8ff2fae5c04a659b741081e90450a39566828 WHIRLPOOL 45ab5ef5ca2d1b0092b1820ad8f5b4d0469f039295846094c575342aabd797c0596ea23c5542bd0cae810cebbaac213eb895d235650ef1bf7b76339baf027043
-MISC ChangeLog 16299 SHA256 2a7311ae37c3b824f47ab2f07d14eadd17317b57990444e4c622222c3457f3a8 SHA512 0bc18d47f50d8cc907fdb0ab26df07d1b164086f3bbd41378ea55b8fc38e449050b99659a8ffacf6f246bfd24bd7f0356cbb2dfba16a99f5f77a370abf4a4f99 WHIRLPOOL bf1610aff8efc3d2dc510e92a8555c8d5ffb0c59177c2f0ab44d9799c153585ca5cb17eb9ad1ef8ec5c9fe7455b28e347ceed93b3465c02ba51897d028cdfc63
+EBUILD xen-4.2.1.ebuild 3088 SHA256 d8c4b1574247c665cd23349f34f1c8e262aaf653a9d3a394d06a6442e9ea6921 SHA512 d4b0d6a04de2c757b128bd06d23fb52936ce601347daeb148ab4d011bc72971c66188fce5a8d304d8e6317c5c9b6d5c6d0c116c126e605aa130b87ab38dc9a3b WHIRLPOOL 995f419cd9aba7bff9cc4ccc46d8217c6b15c8752997b98ee76d5dcb82cab709496f33ae21bd2ee681bb969db6000b4b15f19ef2fe472dbbc2c7396ecca2c2de
+MISC ChangeLog 16444 SHA256 a5f053c6100ad47974688b57e6f0ed63530b11f31d92fb96793c7ec65abc13bb SHA512 25611e045f47bf7af0d2f33535c45b4c6dcb62870f8ea843577c27aba0db349033252d91aac041deff19495e25142decf5c2a66365bb35de0cae0232efefd682 WHIRLPOOL 805e1509ea5b31e48644da0e9c9452e01336470defc141c15739e9d5e6ed08d2cadbe2128b95fadf8a5f55b154254e55f3a7e1cc5730245c75c18a22df9ad0ff
 MISC metadata.xml 484 SHA256 04c4175e3ad068efdc7c047e41347a84c796fbf22ff23c40ad86860f0662fe65 SHA512 acff2c2bbcba61be17a8036edeea6dae0a8d6f7cb6a47597ec6948935b1cbc2c2f9be43dd4cdb9da347fa725d30416ce78ffbde5381c33781dcc184a1f930541 WHIRLPOOL 1bc4a8f1375bb020d410077ba46e62776e71df06ca02accf1819580e87ef4e655722cc6f831a2f8b33614ae66a40bbf7e7268e84ffdd4c04cc1f599134580d68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC+pHQACgkQVWmRsqeSphOHVACfYoFO2pw3GVVewepvJC24VDnf
-WQQAn1B5zw4724CnXpQYx4woks9GS0vp
-=vacs
+iEYEAREIAAYFAlEA/J4ACgkQso7CE7gHKw08dACggordoAUlNm/ogE7Ztikhl1hc
+jjIAni1aN2LO/wmVje4+YsmKAvsGI/ks
+=IquU
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen/files/xen-4-fix_dotconfig-gcc.patch
new file mode 100644
index 000000000000..78eb12b0fc64
--- /dev/null
+++ b/app-emulation/xen/files/xen-4-fix_dotconfig-gcc.patch
@@ -0,0 +1,37 @@
+# Fix gcc-4.6
+diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
+--- extras/mini-os/minios.mk	2012-09-17 18:21:17.000000000 +0800
++++ extras/mini-os/minios.mk	2012-12-05 14:01:10.653260260 +0800
+@@ -6,7 +6,7 @@
+ 
+ # Define some default flags.
+ # NB. '-Wcast-qual' is nasty, so I omitted it.
+-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
++DEF_CFLAGS += -fno-builtin -Wall  -Wredundant-decls -Wno-format -Wno-redundant-decls
+ DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
+ DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
+diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
+--- tools/libxc/Makefile       2012-09-17 18:21:18.000000000 +0800
++++ tools/libxc/Makefile       2012-12-05 14:01:10.653260260 +0800
+@@ -73,7 +73,7 @@
+
+ -include $(XEN_TARGET_ARCH)/Makefile
+
+-CFLAGS   += -Werror -Wmissing-prototypes
++CFLAGS   +=  -Wmissing-prototypes
+ CFLAGS   += -I. $(CFLAGS_xeninclude)
+
+ # Needed for posix_fadvise64() in xc_linux.c
+# Drop .config
+diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
+--- Config.mk	2012-09-17 18:23:12.000000000 +0800
++++ Config.mk	2012-12-05 14:01:10.641260261 +0800
+@@ -7,7 +7,6 @@
+ # fallback for older make
+ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
+ 
+--include $(XEN_ROOT)/.config
+ 
+ # A debug build of Xen and tools?
+ debug ?= n
diff --git a/app-emulation/xen/xen-4.2.1.ebuild b/app-emulation/xen/xen-4.2.1.ebuild
new file mode 100644
index 000000000000..6918ac0122dd
--- /dev/null
+++ b/app-emulation/xen/xen-4.2.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1.ebuild,v 1.1 2013/01/24 09:18:34 idella4 Exp $
+
+EAPI="4"
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug flask pae xsm"
+
+RDEPEND="|| ( sys-boot/grub
+		sys-boot/grub-static )"
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+	flask? ( xsm )
+	"
+
+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 flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	elif use xsm ; then
+		export "XSM_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+
+	# Drop .config and Fix gcc-4.6
+	epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch	# Drop .config
+
+	# 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 {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	# not strictly necessary to fix this
+	sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+}
+
+src_configure() {
+	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
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)"  -C xen ${myopt}
+}
+
+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
+}
+
+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
+}