| 1 |
commit: 20646c92bf82660eae521dfcad1284eebb2fbf7c |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 10 08:37:12 2017 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 10 08:38:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20646c92 |
| 7 |
|
| 8 |
app-admin/setools: fix remove gui 4.1.1 patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-admin/setools/files/setools-4.1.1-remove-gui.patch | 18 ++++++++++++++++++ |
| 13 |
app-admin/setools/setools-4.1.1.ebuild | 2 +- |
| 14 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..1bb78f5fd96 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch |
| 21 |
@@ -0,0 +1,18 @@ |
| 22 |
+diff --git a/setup.py b/setup.py |
| 23 |
+index 2ca44c9..0c8a0d9 100644 |
| 24 |
+--- a/setup.py |
| 25 |
++++ b/setup.py |
| 26 |
+@@ -180,10 +180,10 @@ setup(name='setools', |
| 27 |
+ 'build_lex': LexCommand, |
| 28 |
+ 'build_ext': BuildExtCommand, |
| 29 |
+ 'build_qhc': QtHelpCommand}, |
| 30 |
+- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'], |
| 31 |
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], |
| 32 |
++ packages=['setools', 'setools.diff', 'setools.policyrep'], |
| 33 |
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], |
| 34 |
+ data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], |
| 35 |
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, |
| 36 |
++ package_data={'setools': ['perm_map']}, |
| 37 |
+ ext_modules=ext_py_mods, |
| 38 |
+ test_suite='tests', |
| 39 |
+ license='GPLv2+, LGPLv2.1+', |
| 40 |
|
| 41 |
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild |
| 42 |
index f1e79d0d936..708c8a7e7d6 100644 |
| 43 |
--- a/app-admin/setools/setools-4.1.1.ebuild |
| 44 |
+++ b/app-admin/setools/setools-4.1.1.ebuild |
| 45 |
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND} |
| 46 |
python_prepare_all() { |
| 47 |
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror" |
| 48 |
|
| 49 |
- use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch ) |
| 50 |
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch ) |
| 51 |
distutils-r1_python_prepare_all |
| 52 |
} |
Archives