From 20646c92bf82660eae521dfcad1284eebb2fbf7c Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Thu, 10 Aug 2017 16:37:12 +0800 Subject: app-admin/setools: fix remove gui 4.1.1 patch Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- app-admin/setools/files/setools-4.1.1-remove-gui.patch | 18 ++++++++++++++++++ app-admin/setools/setools-4.1.1.ebuild | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 app-admin/setools/files/setools-4.1.1-remove-gui.patch (limited to 'app-admin/setools') diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch new file mode 100644 index 000000000000..1bb78f5fd964 --- /dev/null +++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 2ca44c9..0c8a0d9 100644 +--- a/setup.py ++++ b/setup.py +@@ -180,10 +180,10 @@ setup(name='setools', + 'build_lex': LexCommand, + 'build_ext': BuildExtCommand, + 'build_qhc': QtHelpCommand}, +- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], ++ packages=['setools', 'setools.diff', 'setools.policyrep'], ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], + data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], +- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, ++ package_data={'setools': ['perm_map']}, + ext_modules=ext_py_mods, + test_suite='tests', + license='GPLv2+, LGPLv2.1+', diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild index f1e79d0d9367..708c8a7e7d6a 100644 --- a/app-admin/setools/setools-4.1.1.ebuild +++ b/app-admin/setools/setools-4.1.1.ebuild @@ -44,7 +44,7 @@ DEPEND="${RDEPEND} python_prepare_all() { sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" - use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch ) + use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch ) distutils-r1_python_prepare_all } -- cgit v1.2.3-65-gdbad