[QA] Remove emul-linux-x86-* from dependencies.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 18 insertions, 27 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index f9547f7af6fa..f98d3c4a3a9d 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.353 2015/03/25 01:58:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.354 2015/06/14 20:36:32 ulm Exp $
+
+  14 Jun 2015; Ulrich Müller <ulm@gentoo.org> grub-0.97-r14.ebuild:
+  [QA] Remove emul-linux-x86-* from dependencies.
 
   25 Mar 2015; Mike Gilbert <floppym@gentoo.org> files/grub.default-3:
   Document options to disable the submenu and play a tone on startup. Bug
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e78c377b1962..9feb36dc360d 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -18,30 +18,25 @@ DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41
 DIST unifont-5.1.20080820.pcf.gz 1379965 SHA256 122b9c470f29b70223b0e07404a6dfa7f339fcfa6ae74c024f478945af7a9a63 SHA512 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649 WHIRLPOOL 0f083d66781cc4c3e554ebeda4e21843fa275ecf3e1908b4873fadfe37b7c88e8346a124656704bb1b29f89afee23d6301b4df0f19e788f454c60d47156fe78d
 DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528bb8ed179a749f7ca2b86eb15805 SHA512 f985e11729d18cb16d3e46fd1004242aa731a9b03ba16035f5954076686e8cdc39df9087daded5e044ead995b03650d8cf1bba9d060d65b5c3af630dbc9e3260 WHIRLPOOL da682398a22abd4282674d9a79b8fdd53e03054863cc166e43e2640dfb7f11c0b71cd3e42431f2086692f3a4202c2ecae9d6d7126249db0127e2da276aae7c9f
 DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
-EBUILD grub-0.97-r14.ebuild 9607 SHA256 caa3c3576ba47be94412023b1d6890ebf143c1f118ffa5526366bca09e3de13f SHA512 f8ddb971b37abdd2254071c663902101cc0d5049cef21341118ab57d203ba756476e1084b792d030bbb5e04251f28633a3e3c942623cb16148dd0970d6cd7e11 WHIRLPOOL 266080e1f8f4f6abce96d6bd3fc5727526a860bc571ca640b1a28dc5a3c0d963b734cd9cdbe010d1f3e03a40e4f5a986addf88cd9d13b68256a1ee1c7e9f8552
+EBUILD grub-0.97-r14.ebuild 9257 SHA256 c9f8b0da10e75a02c62d486f6913f8e5964c070461fcbae04eb9aa08b7ff3f31 SHA512 bc3e583643bc3232e62e045d43d77f107d947ba4fe618fb6009e6aa1a3fed6709e5e226ca0be7ebf003b3d189d51a40112c607c4422e388903f595ddcb97429f WHIRLPOOL 5f0a46899a6676427e6633cc94dc24361ed25ac3d12cb19e7a04d82fb6dafeff5d8772aeb7c7cac12aef7b9306bc257063f8acd5f7e21a101f862402aaa26891
 EBUILD grub-2.00_p5107-r2.ebuild 7824 SHA256 674c0cebcbbdfde8e81a4a5e0d6451bcd439db1949a80f73e22160231db2c70c SHA512 69e5a9af3df1152e76cfc0e02f7c8d5497710ac2c7b78c55ac920d3ed224269623f53a8109ecc76afe80783604e18f0d6dfbd5205d6f4be17245b241dc7a1595 WHIRLPOOL fed9d1fa38481c7994057183da9e26e7ffef91234183d9210758c3e0a3e5ac16856ae57ed00b0d7d86569624dd7c40a29cb61e9920d16e3cf02836046e691cb8
 EBUILD grub-2.02_beta2-r3.ebuild 8014 SHA256 1c996fac215d1bc99208d26f1700e80322c382b8f4c28eb3b317481a3074fb70 SHA512 ddfa711059f4e192bf877169108e4eb084cd3880ebbbf465fc321c2043de817a61f1fe6ea11629dad5804d666121f032012a582c37bca9988883c3add5c4f73d WHIRLPOOL c85bb40e0836d0e54b24931cf1f523eb53f885a194e2bd5fa21d7865719a01ad5fb4a83eca9a2aa5a97de9ca4943c244822ac7aa058ee5b300c5f90767d68e3f
 EBUILD grub-2.02_beta2-r6.ebuild 8275 SHA256 a76310c6679df4dbe426a22d710d9c8ec8f1d888c6cfad87c12e269093fe4b42 SHA512 827c1efaf7a6f7cfae148a836b2b6ce26a7a34ae5075db93c135efeb3e1ad578251f3b43c492c2da506f3f44046fe3563374133bb98e8c1181827c4d942a455a WHIRLPOOL 49752fe3ad45983142315f2d7a8390709ea77d5f42df79ac6c1b2782022b87754b1433c3fe6ff4bb2eb88779b731ae92f90f0826f3acb73cc280ce4fea7014ad
 EBUILD grub-2.02_beta2-r7.ebuild 8341 SHA256 9994326d33e631f95a1b24ed36eaac1890c198ce70988f0cad71a10218f50ee3 SHA512 d5e3f048b02cdabd6cc1761ec59777acbc6d1ae98d892af6203425f0a8a160efbba8ff26aaf18481568225c34df9117f20b0b6155bf3bf1582d1c383d9903cba WHIRLPOOL 21d76fad9c903d2c5325a6ed1d2fffc96fd8071b8925ccbc6c6077d55f3ad82d772a45efe55ab35c7fb90dc8d9c50c8b825acace265047535e3ceec945814536
 EBUILD grub-9999-r1.ebuild 8046 SHA256 d22d5db167c6503861239a24926801d1ab8d8cd7fd1b4345e55a32a595f64f1a SHA512 0863a94d7ec871f4930d1736d875f3b48b6612ba2ba9a4ad42ddcb5bf1c87855150b715939376f369923108b677e8ec5fd7f4f9ac95a3c5fedb34374725f16fa WHIRLPOOL 67e85161d9e8ac5f90ae1b86bdb3d4191ae409fdcb6f42fcc0026e045ad019d6c2d8d36a69a60937c08dc065ea50041a97b8772fa12ea3dcef601d8f2193470b
