diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-06-14 20:36:32 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-06-14 20:36:32 +0000 |
| commit | e5b46cdb20d77236dae0d68ef2fce5224a082fdd (patch) | |
| tree | 6a3416a24d05d40bb6db6e315fdedb2ecb59ed76 | |
| parent | amd64 stable wrt bug #552112 (diff) | |
| download | gentoo-2-e5b46cdb20d77236dae0d68ef2fce5224a082fdd.tar.gz gentoo-2-e5b46cdb20d77236dae0d68ef2fce5224a082fdd.tar.bz2 gentoo-2-e5b46cdb20d77236dae0d68ef2fce5224a082fdd.zip | |
[QA] Remove emul-linux-x86-* from dependencies.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r14.ebuild | 11 |
2 files changed, 6 insertions, 10 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/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 |