gentoo resync : 29.12.2022

3 files changed, 23 insertions, 25 deletions

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 188802f6c75f..ed5225d30db6 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1,6 @@
 DIST libselinux-3.3.tar.gz 206826 BLAKE2B e4cd2bf7172db1dd7661dd7981f875eb45f3c123805618edd03d7258f4b1f7afc974020187ec2e9e50dd59b3581ee21a29012eaa90ddfa82e43db4b8e60c51b7 SHA512 9a89c05ea4b17453168a985ece93ba6d6c4127916e657c46d4135eb59a1f6408faa0802cc2e49187defbde5247d659037beee089877affbab3eab6af3433696c
-DIST libselinux-3.4-rc1.tar.gz 208778 BLAKE2B b15c83149f213a44624285abe68972c0c7f8dcdaf13cd1ca089bd44951f14d30c73302433d68b7d59f0bc7add14315ba12e9f6e6062566c1bdb8f849c5884c28 SHA512 333907b3ed05d66e608ab16958e4e09e18848bf9aaf3d9216d08be2f6e483231c9455a8e6db56648d6704c0f0af7cd4c5c7ba468d678f8368d06b68a60693eb5
+DIST libselinux-3.4.tar.gz 210061 BLAKE2B 65b797516199def3feb1a5de5413e5da6f81422e7c7d97bf859896e78ef55020d3851f98c205bab622f941756341dc62f49d70558ebaf1cb3a8a28b84871d7af SHA512 7ffa6d2159d2333d836bde3f75dfc78a278283b66ae1e441c178371adb6f463aa6f2d62439079e2068d1135c39dd2b367b001d917c0bdc6871a73630919ef81e
 EBUILD libselinux-3.3.ebuild 4239 BLAKE2B ad7894053b45a7637e7c2e0584265077b848b522657b29738e80598706179e69044d773f9c4c2251ccba9f8564d6ab07402305a90bc3359422e4c15c30acf9c9 SHA512 8b379f9b3aef6fc99081a154f98e68abdcd6318b64658e52421f892a73cfc6a37495e0d3c689e2dcb0ed2a40d149c7484db850e078f7a9914b3b3fbcf31ebd3e
-EBUILD libselinux-3.4_rc1.ebuild 4172 BLAKE2B 3fe3943963a70a05869ac24bd6c8bb04c86f7c92553898cc871e50ba81a9bb2d990dd303a6e8deca8de288e5d96959460ebfe7a32cc8e4533cc902c051b1c43e SHA512 c3459e50b935b0f5614f3420c8883d5302fd26748cd9bd53e104f129267bfc98607b1f02f1bd5bf7eabe220481734f5e5551055d976a954ebf2267aadd235674
-EBUILD libselinux-9999.ebuild 4172 BLAKE2B 3fe3943963a70a05869ac24bd6c8bb04c86f7c92553898cc871e50ba81a9bb2d990dd303a6e8deca8de288e5d96959460ebfe7a32cc8e4533cc902c051b1c43e SHA512 c3459e50b935b0f5614f3420c8883d5302fd26748cd9bd53e104f129267bfc98607b1f02f1bd5bf7eabe220481734f5e5551055d976a954ebf2267aadd235674
+EBUILD libselinux-3.4.ebuild 3971 BLAKE2B 1c5558953a0ccec4d4f6dcbea23ae6980cd153dfdbf0a4102c5283da61bd3e67fa9e7fb317f17ade37b5f9ecfc18b8844c4802c90372507173fe9e3c56ebc875 SHA512 dc20bde0f8861410237fb253fe3d1d539f9423825018ea2bb5a35c4f3f5e3c13a0a8866e59db315634717a66002d8fd1b3979d5c0aa2df93b45f51a31cf023e7
+EBUILD libselinux-9999.ebuild 3971 BLAKE2B 1c5558953a0ccec4d4f6dcbea23ae6980cd153dfdbf0a4102c5283da61bd3e67fa9e7fb317f17ade37b5f9ecfc18b8844c4802c90372507173fe9e3c56ebc875 SHA512 dc20bde0f8861410237fb253fe3d1d539f9423825018ea2bb5a35c4f3f5e3c13a0a8866e59db315634717a66002d8fd1b3979d5c0aa2df93b45f51a31cf023e7
 MISC metadata.xml 746 BLAKE2B 4965c5541d4d9481d3e74e28a7d40a47b17895b3fb095111a46524fa77ec45527306f7960375c2d5c1fcfa3cc106aebd6e055341e99b46a2bb2e2f464c6b35ed SHA512 683a5acd27beb458c2f6c8aa7404e4920923d873a993ac21f52b9191a86e0ca5a74e9376a9a6d9e7b225a95a79ae4e813a05184c8c49d0ed7859e768890f080f
diff --git a/sys-libs/libselinux/libselinux-3.4_rc1.ebuild b/sys-libs/libselinux/libselinux-3.4.ebuild
index 90b74872231d..79d30a7aa969 100644
--- a/sys-libs/libselinux/libselinux-3.4_rc1.ebuild
+++ b/sys-libs/libselinux/libselinux-3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 USE_RUBY="ruby26 ruby27"
 
 # No, I am not calling ruby-ng
@@ -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
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 90b74872231d..79d30a7aa969 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 USE_RUBY="ruby26 ruby27"
 
 # No, I am not calling ruby-ng
@@ -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