[app-emulation/xen-pvgrub] Version bump and fix bug #362689

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

5 files changed, 134 insertions, 14 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index 8f52fcd54d36..de207d74d23f 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.2 2011/05/12 13:55:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.3 2011/08/09 17:35:54 alexxy Exp $
+
+*xen-pvgrub-4.1.1 (09 Aug 2011)
+
+  09 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-pvgrub-4.1.0.ebuild,
+  +xen-pvgrub-4.1.1.ebuild, xen-pvgrub-9999.ebuild:
+  Version bump and fix bug #362689
 
   12 May 2011; Jeremy Olexa <darkside@gentoo.org> xen-pvgrub-4.1.0.ebuild,
   xen-pvgrub-9999.ebuild:
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index a3f81183f945..cc2f63284395 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,10 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST newlib-1.16.0.tar.gz 12024353 RMD160 fa40ff43e858da3093c9f3b5b203724b9b327696 SHA1 841edec33d19a9e549984982fb92445ee967e265 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07
-DIST pciutils-2.2.9.tar.gz 234382 RMD160 d46f47e4e70fa52367a80bfab7502c181a753e47 SHA1 516cedfdda6b97c5bf2cdb6fefa9c82da940924b SHA256 7bed38ac8a7db5ce5908e15e6e478cbebeb383694c16a44ac73f88a327b1cb8e
+DIST pciutils-2.2.9.tar.bz2 212265 RMD160 781a3d30c5c429a0d92110a46711144f74acde06 SHA1 2871be0890f0406c7f86fa01646e23935fda789e SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24
 DIST xen-4.1.0.tar.gz 10348539 RMD160 e9ef987b24503d6c993bccfd203be5af9f104f48 SHA1 4295e67524746ce155ff991db5fd2a611be27f67 SHA256 5df61e1b687acdd3d8f54a85be54990518f6679982499f19b28546f03b2909fa
+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.0.ebuild 3199 RMD160 3697a1ef0af03242800bf7969f577e77f14783f6 SHA1 1a61529e1e15a9f116560b7c6d79cf5b05e786f6 SHA256 bd8f09408ed713672620f27be4ae4b1bda353b861f704a321e0b5af5931cb038
-EBUILD xen-pvgrub-9999.ebuild 3590 RMD160 c3ea856f3145de696b3cf4b58ff5b8183f7b8992 SHA1 112d136ed6f4d740eb5bfa1d2101a54fa53a3966 SHA256 906f24d6cecd121e6c2a40592a43167751ac6c654f39b33df6bb4ad6715de990
-MISC ChangeLog 618 RMD160 0ce12e4d1928ea920bbfcd06576652c17ce08c75 SHA1 d177f6fa6f270604d5e707d9ea8fdf4bcc6f01c8 SHA256 ba3fc54bf8920e164b76a7ce03c7489f41322f62dde62053db2855ddf3ffda03
+EBUILD xen-pvgrub-4.1.0.ebuild 3203 RMD160 bb28006c0c867b2e2829c1715709cd6ab94f906e SHA1 2078811d3c67d455d68ba65ae14d286e28c69311 SHA256 940b02cb41e33957a9f41dff6eee64374c34714853dedfaeb6bfe7045bbf04a2
+EBUILD xen-pvgrub-4.1.1.ebuild 3203 RMD160 833f78b508e8e2c75c5db29420c13b6a58785897 SHA1 3c234d20bbd5f42245c7bafb951db2f4b4595cfa SHA256 18a07c3b418166761a7960c716d57d78d04d9abcf41ab3dc1b57461066270013
+EBUILD xen-pvgrub-9999.ebuild 3482 RMD160 c7718b9ffe371ae8a75ced194d444450b35c07f2 SHA1 2e49d359f6e57a080e6a969b7cff4c3a4a43cb0a SHA256 f8f435063366693f1db3ae4dad2520e1b3572050582a24623dbd68776dd73e48
+MISC ChangeLog 813 RMD160 d5068c9e0943a0e00c16b9125d17ebb36cd7a383 SHA1 5f6c833e1f6b697c810cf457d5813b1d220bc01b SHA256 9097384179548def4b80f5f5aab758315ab77ea89ce248ca861af2df2f51a208
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOQW/qAAoJEOf+E+/4L5Lm6PAP/jdB2PCaqaYpIf57PZMadFal
+IncaQFPW4ldWKheYwIHZPJUKrdIRISKxKCl03w2eETNbQOolzkgmC/pIzLq8eRwx
+noUQdgbxwich18pcx1xi/YySRxxTsNNW9QZQwoaq+JTOTns1kPM1JWO62RepbcKW
+gN5hHUJpuNQMhNKTvrpftIFe8ljuw4nacGf9WLaBZip2LD3Ik7gy/R88hiNxKEuw
+32piPBFXXWj/ha4GFBmst5TqMGi3BaxhG+8NADxvxSTbkJDb07O0JQKJilQfsmem
+YLSt3h03aw4lpGE6x0u1metH58WG6e4atwGBIOBnlBB63jr/DcqGq2jXK59i2xEl
+sLX4Kmnbvyv63DHe1FdgQVAb0Eg29x33jEyvyKg122OTqeyYMwNyylAeDaKREpbt
+fDIKPoetDsSHX4ZHdhd1w5qRJdpJ9K/m+nJFpQO7NV1P1saG7DWGmeGhKr66v1Or
+KWpfdixkaq9gXXrqBY5H4vA1XN0n6VMEdBqv2H5I/H4CHwXSg6g/yLnbZyugrn9V
+h7DRUZcWtwOHKQybCse/opo7i5W+oz9GW/j8iOIUi/es4syAHYMp02UdPMqPCikl
+f9NaMVGIvPyJiCmBhL2M5facWsVuSMlskfR2sfJgyuEqecAT5+Bm0mpjNDgC4zol
+x8LhacosgqsZGitbezzK
+=+Ma5
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.0.ebuild
index bdb4396dbacc..de7ab4fe9b8e 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.0.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.0.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-pvgrub/xen-pvgrub-4.1.0.ebuild,v 1.2 2011/05/12 13:55:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.0.ebuild,v 1.3 2011/08/09 17:35:54 alexxy Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="
 		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
 		http://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz
 		http://downloads.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.gz
