summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaman <perfinion@gentoo.org>2017-08-10 16:37:12 +0800
committerJason Zaman <perfinion@gentoo.org>2017-08-10 16:38:29 +0800
commit20646c92bf82660eae521dfcad1284eebb2fbf7c (patch)
tree6a3b4ad29f8383a8e2e0b6e3201dfb49fe02cdc2 /app-admin
parentsec-policy: Stabilize selinux policy 2.20170204-r4 (diff)
downloadgentoo-20646c92bf82660eae521dfcad1284eebb2fbf7c.tar.gz
gentoo-20646c92bf82660eae521dfcad1284eebb2fbf7c.tar.bz2
gentoo-20646c92bf82660eae521dfcad1284eebb2fbf7c.zip
app-admin/setools: fix remove gui 4.1.1 patch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/setools/files/setools-4.1.1-remove-gui.patch18
-rw-r--r--app-admin/setools/setools-4.1.1.ebuild2
2 files changed, 19 insertions, 1 deletions
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
}