| 1 |
commit: a2677b8ee540c538e3cb5ebafbb3984518c1665e |
| 2 |
Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Tue Sep 1 19:33:00 2020 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 15 03:40:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2677b8e |
| 7 |
|
| 8 |
app-admin/setools: Version bump to 4.3.0. |
| 9 |
|
| 10 |
Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> |
| 11 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
| 12 |
|
| 13 |
app-admin/setools/Manifest | 1 + |
| 14 |
app-admin/setools/files/setools-4.3.0-remove-gui.patch | 16 ++++++++++++++++ |
| 15 |
.../{setools-9999.ebuild => setools-4.3.0.ebuild} | 6 +++--- |
| 16 |
app-admin/setools/setools-9999.ebuild | 6 +++--- |
| 17 |
4 files changed, 23 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest |
| 20 |
index 8c9e34e2529..bd5ba05e8cf 100644 |
| 21 |
--- a/app-admin/setools/Manifest |
| 22 |
+++ b/app-admin/setools/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f |
| 25 |
+DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8 |
| 26 |
|
| 27 |
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 |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..85abbf5a7aa |
| 30 |
--- /dev/null |
| 31 |
+++ b/app-admin/setools/files/setools-4.3.0-remove-gui.patch |
| 32 |
@@ -0,0 +1,16 @@ |
| 33 |
+--- a/setup.py |
| 34 |
++++ b/setup.py |
| 35 |
+@@ -146,10 +146,10 @@ setup(name='setools', |
| 36 |
+ author_email='pebenito@××××.org', |
| 37 |
+ url='https://github.com/SELinuxProject/setools', |
| 38 |
+ cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, |
| 39 |
+- packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'], |
| 40 |
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], |
| 41 |
++ packages=['setools', 'setools.diff'], |
| 42 |
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], |
| 43 |
+ data_files=installed_data, |
| 44 |
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, |
| 45 |
++ package_data={'setools': ['perm_map']}, |
| 46 |
+ ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], |
| 47 |
+ annotate=cython_annotate, |
| 48 |
+ compiler_directives={"language_level": 3, |
| 49 |
|
| 50 |
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-4.3.0.ebuild |
| 51 |
similarity index 90% |
| 52 |
copy from app-admin/setools/setools-9999.ebuild |
| 53 |
copy to app-admin/setools/setools-4.3.0.ebuild |
| 54 |
index 88bea390204..fd1fb1b07fa 100644 |
| 55 |
--- a/app-admin/setools/setools-9999.ebuild |
| 56 |
+++ b/app-admin/setools/setools-4.3.0.ebuild |
| 57 |
@@ -1,8 +1,8 @@ |
| 58 |
# Copyright 1999-2020 Gentoo Authors |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
|
| 61 |
-EAPI="6" |
| 62 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
| 63 |
+EAPI="7" |
| 64 |
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) |
| 65 |
|
| 66 |
inherit distutils-r1 |
| 67 |
|
| 68 |
@@ -42,7 +42,7 @@ python_prepare_all() { |
| 69 |
sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ |
| 70 |
die "failed to set lib_dirs" |
| 71 |
|
| 72 |
- use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch ) |
| 73 |
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch ) |
| 74 |
distutils-r1_python_prepare_all |
| 75 |
} |
| 76 |
|
| 77 |
|
| 78 |
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild |
| 79 |
index 88bea390204..fd1fb1b07fa 100644 |
| 80 |
--- a/app-admin/setools/setools-9999.ebuild |
| 81 |
+++ b/app-admin/setools/setools-9999.ebuild |
| 82 |
@@ -1,8 +1,8 @@ |
| 83 |
# Copyright 1999-2020 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
-EAPI="6" |
| 87 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
| 88 |
+EAPI="7" |
| 89 |
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) |
| 90 |
|
| 91 |
inherit distutils-r1 |
| 92 |
|
| 93 |
@@ -42,7 +42,7 @@ python_prepare_all() { |
| 94 |
sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ |
| 95 |
die "failed to set lib_dirs" |
| 96 |
|
| 97 |
- use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch ) |
| 98 |
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch ) |
| 99 |
distutils-r1_python_prepare_all |
| 100 |
} |
Archives