From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-admin/setools/Manifest | 5 +- .../setools/files/setools-4.4.0-remove-gui.patch | 16 +++++++ app-admin/setools/setools-4.4.0.ebuild | 53 ++++++++++++++++++++++ app-admin/setools/setools-9999.ebuild | 5 +- 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 app-admin/setools/files/setools-4.4.0-remove-gui.patch create mode 100644 app-admin/setools/setools-4.4.0.ebuild (limited to 'app-admin/setools') diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index ae14dbd3a278..fabeb8308e1c 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,5 +1,8 @@ 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 1256 BLAKE2B aeb657eccdd0b228cf53858d09316c9469fab28dd1a85dc69048eedebf1edd5dde061f18407ec1eea1223d1d8d66ffbb592f8d42298b7716d60a71d4ef23adad SHA512 95309ce113030bd536fb4e09000c666b980f02e1e2e1e91da112fcd5131b3eb4557766c681fcbddee443354b411f527fb2613e20af90c53ea8481a3caf1bae61 -EBUILD setools-9999.ebuild 1258 BLAKE2B a190613b5627821215a42cc7eca60556501065196ce81160a976e81489dd7f09a3a3369f1be3212902fd1296d62262ede2a1cf20d2b72d176d1fb6ddc4fc1fc2 SHA512 180bceac1a54ad1130870bfa54f3cde17b2060be2dc009465edd6336815aa74dbc474873f0131f5db2a47e14dd82a7d4269df7a4246bc0c26f71b43b9fb5457a +EBUILD setools-4.4.0.ebuild 1337 BLAKE2B 1cf52e0e667b46ce62cd89d4fa0e15c7df474026fbeee279c20aedc3734aed2e9e5ea9c75611f7745ab03068f354b76630133ecc6300c071d3c029b4a42c1d38 SHA512 c3d6d17613b90378be11890a24b365550d997cc3e9dd51c599000d7770633a65ca197b72181836c009c14229b691338ffc01e441ee1a1eae8516931dfe16ca4f +EBUILD setools-9999.ebuild 1337 BLAKE2B 1cf52e0e667b46ce62cd89d4fa0e15c7df474026fbeee279c20aedc3734aed2e9e5ea9c75611f7745ab03068f354b76630133ecc6300c071d3c029b4a42c1d38 SHA512 c3d6d17613b90378be11890a24b365550d997cc3e9dd51c599000d7770633a65ca197b72181836c009c14229b691338ffc01e441ee1a1eae8516931dfe16ca4f MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513 diff --git a/app-admin/setools/files/setools-4.4.0-remove-gui.patch b/app-admin/setools/files/setools-4.4.0-remove-gui.patch new file mode 100644 index 000000000000..01b40adb29db --- /dev/null +++ b/app-admin/setools/files/setools-4.4.0-remove-gui.patch @@ -0,0 +1,16 @@ +--- a/setup.py 2021-03-17 22:56:42.016632635 +0000 ++++ b/setup.py 2021-03-17 23:02:33.625713629 +0000 +@@ -139,10 +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']}, ++ 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.ebuild b/app-admin/setools/setools-4.4.0.ebuild new file mode 100644 index 000000000000..f6471987e0cc --- /dev/null +++ b/app-admin/setools/setools-4.4.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +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}] + dev-python/setuptools + >=sys-libs/libsepol-2.8:= + >=sys-libs/libselinux-2.8:= + X? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-python/cython-0.27 + dev-python/setuptools + 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.4.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 4f559fc5bfcb..f6471987e0cc 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -3,6 +3,7 @@ EAPI="7" PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 @@ -25,6 +26,7 @@ S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} >=dev-python/networkx-2.0[${PYTHON_USEDEP}] + dev-python/setuptools >=sys-libs/libsepol-2.8:= >=sys-libs/libselinux-2.8:= X? ( @@ -32,6 +34,7 @@ RDEPEND="${PYTHON_DEPS} )" DEPEND="${RDEPEND}" BDEPEND=">=dev-python/cython-0.27 + dev-python/setuptools test? ( sys-apps/checkpolicy )" @@ -41,7 +44,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.3.0-remove-gui.patch ) + use X || local PATCHES=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) distutils-r1_python_prepare_all } -- cgit v1.2.3