From de9b2d9850ea1cb41c216274646d749ccec8c311 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 30 Mar 2023 03:54:54 +0100
Subject: gentoo auto-resync : 30:03:2023 - 03:54:54

---
 sys-apps/Manifest.gz                               | Bin 49130 -> 49123 bytes
 sys-apps/checkpolicy/Manifest                      |   8 +-
 sys-apps/checkpolicy/checkpolicy-3.3.ebuild        |  50 ------
 sys-apps/checkpolicy/checkpolicy-3.5.ebuild        |  54 +++++++
 sys-apps/checkpolicy/checkpolicy-9999.ebuild       |   2 +-
 sys-apps/checkpolicy/metadata.xml                  |   3 +
 sys-apps/mcstrans/Manifest                         |   6 +-
 sys-apps/mcstrans/mcstrans-3.3.ebuild              |  49 ------
 sys-apps/mcstrans/mcstrans-3.5.ebuild              |  52 +++++++
 sys-apps/mcstrans/mcstrans-9999.ebuild             |   2 +-
 sys-apps/policycoreutils/Manifest                  |   8 +-
 .../policycoreutils/policycoreutils-3.3.ebuild     | 167 --------------------
 .../policycoreutils/policycoreutils-3.4.ebuild     |   2 +-
 .../policycoreutils/policycoreutils-3.5.ebuild     | 168 +++++++++++++++++++++
 .../policycoreutils/policycoreutils-9999.ebuild    |   2 +-
 sys-apps/restorecond/Manifest                      |   6 +-
 sys-apps/restorecond/restorecond-3.3.ebuild        |  50 ------
 sys-apps/restorecond/restorecond-3.5.ebuild        |  54 +++++++
 sys-apps/restorecond/restorecond-9999.ebuild       |   2 +-
 sys-apps/secilc/Manifest                           |   6 +-
 sys-apps/secilc/secilc-3.3.ebuild                  |  33 ----
 sys-apps/secilc/secilc-3.5.ebuild                  |  37 +++++
 sys-apps/secilc/secilc-9999.ebuild                 |   2 +-
 sys-apps/selinux-python/Manifest                   |   8 +-
 sys-apps/selinux-python/selinux-python-3.3.ebuild  | 111 --------------
 sys-apps/selinux-python/selinux-python-3.4.ebuild  |   2 +-
 sys-apps/selinux-python/selinux-python-3.5.ebuild  | 114 ++++++++++++++
 sys-apps/selinux-python/selinux-python-9999.ebuild |   2 +-
 sys-apps/semodule-utils/Manifest                   |   6 +-
 sys-apps/semodule-utils/semodule-utils-3.3.ebuild  |  41 -----
 sys-apps/semodule-utils/semodule-utils-3.5.ebuild  |  43 ++++++
 sys-apps/semodule-utils/semodule-utils-9999.ebuild |   2 +-
 32 files changed, 558 insertions(+), 534 deletions(-)
 delete mode 100644 sys-apps/checkpolicy/checkpolicy-3.3.ebuild
 create mode 100644 sys-apps/checkpolicy/checkpolicy-3.5.ebuild
 delete mode 100644 sys-apps/mcstrans/mcstrans-3.3.ebuild
 create mode 100644 sys-apps/mcstrans/mcstrans-3.5.ebuild
 delete mode 100644 sys-apps/policycoreutils/policycoreutils-3.3.ebuild
 create mode 100644 sys-apps/policycoreutils/policycoreutils-3.5.ebuild
 delete mode 100644 sys-apps/restorecond/restorecond-3.3.ebuild
 create mode 100644 sys-apps/restorecond/restorecond-3.5.ebuild
 delete mode 100644 sys-apps/secilc/secilc-3.3.ebuild
 create mode 100644 sys-apps/secilc/secilc-3.5.ebuild
 delete mode 100644 sys-apps/selinux-python/selinux-python-3.3.ebuild
 create mode 100644 sys-apps/selinux-python/selinux-python-3.5.ebuild
 delete mode 100644 sys-apps/semodule-utils/semodule-utils-3.3.ebuild
 create mode 100644 sys-apps/semodule-utils/semodule-utils-3.5.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d455f07d5e2c..bbfd3c2e981d 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index ef4eb928d15b..ad18cc9dabe4 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
-DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30
 DIST checkpolicy-3.4.tar.gz 69870 BLAKE2B 891033b1d9d50a3738bb779d014d2f04d6cc5450c6f84ed43246c95b0c808f347d65c0e51c7254041e13b1c555a7e1de5092abb4fc12fabb109be7ddaa090829 SHA512 e7f7a4e987af473fd7cda0e47539061a8cb2e65a6b930f4736c538eb319129b260a3f03d2f50863e73a275ee3d58c441c33f95c80ea2bff6157e37226be54b92
