gentoo resync : 10.02.2019

3 files changed, 53 insertions, 2 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index db8618261711..6a53c273d175 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,8 +2,10 @@ AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff84800
 AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 DIST setools-4.2.0.tar.gz 363802 BLAKE2B a57a7d565bb6e91f67cba0516434d8a0d3635d0717e878d8ac43b6cf7de0884ea74152ec50e93554f7d1a75a4098db2241668e1765e7b069d23b6cc13d4b712e SHA512 b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680
+DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 EBUILD setools-4.1.1-r1.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
 EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
 EBUILD setools-4.2.0.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
-EBUILD setools-9999.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
+EBUILD setools-4.2.1.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
+EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
new file mode 100644
index 000000000000..8df9cb7cd407
--- /dev/null
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+else
+	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X test"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-2.8:=
+	>=sys-libs/libselinux-2.8:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.27
+	test? (
+		sys-apps/checkpolicy
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
+		die "failed to set lib_dirs"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 70e0fb4bed29..8df9cb7cd407 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.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"