commit:     e7f3ccb4296274b217da5a078c4e992da66f941a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Nov 23 07:36:28 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 02:24:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f3ccb4

app-emulation/xen-pvgrub: bump to 4.9.1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-emulation/xen-pvgrub/Manifest                |  17 +--
 app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild | 161 +++++++++++++++++++++++
 2 files changed, 170 insertions(+), 8 deletions(-)

diff --git a/app-emulation/xen-pvgrub/Manifest 
b/app-emulation/xen-pvgrub/Manifest
index 41994e7a595..f09628f9db0 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,8 +1,9 @@
-DIST grub-0.97.tar.gz 971783 SHA256 
4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 
c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
 WHIRLPOOL 
0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
-DIST lwip-1.3.0.tar.gz 398933 SHA256 
772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 
1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
 WHIRLPOOL 
63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc
-DIST newlib-1.16.0.tar.gz 12024353 SHA256 
db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 
40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
 WHIRLPOOL 
47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
-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.8.2.tar.gz 22522336 SHA256 
cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 
7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
 WHIRLPOOL 
8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
-DIST xen-4.9.0.tar.gz 23361741 SHA256 
cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b SHA512 
97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
 WHIRLPOOL 
354527ea01f69c6ab632cffe8f50ca93721d9a89cbc4d84886d24b53fabdb7f62132b80e36189c30c0c9fae66b367eec7e00bb4df5f7af054ec27cec912ecf47
-DIST zlib-1.2.3.tar.gz 496597 SHA256 
1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 
021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 WHIRLPOOL 
8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
+DIST grub-0.97.tar.gz 971783 BLAKE2B 
a7b6feb6dddb6eeb20e027071091b2d37930e5b40687f8c8ff860839db208f832713db61389014d21842e1e152cad0466dc9722a79cbb81bfa1566a30b6b82cc
 SHA512 
c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
+DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 
3567a593eec3d247213daaaab57d9456c9cae50329498ca55cee7726a59461f8e9d77d96cfc8204d6b7b7962f00664f44d3bc7f16a5a53f5e068a02d405fb457
 SHA512 
1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d
+DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 
26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309
 SHA512 
40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
+DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 
014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0
 SHA512 
2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
+DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 
613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0
 SHA512 
88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
+DIST xen-4.8.2.tar.gz 22522336 BLAKE2B 
2c9da971622b4e52fe78fa029107bb1c5f945a63605406493df607c410c6f2a8c2cdb38b1eb30c1bc1c8bc6e5620efad977c3ba55e04c579c01d51f0104afcce
 SHA512 
7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da
+DIST xen-4.9.0.tar.gz 23361741 BLAKE2B 
1cfebb791ca5e51eda9b86a5d98e0883fab1554f5ac805fc065916fbbd3695e6b0f11ca75935a8f973735cc8dd83e38fe4a670d8489010be865be49d8fc1a341
 SHA512 
97f8075c49ef9ec0adbe95106c0cff4f9379578fd568777697565476c3fd948335d72ddcacf8be65fd9db219c0a35dcdc007f355f7e5874dd950fd4c0a0f966f
+DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 
4cfddb351c9a4aa08227138dc1afa921f3d1880048f897428226da38eff9470cd81ae9896f174583048dad0ba8d5c1426df58b029115ba1623366d1980630c0d
 SHA512 
9d22f0aa5dcd01a1c105d17c14bce570cc597e884ddb9b4a46b80a72f647625b76ae5213cede423d0458c14e1906983595a9269bb6e6ff2e9e7e4dea840f4274
+DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 
603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22
 SHA512 
021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e

diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild 
b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild
new file mode 100644
index 00000000000..4f3af9d4100
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit eutils flag-o-matic 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
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+       
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz";
+
+SRC_URI="
+               
https://downloads.xenproject.org/release/xen/${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
+               ${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside 
guest filesystem"
+HOMEPAGE="https://www.xenproject.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
+       x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+       >=app-emulation/xen-tools-${PV}"
+
+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() {
+       # Upstream's patchset
+       if [[ -n ${UPSTREAM_VER} ]]; then
+               einfo "Try to apply Xen Upstream patch set"
+               EPATCH_SUFFIX="patch" \
+               EPATCH_FORCE="yes" \
+               EPATCH_OPTS="-p1" \
+                       epatch "${WORKDIR}"/patches-upstream
+       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.3-externals.patch
+
+       # fix jobserver in Makefile
+       epatch "${FILESDIR}"/${PN}-4.8-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"
+
+       default
+}
+
+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 "https://wiki.xen.org/wiki/Main_Page";
+}

Reply via email to