-EBUILD checkpolicy-3.3.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2
+DIST checkpolicy-3.5.tar.gz 69904 BLAKE2B e02ccad07534568a1bbb612330018bbe486800ea40df20ed6f9dc38c88aff7f8858782a28ba7915a58c3bb384f180eb8da7a8fe97a92bcb9baa61eec18da6cbc SHA512 fcd490d865af3b4350c32c5dd9916f8406219841e1e255d8945c6dcc958535247aa27af5597a6988e19f11faea7beeabcb46e8ba2431112bb4aa5c7697bca529
 EBUILD checkpolicy-3.4.ebuild 1089 BLAKE2B 123f25f3f5aa30792a07d398b36e28e4bc81b879cb936d97b7a95ea819c8fc9f498eb0bd4bb21b76174a7e23eabe8b623ca7949f0c950e83865ef26a45767860 SHA512 78daa9fdc3ef4e9250a546b88286e9fbf2a1d199ef9df2250bd001217a2ee00f87c6441891f27a4b7c491ca6725b8e4942a346c119b4087babef67f43ea051fa
-EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B d8f9c5f8d4441478ba78fcfe77661757a48a0f5f75a155a7d14a281f084afcb49065d043c185d333a49b12aeb365da118f5686a97e66c360e27e8ce47e613bac SHA512 163991ca5b78ff9a26523cbad0f16584bfd40901f8b0c1f6bc44146be23f42caf5cf5dad854ffb78d7f2534279bc8a6f85a057848a2eb5fc9924c3b641cb860b
-MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
+EBUILD checkpolicy-3.5.ebuild 1093 BLAKE2B 6c906c311f009a3674dcde42019f8f68e3cdcbd568c2eca8a55eb4b6ccd48346852fafe93296b9ced65f17b7051f82831d55ea26a0f23be74ac5159f65f93c82 SHA512 3f12684e340c6bd3001ec05c90647d5218a343038652fb607fefb94f511bb247e7019bb8ea85016cc1161f90f1fd9b1706203fe6f82f3b73dcbfe6319d4c33a6
+EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B 6c906c311f009a3674dcde42019f8f68e3cdcbd568c2eca8a55eb4b6ccd48346852fafe93296b9ced65f17b7051f82831d55ea26a0f23be74ac5159f65f93c82 SHA512 3f12684e340c6bd3001ec05c90647d5218a343038652fb607fefb94f511bb247e7019bb8ea85016cc1161f90f1fd9b1706203fe6f82f3b73dcbfe6319d4c33a6
+MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/checkpolicy/checkpolicy-3.3.ebuild b/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
deleted file mode 100644
index bba94c05097a..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://userspace.selinuxproject.org"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-
-DEPEND=">=sys-libs/libsepol-${PV}"
-BDEPEND="sys-devel/flex
-	sys-devel/bison"
-
-RDEPEND=">=sys-libs/libsepol-${PV}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		YACC="bison -y" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)"
-}
-
-src_install() {
-	default
-
-	if use debug; then
-		dobin "${S}/test/dismod"
-		dobin "${S}/test/dispol"
-	fi
-}
-
-pkg_postinst() {
-	if ! tc-is-cross-compiler; then
-		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
-	fi
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-3.5.ebuild b/sys-apps/checkpolicy/checkpolicy-3.5.ebuild
new file mode 100644
index 000000000000..496db82366f7
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	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"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+BDEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsepol-${PV}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index b699f09c01de..496db82366f7 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/sys-apps/checkpolicy/metadata.xml b/sys-apps/checkpolicy/metadata.xml
index 781bc07e6d59..861770703d93 100644
--- a/sys-apps/checkpolicy/metadata.xml
+++ b/sys-apps/checkpolicy/metadata.xml
@@ -5,4 +5,7 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">SELinuxProject/selinux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 7f8878f53d3c..d58ef28b1cb0 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,7 @@
 AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
-DIST mcstrans-3.3.tar.gz 44621 BLAKE2B 624780c219d0b8f369def5ab334caf9d2ae847f9cfb4359ce38e240bcb72b7cfeef45d08cd6e7330cc90394f6c32bd622d2133e675036f98992145b1530ab1e2 SHA512 2157a0361bb5a2bc8e149373b2dd7d9b042f8c4c0aa845ae6967a23d9b875d2dcd6176d99d7f8f15e17eb5877fea60814e19aabfe76950d25b75c9c25df811c2
 DIST mcstrans-3.4.tar.gz 45125 BLAKE2B 59a403e7d4018bee2632360d5720e65f26b0581ed58a42e8caee2d352d104658e27ece850ca6c50ea513766a973c6ae98fd4115d478555dd5c130956188c0668 SHA512 bd612f1ae886c7a0300bb4aa1d52f139677787cc026475eada98e11a46910fa4a8baba9026530af6fa649a4f07978039f584e55567b87bbbb89ff06fb182518c
-EBUILD mcstrans-3.3.ebuild 988 BLAKE2B d4fe2829c039c8871d19cee9a9d50e26bc8b9961ebc2b8d4a77c950b30d573eec52842e9bdef80c43f9734530be2311d8d76190ffb5439bd5fa39133d0a484ed SHA512 d40639217b41c04f1e43c826b7304ad67b9c375d3ec6f3ba5019e52f36f689a5a97dd370ec73d652d82b8599f932f7cffdef76498f09451fe7e722d95aeb2d5a
+DIST mcstrans-3.5.tar.gz 45091 BLAKE2B c6604075a6b37d7bf10e2daee40d9f034a26c5d56b81973cbc3b39621bdf5e2cb1d5906e91942e09ff077a14facafcc2464995675d8df31930707033fac5db90 SHA512 f4d3b04750e197c6abd31f1642af4b53a4fe0e968952a7ade992909f903d7486c1e72733963453563fcbc9745273c8238f169f520550df1470e7f6e4d6e56665
 EBUILD mcstrans-3.4.ebuild 1060 BLAKE2B 823e0bae61bb33293b0753dc11c2d9919a4357570158a3950deb458b40f2e3283a05a98d20aedd5c27e43f39f04d91f66f9487c91e3f032a65451a989607c096 SHA512 9c54f350f79e3ffee210f63d455f29a338c2dfd8ce20a2628b27d346ece7e4966b2e56154b3fd81e723dada12f0e5fb3a008dd75b90913518ca0b53621fc56ba
-EBUILD mcstrans-9999.ebuild 1064 BLAKE2B 8014d2426569f5fa9beb45607b2a85154b66866667ca4c8c793bb928d785e6bd786e125f0af4debc1f97375aac5622a2beef9563d2f6fa00aa553701f8ce58dc SHA512 3f668c23c439999a669bb082253457d8c94f61d8f85800f63b4b352d92d38c871c84dda3ae4f29f1d18c65d052e9e695855ab69cf6a04d3cfc9fb78790293785
+EBUILD mcstrans-3.5.ebuild 1064 BLAKE2B ec64721658c8d2f4f768cdb67eae4f9715c9b56c2a343d38260924c76ea97270679913775cfbea6966fa6ce777198b94f61b0230c433deb054726fa2cb5482cb SHA512 bab61b4da72b5428b7758d0f434281eb0697819ce1f3b0d1d12dea59f80ebad7fd54152d99b28c4fa14df82a6b24136bfbb32b4528e0ae14664a7daf283a67d1
+EBUILD mcstrans-9999.ebuild 1064 BLAKE2B ec64721658c8d2f4f768cdb67eae4f9715c9b56c2a343d38260924c76ea97270679913775cfbea6966fa6ce777198b94f61b0230c433deb054726fa2cb5482cb SHA512 bab61b4da72b5428b7758d0f434281eb0697819ce1f3b0d1d12dea59f80ebad7fd54152d99b28c4fa14df82a6b24136bfbb32b4528e0ae14664a7daf283a67d1
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.3.ebuild b/sys-apps/mcstrans/mcstrans-3.3.ebuild
deleted file mode 100644
index 67f5284fcece..000000000000
--- a/sys-apps/mcstrans/mcstrans-3.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-DESCRIPTION="SELinux context translation to human readable names"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:=
-	dev-libs/libpcre:=
-	>=sys-libs/libcap-1.10-r10:="
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}/etc/rc.d" || die
-
-	newinitd "${FILESDIR}/mcstransd.init" mcstransd
-}
diff --git a/sys-apps/mcstrans/mcstrans-3.5.ebuild b/sys-apps/mcstrans/mcstrans-3.5.ebuild
new file mode 100644
index 000000000000..5cad428935de
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux context translation to human readable names"
+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}/${P}/${PN}"
+else
+	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"
+IUSE=""
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre2:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index 75563498db4f..5cad428935de 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 342d53423896..b1ebbae9d0ff 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,8 @@
 AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
-DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98
 DIST policycoreutils-3.4.tar.gz 771435 BLAKE2B 53654ad8f17c8e539c7821ddcc4f40dde1aa214943b5f2876efbfd8e10c90747d21c1530df3d53e51677159026a70691db6282f3bedc79739673380e053f74a2 SHA512 ded0d6fb5e3f165a893ee42411ac82616ddf37a02acaca6a8437b8f10ea12e5594bbd7bc7e3ead12df00c018078950f3fbe55604c41b0554257c4ca18f55ebb6
+DIST policycoreutils-3.5.tar.gz 775639 BLAKE2B 777b8564484e89385db7a184c4cad9a99aabf1fd1ac41abd5826c7e6ad29118ae9d6f0d0fd968b6ced87f2f04bc6d7cd207b67428151522915367f656fb8d3f8 SHA512 7978ef6b7a278c6384c9b397734d03c4932c8aefecceaa1e6a1345be27b253dbe276fdcd219ce83ad732c6ed55d53bbc3254e39bccadd67d2cd1152a14749444
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
-EBUILD policycoreutils-3.3.ebuild 4588 BLAKE2B 558a11609ee3d8e8d92bb8c590fa21d9e2a09169cffb84e575d2187648b9e77ee7cf187367fc2be1fd40e3f9334344049fcfc327aa86b886633329a39f3a22e0 SHA512 5277de40ffb3feddee3e65b00d26e226028b43bd4a64c8900544472d08ed6693ca9877d38011c93a57e5be7d89305e35f93896dd18e9ca52fc4c26d193e47b1d
-EBUILD policycoreutils-3.4.ebuild 4648 BLAKE2B 5558d3b28b359a2db374d9e2871d35a48fa3f4ffdc698beaf1ec07a7077d913862b4a3c9708412575b492224c44c972c5ba1383eba33cd6b12f78751879493ba SHA512 8b14b920bdee207d1cc8a2b4f4fbeccab1e0590a9eb4f5abd8f635891cb56e7c0d9bc049058b9981c0b44da705d80c5557f3f3176a66a0d9f85196edb691924e
-EBUILD policycoreutils-9999.ebuild 4652 BLAKE2B 4618f860dec6ced27067e1353e72b30b6d6d22a8b8d40ecd853a239f99e35a0f80ab24f2e13d05c1db67b6aae1c161d4db96c74d269f0a693c6470f4a0ec5651 SHA512 b8a319d311d45f6fc1947e4c1f3f7e54c1be51a414f9f15db38b6c292719c198a8fd06a63dae094edbc7db36aea34ca7a8fb65096314ba835fbf55a28dd9eca7
+EBUILD policycoreutils-3.4.ebuild 4648 BLAKE2B 1c728597f8b0b13e2bb513a81acdeecd45a3eba75f4a20e9ac779e7e315d75a337355452b1d6338aef0d44c1e7d25c65103a56c81cc35160119b400365f19541 SHA512 76b1b2cfa0d1dbb591351cd4ee14ebaf187e3a34c3f4af5695df86ecf28acb94126098e37bb99b066c3f8f77fd410e87b5c6963c18f8e2e54efe1dede36d5dbb
+EBUILD policycoreutils-3.5.ebuild 4652 BLAKE2B 1b52298d80edd39cacd62c4927019acae23ca1ab6b325078c9696229edf1f02e7fd4fc6d36659031f7377e92427be6cf76a2fdef51171f9bddb8fc2c3a23df18 SHA512 e9314a444b819dc2928363cc62642ab4a38d94d6ee027e80964c04589e21b264630e56fd2f96509c6e8ffb7156c92be508113103a85135e9cd8123a33e1eb8d5
+EBUILD policycoreutils-9999.ebuild 4652 BLAKE2B 1b52298d80edd39cacd62c4927019acae23ca1ab6b325078c9696229edf1f02e7fd4fc6d36659031f7377e92427be6cf76a2fdef51171f9bddb8fc2c3a23df18 SHA512 e9314a444b819dc2928363cc62642ab4a38d94d6ee027e80964c04589e21b264630e56fd2f96509c6e8ffb7156c92be508113103a85135e9cd8123a33e1eb8d5
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
deleted file mode 100644
index f07f5c672c9a..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
-
-EXTRAS_VER="1.37"
-
-IUSE="audit pam split-usr"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	S1="${WORKDIR}/${PN}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-	S1="${WORKDIR}/${P}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-${PV}:=
-	sys-libs/libcap-ng:=
-	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
-	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
-	pam? ( sys-libs/pam:= )
-	${PYTHON_DEPS}"
-
-# Avoid dependency loop in the cross-compile case, bug #755173
-# (Still exists in native)
-BDEPEND="sys-devel/gettext"
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-	app-misc/pax-utils"
-
-PDEPEND="sys-apps/semodule-utils
-	sys-apps/selinux-python"
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	S="${S1}"
-	cd "${S}" || die "Failed to switch to ${S}"
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live ebuilds please use /etc/portage/patches
-		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
-	fi
-
-	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 2 failed"
-
-	eapply_user
-
-	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-	# Our extra code is outside the regular directory, so set it to the extra
-	# directory. We really should optimize this as it is ugly, but the extra
-	# code is needed for Gentoo at the same time that policycoreutils is present
-	# (so we cannot use an additional package for now).
-	S="${S2}"
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit y n)" \
-			PAMH="$(usex pam y n)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	S="${S1}" # Regular policycoreutils
-	python_foreach_impl building
-	S="${S2}" # Extra set
-	python_foreach_impl building
-}
-
-src_install() {
-	# Python scripts are present in many places. There are no extension modules.
-	installation-policycoreutils() {
-		einfo "Installing policycoreutils"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit y n)" \
-			PAMH="$(usex pam y n)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-
-	installation-extras() {
-		einfo "Installing policycoreutils-extra"
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			install
-		python_optimize
-	}
-
-	S="${S1}" # policycoreutils
-	python_foreach_impl installation-policycoreutils
-	S="${S2}" # extras
-	python_foreach_impl installation-extras
-	S="${S1}" # back for later
-
-	# remove redhat-style init script
-	rm -fR "${D}/etc/rc.d" || die
-
-	# compatibility symlinks
-	if use split-usr; then
-		dosym ../../sbin/setfiles /usr/sbin/setfiles
-	else
-		# remove sestatus symlink
-		rm -f "${D}"/usr/sbin/sestatus || die
-	fi
-
-	bashcomp_alias setsebool getsebool
-
-	# location for policy definitions
-	dodir /var/lib/selinux
-	keepdir /var/lib/selinux
-
-	# Set version-specific scripts
-	for pyscript in rlpkg; do
-	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-}
-
-pkg_postinst() {
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		# There have been some changes to the policy store, rebuilding now.
-		# https://marc.info/?l=selinux&m=143757277819717&w=2
-		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
-		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
-	done
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
index 8be4b2663379..5d45077b38c6 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
diff --git a/sys-apps/policycoreutils/policycoreutils-3.5.ebuild b/sys-apps/policycoreutils/policycoreutils-3.5.ebuild
new file mode 100644
index 000000000000..6df44f548cc8
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.5.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+EXTRAS_VER="1.37"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="audit pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=
+	sys-libs/libcap-ng:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	if use split-usr; then
+		dosym ../../sbin/setfiles /usr/sbin/setfiles
+	else
+		# remove sestatus symlink
+		rm -f "${D}"/usr/sbin/sestatus || die
+	fi
+
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 76ae403650e5..6df44f548cc8 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 7cef7f6d9169..05996abdfb9b 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,7 +1,7 @@
 AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
-DIST restorecond-3.3.tar.gz 18970 BLAKE2B 41c0eed734ab1e89cdfd40fdb0ceff47e1c4bb66354ff78d548a9747c661fbf7ed4b6b3daa1e39325de2a2ca087aca803f073f942f3ac89b71d873e27a1d6712 SHA512 ea2b97d22c1d68aa4ea31d8850f8c9632c0db0d4d666e323c648da896554c6a6fdf6dfa3c105a1df3f1ede9da8cce5ba4c1533b05520846fcb2d584935e5d7cb
 DIST restorecond-3.4.tar.gz 18965 BLAKE2B a77de19d9f00d6e8f384a7ac411257b059ba3ecfefba893eda0e563600002eca705347af364d51037f8b3308bac1c5248bb9326c692175c6c1dc561b18c84bff SHA512 9c6803444445af1592a74177ba2e7cefa1b0e8e3c73d34ef932948598adb38c648dcae8495c951b1badfc587b2d67843b83598c904d924db349b6118560f115c
-EBUILD restorecond-3.3.ebuild 1082 BLAKE2B d004337893dc2363a312366a7c4250158f1396e4d54a7b361d2665a51350f0cce3a9ad76002aa5a32fa5369ddc91b015a85d99e7664fc012eacdead1644af9bc SHA512 47fb0c285c427c1ad5551d0786f90000b85420a16ca52dd1416774a1ee93afdf00e4197d6f91fa51248419a693d4cd2b528c3ad18a99cd668eed1fd0eacd1f9a
+DIST restorecond-3.5.tar.gz 19070 BLAKE2B 6db7d0fc9085a07669d346e025836a94acca610572e986e2c90974b0bd21b55e66b57a2dafd7d42011bed5f06363b654f5431ac43530fccf7b68d3edd9d63850 SHA512 80cb84e62c7072a12fe57ebaafc0bcb441c853862c67f9ea35b86faa2d8e49ea22a70b9e05a3ff24e8ce08ca2999604d7961efd534f89167cd6fcb05c852de40
 EBUILD restorecond-3.4.ebuild 1157 BLAKE2B 223d7e8d6a0dc037f11b35cda8d43a6dadaade0b4759a0ff2a7e4465b1a6c18a98ed9cdc4ee598692ec9bfbeda14258384aedeabdca1dccc747f203132b8f828 SHA512 bd74a112eb99a4a622979e023daacadec66147ff3f65eff78e65708a47a0e08012b1ebcedcef396685e432563cf2ecc40dc6a6c5201b54588b090df526d8a602
-EBUILD restorecond-9999.ebuild 1161 BLAKE2B 3793aa9799c94c6c92d7b078b57756ede4968821aab7e1227c36555255fd79566a03becd5f1dfafb3943ca8957227181a7727ff835887da625c012dfeeec5e81 SHA512 518d1858f9b89ffd2ee639d49f1736d0ed386ecb44626f05facfad3d5c891378c2b66e6db39e8d669c84b95338c7ca4a369062a903fb60c28aa8f69a4e0dc97a
+EBUILD restorecond-3.5.ebuild 1161 BLAKE2B 59fc9cdff1f1d21f54c29325215de5189e34e7129c6a98a54cd1ebbaf540195044f99d82dd14b079578c2b3cd103d06cb25f601b44bdd8c9bd5156d9a60918ec SHA512 52ae3ee7c60e057b929f57d7c487b993aadb2a155e80db038539fcd4da79fa6fdc7f459d4869b6b33f9e5c32b92788da740a482231b2f26b941d852175663482
+EBUILD restorecond-9999.ebuild 1161 BLAKE2B 59fc9cdff1f1d21f54c29325215de5189e34e7129c6a98a54cd1ebbaf540195044f99d82dd14b079578c2b3cd103d06cb25f601b44bdd8c9bd5156d9a60918ec SHA512 52ae3ee7c60e057b929f57d7c487b993aadb2a155e80db038539fcd4da79fa6fdc7f459d4869b6b33f9e5c32b92788da740a482231b2f26b941d852175663482
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.3.ebuild b/sys-apps/restorecond/restorecond-3.3.ebuild
deleted file mode 100644
index ccceea1c063d..000000000000
--- a/sys-apps/restorecond/restorecond-3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd toolchain-funcs
-
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="dev-libs/glib:2
-	>=sys-libs/libsepol-${PV}:=
-	>=sys-libs/libselinux-${PV}:="
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
-		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
-		emake DESTDIR="${D}" install
-
-	rm -rf "${D}/etc/rc.d" || die
-
-	newinitd "${FILESDIR}/restorecond.init" restorecond
-}
diff --git a/sys-apps/restorecond/restorecond-3.5.ebuild b/sys-apps/restorecond/restorecond-3.5.ebuild
new file mode 100644
index 000000000000..a55a218edd6c
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit systemd toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	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 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 92cd1c69200e..a55a218edd6c 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index c5e475199c6d..dc208ba87019 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
-DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8
 DIST secilc-3.4.tar.gz 181312 BLAKE2B cee26f3b6dc3d7a48df3bd3c9e0edf15f92f55b399afe02d7f4efe10cfd1d8ec140aa5ed588003c6ffca95e1abc82a6163f86edc58ea140703f47ca4bf2d5179 SHA512 f29ff42dd60050cdd4367af38b334876817f8e33ed40a9be89304beea840a210bd9a58d658d0b09f98bad54b12b185a0262ca05094b63e7f96c0142729699c3b
