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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57FDA15808B for ; Mon, 11 Apr 2022 03:45:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41F7EE09E1; Mon, 11 Apr 2022 03:44:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1BECE0973 for ; Mon, 11 Apr 2022 03:44:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 600863418FB for ; Mon, 11 Apr 2022 03:44:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC39C3AF for ; Mon, 11 Apr 2022 03:44:48 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1649648633.26cc733271f74892bd6dc93de32df3ee23440fb0.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/restorecond/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/restorecond/restorecond-9999.ebuild X-VCS-Directories: sys-apps/restorecond/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 26cc733271f74892bd6dc93de32df3ee23440fb0 X-VCS-Branch: master Date: Mon, 11 Apr 2022 03:44:48 +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: 2bf84480-9323-4c16-8436-9980d232e149 X-Archives-Hash: 14cb7b60d3bd3c3ae1920ec2d8abcd41 commit: 26cc733271f74892bd6dc93de32df3ee23440fb0 Author: Jason Zaman gentoo org> AuthorDate: Mon Apr 11 00:53:04 2022 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Apr 11 03:43:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26cc7332 sys-apps/restorecond: update live ebuild Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jason Zaman gentoo.org> sys-apps/restorecond/restorecond-9999.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild index f3e66897e8c1..92cd1c69200e 100644 --- a/sys-apps/restorecond/restorecond-9999.ebuild +++ b/sys-apps/restorecond/restorecond-9999.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit systemd toolchain-funcs -IUSE="" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" fi DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts" @@ -21,6 +23,7 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" LICENSE="GPL-2" SLOT="0" +IUSE="" DEPEND="dev-libs/glib:2 >=sys-libs/libsepol-${PV}:= @@ -40,9 +43,10 @@ src_compile() { } src_install() { - SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \ SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \ - emake DESTDIR="${D}" install + install rm -rf "${D}/etc/rc.d" || die