diff options
| author |   Jason Zaman <perfinion@gentoo.org> | 2019-08-19 15:33:04 +0800 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2019-08-19 15:33:50 +0800 |
| commit | fdb745604c565aa304fb3f4f420c1b87689c96b4 (patch) | |
| tree | 127adf883cbcebaaaaafed387773138bba561156 /app-admin/setools | |
| parent | dev-python/protobuf-python: stable 3.8.0 for ia64, bug #692302 (diff) | |
| download | gentoo-fdb745604c565aa304fb3f4f420c1b87689c96b4.tar.gz gentoo-fdb745604c565aa304fb3f4f420c1b87689c96b4.tar.bz2 gentoo-fdb745604c565aa304fb3f4f420c1b87689c96b4.zip | |
app-admin/setools: Fix patch for 4.2.1
Closes: https://bugs.gentoo.org/677560
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Diffstat (limited to 'app-admin/setools')
| -rw-r--r-- | app-admin/setools/files/setools-4.2.0-remove-gui.patch | 18 | ||||
| -rw-r--r-- | app-admin/setools/setools-4.2.1.ebuild | 2 |
2 files changed, 1 insertions, 19 deletions
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 deleted file mode 100644 index 748b33c9a5d1..000000000000 --- a/app-admin/setools/files/setools-4.2.0-remove-gui.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/setup.py b/setup.py -index e075a00..3f8f959 100644 ---- a/setup.py -+++ b/setup.py -@@ -134,10 +134,10 @@ setup(name='setools', - author_email='pebenito@ieee.org', - 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=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], -- 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-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild index b1bf0e666c9a..3e80e5e19f6b 100644 --- a/app-admin/setools/setools-4.2.1.ebuild +++ b/app-admin/setools/setools-4.2.1.ebuild @@ -40,7 +40,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.0-remove-gui.patch ) + use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch ) distutils-r1_python_prepare_all } |