From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C6091382C5 for ; Sun, 21 Mar 2021 22:05:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9418E081B; Sun, 21 Mar 2021 22:05:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD880E081B for ; Sun, 21 Mar 2021 22:05:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83F3A33BEA3 for ; Sun, 21 Mar 2021 22:05:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 341FE13B for ; Sun, 21 Mar 2021 22:05:43 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1616364338.f68166cf02298638993e5ed8a4dddb6f352c83fc.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/openrc/openrc-9999.ebuild X-VCS-Directories: sys-apps/openrc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: f68166cf02298638993e5ed8a4dddb6f352c83fc X-VCS-Branch: master Date: Sun, 21 Mar 2021 22:05:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 51b4f8d6-572f-4302-82c9-41566e552710 X-Archives-Hash: d1e7602d5c50cf99160667860e4a9aa3 commit: f68166cf02298638993e5ed8a4dddb6f352c83fc Author: William Hubbs gentoo org> AuthorDate: Sun Mar 21 22:04:24 2021 +0000 Commit: William Hubbs gentoo 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 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)