-EBUILD secilc-3.3.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4
+DIST secilc-3.5.tar.gz 180803 BLAKE2B a42620318b312a5ef35565e3b40a89fd7ff44aaf73de835bc349f927193121b72c07bd2151a8a6b2cee53e2699a3ae6bb246084e18a181d334ebc082fdfdc56e SHA512 eff37a981072c4b9c7c15bf4709db8797d8af5325883515f5c2fe611136b24419f6d01c797e4f131c9c08e1ba40576fcb2094b1e34325aae8351b6299bdba3dd
 EBUILD secilc-3.4.ebuild 842 BLAKE2B 6e76130de4bfa28a7edfcee8a4547fb72e027344a592c2b6d70b3cb5b0af86c7159285f63c5eac1269895d28d38e6e7538e97ea0b544ccfd9943fab43a2151a1 SHA512 73f477c17b781c76501570b7ff006a4854757c8d715b7e8cb6a8d0373e00c17ce481e421415aca1a1043af7a3e85cb9966b251e3ad36a21f270a00ad18221f4f
-EBUILD secilc-9999.ebuild 846 BLAKE2B e531168df9007f4095558a294b329af64def434354b6572e04762e4f1804c340b8917c87cd23c4d6d488c253fa445eee83a2f20076116d2ef90f5088c9520b18 SHA512 3da24a91a87b20e26bce7139941fc0870e0f6c88d9382cf31496065c3c604e5c58487cc0a484b7500d7e945bf268bbda49d76b97d8e118db8b1763927e335e97
+EBUILD secilc-3.5.ebuild 846 BLAKE2B fc36451aaccfa42879ca010acd0d23377b7cd770c593fb9b834cf7c49c23a1bcfba0fc5d6829cee157fee96f11b33124dc4e9bcf3a3c582e533af4cb2a8d4cea SHA512 e9023aac358442a32a3be721a941d73a50c38a6b6f56adc37118860553bc15f49d39418c3cc2c17c62bfb11058e20f3652f6979368cee47a51031536423049cd
+EBUILD secilc-9999.ebuild 846 BLAKE2B fc36451aaccfa42879ca010acd0d23377b7cd770c593fb9b834cf7c49c23a1bcfba0fc5d6829cee157fee96f11b33124dc4e9bcf3a3c582e533af4cb2a8d4cea SHA512 e9023aac358442a32a3be721a941d73a50c38a6b6f56adc37118860553bc15f49d39418c3cc2c17c62bfb11058e20f3652f6979368cee47a51031536423049cd
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.3.ebuild b/sys-apps/secilc/secilc-3.3.ebuild
deleted file mode 100644
index 8058954b003d..000000000000
--- a/sys-apps/secilc/secilc-3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-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}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}"
-RDEPEND="${DEPEND}"
-BDEPEND="app-text/xmlto"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_compile() {
-	tc-export CC
-	default
-}
diff --git a/sys-apps/secilc/secilc-3.5.ebuild b/sys-apps/secilc/secilc-3.5.ebuild
new file mode 100644
index 000000000000..76eeb7422445
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+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}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index 13b261011af0..76eeb7422445 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 887edd4a37db..ab352648bf6b 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
-DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3
 DIST selinux-python-3.4.tar.gz 3596450 BLAKE2B b98f6ba63814a4281c5ea624b2b0f68c6ae92e4447dd6078a0d70bce34534b0a457f0a9533e1db1fbf665b8a0b379adf78fd8ba8f3ae19973b74a3332157842b SHA512 d601ce2628c4876dc4f2dfccd6db8ff45f68c5eb1b14cec3328644b71959107546469b27dfd90488fc669019b341d0cba708a1797f427ac7f86a0f05e86c0948
