revbump with swig patches, dropping keywords for testing

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

3 files changed, 173 insertions, 16 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index ca75feb366b5..867861db1f05 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.94 2015/02/12 18:04:48 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.95 2015/02/17 19:53:46 perfinion Exp $
+
+*setools-3.3.8-r7 (17 Feb 2015)
+
+  17 Feb 2015; Jason Zaman <perfinion@gentoo.org> +setools-3.3.8-r7.ebuild:
+  revbump with swig patches, dropping keywords for testing
 
 *setools-3.3.8-r6 (12 Feb 2015)
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 1cd654399aee..a97924e88f0a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -6,27 +6,29 @@ AUX fix-implicit-def-fstat.patch 441 SHA256 3d0c55580056353ab3ca575899fb8f669d0b
 AUX setools3-userspace-2.4-compatibility.patch 4245 SHA256 02bb2496f1c33177099ee025be3c297eec718dfe41565695e21056e165d4d626 SHA512 7f8bd3b48c23ea596d521c5a2d71fd714767167df24ee3cdf20b41ab19b077af267e83dec0db4ac9ef3333af26beb4c5e040607e3d33429c2ca96ae827da692b WHIRLPOOL f0752e5c4a5b5124af6be5cfdb9d29c7655983283b5bb71ef2976126231dc3115390f212375765a41dca5d9384b0c914457e7a5c93ed40a2ac9cc902563b9060
 DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
 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
 EBUILD setools-3.3.8-r5.ebuild 4556 SHA256 5c050294face07b984e68334867961fb5ae595517c26ba7b46baa7bc1a98e444 SHA512 4ed547cd0d97b53dc7f798a967780ffde9cda669402dd46f12bb1862092c51c3a6be6415fe8fc03f4d48d19c2f684a0169d92002689a977eda5c3f165597725e WHIRLPOOL b95f4c9973ab5826a43e06cb460b477c6135a2775a86fbd71bfb9d3696ba33d7606afea7d93235b381e2d7b0bf1340ce42fae94fa810cf1ff550d14ae42ffe6d
 EBUILD setools-3.3.8-r6.ebuild 4636 SHA256 dd353ab4dea6c3ad3a0ab21260771a3817aefc8228690818e7a63b4c903085cc SHA512 7bd3728bc02d0756c22318c6878801ad846a035bd2140491d38faa9e3a9bc827c1845d6dd2fe5f6d48911b7be80629e76b680a712a2c18603f5e2aa474b3cef1 WHIRLPOOL 2e1eb142fd528a4c48ac99a583918aa7dcef4b7e4d448c3c02b5b26e8a1c82b5411b5901cdf857dad268ceb93b578700db314af22caf07425af47b73e38e721d
