gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 98 deletions

diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index e5a2d5d2cd79..d0f21e752384 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,5 +1,4 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
-EBUILD selinux-python-3.1-r1.ebuild 2588 BLAKE2B b76d9221aff94a889bf0e478b36f5d0b58c4252734c5ea9966fc7464012ab958d60ec3aca97fc0f43b70bf1f19b149a19a8efac9dad17887fa88f9d1ed689017 SHA512 44dbc59bad47294d6dde5f2c4348e080c1090827eb54657beddc2877bfb013de43f95c6385466dae869781e335d854a06a3e5ab8b219ab7dc6e5b2cd99523759
-EBUILD selinux-python-3.1-r2.ebuild 2545 BLAKE2B 7f5b9c6db2d0e88516e4e53512432b95e8c546fefce46b02efa481cc06aea80e0aafe7ad04aeb9e9bff328ab260b5c19f889bd3e17a87c9beaab91d2c51f0e6e SHA512 449604db5ba1d8331416e0d51bc6c5613d074ebcc3d309706a81392b745a6069dd1e041176c53c24a9632c318c21d65ffb4cb43947c41e728e9c5288b8a6dc07
+EBUILD selinux-python-3.1-r2.ebuild 2543 BLAKE2B fd5cf8e64f172da259a7ff0f6be5d9d3f4824584b2d4e816689b5ac2c00c516b3692e748debd0dab51db4ef2faf07b10510b6b39147c0238969a6ca9cce25c45 SHA512 ae2066a82dd516c983aae8f00b1a7c14d25f61120904ce3cfcaf5958866d659386860598b76137a6ed311e7c6ad550f710f4b6daf099db4c125501c6768c1c72
 EBUILD selinux-python-9999.ebuild 2545 BLAKE2B 7f5b9c6db2d0e88516e4e53512432b95e8c546fefce46b02efa481cc06aea80e0aafe7ad04aeb9e9bff328ab260b5c19f889bd3e17a87c9beaab91d2c51f0e6e SHA512 449604db5ba1d8331416e0d51bc6c5613d074ebcc3d309706a81392b745a6069dd1e041176c53c24a9632c318c21d65ffb4cb43947c41e728e9c5288b8a6dc07
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
deleted file mode 100644
index 8bafa3c13fb9..000000000000
--- a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20200710"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-SEMNG_VER="${PV}"
-
-IUSE=""
-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}/${MY_P}/${PN#selinux-}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
-	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}"
-
-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_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.1-r2.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
index 59dad86d9671..1237105e82d5 100644
--- a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi