gentoo resync : 18.08.2019

7 files changed, 6 insertions, 301 deletions

diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 9af4c0da3795..5db3a1fc0bbc 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,11 +1,6 @@
-DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
 DIST selinux-python-2.8.tar.gz 2068101 BLAKE2B c28f12e4bd453955148a6ba82fd28621d1a4600f872ac63d97372f2e0153091adf1cf871f89765dd300bc6b7b2d610b96f87e3fc5accbfad713ed8a0d8f76f5a SHA512 e695c11122f7f8105b75d1ef98355fd2b82b40d93c2fd9e733dcd95d4d7c392f60b646df81203c43ad2a0e8447f9901083007e1572b78e17368ad2764ffa1aad
-DIST selinux-python-2.9-rc1.tar.gz 2082516 BLAKE2B d1e6e859308739daebd979fd26b3a8b0cbef050f2c69177a93da5b79f103444b0800ce761e5483ba79356b67ce7c6c246c758d19bc85ec7d1061e6b8ab31c6e3 SHA512 afd7686ed21c55aa3fc45934d252da1a7d8a44651ef210bf54d4feeedcb72b9092be2d3becc9ff9c8caba53088d33ad97824e0655e04a47c122b45ea6c3e6455
 DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
-EBUILD selinux-python-2.7.ebuild 2666 BLAKE2B 5cee410508f3b5ace6be6d3a345daee625bd662cf506e2e4a5f10e8a4012f8e0e499eb399c82b763bff2743971d3482ad6ca67450af329b4400fda433c477756 SHA512 21a44872d251813ad0789d207da66c720c58352ee73c6285e4f5237449950c23b51fe9fc136cf63a20e1a302b740b9017194795406fb0dea8fd0d47a15c79853
-EBUILD selinux-python-2.8-r1.ebuild 2574 BLAKE2B fd485f85d9131effc46be7741a5aa1fb2d772d71ce3a01108e59ab8885ea6bb02b28ffbe174eeb3a4b6f195424d04eb6a0d42df5f3c2104506c6b26823f36129 SHA512 a0311ff67fd075219d140e8811cf19872d1ddebe0fc51bdeb870d27a58350459559a54b04ac3bf41d3074fc33446f110279710310afbdbbbd1b3c8bbba7c49e5
-EBUILD selinux-python-2.8.ebuild 2576 BLAKE2B 80aff6e8e5e387c49b0415ec078fe62eb90a4650d554638c65a5c22acbe38b9ac0c5f0f6a3e7bb573b5cb05f37ca15131900801dbe9cc782f7b46e2967e9175d SHA512 568885949f11b5e9b5f2d1b5f6b046fd8d9fad31ac59c1a44132a6f62b6321b420c2a6cce621cf429ae56e0377263ef3e0d97e51fec4399daccfcf5914bea917
-EBUILD selinux-python-2.9.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
-EBUILD selinux-python-2.9_rc1.ebuild 2557 BLAKE2B 0ad8742188c22fae9207a7de4d5c5e8a58146bae03f140324e3eb1e8fc3acd820d12d8cce21fd65d190c5600b82373dd3be0159d14ae476fb6fb1d6b8b77350c SHA512 897d2283a26663358432ac03cdbe357f582c8d8e36bcd2016259b3d33beaf97e2fffcbc376a996f74e6d6a18d919bf9a6e53cc66a5f054f8213c48e8458e994c
+EBUILD selinux-python-2.8-r1.ebuild 2572 BLAKE2B 4a598884f05c149fdfb8ad60665600e7b995b090823232dc563668b852bd878d27036dc4a5619d117bebfb919870942490d43830fb850cffee14e7b119a0fb08 SHA512 ce2ce8993193438bfb74d186a2bf359b80518057422afc9d5a63c233f142312927b9eca2e033037f23bf8b934a72f275b5314707fa10c7c7955a4e1c20bb4b72
+EBUILD selinux-python-2.9.ebuild 2555 BLAKE2B 70d88cf417951b6a0ca45fd199a1f58ebac34bed9900d001e96d4243583c39cea4c91fc33b1d78abcb70f15a865c1c8086855dfe6b066b25989e7d8f3cfbac90 SHA512 522c8bd6fc462e036f38cc9812ffdebf2abb1af87c903ffa0012a5d52066476be5a24f0f274a8586c6ab5d36f7e90055c21dcd76677d56c5c62688671c7f6234
 EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
-MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
+MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/metadata.xml b/sys-apps/selinux-python/metadata.xml
index 94e50a7ff05e..74f36a3eba2d 100644
--- a/sys-apps/selinux-python/metadata.xml
+++ b/sys-apps/selinux-python/metadata.xml
@@ -10,9 +10,6 @@
 		that are required for basic operation of a SELinux system. These
 		include semanage, sepolicy and sepolgen.
 	</longdescription>
-	<use>
-		<flag name="audit">Enable support for <pkg>sys-process/audit</pkg> and use the audit_* functions (like audit_getuid instead of getuid())</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
diff --git a/sys-apps/selinux-python/selinux-python-2.7.ebuild b/sys-apps/selinux-python/selinux-python-2.7.ebuild
deleted file mode 100644
index 5f01a11222d2..000000000000
--- a/sys-apps/selinux-python/selinux-python-2.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20170804"
-SEPOL_VER="${PV}"
-SELNX_VER="${PV}"
-SEMNG_VER="${PV}"
-
-IUSE="audit pam dbus"
-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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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.1.1[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
-	!dev-python/sepolgen
-	${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)" \
-			PYLIBVER="${EPYTHON}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	python_foreach_impl building
-}
-
-src_install() {
-	installation() {
-		emake -C "${BUILD_DIR}" \
-			DESTDIR="${D}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
-			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-2.8-r1.ebuild b/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild
index af8f4d4296f6..76d7035f05ae 100644
--- a/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/selinux-python-2.8.ebuild b/sys-apps/selinux-python/selinux-python-2.8.ebuild
deleted file mode 100644
index 799855a2979d..000000000000
--- a/sys-apps/selinux-python/selinux-python-2.8.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20180524"
-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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${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.1.1[${PYTHON_USEDEP}]
-	dev-python/ipy[${PYTHON_USEDEP}]
-	!dev-python/sepolgen
-	${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-2.9.ebuild b/sys-apps/selinux-python/selinux-python-2.9.ebuild
index eb75834f5ef4..925ab20f61a9 100644
--- a/sys-apps/selinux-python/selinux-python-2.9.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.9.ebuild
@@ -26,7 +26,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
 
diff --git a/sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild b/sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild
deleted file mode 100644
index e68742e64f4f..000000000000
--- a/sys-apps/selinux-python/selinux-python-2.9_rc1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 toolchain-funcs
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20190125"
-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}]
-	!dev-python/sepolgen
-	${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
-}