-MISC ChangeLog 67638 SHA256 6441b9dec65bd064cf960ccf4360ad6594e8fa1eced77ae738735298f7ec7ccf SHA512 1e9a6c242abebc669a837b31a8e72e298a695ca4bba5b7f4b6ccd08f6988f6b3d7c21b5e73f8b808f6422900aecadd7cee6b281ae531df19482b604493813f44 WHIRLPOOL b3c882f977cf51b19a93a2219aa189762ee3d51f9860cc8f8cfa3ca05c64fe635b93baccfe8e8142fc7aaa686b9c62020da0222e482b6a348c3f6b017c7947b8
+MISC ChangeLog 67754 SHA256 da72f26ff52c4b1fbc6aa308723d028c8191ffb2d2959445d506851fe87d58d6 SHA512 09453f98af9999456854e9585b693b1402313e7ad58edd784e822ad9c37b373f0965fad6ad1d7eb1751c5dcec9f3f3a2a13ff38c27efba086563f315f9a56ae0 WHIRLPOOL 4b62311e6666f3ce20ca0e30e0931c2a547827b27c01a35a50888f99ea9a6a4039900c73631be1b62df68723cd34e5f61918903ed72350c025b043578a3e772e
 MISC metadata.xml 1099 SHA256 11bf295d5e9c29b235f08aee8426c0bed0d13e784242d9a0ed85a8785418c0fb SHA512 ed5ba243b98e32e0f4aa7bc7f116219add21bc2d4a60e38df6681cbdc9f4894507f6bc94d6092af777d5020c6a93ac6e8b5088e291b80b2a92294b4a8b69e121 WHIRLPOOL 07ac627189c56533d3484cd318610a18dde5cf732959fcbc405873a5146de96a49d8b29f6e2c2ec15fe62b561952361a4e0092aa17b744f761a500a40245c8fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJZByXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxgYP/jhnfuuDdWcfLPe76DYUPl0h
