| 1 |
commit: fdb745604c565aa304fb3f4f420c1b87689c96b4 |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 19 07:33:04 2019 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 19 07:33:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb74560 |
| 7 |
|
| 8 |
app-admin/setools: Fix patch for 4.2.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/677560 |
| 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.0-remove-gui.patch | 18 ------------------ |
| 15 |
app-admin/setools/setools-4.2.1.ebuild | 2 +- |
| 16 |
2 files changed, 1 insertion(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/setools/files/setools-4.2.0-remove-gui.patch b/app-admin/setools/files/setools-4.2.0-remove-gui.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 748b33c9a5d..00000000000 |
| 21 |
--- a/app-admin/setools/files/setools-4.2.0-remove-gui.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,18 +0,0 @@ |
| 24 |
-diff --git a/setup.py b/setup.py |
| 25 |
-index e075a00..3f8f959 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=[(join(sys.prefix, '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.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild |
| 44 |
index b1bf0e666c9..3e80e5e19f6 100644 |
| 45 |
--- a/app-admin/setools/setools-4.2.1.ebuild |
| 46 |
+++ b/app-admin/setools/setools-4.2.1.ebuild |
| 47 |
@@ -40,7 +40,7 @@ python_prepare_all() { |
| 48 |
sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ |
| 49 |
die "failed to set lib_dirs" |
| 50 |
|
| 51 |
- use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch ) |
| 52 |
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch ) |
| 53 |
distutils-r1_python_prepare_all |
| 54 |
} |
Archives