A quick fix regarding amd64 static building without ncurses

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 11 insertions, 8 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index ad8d5930b628..4fa4f93454cc 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.322 2014/10/20 17:22:05 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.323 2014/10/20 17:29:22 axs Exp $
+
+  20 Oct 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> grub-0.97-r14.ebuild:
+  A quick fix regarding amd64 static building without ncurses
 
 *grub-0.97-r14 (20 Oct 2014)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e613836e480a..38ef47525093 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -27,17 +27,17 @@ DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528b
 DIST unifont-7.0.05.pcf.gz 1359030 SHA256 c897bc3796b1c460d13fbed1d6d800027886405efa3715a31275183d3f85ce91 SHA512 d75d810521306e912228e10d7e08749392ade4b9f35199fa43694c57779054f152ba9b30ce6c3b3bd9bb925f60aebbb99f00d3448ed039e748e0353c787d9336 WHIRLPOOL 1af9cb9b6b3a4c46e596228d3231ef160300b0a5545c3e091eaceeb2b522ac1b25721f17f7f2f742a5a1ab92ccedebf4fe2649260284ab208dbd8696fa69594c
 EBUILD grub-0.97-r12.ebuild 9233 SHA256 d5486666e1f8339a8308489607c9108cd34e8ebc696a956e2ff8dafad1c71815 SHA512 332a89395331ef04654345f960f2939340ce9b47ae6ac755e54f4ecc85f6243060890e7553b515468aaffd8346bbb5a0b7fbd26d23911b847f12c557854e96f1 WHIRLPOOL 1a20c9df999954ce431ca50eaaa5651721c939229b3a55d820445620218ffa64d43ba6251e88b1df6f54163f6914265596698db513a47d3c415ccaa01b51e61d
 EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e40fcbf82273cd2da3fdb072e1 SHA512 615e4d11ba91c7bc2fcb926bfc791d1aa3151a06dd336f9597ccc5b22a4b6a1bbffde5f7622ec6cc4c04216c63d99becfc9cf38bcf8fed476773bd3b7930fad2 WHIRLPOOL 91d94e1f90393bb5137b791bfa2d73b418938091d81ec44b783d749ea08ee3a615a5ca4d07a841c66429f6ff7d480ae2ad4f0626576ddaab459f111106160761
-EBUILD grub-0.97-r14.ebuild 9781 SHA256 cf6579d966fb3f0509920070fa4a931908c1e72819358ee11e3cbae284cdb97e SHA512 969c9d551dff202618e4b09d4c3572fb92d6a67cba019c18ba7a29853ce2be8dbad25cf7c58a77dc4973d7b2109dda15410b75ad27e4dd6325ae3555b2381d95 WHIRLPOOL aee95da509c3aa45b8dc118d705d3051d052ab053cdc2baf906c2f1fb698097c0ecdd1ef279c2a9867e3989d465cf5ea0078c6fe25146475e84edc237268f578
+EBUILD grub-0.97-r14.ebuild 9793 SHA256 ed19a717f6056e70bcbf805c7917c0c52313875854907f11e19471a5503c33d6 SHA512 0d5d334e08a0f70a066b043b9199805183326bfa142750ec0e3073d59ae5fc5889f5152668d54499fba0dee2af56b0d399e29c07313fac4c09beed7ffd5ab55f WHIRLPOOL 27be5d5700ed0932226c94dc9159fe792e213603cfabc56dc78079242c2570a5e8216751517b876a5790cbcf893e028b54c4521a4c5315edea86698470fe9188
 EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee3307a5ca2f687620df43c5a9d52547a SHA512 f95264d8eff99a1dd8420d64539aef4b7eb464edc8119076af7c175fac418d0e554ee7bb0ae4edb57c3a1a5b82f32da51db6b7ffc4a9a62dc7541d3694b65faa WHIRLPOOL d1dd247120f6de17aaea2899760fd7daf3eb242a3945f6ae2c03eae71c33e3c6bb780639a030d9ba46f4b9b8f23d383fc6559306e40a82be293466ce6d6270a5
 EBUILD grub-2.02_beta2-r2.ebuild 8369 SHA256 a642f1d89a6ccf56ef108a0b155258e33a4d40a6247832a4604a4c1b109012ac SHA512 d4ff246cea719df609eab9f17d5b9d16a84cfc5d931ce2d53bd696ee08576bc506f4bf37e23cb6c6046acd534b49af41b5972533067663918db4797426ff3f32 WHIRLPOOL 8b088f40c6cd9cc2451c123fe1f660005792209c83c946b4af91719c4dee04a3eff33c2f0498db985040663c56f6cdf05d49794d1518965efe11465cd52ccf05
 EBUILD grub-2.02_beta2.ebuild 8304 SHA256 7c41c4abbb6daef697960d00f9f44f2779095b4918ac975c97799c0fd38b958f SHA512 07ee0e1605e12899d5544db3e3672d4c91f7dcc6b65556d27c32ab1edf9a39a183a6b7be6eeb4ad1f5c4be84dee3a0e18af90867241069c253e4be7185163f54 WHIRLPOOL dc310d7dbea7e310da6f7ee3b1f0563014cba9102f325603cf7d3f7ce6047a93fa4f50777e3b86097c04a372c659eb12ab06ded3293585b0c87c74872c31b5fc
 EBUILD grub-9999-r1.ebuild 8306 SHA256 5609173790cb6e361c730434a7f050e1bca78423015bf839a3d9cb3c9592e044 SHA512 393dac1f7f638eaa6f6f996042004186cde5bc6cb45241a789579b4529bf56eeaeded86725f5beec564f40e75dd0b10e74189b3aaea571d09679bdeed062792e WHIRLPOOL c91d081afd1b60e0ea018bbfe17d4dcce6b64ac74e60e9dbdbe642ccb8e784d2c7f7e0d50a445aba85dadc96a2e35733f2d5315774f44a67aeffbc2f786d0d7e
