commit: 1fba38d6b078a8ba3aa5513e5076f443a731d1ea Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Mon Aug 19 05:53:09 2019 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Mon Aug 19 06:01:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fba38d6
app-admin/setools: fix 4.2.2 remove gui patch Closes: https://bugs.gentoo.org/692360 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> app-admin/setools/files/setools-4.2.2-remove-gui.patch | 18 ++++++++++++++++++ app-admin/setools/setools-4.2.2.ebuild | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app-admin/setools/files/setools-4.2.2-remove-gui.patch b/app-admin/setools/files/setools-4.2.2-remove-gui.patch new file mode 100644 index 00000000000..58579bf5a00 --- /dev/null +++ b/app-admin/setools/files/setools-4.2.2-remove-gui.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index ac8a876..84001a8 100644 +--- a/setup.py ++++ b/setup.py +@@ -134,10 +134,10 @@ setup(name='setools', + author_email='[email protected]', + 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=[('share/man/man1', glob.glob("man/*.1"))], +- 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.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild index f186598f7c0..22da7166d07 100644 --- a/app-admin/setools/setools-4.2.2.ebuild +++ b/app-admin/setools/setools-4.2.2.ebuild @@ -20,6 +20,7 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0" IUSE="X test" +S="${WORKDIR}/${PN}" RDEPEND="${PYTHON_DEPS} >=dev-python/networkx-2.0[${PYTHON_USEDEP}] @@ -40,7 +41,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.2.0-remove-gui.patch ) + use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch ) distutils-r1_python_prepare_all }
