[patch] ebuild patch v3

grub-multilib.ebuild.diff (text/plain), 1.30 KB, created by Matthew Ogilvie on 2014-06-28 06:41:22 UTC

--- grub-0.97-r13.ebuild	2014-06-25 23:34:29.701700501 -0600
+++ grub-0.97-r14.ebuild	2014-06-27 23:16:00.409191451 -0600
@@ -33,13 +33,17 @@
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="custom-cflags ncurses netboot static"
 
-LIB_DEPEND="ncurses? (
-		>=sys-libs/ncurses-5.2-r5[static-libs(+)]
-		amd64? ( app-emulation/emul-linux-x86-baselibs )
-	)"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+RDEPEND="!static? ( ncurses? (
+		>=sys-libs/ncurses-5.2-r5
+		amd64? (
+			|| (
+				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+			)
+		)
+	) )"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+	static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-),static-libs(+)] ) )"
 
 pkg_setup() {
 	case $(tc-arch) in
@@ -102,9 +106,7 @@
 	# Per bug 216625, the emul packages do not provide .a libs for performing
 	# suitable static linking
 	if use amd64 && use static ; then
-		if [[ -z ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
-			die "You must use the grub-static package if you want a static Grub on amd64!"
-		else
+		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'."