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 23D78138206 for ; Sat, 3 Apr 2021 04:19:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C5B2E084A; Sat, 3 Apr 2021 04:19:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 264AFE084A for ; Sat, 3 Apr 2021 04:19:42 +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 DCB9A340C74 for ; Sat, 3 Apr 2021 04:19:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4925B63D 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: <1617423320.76dbc1d74110f4d7e7f1f95584c45aea57d0a85c.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libselinux/libselinux-9999.ebuild X-VCS-Directories: sys-libs/libselinux/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 76dbc1d74110f4d7e7f1f95584c45aea57d0a85c 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: 974ead10-61aa-497d-a04e-4261692268ff X-Archives-Hash: d869fce3691ad8eeddfdde86638efda8 commit: 76dbc1d74110f4d7e7f1f95584c45aea57d0a85c Author: Jonathan Davies protonmail com> AuthorDate: Thu Mar 18 00:56:23 2021 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Apr 3 04:15:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76dbc1d7 sys-libs/libselinux: Sync live ebuild. Signed-off-by: Jonathan Davies protonmail.com> Signed-off-by: Jason Zaman gentoo.org> sys-libs/libselinux/libselinux-9999.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index 6d2e9c24452..3fd941e767f 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -8,19 +8,18 @@ USE_RUBY="ruby25 ruby26 ruby27" # No, I am not calling ruby-ng inherit multilib python-r1 toolchain-funcs multilib-minimal -MY_P="${P//_/-}" -SEPOL_VER="${PV}" -MY_RELEASEDATE="20200710" +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="SELinux userland library" HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" -if [[ ${PV} == 9999 ]] ; then +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 @@ -30,7 +29,7 @@ SLOT="0" IUSE="pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] +RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} ) @@ -54,6 +53,8 @@ src_prepare() { multilib_src_compile() { tc-export AR CC PKG_CONFIG RANLIB + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + emake \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \