bump; extra patchsets prepared by dlan, -qa.patch required a re-base

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

4 files changed, 209 insertions, 15 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index 1e0f6e2fe9ec..8750564de60d 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-pvgrub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.46 2014/01/24 15:42:08 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.47 2014/02/15 14:14:09 idella4 Exp $
+
+*xen-pvgrub-4.2.3 (15 Feb 2014)
+
+  15 Feb 2014; Ian Delaney <idella4@gentoo.org>
+  +files/xen-pvgrub-4.2.3-qa.patch, +xen-pvgrub-4.2.3.ebuild:
+  bump; extra patchsets prepared by dlan, -qa.patch required a re-base
 
   24 Jan 2014; Yixun Lan <dlan@gentoo.org> -xen-pvgrub-4.3.0.ebuild:
   ebuild clean, drop 4.3.0
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index a1dba82f45dd..22a75a687172 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -23,6 +23,7 @@ AUX xen-4.3-externals.patch 2806 SHA256 f4693d85070c0983b440eaa061b4a769119e12fc
 AUX xen-4.3-fix_dotconfig-gcc.patch 8854 SHA256 4e0d22acdb4ecc4a1d418ec91bc6ddb9ef1c283ee3ca1f67bac85d3116d76ccc SHA512 b4c969b0cf166862ea5c5cb0912d7dae8c5bf7befd6dd6bdf4e56df8a4daf85c0a36c94247053f74edc0f24b1c15a18e7ddae9d24ad28d54b726a1fbbab442be WHIRLPOOL de7b614ae486fd2cc591b405b475745b003c638c9be4c8153b61a368802af36d2a2974d1e022eb14fb58ad9260f9f82c438c84cb65c3499076c579f7e1c3e6ad
 AUX xen-pvgrub-4-qa.patch 985 SHA256 4a3c785ea1246d288c6cfdcc09b090d34a92185f716124704e371e0eea907486 SHA512 a1653775eb09682f8dffb5fd41ae1e4623ccc1f1f4ab4788e0a825d24fee0bbafe8a12a652da9810aba64cde1c7f9fa9a766620c219006407956032812ec0bf2 WHIRLPOOL 6c0e903346c39af28e0d8da70cbb2976d292516b7b587ce0b6f853671a64497d4c64991803fa7ae9e2de796be7d2c841e2d3a9d660deae978c2dd128c72d75f7
 AUX xen-pvgrub-4.2-jserver.patch 1487 SHA256 3bbf6d06ad1960e30dc84a3e3b179d5d23331ecf60d347871b7008c58456a6ed SHA512 f92bced9f3e7fec84b1bfce6ce3366f134cec2b892ffc3afcdd3fd3f73daf158c17c312260fae39bc9e04c1dab1045d17f0da706dd0dba0279e66dea454aed8d WHIRLPOOL 10828eb65effad714a61a18bcd6c33c2b7fb7fd0007b1a68aed7a653cd7e67acc04cc5eb9574d7d50c92fc7ca8223dff0c73f1cfde994e4ee1d787f536588b99
+AUX xen-pvgrub-4.2.3-qa.patch 989 SHA256 bdd692759076df78b2ed777cf1d022002237f4d19a019691863eaa7eeaae0c53 SHA512 337cafc9fbb04c676dacf8212e2a63f580c466e3e71f6953d82d841f01d39d665b390540ac9a2924d5eb9e9bcb31fcbecba255f2241ae4ad0784940c339cc4f1 WHIRLPOOL 775e612612b087f4c3cab9f638b6a5f75648e9fe3568e09544fdb5c39ce46fc86f68ce60e64fa4278559ce56ce4b3dda52f55a19e16252e15cc437b033d81da1
 AUX xen-pvgrub-4.3.1-qa.patch 945 SHA256 6ae5acc45d4c0c9fd1ca5f5013ada76e3aef89c1688b5cf62d0a80c7a240a83c SHA512 bcee20c172c585d92b2557fbec81214c08addfa1f81ea85b4f1646a8ef94ad549e7aeef868a2b2aeb028c92d9d85f943c0c1b532eeed030734da58a6385569bb WHIRLPOOL 1b693f717673125cd9052c45721b147505179ef20d623c6644e95a78a3bc3233366f9b275f475ac5c53fd1af7a0a5f239f383ec838293f3acf8d86e51032309e
 DIST XSA-55patches.tar.gz 23888 SHA256 e86749d02ca5594ebcfdaea820a6cf1fe11015c7fdcc5836260498fae317d75b SHA512 ed1f321a1351df99cfb05e1dfc62dda1268544b0c0ceb7a01438805046e027fb9d59194d179b7a8c302b091a7bf444811b0b9359c4d42f7e902510515c275b6b WHIRLPOOL 5a611e5260f0fc97471f386da3499f7714e015c5c2556bd7199466558d8e375784d32655bdbe9ed4cbf492fa3b41091677d9fe6d3714b029c9a2b1dda6102edb
 DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
@@ -31,26 +32,21 @@ DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9
 DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
 DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005 SHA512 4943b18016ed8c2b194a3b55e6655b3b734b39ffb8cb7ee0a0580f2f4460a1d0e92e1de8ac23f5186272914fad1650586af51fd7c3644d0310eb16f2e11c5e80 WHIRLPOOL 519eb87cb2da694696cbc3e72070a0a3bdb07c46fa266d855d8379eec3a92adfa4d434af3ac01c37834ce4a9174081a6c40030b185a70902329b185cb8d0bbea
+DIST xen-4.2.3-upstream-patches-0.tar.xz 84436 SHA256 7c2477b9b29c9d84bb26ed60bfc2700f2a614ed8040b93906e801831f3498b41 SHA512 a4e8b53a0efb9d64d4dc65ee3107422c8007537e03f9c8e6f1b2c838cf62e6819d447c1ed44aacb5c4e9979f0dad7ed313d2db61df6e6ad2d7708a81964a7e12 WHIRLPOOL cc3c2224bba3b2e5f057ec95f9e85e58b17bc0dce338da429c7970877967cddf69228258ff491be9c1d022169a90fcde34ef1bcb0c198c9123ca219707a5a99f
+DIST xen-4.2.3.tar.gz 15613235 SHA256 69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db SHA512 01521c8724354f92a2555683a8b103e5e16aedeb2c6166cc3ce40a0cc6cd9e07a601aa24930bb7391e00eb97f04003e6523dead09382cf86eb56f5b886509b9a WHIRLPOOL e7f7848ad632e5e77db95b2eb37c82f31a73021af4b6bb44091cc14103faa193bc2d6deb089e2a196daab5a08dbc08f135a8937a25a4ff5d31fe37c789bae1e9
 DIST xen-4.3.1.tar.gz 16429423 SHA256 3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd SHA512 f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275 WHIRLPOOL 087390786cea9aee273a5d81988436303991aa5ea92faf111d3b619517368f8c8feef84f4f8c602cac723980a344eb90414887db4ca88a2ee14bc6b0253e36ca
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
 EBUILD xen-pvgrub-4.2.2-r1.ebuild 5325 SHA256 a23db43442635dc2202dcb185c1a8fcd2bbe8f224e99bd40f7f7acabf8575c5b SHA512 653ea6d984e2e7ba200c83493299dcbfb8f1028be56dd397bdbe76ff7cd0a82ea26b0addea7d67b95d89bbaae0306b80d58f2aaf03df805e0a5cf133cde3196e WHIRLPOOL ab5c1eba1b6bb58b9fe7c28ac72be0fb021032c0eab359ceac268f458ea1d24dcd813e3711c2090eef2cf1412d1425aa8993e4afa94931890d06adf2f1fe4fec
