commit: a2677b8ee540c538e3cb5ebafbb3984518c1665e
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Tue Sep 1 19:33:00 2020 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 03:40:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2677b8e
app-admin/setools: Version bump to 4.3.0.
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
app-admin/setools/Manifest | 1 +
app-admin/setools/files/setools-4.3.0-remove-gui.patch | 16 ++++++++++++++++
.../{setools-9999.ebuild => setools-4.3.0.ebuild} | 6 +++---
app-admin/setools/setools-9999.ebuild | 6 +++---
4 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 8c9e34e2529..bd5ba05e8cf 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1 +1,2 @@
DIST setools-4.2.2.tar.bz2 237881 BLAKE2B
6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82
SHA512
03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
+DIST setools-4.3.0.tar.bz2 249694 BLAKE2B
03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e
SHA512
f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
diff --git a/app-admin/setools/files/setools-4.3.0-remove-gui.patch
b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
new file mode 100644
index 00000000000..85abbf5a7aa
--- /dev/null
+++ b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
@@ -0,0 +1,16 @@
+--- a/setup.py
++++ b/setup.py
+@@ -146,10 +146,10 @@ setup(name='setools',
+ author_email='[email protected]',
+ url='https://github.com/SELinuxProject/setools',
+ cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=installed_data,
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+ annotate=cython_annotate,
+ compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/setools-9999.ebuild
b/app-admin/setools/setools-4.3.0.ebuild
similarity index 90%
copy from app-admin/setools/setools-9999.ebuild
copy to app-admin/setools/setools-4.3.0.ebuild
index 88bea390204..fd1fb1b07fa 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
inherit distutils-r1
@@ -42,7 +42,7 @@ python_prepare_all() {
sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@"
"${S}"/setup.py || \
die "failed to set lib_dirs"
- use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
distutils-r1_python_prepare_all
}
diff --git a/app-admin/setools/setools-9999.ebuild
b/app-admin/setools/setools-9999.ebuild
index 88bea390204..fd1fb1b07fa 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
inherit distutils-r1
@@ -42,7 +42,7 @@ python_prepare_all() {
sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@"
"${S}"/setup.py || \
die "failed to set lib_dirs"
- use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
distutils-r1_python_prepare_all
}
