[app-emulation/xen-pvgrub] Version bump prepared by Ian Delaney aka idella4

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

2 files changed, 132 insertions, 1 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index ff5dcb95d61c..b366c5549419 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,11 @@
 # 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.7 2011/10/13 19:25:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.8 2011/10/25 18:47:03 alexxy Exp $
+
+*xen-pvgrub-4.1.2 (25 Oct 2011)
+
+  25 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> +xen-pvgrub-4.1.2.ebuild:
+  [app-emulation/xen-pvgrub] Version bump prepared by Ian Delaney aka idella4
 
   13 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-pvgrub-4.1.1-r1.ebuild:
   Use toolchain function instead of calling LD directly, copy fix from bug
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
new file mode 100644
index 000000000000..462f8be8b731
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
@@ -0,0 +1,126 @@
+# 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.2.ebuild,v 1.1 2011/10/25 18:47:03 alexxy Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+OCAML_URL=http://caml.inria.fr/pub/distrib
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=http://alpha.gnu.org/gnu/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
+                $OCAML_URL/ocaml-3.11
+		"
+
+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
+	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
+
+	#Prevent internal downloading
+	cp $DISTDIR/zlib-1.2.3.tar.gz \
+		$DISTDIR/pciutils-2.2.9.tar.bz2 \
+		$DISTDIR/lwip-1.3.0.tar.gz \
+		$DISTDIR/ocaml-3.11 \
+		$DISTDIR/newlib-1.16.0.tar.gz \
+		$DISTDIR/grub-0.97.tar.gz \
+		./stubdom/ || die "files not coped to stubdom"
+
+	einfo "files copied to stubdom"
+
+        sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
+		-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
+		-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
+		-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \
+		-e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \
+		-e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \
+                -i stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
+        einfo "1st Makefile adjusted"
+}
+
+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) -C tools/include || die "prepare libelf headers failed"
+
+	if use x86; then
+		emake -j1 CC=$(tc-getCC) LD=$(tc-getLD) \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || \
+		die "compile pv-grub_x86_32 failed"
+	fi
+	if use amd64; then
+		emake -j1 CC=$(tc-getCC) LD=$(tc-getLD) \
+		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 -j1 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 -j1 XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+	fi
+	if use amd64; then
+		emake -j1 XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
+		if use multilib; then
+			emake -j1 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/"
+}