revbump; adjust libexecdir to match other obuilds of xen in version 4.5.0, fixes Bug #537258 by S. Ghost

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

3 files changed, 155 insertions, 15 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index 0eddd615b27f..1c17a366bed9 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.61 2015/01/21 02:29:45 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.62 2015/02/27 06:51:51 idella4 Exp $
+
+*xen-pvgrub-4.5.0-r1 (27 Feb 2015)
+
+  27 Feb 2015; Ian Delaney <idella4@gentoo.org> +xen-pvgrub-4.5.0-r1.ebuild:
+  revbump; adjust libexecdir to match other obuilds of xen in version 4.5.0,
+  fixes Bug #537258 by S. Ghost
 
 *xen-pvgrub-4.5.0 (21 Jan 2015)
 
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 7b83296b0d64..f7e2ea8e68de 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -24,23 +24,14 @@ DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c0
 EBUILD xen-pvgrub-4.2.5.ebuild 5031 SHA256 889f4d0122b1915076f7a21a318db4862ac36b79ac6cf92fdb36cbcac3098258 SHA512 f243e73b72881e418cbc7126e407ff12d71da1051e0d63dd90c29637e63c28fd48a5388191b197197babfd043da8d8d79aa20d9da884ac90a1d210cf58165f4d WHIRLPOOL def926d32dfb76d8fdf3d8218c0253dc56192c083eb676a9f0c8d8ce4e278bd69f094cf033e805f229c182f11fbf70d7c4efb131a20a19f9d4a46a5a8bc969de
 EBUILD xen-pvgrub-4.3.3.ebuild 4488 SHA256 f9be2596390e8e4de06d77f725bae2dfd2bd80e9d5b48eb20621e733269cd6cf SHA512 473d67e8bc5b3fd62756233ae1354c473881bb21c6a51271710ececa094bb5c05e69d6c2f2397f9d08b9f0885dfbc135adb8bec95c011a1a0379efa1255cb817 WHIRLPOOL bf89ba00db9999bfa6924b624f8fe1ea6b5993e8e0d592f52c61079b5da795dbeb8744327023edd69eedb82bc8757091f4ba139c0d8b04ac3c5428f76857977e
 EBUILD xen-pvgrub-4.4.1.ebuild 4423 SHA256 1c72fb83341d58358ffd100bfe4375efc33206ed5beb9f1a9519af651ab5a587 SHA512 444d4915a8d33a2ba4ce272a74a0fcc2eed9dd748014876b325a3c122b9acac69496c4e11b41f979b20d08330292e004387f76021e4da92a7e87a1714d18b4c6 WHIRLPOOL 3532f084caed2f58924e6b18a7863d450843e298f8e99a932a94ce304eba8cd584d8dec4bd072de2ef18d9e34a4c7da6433a9bc0e776996c68eab1d0c2068d99
+EBUILD xen-pvgrub-4.5.0-r1.ebuild 4527 SHA256 2fb0f6f74b941592ef257e40d2a1456bf9846c3f9b184f1a220cf9fdf0801f84 SHA512 7b18bf891f40b18692de604c9d7e2aad7900e2b7700278c2685c93cf469ddd2fdcba10e01d610e226e1307f12daa2bab37b81513d8447e0bebcc7da408e2d2bb WHIRLPOOL dc4eb38ce5f683e318771fd8201de6913afb94694b4fd552a14ad8f915d006b5379f67bf3e760714af525bd2670c10d744ad2a35bbc275c873b49457ff335608
 EBUILD xen-pvgrub-4.5.0.ebuild 4324 SHA256 781479049296815da91e6749bc2832a601279e8abad22176a4a85465ae27d2d5 SHA512 4fad750763cc606b2f90e8dc968bbfed9d74a33e47cdbd7af92ced0a7c9109fd749c5e415f5e0303ccaa581c17a0ddedfd1ebb9c31e5d857ecb224abc5ea7810 WHIRLPOOL d893822bf02026eaa78154742c507bd7e163c940fdee08962eb0ebd85f0cc3630f44bc965824a89730a7741604877ffd23964bda54b723aee630e1dcf3f95976
