gentoo resync : 16.04.2022

5 files changed, 30 insertions, 42 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 7ed24b42d95e..d818ac5ae6df 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,9 +1,7 @@
 AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653
-AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6
 AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924
-DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
-EBUILD setools-4.3.0.ebuild 1261 BLAKE2B 2bab4af1c52f47255c6b54fb533084022005c875c7c7dd73738d60c4a8510d3e37467a11a19e5d3380ec2e677e8e2d65b4ba9c12ed51a8502cb2709be48ff308 SHA512 8ef6976367724748118cd44c4c1c8ee1de6d2f993e78193a45163ec7647c6949bf1226eea600d5a9e4f0fb12ac17ec4e6a33feaf5e10f5bd14662823d22f1d09
-EBUILD setools-4.4.0-r2.ebuild 1485 BLAKE2B d99d920a6705bfc0e46cd58408094babf01a53d66af417b7a140fb50d5ffb3569d86b62bde306fe9d7fdb1e5274f906e618bf593ce3b9d93eecb4db38a2b0053 SHA512 e83dcfe365e175fa20525dea24280080fa95bde3af59402db3bcd0337729bd796728b29407afbf2e6d7ae08f06659e2ff5f3665404b347a9a56b83355c93c88b
-EBUILD setools-9999.ebuild 1411 BLAKE2B 74ccfaecb1e994f341e6990ba0914d05b7c1be845a66e1d21fb86b2e17a405ca125930e188553badb42eb9ae4e065c2c1ebf9e50114abfe8d02e9791ad4f1e99 SHA512 fa0405bf8e52c3a461c50505da52991e3d48f03ade22eddd29a14005f00f5c201a2aff5a54b82637d3d4ae973cdc5f710c4a95a5f8bc45d884f9a9397b7765e5
+EBUILD setools-4.4.0-r2.ebuild 1481 BLAKE2B 00e7179edd022254b0db466dc67218cce6d6e7bf288e946a090eb0817cd2f8a44a2190e851800f69a685a6c4bc35e12f799902f72458f3fbc8c5f2e0a5a6f139 SHA512 15b04afeae27ff80307ea8de1380578d3c52eca4d2a134c00a5fa7151b070fe5477c90e907f8aaf3093ad65b8e28cab730342172ccb00acb65988de02846777e
+EBUILD setools-4.4.0-r3.ebuild 1535 BLAKE2B b0b92b114dd071d8ae1a2a7a4e38b1ff7945e4d5a5939c1a003d7fb35d167c4f34f64c66b2a89f558636fe8ee17cd7dd623bf83144a6d43dd6ced844492862e3 SHA512 aed40ea3f5d5f61e109e066e3c994c7166db4c19484010520b6280d1f839d42bc7bd35b79b327fe34abcd2037d23bee7901d135f3c44ea5941e47e3f93000108
+EBUILD setools-9999.ebuild 1483 BLAKE2B 60d268a146ebbc48f8565e36ec76ae69fb903b545d42be27b7012bc1e68017cffab1d76b04687e30cf953314232ad8864cdabdbd85772c0ed66d7d09ce798355 SHA512 7b7d1da8dc8f422cd4ce5e1fb83562a64ccbb7d835aff070b862455503c50d7d58e453108b907433b573fba6a82db8bd336278ab2a93290cba6317094f5a167d
 MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f
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
deleted file mode 100644
index 85abbf5a7aa3..000000000000
--- a/app-admin/setools/files/setools-4.3.0-remove-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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/setools-4.4.0-r2.ebuild b/app-admin/setools/setools-4.4.0-r2.ebuild
index 0d3f876fd18f..ebb4b7598795 100644
--- a/app-admin/setools/setools-4.4.0-r2.ebuild
+++ b/app-admin/setools/setools-4.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -26,8 +26,8 @@ S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools
-	>=sys-libs/libsepol-2.8:=
-	>=sys-libs/libselinux-2.8:=
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
 	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.4.0-r3.ebuild
index 19992dacb4a2..82ee339e0806 100644
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ b/app-admin/setools/setools-4.4.0-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -14,25 +15,28 @@ if [[ ${PV} == 9999 ]] ; then
 	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 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="X test"
+IUSE="test infoflow X"
 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:=
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
+	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
 	)"
 
@@ -41,7 +45,8 @@ 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.3.0-remove-gui.patch )
+	local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch )
+	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 3737750ca8eb..965896ee5a44 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -13,28 +13,29 @@ HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="test infoflow X"
 RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools
-	>=sys-libs/libsepol-2.8:=
-	>=sys-libs/libselinux-2.8:=
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-3.2:=
+	>=sys-libs/libselinux-3.2:=
 	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27
-	dev-python/setuptools
+BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy