summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaman <perfinion@gentoo.org>2017-02-04 14:47:29 +0800
committerJason Zaman <perfinion@gentoo.org>2017-02-04 14:48:09 +0800
commita6aab70811fcf525ef6322f8c6d7ebcaa2b2a308 (patch)
tree865b198df879f769e2a3678cdc54ed1c188b1d53 /app-admin/setools
parentwww-apache/passenger: bug#580078 isnan compile fix. (diff)
downloadgentoo-a6aab70811fcf525ef6322f8c6d7ebcaa2b2a308.tar.gz
gentoo-a6aab70811fcf525ef6322f8c6d7ebcaa2b2a308.tar.bz2
gentoo-a6aab70811fcf525ef6322f8c6d7ebcaa2b2a308.zip
app-admin/setools: update remove gui patch for 4.1.0
Also, 4.1.0 removed the dep on bz2 Package-Manager: portage-2.3.3
Diffstat (limited to 'app-admin/setools')
-rw-r--r--app-admin/setools/files/setools-4.1.0-remove-gui.patch18
-rw-r--r--app-admin/setools/setools-4.1.0.ebuild3
-rw-r--r--app-admin/setools/setools-9999.ebuild3
3 files changed, 20 insertions, 4 deletions
diff --git a/app-admin/setools/files/setools-4.1.0-remove-gui.patch b/app-admin/setools/files/setools-4.1.0-remove-gui.patch
new file mode 100644
index 000000000000..67d7fe5c6eea
--- /dev/null
+++ b/app-admin/setools/files/setools-4.1.0-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 4e7645c..aa3895a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -180,10 +180,10 @@ setup(name='setools',
+ 'build_lex': LexCommand,
+ 'build_ext': BuildExtCommand,
+ 'build_qhc': QtHelpCommand},
+- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff', 'setools.policyrep'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+- package_data={'': ['*.ui', '*.qhc'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ ext_modules=ext_py_mods,
+ test_suite='tests',
+ license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/setools-4.1.0.ebuild b/app-admin/setools/setools-4.1.0.ebuild
index c26cdd4e2e26..af77d447ce62 100644
--- a/app-admin/setools/setools-4.1.0.ebuild
+++ b/app-admin/setools/setools-4.1.0.ebuild
@@ -25,7 +25,6 @@ IUSE="X debug test"
RDEPEND="${PYTHON_DEPS}
>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
- app-arch/bzip2:=
dev-libs/libpcre:=
X? (
dev-python/PyQt5[gui,widgets]
@@ -44,7 +43,7 @@ DEPEND="${RDEPEND}
python_prepare_all() {
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
- use X || local PATCHES=( "${FILESDIR}"/setools-4.0.1-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.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 c26cdd4e2e26..af77d447ce62 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -25,7 +25,6 @@ IUSE="X debug test"
RDEPEND="${PYTHON_DEPS}
>=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
- app-arch/bzip2:=
dev-libs/libpcre:=
X? (
dev-python/PyQt5[gui,widgets]
@@ -44,7 +43,7 @@ DEPEND="${RDEPEND}
python_prepare_all() {
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
- use X || local PATCHES=( "${FILESDIR}"/setools-4.0.1-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch )
distutils-r1_python_prepare_all
}