upgrades to 4.2.0-r1 mirrored in 4.2.1-r1

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

5 files changed, 48 insertions, 35 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index a580edaa5671..05e07b16d8bd 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen-pvgrub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.22 2013/02/19 19:18:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.23 2013/02/19 20:20:56 idella4 Exp $
+
+  19 Feb 2013; Ian Delaney <idella4@gentoo.org> -files/xen-4.2.1-CC.patch,
+  files/xen-4.2.1-externals.patch, xen-pvgrub-4.2.1-r1.ebuild:
+  upgrades to 4.2.0-r1 mirrored in 4.2.1-r1
 
   19 Feb 2013; Ian Delaney <idella4@gentoo.org> files/xen-4.2.0-externals.patch,
   xen-pvgrub-4.2.0-r1.ebuild, xen-pvgrub-4.2.1-r1.ebuild:
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index aaa10fe49473..f9bdc86a0426 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -7,8 +7,7 @@ AUX xen-4-CVE-2012-6075-XSA-41.patch 1393 SHA256 6aa21c02e94cb9b4f612c7a9d1a8f98
 AUX xen-4-fix_dotconfig-gcc.patch 9551 SHA256 93c8726fc3e0bd3f54d4162a3fdace45e3c3ea24fecf5f54270c6dc55c3924ab SHA512 64bfc2dd60bf5a7db593250f9da62cdea4daa458aa8c474ec47b065f6e19509555f48d49ec8624c484d873fe947b6f9cab98cdcd2c24ca8795eb1b64b378a004 WHIRLPOOL 341506ced55ae2ad30af1696434df25ba77c665042aa82dda35d0722f0cccbe567c8cebf51c2e20e0df3084f74f7eb7a69808dea2801f911b2d3c46a293b6ba2
 AUX xen-4.2.0-externals.patch 4283 SHA256 6666c647d55a9d020be5ecad5ffc17bd3e739ef0d6a570457e6960fa0b0a0b4d SHA512 906ca695204a6c89d700c4a1cbc63faf614b8c2afd6e2a98f7b4f49a5ed2b1ccdeb64a9613f3e80e10ea3ddd8b7233c5a4e58e25edc2b5918bb230dac4f741d9 WHIRLPOOL 0c5ff52dd7c69d7f9f841b15b543374a22486f7369ed41b43bd0b86003d6a90c9434ff9e7af95923a68b17142036a1fe5d9dc0b5e2057aeb62f7fd8b89dfea8f
 AUX xen-4.2.0-jserver.patch 1487 SHA256 3bbf6d06ad1960e30dc84a3e3b179d5d23331ecf60d347871b7008c58456a6ed SHA512 f92bced9f3e7fec84b1bfce6ce3366f134cec2b892ffc3afcdd3fd3f73daf158c17c312260fae39bc9e04c1dab1045d17f0da706dd0dba0279e66dea454aed8d WHIRLPOOL 10828eb65effad714a61a18bcd6c33c2b7fb7fd0007b1a68aed7a653cd7e67acc04cc5eb9574d7d50c92fc7ca8223dff0c73f1cfde994e4ee1d787f536588b99
-AUX xen-4.2.1-CC.patch 634 SHA256 6104d136712d982b4f5a7e0c8fadd35d2569a7549bb3c8de0c33c9b4109e9422 SHA512 a36968be5cadac26016e71d0dfa2c5ab9b6bfabe7f2e8269af3f7fdfb7b604e5cb99e905572ced59663e4a9225be1d646dcabb8ea4d1a6481709c10ff25c9bc9 WHIRLPOOL 03b6ed48e5662560c70f0ce000bae04594aca646c3be7b09f023fe7a5005cab91eb8e77d900fd11c69f5f17655c9a45f7b0360ef8235b67d9348bbe12e2f315d
-AUX xen-4.2.1-externals.patch 2736 SHA256 4dd9d38405339ab4c312ee0f245037d54e5957f4b93b76553ac415896dfae91f SHA512 c7ac2e3e628a3381bd75f1e10bd15f1e680cc067faf8b9f009e949cd916cb1ab4cab902e38a1e6e7db482bd6d86c222db9e982a65f14c39759d388b33b2c3577 WHIRLPOOL 1286ed5122bf9f7104353019df11e5da9b37bd0b8f0772d660c07efe3d1166f4293f6f6a875263a8476042a63238d07dabc96cebfba85f3e8f105aca587da15b
+AUX xen-4.2.1-externals.patch 3188 SHA256 08178c57f3de4dc5227a3a8dc3a7f6c951ddb7224cf1566066f0ca39a3f772bf SHA512 50455f5544f381fe75a3c00b8920fc30ed5f5738343a89dbb9af3883745b6dbd792f458fe073ee8a6bc41bde061aeab64fde28c2ac008fe8a7bb8a9e1c2ca823 WHIRLPOOL 9be67a23c4594737c2c531b068cebd1d456855417c762db9392c81bce2c7ecd5c94a06dafe872e1e7ee2f8ef2a72a55f12e5b2fc6cb3b59d01d20779521b2694
 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
@@ -17,14 +16,14 @@ DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95c
 DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
 EBUILD xen-pvgrub-4.2.0-r1.ebuild 4475 SHA256 fceb4fa420c5ec25efb54c986c89c183b663f633a1ac3d1ed697503947524cb0 SHA512 953e3d435f03b4bc84a65c5a5abced627786d879b04e4dd70bfbe55d2e85d52d56f1ed24ede8b6e4fb9700b337e691d63a93fd0a70df6866888a8259dcfe9903 WHIRLPOOL 473239d1e09c24a6cc33a64c55917cbbe4c25e57dbe30e97bb2c9ccefaf8ff77dc7af61097527f7c8b608ddf33e13c26e990d3f2b0e40882dde3964342f7431a
-EBUILD xen-pvgrub-4.2.1-r1.ebuild 3666 SHA256 5a61536d9ebb6800d2a6668311d4691609e17eeb7e332734c38c4402c61e6df6 SHA512 011b602eb2ab1a0dac25de0cf321afccaf55132c7ec785e15c1832289503d1d9cc157138aef75ef1e017f4855999e241985b0b48f90a5303818ad08d55596427 WHIRLPOOL 205c411c3145613a34fdf591a27c8eb9d636cf2ab920d0ec1b7c648a86227f27f831e425aaa54cceff4ebf9fd0a3a5f3e62fd5df059fc31eff9491cbf1943ae9
+EBUILD xen-pvgrub-4.2.1-r1.ebuild 4284 SHA256 828aa5f490ff327d4ec7f980fb332718896ec3a29fe8b404a76a47f2f3a74c59 SHA512 85928afef0dc195519794363a1cba95c813372cc87901cbf37dfd08a92d1e3b370c6a224975a4b2ac6a7afbd8a7888400fbbca84b6aa171256a1d28fa597a0b0 WHIRLPOOL 4d9bc9d2879bc5a06df65f143753a520084307fc943e3d3a647b4d0c64fc92d141ab17131c21a571f4fa32e11ebe35e44cff436f012b2fd7d85dcd9ac22142c6
 EBUILD xen-pvgrub-4.2.1.ebuild 3676 SHA256 acd0892c712e9d0029d9ed6084fdfe872e44bc55b45a9de731cc88e56c7d5d05 SHA512 fa91836feb63768e8d1870874a3fb0445e5483ef708582003f7b13ac8315a1134425ddfb8be10565a779f0360cc95b670a86a6043fee4144846ab9548cc9a4dd WHIRLPOOL 349dbc28d6739e9820e3c42d6013acf1498a17c80e47477851ab5eca8320dae7fb78e4939c7ccc5e89a410c3fbe98684163b04c0ea144f7d796c46adcb67e6ac