-EBUILD selinux-python-3.3.ebuild 3085 BLAKE2B 72062f0af0c1cd4e3aa9e0acb38e39d46a19e17d0676a088d58a5de0dabddf80ab230fdee15c6c4ec3b2a17d3618b9c3694ba2fa63afc7f7be255caa46590364 SHA512 61e934719660e994acbd8eba4f8365ff6570670b3b6c3e696ec91044673d7611d595e8e35490f1b717d4e812b6ae9247110b8e91f67bd958a56d27cb98b60b07
-EBUILD selinux-python-3.4.ebuild 3162 BLAKE2B 087ec303b0e37c4a29d1a40a8678d8f138af6b7f4f205c7d8b4adf16661f8ed86e7bf12c758b7982da58eb2c49b483f5619ae6557054af8951bb5da018becfe5 SHA512 6222d2f23acf8ce5d6f123c7c3a1f96e2dc0ef208036d672fb036ff286525c69335bf07da9572c9b40637ce77b8e7def804d43a9d8c701d2c17d8062607f1eaf
-EBUILD selinux-python-9999.ebuild 3166 BLAKE2B a8a37bf02cf4967f21250561ff71fb663132a705863c0ecc6d4d5baa51e649b33468136795a1f08ba158b1ceaa3ba32d13ea8cd640396f018ded2f6763c7d997 SHA512 1c202cbed45732c3e74aab89d67075d91ce3a2882ce1d3fc7c9223ed87dd7aeaa93e4f22b4d0eca29c0c48846731a34b4b4bd84df0d534b4e5a9de63c74a5ed5
+DIST selinux-python-3.5.tar.gz 3604439 BLAKE2B 5a7fcd303c337cb0f5ae0066d13c945bb5cacaba472c7b17f0496295294998fcc6d81c153720ef704b749a01590c28b48b4f471a48fc386b8f02564c3550250b SHA512 2ac176a9f078f2b2721e5871ba21e92041eed54fc692fd8d809ff14327beee6de63b3084d0f1053a640b9e40bcc6461498915bb9b038a658cd772f77d80fd217
+EBUILD selinux-python-3.4.ebuild 3162 BLAKE2B 0273b02c35abae8d4aa5798b71398f9c949640fe09a2f40ab3347662cb5d12b979bd700ea6841eb6fa3dbdfdbcdcbdd9040840dfead606d24c51a388429981a6 SHA512 346c103082f36ba32ec65831109236df893bf7c9debec153c8a2ce604533a79bfcbb5d9f73d4dffa0366651df32b3c8080b0ed7d1ec4d972f928a0dbbdec32c8
+EBUILD selinux-python-3.5.ebuild 3166 BLAKE2B cfa0a61e9b8c3da3c6ae9252a742b0ab199e7ce015e37426e36574837b2370971e913bd7c64629accc06c26fc49ced92fc67c33943c76ba201ffacfba0ef4339 SHA512 7a7094de4756093fc5624398c95faf85c90493282b75dfe8189a15772bce365cbd04bd3e7f09e71645a2439e35ebb803359b4f8f752cace6b81b532f3de4c9f7
+EBUILD selinux-python-9999.ebuild 3166 BLAKE2B cfa0a61e9b8c3da3c6ae9252a742b0ab199e7ce015e37426e36574837b2370971e913bd7c64629accc06c26fc49ced92fc67c33943c76ba201ffacfba0ef4339 SHA512 7a7094de4756093fc5624398c95faf85c90493282b75dfe8189a15772bce365cbd04bd3e7f09e71645a2439e35ebb803359b4f8f752cace6b81b532f3de4c9f7
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.3.ebuild b/sys-apps/selinux-python/selinux-python-3.3.ebuild
deleted file mode 100644
index 6984565f532b..000000000000
--- a/sys-apps/selinux-python/selinux-python-3.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit python-r1 toolchain-funcs
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-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}/${P}/${PN#selinux-}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
-	>=sys-libs/libsemanage-${PV}:=[python(+)]
-	>=sys-libs/libsepol-${PV}:=
-	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
-	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=sys-apps/secilc-${PV}
-	)"
-
-src_prepare() {
-	default
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			CC="$(tc-getCC)" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	python_foreach_impl building
-}
-
-src_test() {
-	testing() {
-		# The different subprojects have some interproject dependencies:
-		# - audit2allow depens on sepolgen
-		# - chcat depends on semanage
-		# and maybe others.
-		# Add all the modules of the individual subprojects to the
-		# PYTHONPATH, so they get actually found and used. In
-		# particular, already installed versions on the system are not
-		# used.
-		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
-			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
-		done
-		PYTHONPATH=${PYTHONPATH} \
-			emake -C "${BUILD_DIR}" \
-				test
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	# Set version-specific scripts
-	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-		python_replicate_script "${ED}/usr/bin/${pyscript}"
-	done
-	for pyscript in semanage; do
-		python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-
-	# Create sepolgen.conf with different devel location definition
-	if [[ -f /etc/selinux/config ]];
-	then
-		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
-		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
-		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
-	else
-		local selinuxtype="${POLICY_TYPES%% *}";
-		if [[ -n "${selinuxtype}" ]];
-		then
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
-		else
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
-		fi
-	fi
-}
diff --git a/sys-apps/selinux-python/selinux-python-3.4.ebuild b/sys-apps/selinux-python/selinux-python-3.4.ebuild
index ef7c3b8328f6..6a2211786b3f 100644
--- a/sys-apps/selinux-python/selinux-python-3.4.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/selinux-python/selinux-python-3.5.ebuild b/sys-apps/selinux-python/selinux-python-3.5.ebuild
new file mode 100644
index 000000000000..470211f8d553
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux core utilities"
+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}/${P}/${PN#selinux-}"
+else
+	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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
+	>=sys-libs/libsemanage-${PV}:=[python(+)]
+	>=sys-libs/libsepol-${PV}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=sys-apps/secilc-${PV}
+	)"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_test() {
+	testing() {
+		# The different subprojects have some interproject dependencies:
+		# - audit2allow depens on sepolgen
+		# - chcat depends on semanage
+		# and maybe others.
+		# Add all the modules of the individual subprojects to the
+		# PYTHONPATH, so they get actually found and used. In
+		# particular, already installed versions on the system are not
+		# used.
+		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+		done
+		PYTHONPATH=${PYTHONPATH} \
+			emake -C "${BUILD_DIR}" \
+				test
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index deb8817289f4..470211f8d553 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 81e4a6e1d1ec..f167732b6d05 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
-DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc
 DIST semodule-utils-3.4.tar.gz 14267 BLAKE2B 292c9550a5f1bc8b901c7c95fe2dde07068513bf7d358decab65afc2db185996ec905b582691265a63aba7bc47f4e1d6da4c867eb9a9df5b22fc623a716e927b SHA512 3a102eb83e1feff9796c4da572500be1e3a8a8bc8a7eed762ef4144761280f0513050c714aa287b1e4e67d2938f9f9a0ee5036762472d732eae0288b437cb7a9
-EBUILD semodule-utils-3.3.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8
+DIST semodule-utils-3.5.tar.gz 14383 BLAKE2B a1bb432013bca1023d99b32f43b2c972b6b807a4677f9d8c9fb9aff10225232506f3ecca86fc231b4c63d04582a91a1c4218f87ce5532a4d35a26a09665c6f10 SHA512 7c32f425ae71745040d1c6a6585149a1efb319913aa9d4c8bf185b0a4216dc66378fa38595b171614ee3ae4ade997d3ae56a060346e334faec55c419a87d71dd
 EBUILD semodule-utils-3.4.ebuild 876 BLAKE2B c2c34cdef78eda782f310838af7ddcefdc5c40d4c0af9bf3f4c7ffd7650ac9398ec26307842508fb92bc7098e6c2ffde2045bb1f74e5067d7edc761c040175aa SHA512 493cd4483a36c5e92ec43e5d0b3b1212943979b3a7d98966fc86dbe5afc65780e17838c49240479ad3fe73877650793bb3a1175f2059dde82327693f71acb225
-EBUILD semodule-utils-9999.ebuild 880 BLAKE2B 3122abbba2f5fb48d2e756f92380aa362bdcac2794bd566012bfb54c8d74a702d131d1d66b61504f2502758ddd36a9e0e1ef111c6961b1f580a50b87a52db1d7 SHA512 a6583f9fb2527091c65c90fcb10bb93f9635f0e4c9edac977aac3c2964d3460b0baaa39376147f3ca4b39fc4d3528ba244cb7892c5596cc7228c7604599ba33e
+EBUILD semodule-utils-3.5.ebuild 880 BLAKE2B 3624682497456dbe8eb0f8a7e9fb082da518ee0592b995958c8b06565450993c19f77039911e0f088619c1c81529626e6e81471cd2c1cc8995f5a070b36abeb3 SHA512 6f11547af02e16e53a7f8dcac9808fdf631c485c123bdb45dbe210e8f2816f88f6889de49ec7631684ab47669b408fbd87b8d8ffa454d8bc8b74b7e7ceb91443
+EBUILD semodule-utils-9999.ebuild 880 BLAKE2B 3624682497456dbe8eb0f8a7e9fb082da518ee0592b995958c8b06565450993c19f77039911e0f088619c1c81529626e6e81471cd2c1cc8995f5a070b36abeb3 SHA512 6f11547af02e16e53a7f8dcac9808fdf631c485c123bdb45dbe210e8f2816f88f6889de49ec7631684ab47669b408fbd87b8d8ffa454d8bc8b74b7e7ceb91443
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.3.ebuild b/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
deleted file mode 100644
index 5a5792a677bd..000000000000
--- a/sys-apps/semodule-utils/semodule-utils-3.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-DESCRIPTION="SELinux policy module utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libsepol-${PV}:="
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/sys-apps/semodule-utils/semodule-utils-3.5.ebuild b/sys-apps/semodule-utils/semodule-utils-3.5.ebuild
new file mode 100644
index 000000000000..525188411f40
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy module utilities"
+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}/${P}/${PN}"
+else
+	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"
+IUSE=""
+
+DEPEND=">=sys-libs/libsepol-${PV}:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index ce9f168c9c89..525188411f40 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-- 
cgit v1.2.3