-Npu5f9Dm1zW9+7HI9Y1Kh7NfNdcu5NmXK5+eqp+sDH2LqRiy5QO+gL3vd9A4xodt
-9LnghOccdtgYTj8SKVBjVcasSujeFC9zRbn363v84UvgpfV3bTlpiiQCGcfNeEeN
-6hIK1UklKavmRsNI3xMI9NPZ7WfSZkKxBLRmqWaVgx64HpfPsJuLhMbybZzEG+iK
-XKlBcDfbYXjdRAcQXfE7zOqLAsj7VISRgev+nlqTF+iOdvIUBCLFkIrgkaVkglyo
-i8ayAVUzV8Byt6h6zVEGF69VXF++YGPV8nll3zCkI8NBqhQ+LBeld5VxZh+TT2n0
-WjVmqrK++MjycTp0UOySJmePhPgD/1/02zu9Jn6kK5trjspppll3DNFXgTqn7I3N
-62zj0fX48J6xe7lee//H9UTSaqBLxFRxSRNDY0XgQrKw6Sj7UY55iaA2LLGKE+OU
-Q7Kft6Z01IuwL7EUys9eLPkHshyrjdLSf7GlZ1qgJA7AWkcikYyfemkzhO03Wp4k
-WLMhLxQh4dKODhxafDgDfsxcny7jmcl6xD77Nip05DCe0QB6dwYn7fVXb7WJc1YV
-8Yx7eN5reUa6u17nJCu1C+z8+VqfztZFFdqb3ypZgZBOecbppeu2z6DpdS1S0hTz
-2QCmD6W6EDWO6WT/Lvtm
-=L0hj
+iQGcBAEBCAAGBQJVfeVnAAoJEJQzkH1pP7W4fIMMALDRpAgTCEDJocvu45fjphkI
+3fGvzUkU6eLpXfeKiph2rTIFyUxDDlBiV59pTAW/6i455IGiCPn4lizKnnhzvCIw
+FIOGcCnum359+4ilKsMWD1eM5KlW1aFtmpzFis/lrUi0qAj4YEmYce1rXt8fucLo
+kgd6PLwp7aDhZ/f/xehvVVETTVunpX7DUO8HsJR3KhKRCyza6QdDrJ6izkTjZr9U
+EQJy02Sr/8ELWkKPigQHd08P/zzVdDhGLRG+lhqFuqrws3H0b32h9wUOkxAEsK6p
+lJvPby0WEB6OaBBllBzNlJ/k8HK2Ae+Ntx9G/hkYHZ02UwoINq9n8Rh9FWp0TOFj
+47w9dRuba4GDGJOThcyl+E061n4c2mucmZ9qojZAFfMZdqtnnxGPU5yLH8Xb5ojY
+ydgQmu9qJ1NtnwYO/YTzRXcS4NKcK2JrK1IycBM6IGxtYQXGPUpHMszH8o26V7Tu
+57SRAWpNWW3EppZzj7ZRDHS6fwQi60aWOLXn00pf2w==
+=Av4J
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r14.ebuild b/sys-boot/grub/grub-0.97-r14.ebuild
index 592d40059041..d2e2664cc152 100644
--- a/sys-boot/grub/grub-0.97-r14.ebuild
+++ b/sys-boot/grub/grub-0.97-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.7 2015/03/16 21:39:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.8 2015/06/14 20:36:32 ulm Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -35,10 +35,7 @@ IUSE="custom-cflags ncurses netboot static"
 
 LIB_DEPEND="ncurses? (
 		>=sys-libs/ncurses-5.9-r3[static-libs(+)]
-		amd64? ( || (
-			>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		) )
+		amd64? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
 	)"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)\]/} )"
 DEPEND="${RDEPEND}
@@ -103,16 +100,12 @@ src_configure() {
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
 
-	# Per bug 216625, the emul packages do not provide .a libs for performing
-	# suitable static linking
 	if use amd64 && use static ; then
 		if [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
 			eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This"
 			eerror "is specifically intended for building the tarballs for the"
 			eerror "grub-static package via USE='static -ncurses'."
 			eerror "All bets are now off."
-		elif use ncurses && ! has_version ">=sys-libs/ncurses-5.9-r3[abi_x86_32,static-libs]"; then
-			die "You must use the grub-static package if you want a static Grub on amd64!"
 		fi
 	fi