-MISC ChangeLog 13436 SHA256 5dffce2fc14295558954ab56c7c86be642e97f2df1ec1bfff1d6c14dfdf64b2c SHA512 c49ca2feed250a321eee0f2d733e719ad4a57c6b13e9ec15e9181b64e2febf22323545436e33b628c3b16e2fb611df14b9bd227a65bc672ac61b65d665abeca3 WHIRLPOOL 4032a52a9a205cdde534bda75a6a81d8a29060a03b7753fb50da13a503775ad843bb6095ef9d02912a00801c10ffa627a8b83d51a85e1a2f561b04fa3ac8ae07
+MISC ChangeLog 13662 SHA256 ab3dcfd7cade94abe676c7a5d4a7f3cb7e951c5d0db118da9025e808e18e0929 SHA512 6c3b7f79321cd73d737f97a2f72270cd2a40390fa6ba5eb7b232e003fb6426d8d1a29aebbf063f7f4e590df6f3d76e211ff2d5828de86f946fe04d9731c313d7 WHIRLPOOL 0b0813433948ec3722b9513eb525fb506010df5436d1cd1017d176b6068c9ee7af0786f49cc24d005b1fa09661b34627994bd3b99e8ffd9b7aca8c380873994e
 MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUvw8jAAoJEJIMDbyqvv1V6hIQAKmd33EdeYue+C8p8uYMJ3Hz
-eRUufRT/cL/OH18ghXMEtqFFTGoaxiHvpij+a63umpJcOt6vWryZs9TnQQKkaBhC
-IPbXQyNgjRx6DxeQfIOwuW823aXs6obR5pPY7Rt4sBJ6ZbVulFydFu5t4cbhmcC0
-t9TZEdbt0iPuE2eO25tTpdqdrnC7k71rsY3BTplE5AgdNmgAKgx6/4h2Tgiyg3aF
-vPtTQASBHxK5JBq1Es8OLrcRoBNOsEeTT8g78INrzlqcJi/wztEyDx80N7G5giTB
-tPmhouOYjUdEd9/0bRQe9gjoH14Y6bOkKlgN3J1zRcVIDQ7Q4JU5HHgsKtX5Taob
-orc2ZCctexu1u8mF+i/uPVTHIT2jrkQGCvxo1Qf7Omp8midUElGU9TIrccF+7Fvk
-Gb78tlE3gw6Jj//vfzDol/KR4DUIQTfHO3CegPtG8E31KmpcvTE9qIvFZzv9VXTF
-jgl8jrFAr8DMeYTgZKq3KSc2z6+5oiEGM1mn5eJo5MEh0rOA0CGG3a8+VZBBtyTi
-9nYDI+ih0Tv7ooP7MOqTnfXsq9ImkFt5KnaN2bCdbd/kA6V36qciDH0GtIqHFfNs
-koUU1ytShJBrOEMiELBF+viDYAc5vpIz9baU+eiIxfG2QWUrM74lADTXPbVvK2PR
-DwqU+dXTNuYvdmMJE6o8
-=JIo5
+iEYEAREIAAYFAlTwFBoACgkQso7CE7gHKw09/wCdEQvSvekkl7hrJauifUBL1Yu+
+7Y4AoJDVkHpIoP80M8JI0U2EVooLsodi
+=QmnY
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..bc8456b36af2
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.0-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 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.5.0-r1.ebuild,v 1.1 2015/02/27 06:51:51 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 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
+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
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
+
+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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo"
+
+RDEPEND=">=app-emulation/xen-4.2.1"
+
+pkg_setup() {
+	python-single-r1_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 polarssl-1.1.4-gpl.tgz 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
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+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
+
+	# 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.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.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_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+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 has_multilib_profile; 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 has_multilib_profile; 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 "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}