gentoo auto-resync : 06:05:2024 - 00:00:51

5 files changed, 14 insertions, 60 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ed1a25eb16c1..5dd9ec0b9bd8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 57d85b534eee..f64aee0eb602 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,8 +1,7 @@
-AUX setools-4.4.1-cython3.patch 1853 BLAKE2B 7a7d5ae303d135cf69be3dfac99cace7afdb345835338f47570629c0cb31be8878abe042e010a18d73313b71035b7b2c77a9b57921a4a5600f1fd1c41a141ad1 SHA512 4892b69a14e0f45c89c397f1840af88b79903ccf50aa7e51c4d6dda9be0a2572e21de40f5f44071ab2a61cf0bba9bc8f5a0a8fba9e84c013db4812bab5257df3
 AUX setools-4.4.2-remove-gui.patch 1131 BLAKE2B 54f1258b4b8318f02fd8ef14c4377eacb42254a406b4b9f339b94b0958da352bda028b4b49871ebcdaf1dfc4e37e51f5a0dd346c288270c149d828981c2b5413 SHA512 a827c435072f4a35c165a2492f18c4689144f352ff8fa84ca840dd4b31c59dbd4d4e7c249ad54fb60616e00daad5bc245604041c710141650f80cba01c9cecb0
-DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1
 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e
-EBUILD setools-4.4.2.ebuild 1408 BLAKE2B 14733f327fc1e9c6d7b9c351b4575b7965a8d4d64d3852ba013b6c3b78a62f017bb90c3153c6d3460961f6ba93444f323bf78d5ef70d3adcea78ec648683d22d SHA512 8820db660d9ebda0aaa7290c4ce65768c9635237433e9a2741a0f21e0f5598960903442b39fb064d3e13783c840601973df33f86e95591228d8f32591e75cb17
+DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8
 EBUILD setools-4.4.4.ebuild 1353 BLAKE2B f6ab12efe9ed72b253047de2a38e795322b72bc0160782f04ffe3328e88c165dbc7f9872bbf14d66d99e0f049753574121bc0e3b958d6dc25bb2bf8d62a507cc SHA512 cc36f9315669717377a726e5316dc6634c96a14171ae0d11490584dff21909ff1623ef2c40b20c501e80d83dd86976438b559be4f73649cf8f2b410530a56777
-EBUILD setools-9999.ebuild 1357 BLAKE2B be1932f3ab1dd22f2d3c975dea89ff9c9c0fa1911a5feda38f11572856330c8524aaa61af6d62629e09ad75862c3160e38185bb8c18cfbe04c6854efa5c81029 SHA512 eef76a7acb9aa83341eb06e79e1193488482e7bd8ba443e784f989742e1ef57331f0a7c1f9e79342129371ca1c48972167f3ea7ebdb7a37c1e9fb399ffb8530e
+EBUILD setools-4.5.1.ebuild 1392 BLAKE2B 88e56eb9a937c589d1d9c06ec5f247e0f1faee8745e4558f1baed9e0545cbe45313aa32bfdeeb42d3854b3bbaa3d1dbd0931f4e055bfc1cf013007260074501d SHA512 ccc35d94e7fbf9fd3e41670a50f61d121d6962053259065a998bdceb59b31b7d70b245eef02e55585960d74dd353b77b40e083e9da24cedc5f120dc371a758b5
+EBUILD setools-9999.ebuild 1402 BLAKE2B 8d4236b8b740bd557d520a49c6768e33b3704eb5fe5a6f09daed7dc06754a3bd5eb1d1062310961cc32c75188d791abef235a5e1791c066de8ce6295e30243be SHA512 e6fcc753f7a1005727c82c256afaf543203040f5ef1e77d6a2bf1ffa9da5e0560801e85b86f24f4cd7b48ca57a394cb28687546ff06556c9a7d282b569022852
 MISC metadata.xml 335 BLAKE2B 81a7604472415bdf249d90f69e80a7a7c66f23597cba3005fc1fc825012ffdeb29bcb3f8f8b028ee35e0a076fe4863c25d79077718b28d5f658e68df2a703c5b SHA512 9115e12f13e78b8f63ec90a2ed71c5c731781415a77c2fd06bba358240261bf83183f14f2d38e5e9ffcafaee56de4df224b517afceb536d8e1e6af6f1eaa0938
diff --git a/app-admin/setools/files/setools-4.4.1-cython3.patch b/app-admin/setools/files/setools-4.4.1-cython3.patch
deleted file mode 100644
index 386b92f44576..000000000000
--- a/app-admin/setools/files/setools-4.4.1-cython3.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/898664
-https://github.com/SELinuxProject/setools/pull/105/commits/fc443b5a0379f3644e071a458e996ea6115ccba3
-(cherry-picked from https://github.com/SELinuxProject/setools/commit/31e104c3a9ca97038e09d3a4549fe2b8c8df36e8)
-
-From fc443b5a0379f3644e071a458e996ea6115ccba3 Mon Sep 17 00:00:00 2001
-From: Chris PeBenito <chpebeni@linux.microsoft.com>
-Date: Mon, 17 Jul 2023 16:08:21 -0400
-Subject: [PATCH] SELinuxPolicy: Add explicit cast for libspol message
- callback.
-
-Cython 3.0 is more strict.  The change fixes this issue:
-
-setools/policyrep/selinuxpolicy.pxi:685:46: Cannot assign type 'void (void *, sepol_handle_t *, const char *, ...) except *' to 'msg_callback'
-
-Additionally, the msg_callback is not typedef-ed in sepol/debug.h, so it must
-be explicitly defined in sepol.pxd for the casting to work.
-
-Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
---- a/setools/policyrep/selinuxpolicy.pxi
-+++ b/setools/policyrep/selinuxpolicy.pxi
-@@ -668,7 +668,7 @@ cdef class SELinuxPolicy:
-         if self.sh == NULL:
-             raise MemoryError
- 
--        sepol.sepol_msg_set_callback(self.sh, sepol_logging_callback, self.handle)
-+        sepol.sepol_msg_set_callback(self.sh, <sepol.msg_callback>sepol_logging_callback, self.handle)
- 
-         if sepol.sepol_policydb_create(&self.handle) < 0:
-             raise MemoryError
---- a/setools/policyrep/sepol.pxd
-+++ b/setools/policyrep/sepol.pxd
-@@ -16,8 +16,10 @@ cdef extern from "<sepol/handle.h>":
-     void sepol_handle_destroy(sepol_handle_t *sh)
- 
- 
-+ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...)
-+
-+
- cdef extern from "<sepol/debug.h>":
--    ctypedef void (*msg_callback)(void *varg, sepol_handle_t *handle, const char *fmt, ...)
-     void sepol_msg_set_callback(sepol_handle * handle, msg_callback cb, void *cb_arg)
- 
- 
diff --git a/app-admin/setools/setools-4.4.2.ebuild b/app-admin/setools/setools-4.5.1.ebuild
index a0fdba4cdd9d..22f10e5d09ca 100644
--- a/app-admin/setools/setools-4.4.2.ebuild
+++ b/app-admin/setools/setools-4.5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 x86"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/${PN}"
 fi
 
@@ -28,23 +28,20 @@ IUSE="test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.6[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
 	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.1-cython3.patch
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index ec3d11050109..0ce34473cb2a 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -28,15 +28,16 @@ IUSE="test X"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-2.6[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
 	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
+BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}]
 	test? (
 		sys-apps/checkpolicy
 	)"