ulm 15/06/14 20:36:32 Modified: grub-0.97-r14.ebuild ChangeLog Log: [QA] Remove emul-linux-x86-* from dependencies. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path 1.8 sys-boot/grub/grub-0.97-r14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild?r1=1.7&r2=1.8 Index: grub-0.97-r14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r14.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- grub-0.97-r14.ebuild 16 Mar 2015 21:39:48 -0000 1.7 +++ grub-0.97-r14.ebuild 14 Jun 2015 20:36:32 -0000 1.8 @@ -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 @@ 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 @@ 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 1.354 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.354&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.354&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.353&r2=1.354 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.353 retrieving revision 1.354 diff -u -r1.353 -r1.354 --- ChangeLog 25 Mar 2015 01:58:00 -0000 1.353 +++ ChangeLog 14 Jun 2015 20:36:32 -0000 1.354 @@ -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 <u...@gentoo.org> grub-0.97-r14.ebuild: + [QA] Remove emul-linux-x86-* from dependencies. 25 Mar 2015; Mike Gilbert <flop...@gentoo.org> files/grub.default-3: Document options to disable the submenu and play a tone on startup. Bug
