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 56F3A158091 for ; Sat, 4 Jun 2022 01:03:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AF08E09D7; Sat, 4 Jun 2022 01:03:54 +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 4EC69E09D7 for ; Sat, 4 Jun 2022 01:03:54 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 178113425C1 for ; Sat, 4 Jun 2022 01:03:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71AB647E for ; Sat, 4 Jun 2022 01:03:51 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1654304573.a245b6b7b1c3ad557610262c28eadb3bbc2ed19a.concord@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: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: a245b6b7b1c3ad557610262c28eadb3bbc2ed19a X-VCS-Branch: master Date: Sat, 4 Jun 2022 01:03:51 +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: 00e74de3-afbe-46ab-89eb-70f5491f467e X-Archives-Hash: f84879ebc466de34cf9223f60feb3005 commit: a245b6b7b1c3ad557610262c28eadb3bbc2ed19a Author: Kenton Groombridge gentoo org> AuthorDate: Thu Jun 2 13:50:52 2022 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Sat Jun 4 01:02:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a245b6b7 sys-libs/libselinux: make pcre2 unconditional Bug: https://bugs.gentoo.org/837986 Signed-off-by: Kenton Groombridge gentoo.org> sys-libs/libselinux/libselinux-9999.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild index 90b74872231d..e2a73b254d7b 100644 --- a/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sys-libs/libselinux/libselinux-9999.ebuild @@ -26,12 +26,11 @@ fi LICENSE="public-domain" SLOT="0" -IUSE="+pcre2 python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27" +IUSE="python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -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}] ) +RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] python? ( ${PYTHON_DEPS} ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) @@ -58,7 +57,7 @@ multilib_src_compile() { LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ all @@ -68,7 +67,7 @@ multilib_src_compile() { LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ pywrap } @@ -85,7 +84,7 @@ multilib_src_compile() { LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ rubywrap } @@ -101,7 +100,7 @@ multilib_src_install() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install if multilib_is_native_abi && use python; then @@ -109,7 +108,7 @@ multilib_src_install() { emake DESTDIR="${D}" \ LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install-pywrap python_optimize # bug 531638 } @@ -125,7 +124,7 @@ multilib_src_install() { LIBDIR="\$(PREFIX)/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ RUBY=${1} \ - USE_PCRE2="$(usex pcre2 y n)" \ + USE_PCRE2=y \ install-rubywrap } for RUBYTARGET in ${USE_RUBY}; do