| 1 |
commit: 82a00bab274f589c8efa35bfce7342429c12295a |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 4 21:00:13 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 4 21:05:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a00bab |
| 7 |
|
| 8 |
sys-boot/grub: cleanup DEPEND/RDEPEND |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116 |
| 11 |
|
| 12 |
sys-boot/grub/grub-2.02-r1.ebuild | 8 +++----- |
| 13 |
sys-boot/grub/grub-9999.ebuild | 8 +++----- |
| 14 |
2 files changed, 6 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild |
| 17 |
index d18b6e78cb6..5181e64af6d 100644 |
| 18 |
--- a/sys-boot/grub/grub-2.02-r1.ebuild |
| 19 |
+++ b/sys-boot/grub/grub-2.02-r1.ebuild |
| 20 |
@@ -68,7 +68,7 @@ REQUIRED_USE=" |
| 21 |
|
| 22 |
# os-prober: Used on runtime to detect other OSes |
| 23 |
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue |
| 24 |
-RDEPEND=" |
| 25 |
+COMMON_DEPEND=" |
| 26 |
app-arch/xz-utils |
| 27 |
>=sys-libs/ncurses-5.2-r5:0= |
| 28 |
debug? ( |
| 29 |
@@ -81,7 +81,7 @@ RDEPEND=" |
| 30 |
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
| 31 |
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
| 32 |
" |
| 33 |
-DEPEND="${RDEPEND} |
| 34 |
+DEPEND="${COMMON_DEPEND} |
| 35 |
${PYTHON_DEPS} |
| 36 |
app-misc/pax-utils |
| 37 |
sys-devel/flex |
| 38 |
@@ -114,7 +114,7 @@ DEPEND="${RDEPEND} |
| 39 |
media-libs/freetype:2 |
| 40 |
) |
| 41 |
" |
| 42 |
-RDEPEND+=" |
| 43 |
+RDEPEND="${COMMON_DEPEND} |
| 44 |
kernel_linux? ( |
| 45 |
grub_platforms_efi-32? ( sys-boot/efibootmgr ) |
| 46 |
grub_platforms_efi-64? ( sys-boot/efibootmgr ) |
| 47 |
@@ -123,8 +123,6 @@ RDEPEND+=" |
| 48 |
nls? ( sys-devel/gettext ) |
| 49 |
" |
| 50 |
|
| 51 |
-DEPEND+=" !!=media-libs/freetype-2.5.4" |
| 52 |
- |
| 53 |
RESTRICT="strip !test? ( test )" |
| 54 |
|
| 55 |
QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*" |
| 56 |
|
| 57 |
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild |
| 58 |
index d5bfc5ad9ac..3b49a8b4802 100644 |
| 59 |
--- a/sys-boot/grub/grub-9999.ebuild |
| 60 |
+++ b/sys-boot/grub/grub-9999.ebuild |
| 61 |
@@ -67,7 +67,7 @@ REQUIRED_USE=" |
| 62 |
|
| 63 |
# os-prober: Used on runtime to detect other OSes |
| 64 |
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue |
| 65 |
-RDEPEND=" |
| 66 |
+COMMON_DEPEND=" |
| 67 |
app-arch/xz-utils |
| 68 |
>=sys-libs/ncurses-5.2-r5:0= |
| 69 |
debug? ( |
| 70 |
@@ -80,7 +80,7 @@ RDEPEND=" |
| 71 |
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
| 72 |
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) |
| 73 |
" |
| 74 |
-DEPEND="${RDEPEND} |
| 75 |
+DEPEND="${COMMON_DEPEND} |
| 76 |
${PYTHON_DEPS} |
| 77 |
app-misc/pax-utils |
| 78 |
sys-devel/flex |
| 79 |
@@ -113,7 +113,7 @@ DEPEND="${RDEPEND} |
| 80 |
media-libs/freetype:2 |
| 81 |
) |
| 82 |
" |
| 83 |
-RDEPEND+=" |
| 84 |
+RDEPEND="${COMMON_DEPEND} |
| 85 |
kernel_linux? ( |
| 86 |
grub_platforms_efi-32? ( sys-boot/efibootmgr ) |
| 87 |
grub_platforms_efi-64? ( sys-boot/efibootmgr ) |
| 88 |
@@ -122,8 +122,6 @@ RDEPEND+=" |
| 89 |
nls? ( sys-devel/gettext ) |
| 90 |
" |
| 91 |
|
| 92 |
-DEPEND+=" !!=media-libs/freetype-2.5.4" |
| 93 |
- |
| 94 |
RESTRICT="strip !test? ( test )" |
| 95 |
|
| 96 |
QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*" |
Archives