From 3b457567cf4abf5703f0f0ee427db6901adbf46f Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Wed, 17 Sep 2014 16:27:36 +0200 Subject: sys-boot/grub: Prioritize sys-libs/ncurses[abi_x86_32] over app-emulation/emul-linux-x86-baselibs Package-Manager: portage-2.2.12 --- sys-boot/grub/ChangeLog | 4 ++++ sys-boot/grub/Manifest | 4 ++-- sys-boot/grub/grub-0.97-r13.ebuild | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'sys-boot/grub') diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 22f2a339..47f1510f 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Sep 2014; Bertrand Jacquin grub-0.97-r13.ebuild: + sys-boot/grub: Prioritize sys-libs/ncurses[abi_x86_32] over app-emulation + /emul-linux-x86-baselibs + 17 Sep 2014; Bertrand Jacquin grub-0.97-r13.ebuild: sys-boot/grub: Stable amd64 diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 2c31445c..567f8cdd 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 9579 SHA256 2f352566ac3cc877dc6001db290c553eb6fafe1bef5719ef840711db733cb4c8 WHIRLPOOL e32c3d01b339525bd93e4cae40dfb72825303942c772c6131a11e1b5952d78ddba261e391911fb747c0de7f4a23a5e0bab1bd81eb3520d3b571888d92286a9bd -MISC ChangeLog 3984 SHA256 a5559218f3f306eb796f43fe1c9c8743f895e18267f5228101ec2dcb7028ea36 WHIRLPOOL 6ba9f439236a50d6778aa1f9a22f6b044247f4f7d19ca9d35571fcc7be944ed06708e9ece39a3b03297117457940ed4aef3353aea9b0aa690ec50867ebf0f51c +EBUILD grub-0.97-r13.ebuild 9579 SHA256 5b4ea5999244ad5d11fffe21ace2861497ee092b3536a4ecaeed2e69c81fd134 WHIRLPOOL 8fc1a3b0fc6579ca08c9cf5c7adc4298a91c41cf6a7745637ca8ed8d81ac9b3e8904a19cda842feb9f44270e815460e2b466aa53a4e5ede9df5ed324fcb62125 +MISC ChangeLog 4163 SHA256 d9b80d3c99b5943081532065a3269bfa97949ff9cb58e9f0e1bb82af9e3e2520 WHIRLPOOL 571bf1c29fa3841a7e7a41bc5fbebbc2a8516943a81002f0e1c438dbab60cbae045fbd684f9f9d681c3ff58b5d762b27af840115a423651b4ff8090df9b07433 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 ee7a933c..0c479fb5 100644 --- a/sys-boot/grub/grub-0.97-r13.ebuild +++ b/sys-boot/grub/grub-0.97-r13.ebuild @@ -37,8 +37,8 @@ LIB_DEPEND="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(-)] + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ) )" -- cgit v1.2.3