diff options
-rw-r--r-- | metadata/md5-cache/sys-boot/grub-0.97-r13 | 6 | ||||
-rw-r--r-- | sys-boot/grub/ChangeLog | 3 | ||||
-rw-r--r-- | sys-boot/grub/Manifest | 4 | ||||
-rw-r--r-- | sys-boot/grub/grub-0.97-r13.ebuild | 8 |
4 files changed, 12 insertions, 9 deletions
diff --git a/metadata/md5-cache/sys-boot/grub-0.97-r13 b/metadata/md5-cache/sys-boot/grub-0.97-r13 index c869e067..8ea9c3aa 100644 --- a/metadata/md5-cache/sys-boot/grub-0.97-r13 +++ b/metadata/md5-cache/sys-boot/grub-0.97-r13 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test -DEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( || ( app-emulation/emul-linux-x86-baselibs sys-libs/ncurses[abi_x86_32(-)] ) ) ) ) static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5[static-libs(+)] amd64? ( || ( app-emulation/emul-linux-x86-baselibs sys-libs/ncurses[abi_x86_32(-)] ) ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] sys-libs/ncurses[abi_x86_32(-)] ) ) ) ) static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5[static-libs(+)] amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] sys-libs/ncurses[abi_x86_32(-)] ) ) ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=GNU GRUB Legacy boot loader EAPI=4 HOMEPAGE=http://www.gnu.org/software/grub/ IUSE=custom-cflags ncurses netboot static KEYWORDS=~amd64 ~x86 ~x86-fbsd LICENSE=GPL-2 -RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( || ( app-emulation/emul-linux-x86-baselibs sys-libs/ncurses[abi_x86_32(-)] ) ) ) ) +RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.2-r5 amd64? ( || ( app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] sys-libs/ncurses[abi_x86_32(-)] ) ) ) ) SLOT=0 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.14.tar.bz2 _eclasses_=autotools 5256b4f4c1798109f39f308f9f7eaf5f eutils 025442f2eecab39ad0b4e541b6e142af flag-o-matic 9a539029fe1d390c1828ff633baf26b5 libtool b9b3340e3a19510f0d9f05cfccbf209f linux-info 90944ede7e9761bd7ef07602acdef9e3 mount-boot 02dd3bb4c5f025fef0fc3ade0f27c217 multilib fac675dcccf94392371a6abee62d909f multiprocessing c2d96fb38f2596209e98fceda58ba1ed pax-utils 2424f959506320f5196de8f79fa05297 toolchain-funcs 48b38a216afb92db6314d6c3187abea3 versionator a8a3963967d6140be9a14b08bb8f047f -_md5_=cd95ae704c23f26a6d24bc16c36a1f13 +_md5_=dff3bee12bdc9bc43e7689e832f51e74 diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index cee33144..c8be49de 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 May 2014; Bertrand Jacquin <beber@meleeweb.net> grub-0.97-r13.ebuild: + sys-boot/grub: Import patch from Michał Górny from bug #510758 + 19 May 2014; Bertrand Jacquin <beber@meleeweb.net> grub-0.97-r13.ebuild: sys-boot/grub: Get ride of app-emulation/emul-linux-x86-baselibs diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 20f4c516..834d3799 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -5,6 +5,6 @@ AUX grub.default 1254 SHA256 97f10c0421641b03cdb1f63496a1b10fbdeeb4b97e74c680492 DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b -EBUILD grub-0.97-r13.ebuild 9492 SHA256 516577dc79eba272b5690bd95f917b504974af75c7dda6e43706ac2c2125ec55 WHIRLPOOL 09e57e01dba31878365163167db4794d2a8ef497d0c3943aa4c044c44fb66f72650ef42a6c37e4904105f928fbb946739d38ade60c7e2d877d964027185403e3 -MISC ChangeLog 3735 SHA256 01dc62e54ae9a44c82a901837ac69dcae1e431c44c81c9f034a716be089402db WHIRLPOOL 04f0ce234014fbdf1e59317b5cb27a61d6b4b3cd29419a4dfab1d3ffe8b0bc7064d260b646de9bcb39d04d1fbf898b067e931939d58efa32207f856fa65ffd68 +EBUILD grub-0.97-r13.ebuild 9580 SHA256 e5025af81d81840530edf1e778aad635efd70ac6c41aa693eae8585f68fbc41f WHIRLPOOL dcecbeb0564398b82e91a5e760b616395055911e21073d3e9dda7c625b26c6d353dd1b778c21120a2509fafa9cf39a8d6ffac6a7ac797d4a508ac0e854178808 +MISC ChangeLog 3878 SHA256 3aefc61e503b2f159df66a54d101a2a802cc83bb32062ec706ac9794659e6f3f WHIRLPOOL 243db38bce46c4d92f198dee3aa5a21504c71a2bc698f7da0472f65b5b22be1aba4ce5356467152c55e46e725dc324ee2421d4746040002b582e176e4065713e MISC metadata.xml 392 SHA256 ae5988356aa772177dad1e9ae04512450cc818285637adb86614d40d0dfb46bc WHIRLPOOL 9859d85d66b8dae1204950d9ab6a42004f7aaca8deb5616febb221ecc3b3479f8cfe8a6c475a6ea1aaf1fc3987eb6a24a7130879ebfe2c3208083fb1bd7ffdf0 diff --git a/sys-boot/grub/grub-0.97-r13.ebuild b/sys-boot/grub/grub-0.97-r13.ebuild index ac55e6ab..feca4d8e 100644 --- a/sys-boot/grub/grub-0.97-r13.ebuild +++ b/sys-boot/grub/grub-0.97-r13.ebuild @@ -37,7 +37,7 @@ LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.2-r5[static-libs(+)] amd64? ( || ( - app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] sys-libs/ncurses[abi_x86_32(-)] ) ) @@ -109,13 +109,13 @@ src_configure() { # 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 [[ ${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 ! 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 |