[gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/

[Jason Zaman]

commit:     20646c92bf82660eae521dfcad1284eebb2fbf7c
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 08:37:12 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 08:38:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20646c92

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(-)

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 00000000000..1bb78f5fd96
--- /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 f1e79d0d936..708c8a7e7d6 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
 }