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 35E9313835A for ; Sat, 3 Apr 2021 04:19:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B049E0867; Sat, 3 Apr 2021 04:19:43 +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 61E9CE0867 for ; Sat, 3 Apr 2021 04:19:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 53C46340C57 for ; Sat, 3 Apr 2021 04:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E40F63F for ; Sat, 3 Apr 2021 04:19:39 +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: <1617423322.df053eef42a71d08220604f0222bc92685c2ff88.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libsemanage/libsemanage-9999.ebuild X-VCS-Directories: sys-libs/libsemanage/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: df053eef42a71d08220604f0222bc92685c2ff88 X-VCS-Branch: master Date: Sat, 3 Apr 2021 04:19:39 +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: e3caa41e-02a8-4f83-aec2-e4270745ff09 X-Archives-Hash: b5a3d7e0b8600b2a4df2889826777121 commit: df053eef42a71d08220604f0222bc92685c2ff88 Author: Jonathan Davies protonmail com> AuthorDate: Thu Mar 18 00:57:31 2021 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Apr 3 04:15:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df053eef sys-libs/libsemanage: Sync live ebuild. Signed-off-by: Jonathan Davies protonmail.com> Signed-off-by: Jason Zaman gentoo.org> sys-libs/libsemanage/libsemanage-9999.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild index 4ae63c47240..bf41c8352d7 100644 --- a/sys-libs/libsemanage/libsemanage-9999.ebuild +++ b/sys-libs/libsemanage/libsemanage-9999.ebuild @@ -6,11 +6,8 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit multilib python-r1 toolchain-funcs multilib-minimal -MY_P="${P//_/-}" -MY_RELEASEDATE="20200710" - -SEPOL_VER="${PV}" -SELNX_VER="${PV}" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="SELinux kernel and policy management library" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" @@ -18,19 +15,19 @@ HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" - S="${WORKDIR}/${MY_P}/${PN}" + S="${WORKDIR}/${P}/${PN}" else - SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_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 LICENSE="GPL-2" -SLOT="0" +SLOT="0/2" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}] - >=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + >=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}] >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ${PYTHON_DEPS}" DEPEND="${RDEPEND}" @@ -74,6 +71,8 @@ src_prepare() { } multilib_src_compile() { + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \