gentoo resync : 15.12.2019

5 files changed, 8 insertions, 62 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 12512972b02a..935a6fba175c 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,10 +1,8 @@
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
 AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
-DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
-EBUILD setools-4.1.1-r1.ebuild 1445 BLAKE2B 7f7549954ddd2b34d55960ac869f4cead17b6968bba0ca5634eaf5804ee31ffe08a232f93f6cc7aaaeb5f6485261f89ec27df6977195d734a8c0744e2aa91e60 SHA512 fd76c7f9e899f051388126b76c73490836ecc3937f8c31d8639d578e21c89487d5d2d90f6e68595fa660c5a49daff937ad050a12150b1d5863183664592c4ab2
-EBUILD setools-4.2.1.ebuild 1199 BLAKE2B cc0644c200c087907d0b4c29013b1e833976044de9b8e402ad9af2ceabde6f69a2dbdb1993ff8ec3aa2bb49f20347ef8cd4a179e3fd17ac3b8175d84eaf84971 SHA512 40712f5f7cae13f9f74a39dc58b2aca127b6901825bddab3bb045a7661c730659b28d0345719b50fd0f76d5144a84db4c640092cdb2110481cb7654b04970f37
-EBUILD setools-4.2.2.ebuild 1223 BLAKE2B 54d3f0e059ce452bae3dcc7829a411745a8382c2bd67f67b4c9e044b7a7bb424bfb25bc5ea382679651a3edce994d8bf37b77c27426f43ea07dddda552eb8bcd SHA512 be933b756cf01e925a74249f15b02bbc451182d5b795934352410a5ae5ea4f629d12f37dd823366e057928634db96d8ebeff7c816ae594fb1bb321e527bb2b95
-EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
+EBUILD setools-4.2.1.ebuild 1226 BLAKE2B c0b2e79c21e619c34e2191e3361641455380a897c5b889cb42d56c6a627b03661b0fe5c5f3d209bb55b80735626b949382c2bc639f1b155192c9852e07f1d5fe SHA512 b3c40a5f65fd2167eb4b8241ad69acc4bc38c677be3e57ba636b515a0a943a1b9bc0b27511bb878cdff719f48c4023d5e0abaca6523c34cd0df36da94dca7f01
+EBUILD setools-4.2.2.ebuild 1250 BLAKE2B 8e24854945a7cf9f535a45bc847e6d32b2328ce535d24f2b1e4d07d9571eb3f4aa9891f68f261c931ea9ff20b51e5040107800463f3c7ca440403607d1d17bb0 SHA512 f3c29e465a3e92ff1e4c17ca67d592c0d3f6f7b6b923357e4eac3acf7a7b4ac3c79ede85acea421ddf3706bf61a7be837066e1826769418a5d2ec32f308b7df8
+EBUILD setools-9999.ebuild 1228 BLAKE2B c0866df58ed5dc0f3a92b4abf0b20c3207b35c20b9dd0e64cf00b26fbc342e5404271de14639a788725a816a3dc9519887dc248cbfc0c7301ea88a073db15576 SHA512 21bad0e03734b09bbb659b92ad180cf390c40a0b29a1591aae819a97c721668b7c8e7b215a5dd30765f33322fd7cefdc4755dd20f6b9bfe2cf3d5d0b731b036f
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.1.1-r1.ebuild b/app-admin/setools/setools-4.1.1-r1.ebuild
deleted file mode 100644
index 5a0548877647..000000000000
--- a/app-admin/setools/setools-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
-else
-	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X debug test"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-libs/libsepol-2.7:=
-	>=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-libs/libpcre:=
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.12:0
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-libs/libsepol-2.5
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		sys-apps/checkpolicy
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
-		die "failed to set base_lib_dirs"
-
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index 3e80e5e19f6b..ee786fe4b51a 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index 22da7166d078..20bb81b9fcd1 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 8df9cb7cd407..96ff5057cd8e 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]