gentoo resync : 16.09.2020

5 files changed, 75 insertions, 6 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 9c21e2198fff..cccbb81081e3 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,5 +1,8 @@
 AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
+AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
+DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 EBUILD setools-4.2.2.ebuild 1244 BLAKE2B 12679432d583a6d7cf3bc5b4934afe807baa10beb06cd65554eff037041e4b920ca969cd74e7af575bc14987dd56e5490b54c8b99f31fe93309e30ebebd79800 SHA512 15d41d5cabd0cc8c5f0996379d371342701c42cfbf25e73c72d753bc798fc294ec0e6074b4d04074bc4965bc015acf1d16a083eeef1600b3f57e0eab54a136f6
-EBUILD setools-9999.ebuild 1246 BLAKE2B 96a9668a3c3da8e18bb5c07a14914024776737cdb485963536e8686851538b661fe2deb1032fc8af57101117534cceaeafe7e11d1df4eefb82ab5203d0bd3749 SHA512 8b5f81c50005b285bf67af722f0bef81fac45692764669363241c9fbdc65822c7f0bf40f2be6ba01742ab2b78b41ce4965dd0e5f63aedac0a641209979bf9e1f
-MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
+EBUILD setools-4.3.0.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+EBUILD setools-9999.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513
diff --git a/app-admin/setools/files/setools-4.3.0-remove-gui.patch b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
new file mode 100644
index 000000000000..85abbf5a7aa3
--- /dev/null
+++ b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
@@ -0,0 +1,16 @@
+--- a/setup.py
++++ b/setup.py
+@@ -146,10 +146,10 @@ setup(name='setools',
+       author_email='pebenito@ieee.org',
+       url='https://github.com/SELinuxProject/setools',
+       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+-      packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++      packages=['setools', 'setools.diff'],
++      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+       data_files=installed_data,
+-      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++      package_data={'setools': ['perm_map']},
+       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+                             annotate=cython_annotate,
+                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index fdc3261aeec3..8b667b0a7682 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -5,7 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>SELinux policy analysis tools.</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/setools</remote-id>
 	</upstream>
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
new file mode 100644
index 000000000000..fd1fb1b07fac
--- /dev/null
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+
+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/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}"
+
+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.3.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 88bea3902042..fd1fb1b07fac 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
@@ -42,7 +42,7 @@ python_prepare_all() {
 	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.2-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }