gentoo resync : 28.04.2018

4 files changed, 200 insertions, 8 deletions

diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 4d4f11462c08..63680d1ccd99 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,4 +1,8 @@
 DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
+DIST selinux-python-2.8-rc1.tar.gz 2068420 BLAKE2B 7c00bd05cb692ae31e11c5d415641f5ceafd032882a329984a495b353e8e7272a87045c732e10a563cd0d33faca81fb373cee3d0671bc6699b6f007148f13d7d SHA512 bce5823ac4c24f1bceae9219a07fc9e6192d703e044711f9dfc170946dde411b833cb7a6d0c175e569efcd878a75a8df33dda0498e3da888f60b7adf9d5448a1
+DIST selinux-python-2.8-rc2.tar.gz 2068421 BLAKE2B 1c1564f9eb281f896a794a5086ef09e91486f8ba7d404de14b0de78f3ec4aa9c3a8293b24988b80289e4e9e186b06184e8016a1ec936d6d76f17db0c3ef22a40 SHA512 5a3fb2131a12850bfe5beb794083c97507fd3f43d87674cb7050fd33ea181607077a9e004cf983918bb5b349ed22b02f3c681f2a1f72a64ee93bd49fbf40bd32
 EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
-EBUILD selinux-python-9999.ebuild 2680 BLAKE2B fe6418d3802857143c9ab2b7ba5b6c2b69caad5686740c81cb600ea2c9d1e45bc8388957a46d791afad73b8317711a6b6f78a77bb40465e9d5515f4f6038b77d SHA512 6931842e2036e3644c7c93c7c4908aef9403f68c5190b349865742dee41bcada1ddaeb3472bfbe0ae979000ed6592fb22dc49f427b60ba73a1eee256c9e98046
+EBUILD selinux-python-2.8_rc1.ebuild 2585 BLAKE2B 5493f174730a4905b9110f7eafc0c1e3bcaac09ca592725fccd4624aa47649ec013043828707a290f7cd39ce261fb91200b0a1fa21cdd014213f111bfdfa5d62 SHA512 ed7617917eb838f0a40cff44b996e3f2de5760ad8aa199cb710eb7d5e145de4b27cf056911da424dd9944c64b44c24beb599b6d1c07793d0df888b61afa5dfad
+EBUILD selinux-python-2.8_rc2.ebuild 2585 BLAKE2B b2707890a99d88550aef69c068f1fe50f645770d856540470bce968cad32ad777e118486cc16a8c6e7bd00b6dc5b0c02ea4f751ad599c76cfe8061d5eb138368 SHA512 27c8b1171fd5d40e5cbd8ba417e6927cffdba8228cb362f7df9c95c22e6f55a0e8d2e8a3b743c05bd3eb66eecea68a056a5c8f055d4f6bf52968e23138af00e7
+EBUILD selinux-python-9999.ebuild 2585 BLAKE2B b2707890a99d88550aef69c068f1fe50f645770d856540470bce968cad32ad777e118486cc16a8c6e7bd00b6dc5b0c02ea4f751ad599c76cfe8061d5eb138368 SHA512 27c8b1171fd5d40e5cbd8ba417e6927cffdba8228cb362f7df9c95c22e6f55a0e8d2e8a3b743c05bd3eb66eecea68a056a5c8f055d4f6bf52968e23138af00e7
 MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
diff --git a/sys-apps/selinux-python/selinux-python-2.8_rc1.ebuild b/sys-apps/selinux-python/selinux-python-2.8_rc1.ebuild
new file mode 100644
index 000000000000..abb33eda4e3f
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-2.8_rc1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20180419"
+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.8_rc2.ebuild b/sys-apps/selinux-python/selinux-python-2.8_rc2.ebuild
new file mode 100644
index 000000000000..73a4652fbf63
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-2.8_rc2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20180426"
+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-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index c1e6a49cf4c2..73a4652fbf63 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -9,12 +9,12 @@ inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20180426"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
 
-IUSE="audit pam dbus"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DESCRIPTION="SELinux core utilities"
@@ -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 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -54,7 +54,6 @@ src_compile() {
 	building() {
 		emake -C "${BUILD_DIR}" \
 			CC="$(tc-getCC)" \
-			PYLIBVER="${EPYTHON}" \
 			LIBDIR="\$(PREFIX)/$(get_libdir)"
 	}
 	python_foreach_impl building
@@ -65,7 +64,6 @@ src_install() {
 		emake -C "${BUILD_DIR}" \
 			DESTDIR="${D}" \
 			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
 			install
 		python_optimize
 	}
@@ -73,10 +71,10 @@ src_install() {
 
 	# Set version-specific scripts
 	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-	  python_replicate_script "${ED}/usr/bin/${pyscript}"
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
 	done
 	for pyscript in semanage; do
-	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
 	done
 
 	# Create sepolgen.conf with different devel location definition