5 files changed, 6 insertions, 78 deletions
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index bd5ba05e8cfb..e834e07f6e91 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,2 +1 @@
-DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
diff --git a/app-admin/setools/files/setools-4.2.2-remove-gui.patch b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
deleted file mode 100644
index 58579bf5a004..000000000000
--- a/app-admin/setools/files/setools-4.2.2-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ac8a876..84001a8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -134,10 +134,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=[('share/man/man1', glob.glob("man/*.1"))],
--      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/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
deleted file mode 100644
index 72faee385170..000000000000
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-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.2.2-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
index 97ec08791481..7d96d7ddaaef 100644
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,9 +30,8 @@ RDEPEND="${PYTHON_DEPS}
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
-
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.27
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-python/cython-0.27
 	test? (
 		sys-apps/checkpolicy
 	)"
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 6e72d71294c0..0ec2d1c856fc 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,9 +30,8 @@ RDEPEND="${PYTHON_DEPS}
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
-
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.27
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-python/cython-0.27
 	test? (
 		sys-apps/checkpolicy
 	)"