-		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.gz
+		http://www.kernel.org/pub/software/utils/pciutils/pciutils-2.2.9.tar.bz2
 		http://download.savannah.gnu.org/releases/lwip/lwip-1.3.0.tar.gz
 		ftp://sources.redhat.com/pub/newlib/newlib-1.16.0.tar.gz
 		"
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1.ebuild
new file mode 100644
index 000000000000..396e12af00a0
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 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.1.1.ebuild,v 1.1 2011/08/09 17:35:54 alexxy Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils multilib
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		http://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz
+		http://downloads.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.gz
+		http://www.kernel.org/pub/software/utils/pciutils/pciutils-2.2.9.tar.bz2
+		http://download.savannah.gnu.org/releases/lwip/lwip-1.3.0.tar.gz
+		ftp://sources.redhat.com/pub/newlib/newlib-1.16.0.tar.gz
+		"
+
+S="${WORKDIR}/xen-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+DEPEND="sys-devel/gettext
+	sys-devel/gcc"
+
+RDEPEND=">=app-emulation/xen-${PV}"
+
+src_prepare() {
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+	# 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
+
+	sed -i \
+	-e 's/WGET=.*/WGET=cp -t . /' \
+	-e "s;\$(XEN_EXTFILES_URL);${DISTDIR};" \
+	-e 's/$(LD)/$(LD) LDFLAGS=/' \
+	-e 's;install-grub: pv-grub;install-grub:;' \
+	"${S}"/stubdom/Makefile || die
+	# Fix gcc-4.6
+	sed -i \
+		-e "s:-Werror::g" \
+		-i tools/libxc/Makefile \
+		-i extras/mini-os/minios.mk || die
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake -C tools/include || die "prepare libelf headers failed"
+
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || die "compile pv-grub_x86_32 failed"
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub || die "compile pv-grub_x86_64 failed"
+		if use multilib; then
+			multilib_toolchain_setup x86
+			emake XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || die "compile pv-grub_x86_32 failed"
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
+		if use multilib; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+		fi
+	fi
+}
+
+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/"
+}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
index e1c1a3e359b7..7a725b17473d 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-9999.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-pvgrub/xen-pvgrub-9999.ebuild,v 1.2 2011/05/12 13:55:40 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-9999.ebuild,v 1.3 2011/08/09 17:35:54 alexxy Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://xen.org/"
 SRC_URI="
 		http://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz
 		http://downloads.sourceforge.net/project/libpng/zlib/1.2.3/zlib-1.2.3.tar.gz
-		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.gz
+		http://www.kernel.org/pub/software/utils/pciutils/pciutils-2.2.9.tar.bz2
 		http://download.savannah.gnu.org/releases/lwip/lwip-1.3.0.tar.gz
 		ftp://sources.redhat.com/pub/newlib/newlib-1.16.0.tar.gz
 		"
@@ -75,11 +75,6 @@ src_prepare() {
 	-e 's/$(LD)/$(LD) LDFLAGS=/' \
 	-e 's;install-grub: pv-grub;install-grub:;' \
 	"${S}"/stubdom/Makefile || die
-	# Fix gcc-4.6
-	sed -i \
-		-e "s:-Werror::g" \
-		-i tools/libxc/Makefile \
-		-i extras/mini-os/minios.mk || die
 }
 
 src_compile() {