gentoo auto-resync : 30:03:2023 - 03:54:54

5 files changed, 37 insertions, 28 deletions

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 16e9d7ec0e5d..42da750fc306 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.tar.gz 210061 BLAKE2B 65b797516199def3feb1a5de5413e5da6f81422e7c7d97bf859896e78ef55020d3851f98c205bab622f941756341dc62f49d70558ebaf1cb3a8a28b84871d7af SHA512 7ffa6d2159d2333d836bde3f75dfc78a278283b66ae1e441c178371adb6f463aa6f2d62439079e2068d1135c39dd2b367b001d917c0bdc6871a73630919ef81e
-EBUILD libselinux-3.3.ebuild 4095 BLAKE2B 33e420f67fed5dec14ae02bf29af10b250b0f0e5e717cb214da75773d3103b4f965391ffe3fc10815fcac71d934b7afa78c20f5dc0a0bd91ae55b4013b60ed50 SHA512 468ed007e2ae269db041e45c6e03b001b148576b6523a52b278b0f09277ba1c806468bd4b51ddd1344cdf94142617617f26d5a149ef24f96c7a632fe4aaaf45a
-EBUILD libselinux-3.4.ebuild 3895 BLAKE2B e09e761e6a90b64f02bd098b3de26ac5cefb324e965e3f60597e7e31e320bc2a581e44cc0c299e5506cb6d6478b10c53ba7f0a1a931da3b318c387ccd8b09898 SHA512 b78171909c779031ecc78dd1bb6618ce2f7b44f74ad58fd1f74e818434d05a12a3c37bf5c171192148312dad29edc0817a7415d1e1192ba319b76e4e957d55f6
-EBUILD libselinux-9999.ebuild 3899 BLAKE2B eb2c455f4694890a4ad4ca228379a952a2679f36c038d866290b533e08c2a275a0fb2347a327cc649a93100b6373aa0695ecd8e372dee06d48f198210f8ca62f SHA512 bfba472d5a159d7fc1c5b9b84be8f3f762b62031b3d69ced01cc7b2a7dea9a7c67def7bd869a0d3804ff0a9a8ce281288bbf2c44524b3784f385e1e66b04c2af
-MISC metadata.xml 746 BLAKE2B 4965c5541d4d9481d3e74e28a7d40a47b17895b3fb095111a46524fa77ec45527306f7960375c2d5c1fcfa3cc106aebd6e055341e99b46a2bb2e2f464c6b35ed SHA512 683a5acd27beb458c2f6c8aa7404e4920923d873a993ac21f52b9191a86e0ca5a74e9376a9a6d9e7b225a95a79ae4e813a05184c8c49d0ed7859e768890f080f
+DIST libselinux-3.5.tar.gz 211453 BLAKE2B f7f3067c4bb0448e18bd7085135f11d94ae99728949480a655c0f660486817beb5829d8a43dff7bce286ccd50705b0c657bde85970f01c794e01fb707f469d8b SHA512 4e13261a5821018a5f3cdce676f180bb62e5bc225981ca8a498ece0d1c88d9ba8eaa0ce4099dd0849309a8a7c5a9a0953df841a9922f2c284e5a109e5d937ba7
+EBUILD libselinux-3.4.ebuild 3933 BLAKE2B 4f0e4c369da7b4d15dc3720a18f6819eaff84982536a9e5fe1c77cfde8d8b78947debb27a30a82da28c675e3d9b125b0aa1e1b1df2f08e21f8d6603d79409a3a SHA512 e65ad1d0335103a01d44db3529e51874c8a6c5dd7ee88ef00846dfff93cf483079f69b6d9b5994abc09f82b3a0ebfbbdbe59a1378615972a69a9f0fdf5ea6b0d
+EBUILD libselinux-3.5.ebuild 4081 BLAKE2B 484cd7f41790d597f4d3fcca879842511db77df847dff72d8414f833ac86d5382f8a42a955eddba21083fc877c058c3f87805d22114ee6470872da304fabd03f SHA512 e0f697cce5f412bd8bedea6ca144dbbb6af0588ce42415526b5abf901fd0065c02a06cd58e5cf0be134ea2b6e22e28c3601df42e3c56023798153632a39aadd7
+EBUILD libselinux-9999.ebuild 4080 BLAKE2B b08aa039c27f48a36519b871392845f9e23fede54ad62d60b849b92e45b0eb280c564cacc41a6d8b07aa93bc4d1901eb190c7e9e18b9188bfb9306c80b5994b8 SHA512 e06f8afe3e2d53aa5b8222c6f04d41c567c769d54f982933f30ab383c1860db0808fa83245d5baec5325ef17ecddc96622e2c93963c4e0db1d68f655f6016cc2
+MISC metadata.xml 649 BLAKE2B 0d4704823be4492064b2d69a31581397cdedc9e5d564090d9770aa79124c53a66f98290fb4de22abb4f81e732267589ad1df3beda2bb71a3cf5a70f84b885dc4 SHA512 6b240fad142e4ba6457f70c83fb3171c6869ed4ac5729d51b8cc159b2471959c24a0a290ff91fa1d90e0f24f96be76a69487174de22c603539f3fc0e7109a561
diff --git a/sys-libs/libselinux/libselinux-3.4.ebuild b/sys-libs/libselinux/libselinux-3.4.ebuild
index e062a393437c..255324c5d443 100644
--- a/sys-libs/libselinux/libselinux-3.4.ebuild
+++ b/sys-libs/libselinux/libselinux-3.4.ebuild
@@ -38,7 +38,10 @@ RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
+	python? (
+		>=dev-lang/swig-2.0.9
+		dev-python/pip[${PYTHON_USEDEP}]
+	)
 	ruby? ( >=dev-lang/swig-2.0.9 )"
 
 src_prepare() {
diff --git a/sys-libs/libselinux/libselinux-3.3.ebuild b/sys-libs/libselinux/libselinux-3.5.ebuild
index cab961d8d891..4153725c12b0 100644
--- a/sys-libs/libselinux/libselinux-3.3.ebuild
+++ b/sys-libs/libselinux/libselinux-3.5.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
-USE_RUBY="ruby27"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby30 ruby31 ruby32"
 
 # No, I am not calling ruby-ng
 inherit python-r1 toolchain-funcs multilib-minimal
@@ -20,26 +20,30 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby27"
+IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32"
 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_ruby27? ( dev-lang/ruby:2.7 )
+		ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+		ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
+	python? (
+		>=dev-lang/swig-2.0.9
+		dev-python/pip[${PYTHON_USEDEP}]
+	)
 	ruby? ( >=dev-lang/swig-2.0.9 )"
 
 src_prepare() {
@@ -57,7 +61,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
 
@@ -67,7 +71,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
 		}
@@ -84,7 +88,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
 		}
@@ -100,7 +104,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
@@ -108,7 +112,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
 		}
@@ -124,7 +128,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 d0288a47317c..bcc279ed6fdd 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 # No, I am not calling ruby-ng
 inherit python-r1 toolchain-funcs multilib-minimal
@@ -26,19 +26,24 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="python ruby static-libs ruby_targets_ruby27"
+IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}]
 	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+		ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
+		ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
+		ruby_targets_ruby32? ( dev-lang/ruby:3.2 )
 	)
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
+	python? (
+		>=dev-lang/swig-2.0.9
+		dev-python/pip[${PYTHON_USEDEP}]
+)
 	ruby? ( >=dev-lang/swig-2.0.9 )"
 
 src_prepare() {
diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 73a31c45e9f4..dfd7bb04e0a4 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/metadata.xml
@@ -10,9 +10,6 @@
 		process and file security contexts and to obtain security policy
 		decisions.  Required for any applications that use the SELinux API.
 	</longdescription>
-	<use>
-		<flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for fcontext regexes</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:selinuxproject:libselinux</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>