[gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/

[William Hubbs]

commit:     f68166cf02298638993e5ed8a4dddb6f352c83fc
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 22:04:24 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 22:05:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68166cf

sys-apps/openrc: live ebuild - clean up branding and OS

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 sys-apps/openrc/openrc-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-apps/openrc/openrc-9999.ebuild 
b/sys-apps/openrc/openrc-9999.ebuild
index 2edcd38b66c..1b174499aee 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -71,6 +71,7 @@ src_compile() {
        unset LIBDIR #266688
 
        MAKE_ARGS="${MAKE_ARGS}
+               BRANDING=\"Gentoo Linux\"
                LIBNAME=$(get_libdir)
                LIBEXECDIR=${EPREFIX}/lib/rc
                MKBASHCOMP=yes
@@ -81,12 +82,9 @@ src_compile() {
                MKPAM=$(usev pam)
                MKSTATICLIBS=no
                MKZSHCOMP=yes
+               OS=Linux
                SH=$(usex bash /bin/bash /bin/sh)"
 
-       local brand="Unknown"
-       MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-       brand="Linux"
-       export BRANDING="Gentoo ${brand}"
        use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
        export DEBUG=$(usev debug)
        export MKTERMCAP=$(usev ncurses)