Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/setools/, app-admin/setools/files/
Date: Mon, 19 Aug 2019 06:01:59
Message-Id: 1566194479.1fba38d6b078a8ba3aa5513e5076f443a731d1ea.perfinion@gentoo
1 commit: 1fba38d6b078a8ba3aa5513e5076f443a731d1ea
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 19 05:53:09 2019 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 19 06:01:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fba38d6
7
8 app-admin/setools: fix 4.2.2 remove gui patch
9
10 Closes: https://bugs.gentoo.org/692360
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
13
14 app-admin/setools/files/setools-4.2.2-remove-gui.patch | 18 ++++++++++++++++++
15 app-admin/setools/setools-4.2.2.ebuild | 3 ++-
16 2 files changed, 20 insertions(+), 1 deletion(-)
17
18 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
19 new file mode 100644
20 index 00000000000..58579bf5a00
21 --- /dev/null
22 +++ b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
23 @@ -0,0 +1,18 @@
24 +diff --git a/setup.py b/setup.py
25 +index ac8a876..84001a8 100644
26 +--- a/setup.py
27 ++++ b/setup.py
28 +@@ -134,10 +134,10 @@ setup(name='setools',
29 + author_email='pebenito@××××.org',
30 + url='https://github.com/SELinuxProject/setools',
31 + cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
32 +- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
33 +- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
34 ++ packages=['setools', 'setools.diff'],
35 ++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
36 + data_files=[('share/man/man1', glob.glob("man/*.1"))],
37 +- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
38 ++ package_data={'setools': ['perm_map']},
39 + ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
40 + annotate=cython_annotate,
41 + compiler_directives={"language_level": 3,
42
43 diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
44 index f186598f7c0..22da7166d07 100644
45 --- a/app-admin/setools/setools-4.2.2.ebuild
46 +++ b/app-admin/setools/setools-4.2.2.ebuild
47 @@ -20,6 +20,7 @@ fi
48 LICENSE="GPL-2 LGPL-2.1"
49 SLOT="0"
50 IUSE="X test"
51 +S="${WORKDIR}/${PN}"
52
53 RDEPEND="${PYTHON_DEPS}
54 >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
55 @@ -40,7 +41,7 @@ python_prepare_all() {
56 sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
57 die "failed to set lib_dirs"
58
59 - use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
60 + use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
61 distutils-r1_python_prepare_all
62 }