app-admin/setools: bump to 4.0.0 and drop keywords for testing

Package-Manager: portage-2.2.26

4 files changed, 88 insertions, 6 deletions

diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 6aeaf2fec08d..a41736e63a3e 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,3 +2,4 @@ DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec845
 DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
 DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
+DIST setools-4.0.0.tar.gz 408231 SHA256 6946e725ec7163f4017ffcb0cd4c39056fc41309857a86383c0f34912726125b SHA512 5eb3ddc00ef7878f39eb7afb379ec441ab33210ceec1457db3412a0f5d6939952cc66031e998f9c3df1da874b781f355d7442a2c505aa636b4aa7b486f8c7826 WHIRLPOOL 1bdaaf1a323a51df4b8eadea70a251d22c78c53b552f8f24bb2441c939f6a06b536be30609da4a086beaa66434a425d890ff111d763b1f65fe49649452d70d2a
diff --git a/app-admin/setools/files/setools-4.0.0-remove-gui.patch b/app-admin/setools/files/setools-4.0.0-remove-gui.patch
new file mode 100644
index 000000000000..e8cd6f52a4e7
--- /dev/null
+++ b/app-admin/setools/files/setools-4.0.0-remove-gui.patch
@@ -0,0 +1,18 @@
+--- setools-4.0.0/setup.py.orig	2016-05-05 01:11:19.204938821 +0800
++++ setools-4.0.0/setup.py	2016-05-05 01:18:48.852004644 +0800
+@@ -162,12 +162,10 @@
+                 '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") ),
+-                  (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") +
+-                                                      ["data/perm_map", "qhc/apol.qhc"] ),
+-                  (join(sys.prefix, 'share/setools/icons'), glob.glob("data/icons/*.png"))],
++                  (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),],
+       ext_modules=ext_py_mods,
+       test_suite='tests',
+       license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/setools-4.0.0.ebuild b/app-admin/setools/setools-4.0.0.ebuild
new file mode 100644
index 000000000000..231ba7fe19b7
--- /dev/null
+++ b/app-admin/setools/setools-4.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+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
+		dev-qt/qtchooser
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.12:0
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-libs/libsepol-2.4
+	test? (
+		python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.0.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 5019032d666f..4a0694a4689d 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_4 )
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
 inherit distutils-r1
 
@@ -14,20 +14,23 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
 else
-	#SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="debug test"
+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
+		dev-qt/qtchooser
+	)"
 
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-2.0.12:0
@@ -41,5 +44,11 @@ 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.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	esetup.py test
+}