-MISC ChangeLog 5433 SHA256 8e52f1eccdab7a7e024ba99fd01bc6d7adfec65fab8bed9aaa78294c896e2459 SHA512 76e4b78e7853f5674be8e2ba76ae0498bc8a8537aa486cb58586fcd2907771bfaf852e595331450b984a999ba92a4aef3420783cc3506b48f790a7e786ac3a81 WHIRLPOOL e5f7903614fc4719529f320d4ad5ce465a951a17f3ca424635a58f5100fa61276167fa87e5c5efae22a4f7a1a82138856c9b4d92d0627fd3bf5fbd8e8eee2b75
+MISC ChangeLog 5616 SHA256 d1a002e6385015f32f5716e61a81d72272c60b8c7b3236a8fca1c79072a4e2b8 SHA512 697899b54924e4bdb38ebe958d47dcc819f2d385a31c46548f89497cb75a03a10bb9e12650bc78996d64b9e21368f0b1e3fbcf6c4fe8a6ec5eb5e66e75406338 WHIRLPOOL 8ad498d5b4d6405d1636491cf2f298623dd2b9508dc1a181670a003a3e2165f964d73d7e9bc4217b3a91899f2f38e3d5f302dabe5f90304d72428f1c905b375b
 MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEjz/0ACgkQso7CE7gHKw1ZTwCfcvvdHeL5+rRrnO2Cef41QxMv
-QTUAoI81J3kbelv8ARJwWMOCLZZM3jac
-=g9Ez
+iEYEAREIAAYFAlEj3roACgkQso7CE7gHKw1BOgCgq3wyemdAMMZp/Mo+p4NZXRit
++gIAoJDOZUi1YaWOwzR7n8Nrscz/9MN/
+=aEBg
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch b/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch
deleted file mode 100644
index 9280e38d9851..000000000000
--- a/app-emulation/xen-pvgrub/files/xen-4.2.1-CC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xen-4.2.1.orig/stubdom/Makefile xen-4.2.1/stubdom/Makefile
---- stubdom/Makefile	2012-12-17 23:00:06.000000000 +0800
-+++ stubdom/Makefile	2013-02-10 16:01:01.883644638 +0800
-@@ -130,7 +130,7 @@
- cross-zlib: $(ZLIB_STAMPFILE)
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
- 	( cd $< && \
--	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
-+	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
- 	  $(MAKE) DESTDIR= libz.a && \
- 	  $(MAKE) DESTDIR= install )
- 
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
index 2c3b1b7b19a2..f2525ae1b505 100644
--- a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
@@ -36,6 +36,15 @@ diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
  
  zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
  	tar xzf $<
+@@ -130,7 +130,7 @@
+ cross-zlib: $(ZLIB_STAMPFILE)
+ $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
+ 	( cd $< && \
+-	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
++	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
+ 	  $(MAKE) DESTDIR= libz.a && \
+ 	  $(MAKE) DESTDIR= install )
+ 
 @@ -141,7 +142,7 @@
  ##############
  
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild
index 558bbb328edb..1843398e3510 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1-r1.ebuild,v 1.3 2013/02/10 08:20:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild,v 1.4 2013/02/19 20:20:56 idella4 Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -36,8 +36,28 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-src_prepare() {
+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() {
 	# 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"
@@ -51,15 +71,6 @@ src_prepare() {
 			-i {} \;
 	fi
 
-	#Substitute for 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/newlib-1.16.0.tar.gz \
-		$DISTDIR/grub-0.97.tar.gz \
-		./stubdom/ || die "files not coped to stubdom"
-	einfo "files copied to stubdom"
-
 	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
 	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
 
@@ -75,8 +86,9 @@ src_prepare() {
 	#Sec patch
 	epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch
 
-	# wrt Bug #455196
-	epatch "${FILESDIR}"/${P/-pvgrub/}-CC.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() {
@@ -91,11 +103,12 @@ src_compile() {
 		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)" \
+		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)" XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
 		fi
 	fi
 }