-MISC ChangeLog 61587 SHA256 189d1ef108075cb2eebc96265633b8680848b05b98595d7cd2595fa189dc28d4 SHA512 f7e502812cda6d02f9984aaa8afb82c8f111be1d95e2f596170136c9540cc617b910f1c7c7c036ffcf366a48f85b5f49030c73c486a7acee6236ff65456f6d12 WHIRLPOOL 4b815e5a31491f1207498b553c614bf3edd5a119714219d9c370123ddcc5c19bb0492759f760dd51daefe027eeeadd9eb4276ed215295e3c02ab5be17dbeb4da
+MISC ChangeLog 61729 SHA256 d2a0c4a8d3d58cd283c97b2875a312dafc9577948295d8f73ac80d4b0c9d0dd6 SHA512 4ae0cbe98cdde9657e3762d19fafb1db3d95a7a4861dab70d09f82d449b29c6b41a9c7212ada7cfcd31349fd293af06c5d53b3d88e8f9c85b8c6379592db7916 WHIRLPOOL e1da1814e6e5c783cd96f18b0710b28ef8e754d62e66ccd632607ddefacf4529f0de8c5e960c45c5bf0b0bbe5a24ce1a1083eff2bc0e76dd46d37472be6dd921
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRFRMsACgkQ2ugaI38ACPDp5wD/XWkAzTlcd+xiuMkPqdnN3ree
-LhUkiJ82ZVczgV686rAA/RfCDCwH5bJSUZeneJdKf7Yl8Ly3q5boweoPjXiegewo
-=vNX6
+iF4EAREIAAYFAlRFRoEACgkQ2ugaI38ACPDG/wD/S7EdOYSE9yz1EutBn9SfDLcY
+Ckkgb49YdRY0D3zip5sA/jkf/FCn79ByWW+cGsPNE2vhO2cfXYRzrZTlYwvUJQWg
+=AP3M
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r14.ebuild b/sys-boot/grub/grub-0.97-r14.ebuild
index b77f24649278..9cd6dfacdcea 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-2014 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.1 2014/10/20 17:22:05 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v 1.2 2014/10/20 17:29:22 axs 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
@@ -115,7 +115,7 @@ src_configure() {
 			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 ! has_package ">=sys-libs/ncurses-5.9-r3[abi_x86_32(-),static-libs]"; then
+		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