[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

[Mike Gilbert]

commit:     82a00bab274f589c8efa35bfce7342429c12295a
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 21:00:13 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May  4 21:05:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a00bab

sys-boot/grub: cleanup DEPEND/RDEPEND

Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116

 sys-boot/grub/grub-2.02-r1.ebuild | 8 +++-----
 sys-boot/grub/grub-9999.ebuild    | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys-boot/grub/grub-2.02-r1.ebuild 
b/sys-boot/grub/grub-2.02-r1.ebuild
index d18b6e78cb6..5181e64af6d 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -68,7 +68,7 @@ REQUIRED_USE="
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
+COMMON_DEPEND="
        app-arch/xz-utils
        >=sys-libs/ncurses-5.2-r5:0=
        debug? (
@@ -81,7 +81,7 @@ RDEPEND="
        ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
        ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        ${PYTHON_DEPS}
        app-misc/pax-utils
        sys-devel/flex
@@ -114,7 +114,7 @@ DEPEND="${RDEPEND}
                media-libs/freetype:2
        )
 "
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
        kernel_linux? (
                grub_platforms_efi-32? ( sys-boot/efibootmgr )
                grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -123,8 +123,6 @@ RDEPEND+="
        nls? ( sys-devel/gettext )
 "
 
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
 RESTRICT="strip !test? ( test )"
 
 QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d5bfc5ad9ac..3b49a8b4802 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -67,7 +67,7 @@ REQUIRED_USE="
 
 # os-prober: Used on runtime to detect other OSes
 # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
+COMMON_DEPEND="
        app-arch/xz-utils
        >=sys-libs/ncurses-5.2-r5:0=
        debug? (
@@ -80,7 +80,7 @@ RDEPEND="
        ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
        ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        ${PYTHON_DEPS}
        app-misc/pax-utils
        sys-devel/flex
@@ -113,7 +113,7 @@ DEPEND="${RDEPEND}
                media-libs/freetype:2
        )
 "
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
        kernel_linux? (
                grub_platforms_efi-32? ( sys-boot/efibootmgr )
                grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -122,8 +122,6 @@ RDEPEND+="
        nls? ( sys-devel/gettext )
 "
 
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
 RESTRICT="strip !test? ( test )"
 
 QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"