summaryrefslogtreecommitdiff
path: root/app-admin/setools
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/setools')
-rw-r--r--app-admin/setools/Manifest7
-rw-r--r--app-admin/setools/files/setools-4.2.0-remove-gui.patch18
-rw-r--r--app-admin/setools/metadata.xml2
-rw-r--r--app-admin/setools/setools-4.2.0.ebuild49
-rw-r--r--app-admin/setools/setools-9999.ebuild32
5 files changed, 86 insertions, 22 deletions
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 15cc7097321a..db8618261711 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,9 @@
AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
+AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
+DIST setools-4.2.0.tar.gz 363802 BLAKE2B a57a7d565bb6e91f67cba0516434d8a0d3635d0717e878d8ac43b6cf7de0884ea74152ec50e93554f7d1a75a4098db2241668e1765e7b069d23b6cc13d4b712e SHA512 b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680
EBUILD setools-4.1.1-r1.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
-EBUILD setools-9999.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
-MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
+EBUILD setools-4.2.0.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
+EBUILD setools-9999.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
+MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
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
new file mode 100644
index 000000000000..748b33c9a5d1
--- /dev/null
+++ b/app-admin/setools/files/setools-4.2.0-remove-gui.patch
@@ -0,0 +1,18 @@
+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/metadata.xml b/app-admin/setools/metadata.xml
index 8e9f11ed8b4c..fdc3261aeec3 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -7,6 +7,6 @@
</maintainer>
<longdescription>SELinux policy analysis tools.</longdescription>
<upstream>
- <remote-id type="github">TresysTechnology/setools</remote-id>
+ <remote-id type="github">SELinuxProject/setools</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-admin/setools/setools-4.2.0.ebuild b/app-admin/setools/setools-4.2.0.ebuild
new file mode 100644
index 000000000000..70e0fb4bed29
--- /dev/null
+++ b/app-admin/setools/setools-4.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+else
+ SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X test"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+ >=sys-libs/libsepol-2.8:=
+ >=sys-libs/libselinux-2.8:=
+ X? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-python/cython-0.27
+ test? (
+ sys-apps/checkpolicy
+ )"
+
+python_prepare_all() {
+ sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+ 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 )
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 13b8cb7389c8..70e0fb4bed29 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,52 +1,46 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+ EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
else
- SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-IUSE="X debug test"
+IUSE="X test"
RDEPEND="${PYTHON_DEPS}
- >=sys-libs/libsepol-2.7:=
- >=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
- >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- dev-libs/libpcre:=
+ >=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+ >=sys-libs/libsepol-2.8:=
+ >=sys-libs/libselinux-2.8:=
X? (
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
- >=dev-lang/swig-2.0.12:0
- sys-devel/bison
- sys-devel/flex
- >=sys-libs/libsepol-2.5
+ >=dev-python/cython-0.27
test? (
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
sys-apps/checkpolicy
)"
python_prepare_all() {
sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
- sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
- die "failed to set base_lib_dirs"
+ 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.1.1-remove-gui.patch )
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
distutils-r1_python_prepare_all
}