gentoo auto-resync : 15:02:2025 - 00:13:02HEADmaster

3 files changed, 2 insertions, 118 deletions

diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 48d8c0d9399f..d0cea6af4cd2 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,8 +1,6 @@
-DIST selinux-python-3.6.tar.gz 3633272 BLAKE2B c2b99779eda2c7698f7f68740e3136cbfa5ab471a5d154142aafd2694d8c32aa605df3609a3667c687449d3ba44e72bcc3b37c36adecba8e34fcc629b9f04de5 SHA512 6289f3f2a3038b2cb62f6b3b12c729a9981c34a5ee80c0830e6316e8c77f5283dffa46007f6e7dc073332b829ed9953ba54e64c986fb18c7dc40759ec0375dc9
 DIST selinux-python-3.7.tar.gz 3652377 BLAKE2B 59fd7cab0034c175f42f6120ba665701945adcbd4e8af97a0dc2a1c79688a596b199528886ceea079a3f7a969258611fb660449d313d9e893de381293e786381 SHA512 036bc1f0e64cbbaade592dc7899a92765a0bac426140d7d3960f73bad6eb5f95d79d91e0f0e1604f88a991ebf59c4c90ccaaa4158f5dc4d3275ca2aed1673b09
 DIST selinux-python-3.8.tar.gz 3652643 BLAKE2B 1626fe75466be418394fdd896c250044ada8ebf4bdfe7da10c7d038cbce7882037f9e8c87bb0b569deeff51323c68652e6ae8ef9525e13d93b7f30b06b960858 SHA512 d5f6fcf64f2780be320b8a8dabe6370b5403ca9119db61fea8b1be798a84a174738a564c1c8a3c6bfec922becaf3da02aeb2a63d065627cecab4ff48126cfac9
-EBUILD selinux-python-3.6.ebuild 3172 BLAKE2B 8d2f3ac1dd29d274af9866a196cd46ff072e4cb96dd1ba45a549a566b68cc72cde92f32cbd0a9d8315ae8d0c2244837dd209765860d4ade74d518054de1cc8de SHA512 0f456170f69a81fc5be055d6fa33affaeced63b821f837c886ec3a5ae55503095c4fe54aa026dbcd3a710e0d2ce38f17f9ef68daa08cda2764a141183c559b68
-EBUILD selinux-python-3.7-r1.ebuild 3308 BLAKE2B cd5dba8fc7bbfa29382e0a8e16352974093412db9f6ef4930ae470e478a6769dd6198adca75f89fef44a61dfe13f2894ea9704c3c7b2c36b253f55ae34c710e0 SHA512 a3e5006141c3d77226e8fb2ae0b78672e3c9389f62c3ce863fe39df71af2ed7e818dbdb8a566fff0a98af48585c76d7fb9266aa2b64f9b0363592972e76b9dde
+EBUILD selinux-python-3.7-r1.ebuild 3306 BLAKE2B 26e4aea17e3b8faa27c07a444d32f4c49fcbbbf3f7a84a91881071c125ac793db3fb4b655851f21b1ca2b1813b1392f8e609d6586ef548586ca23882bd6f7e74 SHA512 392fd9c638c35abd96cababd39ac972d014f60f5fbe15e9f3fa293d428a3ff577d4ac9886ad9e9bdbf69eda136f5dda7b0fdf6b51b11611874f6ed58e7fbac44
 EBUILD selinux-python-3.8.ebuild 3303 BLAKE2B b2016dfd09903cff4cde1a1436d7237f69f5f4366110261e35da18718e88085931f3d46f1e668156e63cabecb0441e55e44a0f2057bdf7c113015b8f3d342a6b SHA512 fd6fb71533fc25ca184a2904e1f4859b58a853fd2b3c93ed7832b30ba3c5f3a803597e7bf872bdd92142a12639362ab5cf964faee3687bc85f634b74862fd1d8
 EBUILD selinux-python-9999.ebuild 3303 BLAKE2B b2016dfd09903cff4cde1a1436d7237f69f5f4366110261e35da18718e88085931f3d46f1e668156e63cabecb0441e55e44a0f2057bdf7c113015b8f3d342a6b SHA512 fd6fb71533fc25ca184a2904e1f4859b58a853fd2b3c93ed7832b30ba3c5f3a803597e7bf872bdd92142a12639362ab5cf964faee3687bc85f634b74862fd1d8
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.6.ebuild b/sys-apps/selinux-python/selinux-python-3.6.ebuild
deleted file mode 100644
index 0d7aaa6c015a..000000000000
--- a/sys-apps/selinux-python/selinux-python-3.6.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{10..12} )
-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 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}:=[static-libs(+)]
-	>=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
-	mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
-	if [[ -f /etc/selinux/config ]];
-	then
-		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
-		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.7-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild
index 64d6d1f1f057..7d61f76ceb71 100644
--- a/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.7-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	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 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi