From 010e5171befaae2ecf8677b5d8e306bbebf0ae87 Mon Sep 17 00:00:00 2001 From: Kenton Groombridge Date: Fri, 7 Jun 2024 16:11:55 -0400 Subject: [PATCH] app-admin/setools: update remove gui patch for 4.5.1 Thanks-to: Jan Breig Closes: https://bugs.gentoo.org/931286 Signed-off-by: Kenton Groombridge --- .../files/setools-4.5.1-remove-gui.patch | 21 +++++++++++++++++++ app-admin/setools/setools-4.5.1.ebuild | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 app-admin/setools/files/setools-4.5.1-remove-gui.patch diff --git a/app-admin/setools/files/setools-4.5.1-remove-gui.patch b/app-admin/setools/files/setools-4.5.1-remove-gui.patch new file mode 100644 index 0000000000000..efb7ae76e490e --- /dev/null +++ b/app-admin/setools/files/setools-4.5.1-remove-gui.patch @@ -0,0 +1,21 @@ +diff --git a/setup.py b/setup.py +index 05aac33..c685791 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,13 +70,10 @@ setup(name='setools', + author='Chris PeBenito', + author_email='pebenito@ieee.org', + url='https://github.com/SELinuxProject/setools', +- packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.widgets', +- 'setoolsgui.widgets.criteria', 'setoolsgui.widgets.details', +- 'setoolsgui.widgets.models', 'setoolsgui.widgets.views'], +- 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={'': ['*.css', '*.html'], +- '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 22f10e5d09caa..0d7426d6b2721 100644 --- a/app-admin/setools/setools-4.5.1.ebuild +++ b/app-admin/setools/setools-4.5.1.ebuild @@ -48,7 +48,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 X || PATCHES+=( "${FILESDIR}"/setools-4.5.1-remove-gui.patch ) distutils-r1_python_prepare_all }