-MISC ChangeLog 12887 SHA256 90be7d0cd84f5794f19a432caadf372bb114983483be468aa643391e6726a7ae SHA512 622aa65688dbd6f05fe3831c9bbc99b9c60769bc4f9aef0d5707798db931eeb5214f2067e334f098b1c05116e768b89dca2e22a7936e687f507a25ad04e67f88 WHIRLPOOL 735b802833ca6f414127425d05532edce8dede3db6c4af701238ec2f07d603d0a9aa57d8635e4a3ed898793bf5da7b5543ad5441979980402508cb86611b9982
+EBUILD setools-3.3.8-r7.ebuild 3817 SHA256 c38e15c7bdc709bc327e77f20851ce3d2389a3a1493b2bb244d5c4f2fabfbe79 SHA512 8773d57eaafe9060f1f4dd1c6d6d750b80107cf5aa0ee10325fa9b9eb0eb2f30ff976d6f7f22d266f6a4a5be415e3a75f6929449095845182c81906f2626e8cb WHIRLPOOL b88a4b1f59a94039096cb575efb31b358419829afff9a7e576f3ccc35268eca8df1149e441d13fcdac7c6a6a340a1bc3230ddb29f5b578d32fe84a6b17dc10e2
+MISC ChangeLog 13056 SHA256 4af6012fd01e9965b250183ad825f1986012b4471fa4a5a475850ca3de5fe7e1 SHA512 f9db8078b5fc61adc57d004818f31967e5e33a1d19e1325762983bbd1e5485b47ee950fd5647b61c6d04351d4f25e0acc3cd5e23c97cd92c0d193a5701784e46 WHIRLPOOL 7eca5ce9c74bc3cafaf7517693c33f6de8f9447b8f02d6336f22f38530bfc2bd4084262ac93beb56bcef37694901f8c278ad666eb187004fa6698e324534a492
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU3OtGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU45xTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vn4UP+gOh8/O5acBZJLeQA+Wx61uk
-/KyKZfUMnHEMhdM5kyWKDEVC3goda7aEfkzGXGfzVkf3XELRnEbZPEILy+mx7GOh
-g+U5cgfKyzekiDYUSxFpFZhPdkbVPkazwjvTztMY3jWqMgCcJYMy/fMbhQqUQldt
-ybX2CTU1VVKNNvMWC5H7MPgejhx8EzYPa+CDnpjfjjAza6Uy3eXRfwxLe7094MmM
-KswNYu/4/0fq2ABNV8caR1E/rKPrsQJ+UyulOvpHwd6byRxRKA6InkCU4S9WWzaU
-Ke9Z/zCV4ZcRmhOgfdwqj+z3fzcXmk904AhMihPCJ7h7GKTjsSItd0Pvs2qUYap0
-48m92G27E4ISrl6ypIkVMDmoxp1vOgnskfCyTXz85LtgqakdltC1lFB4vJrlJWfP
-7PIHU9H9TL1PV77j6eNmUgxuu/NaipaBQ5fbv0Zx+RRoGXqv3K5ZvFwpByXMV08b
-Z1+e/F61PJs/2TNjpB5523xzZmQRWJ8Fgh+6kl4KT9Xsw+Zu6bTGAwUB5q1mKcIF
-y9XaRBDqbi7gnLX7BobpFTI+JT/mwiy7kBmXny2R/8zY1gW2EIhNf7pqOg3e3iY3
-MGNY3kKd4MuQTKMdJmVFcqbz9yk2l6Utg7lg7zU98qIcvhwxzVEYLCH7sVltLUmq
-LpJamoRarTYN82Nl4vt1
-=e5dE
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9V9NUP/1l6ttpfTDKTwJRrm02+u4U0
+97LlyCtYbr7A9antDP8FNeNFpxwKN5+2duWbuSCV7WrMZj2CMVmLo22FgPMQQALt
+vflcZy3wwuLCz0d5G5YTvvB56GCyNCpD3Taz8k7LtOASV13+g7XW6i/vWcQFZuTw
+NoqzWCTyasLz7pNmCL51nad2PtwkM729cBmNH1Idoij7SXVKAaS6E3SMEZ+T2bkf
+BsngnBR+wq1QtbziNc2Dn+OnFipUnOqRCojlt8mbHPXZ+sR/DLA72Q5En6IA8i4b
+BJo2h7uMhyioaazQlBRY6XXuJ+OL/QF2/ySPJt9J6pkirY/WkOV/B/7YhCARoxEC
+mpbRmpVwM9UhsKLsaAdHc4gLLBHESoLLCmJ8xmIhU8GSuWJ446zhthPbNk0PWwRx
+4CkGxfCkm3vW/pL37wcBwL0a1TyYg3oHfFDK7x1ymLAx8J5NTpe1JfP7zHhbErRx
+QuVIw5O5hZOc6EsZcEAAO8YmXSzNcJE6Zae23v9+xJaLnzUhJ50zcp7FT5ztA7yd
+H+bfJWT6dqAqYKcjfTsW4zhnmTO64JeLBZVY/Ff8Odw7EWBBjHcEhqZDFu4La7QP
+NB3/lMdHx9OFbcR4gJMUsQuDO5PsKtwP8OPAapEa97EEm65VhKMe3X8ILwoKkC81
+I2CDDT154UrgFkImJXKD
+=xTp9
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
new file mode 100644
index 000000000000..584e35adf437
--- /dev/null
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.1 2015/02/17 19:53:46 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit autotools java-pkg-opt-2 python-r1 eutils
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+	http://dev.gentoo.org/~perfinion/patches/setools/${P}-04-gentoo-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="X debug java python"
+
+DEPEND=">=sys-devel/automake-1.12.1
+	>=sys-libs/libsepol-2.4
+	>=sys-libs/libselinux-2.4
+	sys-devel/bison
+	sys-devel/flex
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	java? (
+		>=virtual/jdk-1.4
+		dev-lang/swig
+	)
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RDEPEND=">=sys-libs/libsepol-2.1.4
+	>=sys-libs/libselinux-2.3
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	java? ( >=virtual/jre-1.4 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=dev-tcltk/bwidget-1.8
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RESTRICT="test"
+# setools dirs that contain python code to build
+PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+
+pkg_setup() {
+	local myld=$(tc-getLD)
+
+	if use java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	${myld} -v | grep -q "GNU gold" && \
+	ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now."
+}
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Fix build failure due to double __init__.py installation
+	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		# Python bindings are built/installed manually.
+		sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+		# Make PYTHON_LDFLAGS replaceable during running `make`.
+		sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+	done
+
+	epatch_user
+
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo '#!/bin/sh' > py-compile
+}
+
+src_configure() {
+	econf \
+		--with-java-prefix=${JAVA_HOME} \
+		--disable-selinux-check \
+		--disable-bwidget-check \
+		$(use_enable python swig-python) \
+		$(use_enable java swig-java) \
+		$(use_enable X swig-tcl) \
+		$(use_enable X gui) \
+		$(use_enable debug)
+
+	# work around swig c99 issues.  it does not require
+	# c99 anyway.
+	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+	emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+
+	if use python; then
+		building() {
+			python_export PYTHON_INCLUDEDIR
+			python_export PYTHON_SITEDIR
+			python_export PYTHON_LIBS
+			emake LD="$(tc-getLD).bfd" \
+				SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
+				PYTHON_LDFLAGS="${PYTHON_LIBS}" \
+				pyexecdir="${PYTHON_SITEDIR}" \
+				pythondir="${PYTHON_SITEDIR}" \
+				-C ${1};
+		}
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_foreach_impl building ${dir};
+		done
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		installation() {
+			python_export PYTHON_SITEDIR
+			emake DESTDIR="${D}" \
+				pyexecdir="${PYTHON_SITEDIR}" \
+				pythondir="${PYTHON_SITEDIR}" \
+				-C ${1} install
+		}
+
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_foreach_impl installation ${dir};
+		done
+	fi
+}