diff options
Diffstat (limited to 'app-admin/setools')
| -rw-r--r-- | app-admin/setools/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/setools/files/setools-4.4.2-remove-gui.patch | 18 | ||||
| -rw-r--r-- | app-admin/setools/setools-4.5.1.ebuild | 12 | ||||
| -rw-r--r-- | app-admin/setools/setools-9999.ebuild | 16 |
4 files changed, 17 insertions, 34 deletions
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 64ea7445b0d6..5b76ba754a10 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,8 +1,7 @@ -AUX setools-4.4.2-remove-gui.patch 1131 BLAKE2B 54f1258b4b8318f02fd8ef14c4377eacb42254a406b4b9f339b94b0958da352bda028b4b49871ebcdaf1dfc4e37e51f5a0dd346c288270c149d828981c2b5413 SHA512 a827c435072f4a35c165a2492f18c4689144f352ff8fa84ca840dd4b31c59dbd4d4e7c249ad54fb60616e00daad5bc245604041c710141650f80cba01c9cecb0 AUX setools-4.5.1-remove-gui.patch 1194 BLAKE2B 39c9fe32301b065bee51358694f4f79d342346c2c0d0efdfecacbaaf42eb77498f6923deeb618bf90c9b13ae2664c60fe6a69ecdf64059baee1234dbbfdc037c SHA512 5982941899261c66ca47e26ee35cf68fa9d57f7002a40bc567fa5419cf6905bf336cb3f12e3d5ba8798b826037a3352f33f39d80a9b7d0a736545084b361d520 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8 EBUILD setools-4.4.4.ebuild 1353 BLAKE2B 87f4801abbcf91b3ef920460cb806b2bc51114b45619e2f51404e7959ed704b76a6d3c752d8ecef4cabd17514a83b1ec70c28202980d3a0333d8f5e7a176d90f SHA512 87493707fec2369723ac3f433fd73531d5db6baa1d54dc02d302ed9e73229f4a60f1c0aebd89cc84c7d82a1ce9a4b2a552c13d2373b36f15aee28f14eeb50ecf -EBUILD setools-4.5.1.ebuild 1500 BLAKE2B b82d87d2b003c7730f275d849e33c26ae5f7b04402c848020c49a6447ab822355069d1ce12b4d1c6b3a9e62f2475d6906a3a07851a71851811ee096a2c7268d9 SHA512 992c416a3db4700e14f08382caa126eec05c0e33baff323a7258e1d0323f2b1adce49bacc5e68bc6a7bed3b3439df116fa95bf77bbb4b5781042737e54e42300 -EBUILD setools-9999.ebuild 1402 BLAKE2B b9ef165dfc462cfe42858ff291ac5a6278db7db26ab9ee7dac0917985015feeacb1991d6fa35ebe37b29a9639abcc868f949502207e805a78d69beb7383e88f5 SHA512 cb31dc8c888f84288c15cf2aa0acbbd5aace3e841a96bd1e8afdcd6c9fc519253e90eaba8386d0cfee2d11cfa3b083875db5e0bfeb18b7fc99128b98ccf1dd10 +EBUILD setools-4.5.1.ebuild 1502 BLAKE2B 32e1a2bc39187418de801a0314eec4142f97212efa43d00ab0cc42ac1b3ee0a76820dc65f07504c277b49137b3ddc2d922dd76e65c6606073c194895fc5a4e94 SHA512 d4b073d0229a6a919d88b0e9ae131dce83c67c7220eb19206bdab408a0d5f4171e17ea100eee7704899e739e0a2bcaca0fb17a5e7a241599ebdac7b537d95add +EBUILD setools-9999.ebuild 1511 BLAKE2B 3271aba051e17a4484304840b05486555814832a043f58a640515cdde7f72955cddc30a6f7a27fa01914465b5c9ab9aa8607114f4554c8398a9aaca5fa1cc4e6 SHA512 1a9a5fefa0c83f01358a5f31cd6929bf0e2b607669a24669e0575bdc144b7c07db36b62ff2ee392cfaabab89500e2b6a1532e07935ded45f04a9e8902c06f862 MISC metadata.xml 335 BLAKE2B 81a7604472415bdf249d90f69e80a7a7c66f23597cba3005fc1fc825012ffdeb29bcb3f8f8b028ee35e0a076fe4863c25d79077718b28d5f658e68df2a703c5b SHA512 9115e12f13e78b8f63ec90a2ed71c5c731781415a77c2fd06bba358240261bf83183f14f2d38e5e9ffcafaee56de4df224b517afceb536d8e1e6af6f1eaa0938 diff --git a/app-admin/setools/files/setools-4.4.2-remove-gui.patch b/app-admin/setools/files/setools-4.4.2-remove-gui.patch deleted file mode 100644 index 49d16ec66b56..000000000000 --- a/app-admin/setools/files/setools-4.4.2-remove-gui.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -139,12 +139,10 @@ setup(name='setools', - author_email='pebenito@ieee.org', - url='https://github.com/SELinuxProject/setools', - cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, -- packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'], -- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], -+ packages=['setools', 'setools.checker', 'setools.diff'], -+ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'], - data_files=installed_data, -- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map', -- 'policyrep.pyi', -- 'py.typed']}, -+ package_data={'setools': ['perm_map', 'policyrep.pyi', 'py.typed']}, - 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.5.1.ebuild b/app-admin/setools/setools-4.5.1.ebuild index d191d79f839e..3bf6621425a8 100644 --- a/app-admin/setools/setools-4.5.1.ebuild +++ b/app-admin/setools/setools-4.5.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools @@ -12,19 +12,19 @@ inherit distutils-r1 DESCRIPTION="Policy Analysis Tools for SELinux" HOMEPAGE="https://github.com/SELinuxProject/setools/wiki" -if [[ ${PV} == 9999 ]] ; then +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 arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~riscv ~x86" S="${WORKDIR}/${PN}" fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="test X" +IUSE="gui test" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} @@ -32,7 +32,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= - X? ( + gui? ( dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] dev-python/pygraphviz[${PYTHON_USEDEP}] )" @@ -50,7 +50,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 || PATCHES+=( "${FILESDIR}"/setools-4.5.1-remove-gui.patch ) + use gui || PATCHES+=( "${FILESDIR}"/${P}-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 16398f7136ad..c7c56b0bb408 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools @@ -12,19 +12,19 @@ inherit distutils-r1 DESCRIPTION="Policy Analysis Tools for SELinux" HOMEPAGE="https://github.com/SELinuxProject/setools/wiki" -if [[ ${PV} == 9999 ]] ; then +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" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" S="${WORKDIR}/${PN}" fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="test X" +IUSE="gui test" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS} @@ -32,13 +32,15 @@ RDEPEND="${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= - X? ( + gui? ( dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}] dev-python/pygraphviz[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}] test? ( + dev-python/pyqt6[gui,testlib,widgets,${PYTHON_USEDEP}] + dev-python/pytest-qt[${PYTHON_USEDEP}] sys-apps/checkpolicy )" @@ -48,7 +50,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 || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) + use gui || PATCHES+=( "${FILESDIR}"/${PN}-4.5.1-remove-gui.patch ) distutils-r1_python_prepare_all } |