+EBUILD xen-pvgrub-4.2.3.ebuild 4926 SHA256 96bd6f83ddf9326204dbe39fd838196f40abc42b8a57191c2ab6b6123acca027 SHA512 5fc3347a0701a867d6f4d1b033557c3b1513c397700c83478bc82b96e08d3c5e3a3c90c8a875fc156dddd91e5f67289e44145008f3d0a42d514c48f7b851d22a WHIRLPOOL ec1404c7c3a61bccbb9c509d655547c0d8616749dcbdb34a664e0ef8f812362ba12ea11c30105bf8605d81809da487853fed50b2693af442ee5d7af4f76ba69b
 EBUILD xen-pvgrub-4.3.1.ebuild 4458 SHA256 223802e59303b47dcbf895e6e29c90a8ffbb9d43711ccaf535b455807eafcafb SHA512 c6cef380fdc84fa065fb50996f52925ef70bb6fc712190f012820598dc48822fad7cc5982f4e3884ba7e1713757ec9e22b5da42947c265f0235ad594a8f6d92f WHIRLPOOL 533f6941a30b7c3457f0f942047072244150d1e319f99aa48af97d65efbd58cbdf76721313e70a6e125b66b00123aec12ebae5010b51292605af7450c4730aa8
-MISC ChangeLog 10531 SHA256 4bdfe2772c045d24dc0e914f753f0871e8ad4eb327b70c409c046846c94a039f SHA512 7aa83a3a73f073e0e7343ecf1f911073ba2491b3a8704f32333ba0218f13588f8cef851a9c4b7579533c3443b1026ac944df41dd975b306ce84c43a977543173 WHIRLPOOL b933d7366eb51c39d6c871d97410c58382280d6cbbf8d92ff25222eee185a65d1d7773d9a85788dedb26e900bdb27a14ce7bfb40c8b0bd479f805b99a27f9b7a
+MISC ChangeLog 10749 SHA256 53849d065f46837b7fe651a87415dbcd792db61e814de17fbac3c3699349fceb SHA512 e6fa2073dd18fbedb23ef7d4a1bad5096f6537dc5b22e81f26129ede73c7ad9a19049e5e0f001f00801a60545b714d52bc6abcce3f92558d55d10a4cd95e94c4 WHIRLPOOL 8d63f0aafaf19c4a70b9cd41b40acca8939f93cb33df8b6e6f5700353aa1b26656767bba5b40313288c087967741ad22a92068adf65fcaadf2f664deab195de7
 MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23
+MISC xen-pvgrub-4.2.3.ebuild.orig 4260 SHA256 bb6df105a65c15d418ba7c04977edc024e9ada76053c7213cbac2f754996c3a3 SHA512 b7e9958a8b066cdd429de03ee817a8d94d1bcfeb0617be78698fa184678f13626c7091301544ed48301cd30e9cc9309cf6974402bd909148a9ab52cf2cdef033 WHIRLPOOL c259007a6616f0ead0652cf201fcd9144f21aebb797fae9c5ec41a948e87dd918f0f999df76130efbb317f41c7b8575807f5bdc5fb42886f31671ca700b049f4
+MISC xen-pvgrub-4.2.3.ebuild.rej 307 SHA256 a1a9c52fa900a8ad449ab008ab05fc59f55b1f0f86e7bb4ff679f7f60b6b5c70 SHA512 0b45730f861f11bc0d1dc1c0429eb604545d00a00db096a083af8de890f5ee6df1430776da0db4dc0aef6233dda1f28b0d92adbb72de77473c1e1423d6000b89 WHIRLPOOL 5f1a594fa623405485618109c63b8f103737382c1e61a1d5459d7734c626584dbb82ce46deb41c343ac4d293a9d05e84277057b94664648854661ba9cff3afcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS4onSAAoJEJIMDbyqvv1VaLcQAJYwdQ87MtW38jrP8/hziodT
-dFl50PDO2soLfQHK2sEY5/V6NdRbX1x3RdThDS2z9FIqeL9YpLqJxIMj+Y4k6eby
-DMHkTn275wBMr6KEHRoyBG1jduM6zHiugE3Hk5jsi2gnzpQaqJ9ND/GOt3Pd1k+n
-efWr6wbTEf4ACAcU5f9kTJsz4xDBC1QUD86N8XZ7B9W/ZUU+HGjYTy9X33nvZCIl
-O1vSipfJrT6DlzP05pW8hAZu8P/ny2GBL8aakMqmDxdLawfa0OEDkHrG7kK15l4G
-jSU68e9wu+joDrqLD08bdtKmOadqmrPnsTnpQpnjt4V7VawugctFz7z9YNd30+mQ
-XQ6i2bR5MJeBvUZ+ft4Q+EX4w5U0SWichbxWJWfgBBFjf50aSv1wVVBzr1zi+lIV
-rrTST6J+b0LZYGpOrCRwYkGj6U/omCX7FgliFxx1k2hl+ohIMoa6mJVUk/pJndlg
-3sSJ9lh5qv30z07cJ612qX80TVKg2lzUDhZZUYZwt0CdajbqeUHHvfCZSKZ0ouoG
-qvv+K3xQBkRi5S0FTujplU18u+f3vGxxdrr3KnJVtFlN+KTbaRN4VmmE9ZG88QLZ
-qZnjy3gLr+l+9C9bCFpXP9Id3q7L6PtgNmb0VgXsQm6cy9iPI6JDTT8ZKrsAkmgA
-uQSIHm/VFyHYyaEKgr5S
-=P/Rq
+iEYEAREIAAYFAlL/dMcACgkQso7CE7gHKw1TfQCgwMAMjKsJgW3c3pYLQNJ5cNZv
+CeoAoJ4YMYRgu6PdBEMLyLBFuWzQKAtU
+=u8hR
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch
new file mode 100644
index 000000000000..ea693666f022
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch
@@ -0,0 +1,34 @@
+This includes a few headers to fix some missing function declarations.
+
+Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+diff --git a/stubdom/grub/config.h b/stubdom/grub/config.h
+index 1649d51..15a6583 100644
+--- a/stubdom/grub/config.h
++++ b/stubdom/grub/config.h
+@@ -2,6 +2,7 @@
+ #undef putchar
+ #include <ctype.h>
+ #include <string.h>
++#include <kernel.h>
+ #define debug _debug
+ #define grub_halt(a) do_exit()
+ #define printf grub_printf
+diff -ur xen-4.2.3.orig/xen/include/xen/libelf.h xen-4.2.3/xen/include/xen/libelf.h
+--- xen-4.2.3.orig/xen/include/xen/libelf.h	2013-09-09 20:27:41.000000000 +0800
++++ xen-4.2.3/xen/include/xen/libelf.h	2014-02-15 13:42:24.491435783 +0800
+@@ -37,12 +37,14 @@
+ #ifdef __XEN__
+ #include <public/elfnote.h>
+ #include <public/features.h>
++#include <xen/string.h>
+ #include <xen/stdbool.h>
+ #else
+ #include <xen/elfnote.h>
+ #include <xen/features.h>
+ 
+ #include <stdarg.h>
++#include <string.h>
+ #include <stdbool.h>
+ 
+ struct elf_binary;
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.3.ebuild
new file mode 100644
index 000000000000..88464c940487
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.3.ebuild,v 1.1 2014/02/15 14:14:09 idella4 Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+
+inherit flag-o-matic eutils multilib python toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=0
+GENTOO_VER=
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+[[ -n ${GENTOO_VER} ]] && \
+	GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}
+		"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+DEPEND="sys-devel/gettext"
+
+RDEPEND=">=app-emulation/xen-4.2.1"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	# 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
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.1-externals.patch
+
+	# Drop .config and Fix gcc-4.6
+	epatch 	"${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+	# gcc warnings/QA fix
+	epatch "${FILESDIR}"/${P}-qa.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if use multilib; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if use multilib; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}