Fix bug #509532 - Build failure with unresolved overloaded function type

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 186 insertions, 15 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index d4da9ea8c764..ee6e2cc7bcad 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.89 2014/03/24 19:53:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.90 2014/05/28 16:58:19 swift Exp $
+
+*setools-3.3.8-r5 (28 May 2014)
+
+  28 May 2014; Sven Vermeulen <swift@gentoo.org> +setools-3.3.8-r5.ebuild:
+  Fix bug #509532 - Build failure with unresolved overloaded function type
 
   24 Mar 2014; Sven Vermeulen <swift@gentoo.org> setools-3.3.8-r4.ebuild:
   Stabilize
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 0f1f1e413153..4c5ec5ba8d06 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -11,6 +11,7 @@ DIST setools-3.3.7.tar.bz2 940657 SHA256 2bfa0918746bdcc910b16b26a51109a4ffd0740
 DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
 DIST setools-3.3.8-01-gentoo-patches.tar.gz 5798 SHA256 3b8fa933617e42f1fe857b2b8b9ae949ea01324f98f17837e988714562b076b8 SHA512 bcca3678b3f3a3abdbac2d05b1007329249e0dda4f84a9c40c3030cdf22f7815a47bcfa68d7c70836ec1b8b2cbfd8c370d7cd7d09c41b3d4983ec23d79468e56 WHIRLPOOL 5a6072e512754caf7af32a626b3213d6a543c51cc0ff67bbd9b3f6bb822a0b8e406f7e245c9d459be27e2d6ecef527633b889aface5bffc2e04cc15f881529bb
 DIST setools-3.3.8-02-gentoo-patches.tar.gz 6296 SHA256 d386e82ebc0070548a401756985854b79674d7b144076b28f4eaf37fccc0fa1a SHA512 d86ff65f23e54a659eeb2e91d71075e8667d972adcc698709c64f33a9702bb196ef0ded4b5d415f8e5b6a552bfddaaf52b42aa71fb21299f29ca2b7ae230adf1 WHIRLPOOL cd50fbd2f7732f447c224000cd2ebf30c17728217f2e0529d297a110e2ea016498b9bce3dc5209ab8e2cd5091e70e55fb85296bb818567ebe781df74d9aaddf5
+DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
 EBUILD setools-3.3.7-r1.ebuild 4297 SHA256 93f8e6d0e377fb1efb48495312a9732e99766901b4895da0562ea9fd5e1e0294 SHA512 0ebde8932bf65b1bd06401761238029c11358c5b990d49b414445b227e4277620df1ed62f82600ff4b0fbe0b05c943fd0e88c43a902a7d91a9b168c12641e04b WHIRLPOOL af203d89bbbacb7bbc095ce48c03302380c30075959f7386d2c45e04674f5f2c38167d40b0025234b2573f2d5a16976a18f76b665547085c3635db8322fc8646
 EBUILD setools-3.3.7-r3.ebuild 4907 SHA256 e53cb13a5ebe4e87432d3f18ad099fc0e9616a2339ef1973c78b11e3d4988774 SHA512 24593a56d6c5f16961e65a06ebc92035377976d5c967c8406ee25d8a6ff281577038d7d59e0bb75149d8eb96b891cea03422f731ec95d0ac5bc19940e1d2dd8e WHIRLPOOL 80deb12f2a5edff7b325290368af5f5a86110dff2baf49f031a7edaf610e50e416efd77aa580cdd67d43982e11c3cf805e4117b8dd88e318367c84e49a694624
@@ -20,22 +21,23 @@ EBUILD setools-3.3.8-r1.ebuild 4919 SHA256 42afa1ed05ee5af6f7b85641852cb3c79849a
 EBUILD setools-3.3.8-r2.ebuild 5087 SHA256 5101bfbfd6c76be0f8e984d0e3075da77e8fe1af167e636b9c206038029e98a2 SHA512 146ac0b7e3e9ebf3dfb29446f890f9104a805fdb7aa47061fbe46037303570428830b14ce030be979dd5e4637bb1a01a3324ca0cd7426db09dce768fbe3d3601 WHIRLPOOL e0b8bc0a9e69eb75d974e388d7fff8e13ebe10b7072933edb13d018bbff4af46a24946fc0caf6fe43288ada36861ff4ba9a5764f5c39d826bf9614f264905b19
 EBUILD setools-3.3.8-r3.ebuild 5089 SHA256 106a859da7a115f59f9e68ea77f760207173ead27351f104b17e351974400e21 SHA512 a3565e8296f3fcebd4a600a6a53f648a7a6eecc35d6ba8c8c69681cb0f1445cb22ddc7ce043e39965ae7db0a8d8f8e66a8f037906f7bf6554baff68092827331 WHIRLPOOL d1556dee1f7284dc0cf7312291515d1976ee6f1867e517c57f59d60afbc84b75482ff3dc938b4befa31f1a72e459e8374dfe6dae0fc5d848e44570080a37fa35
 EBUILD setools-3.3.8-r4.ebuild 4544 SHA256 142569315f53b8def43cfc7b16be00fe7344891b04040e4fb3eb4f47d53b9e7b SHA512 43d795a6ea057879f54357455a6c4516ddd09a9453def5c9bba3120731eaa650ba80ea7d1724f38a3d8397e34e3a92363546100799cecbe304a71f95ba21cd5b WHIRLPOOL a0f31ad0cf46bf87d2921fa12244e144469ddc02fb4c9f71032f45d5eff36daca781c60b86a3f6c3e6d09f9e4934d3b50fb5c3d024e8643450586230dab9606a
-MISC ChangeLog 11983 SHA256 beb0a0aacf3598bd2e81a5756b0a4788dcc4c8d9b2be2756269ce7b5dce9c172 SHA512 b2bf41d42cbca9f6e39d8a4436f062babc6681b289707689c208ff9db3ea375009020a3b101220c33bf76b2c61a3faf8aae78d69428d1392bfc22bc4d4c2049a WHIRLPOOL cc2c08c8e9d6873d79824da743623ea606462fd60848f3678f5dbfe001767f6ab42c63748948551ce0f514066bdecc20f27ee9d88c0b1fc7c897db69ccd24c31
+EBUILD setools-3.3.8-r5.ebuild 4558 SHA256 bc645a7b652b3f15160735c6ddfca6ad1924371a26e0dd818c774c21c5696035 SHA512 e9739cf5d3c0600dfcac7682bb6751da1b841bafe53b0e7e5bdc56facc1d98c380966f7d00884ccecf0a2aeb9d9c72e82cf5f796233759c6418e3d892617c4df WHIRLPOOL 50bd1eeb27e913fa9ecc77fbc1011f97566bb08440f72f8cabcd159ddb419df9a5e2f7961b03f19e594b638e5951b67607e0ebd268976028be43372479453434
+MISC ChangeLog 12167 SHA256 a0fa78ad486d002003523db70b0e556d8ad262adb2022721a5a100b4dafeec42 SHA512 54e4e8ec43c1e3f7b792e025c91c27514952ebd7da5333420e37f2bbb9990a1b735d617410c4c5b0ebb015efd3f79d955ab81d5006b734b2a795d0b3a2e7a686 WHIRLPOOL b0bd782f077d51e3b42b0e9f8e54906c137d7a2fd9d1ea8ce5860ad74a3874a5329bf63a08316a2ff295e26d827657e7c152d6945c52da66ac1cbc37e9ed5c21
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMIzDAAoJEC7dUkA7aK9Hk/UP/i+9HaV8kl62QxEuEsb3wmKl
-BGgHDNveckiJLSamXfm84Uhhl0+eecz8gKSeryBlXPnR3H/qIfsjDDowPGZJ8WEX
-kQYE5/OBbjiORrazvvb+SiBf6tEHeGiuA6RRDyzjOIwXAgB0cOZeHs01UNe2k5Uy
-Z7b9xoaEnrz+pUdtV2mEtWxc9hdM9UnCJz3xki+zvHEq1OkB37UV39jpiJy4zrGS
-tvx19iLlgIZqMeBIz9PrLb35ucMgKlTEwCUifm2tN59N0t+G5VYOsb+0ZOTwNtxS
-vlRNWaAODtziV8IO1ZfC+UvuJY/DumuQ+Uw8NAu9yPvnlrzRGmXoqdAtl3bdrL3p
-8M/2DNj9TxnuxJilAAcmO/cZI4RuS2GZ8SSRTMbO685mN+qN31svUAQd9uBoSIKp
-SvYwqllPsJ2Jab108FipLqc/tXHkTt09SWTzBOuH6BGXS6k6C+E5kMizx46qsTz2
-YJwTTciZMrK3FI7MCpcOqWx4ruXwfhIkws1TlZqj82OUZqGC++ux9LKjypPLlDKd
-pq237kEcK4yifoBF8kewaxz8FeVri66BMvCMZNqMs/pkSfBPzDGlPw/TzSvwb+ww
-Zd3JAL2+az9jEve14VxejtpXcLWfygM3se6bcxU6rjK/xxhDwkQfNLRg9pbyQkAt
-ABDVHNFrgxTq9ye1n+I1
-=htat
+iQIcBAEBCAAGBQJThhWXAAoJEC7dUkA7aK9HlhsP/jygaqt3g4omlXp8fk6MNhtv
+mKtPRuj7AD5vRg0t9O4P/HULlWxnkpVnCNM6z+3hPMj5FwjX0v3BCxqOb7TYGYhl
+7i+xiesBdNCIfzErt1Jr9jd0MO/t9IVdujQ68X1XGLkrKy4P34rpqDWV8OTPHNcm
+uw7zRoZLx6n7Epsz8YuAhr9cZPSXI/bzYsuW0h3WQS+MiwxsPL1t16zZmdolmxlI
+CDEQx2nTYGSHxcGUN8N0is3swJu9op/9UTEFEO8LYwqGheB3cCcTP9a5I45Jw7fj
+xViyGPGzOF0C/jhQqxbDOKHPVSmXtAZNrbUGTwGcL4NKcYtF33iN24DDHR4faCfy
+kjePPSmiAtGt7/wvneW4OKIzHWvjp1o5qgBecOab5SZmekTtCGodEINVNxTjK0OK
+1mb/+fkiq+/whkkR9pS6LBVOXiPQ9itCE4EWyhWF5f+2PHSd1ySnv4gT1vcRCGWY
+t9/uUWudYURy9sBjGvlFUFu/17tkdJt0cAaBxvNNY30x2sHksgk0YWsL3A0hFSoF
+/wtIk5UmRDtSj/kcKsvIcxuDAWkfvAU9unIPKQIOA9hqaBrFqavPt0gtO0Pv6nou
+0uPfXpF1TrrMKnVVkxQz7s66y2xQvrQsEkO8XhkDzyPXWHUjxFI6bzZQvVsilCj3
+b2uN6Sw6/EOJ01oAuur0
+=uar7
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/setools-3.3.8-r5.ebuild b/app-admin/setools/setools-3.3.8-r5.ebuild
new file mode 100644
index 000000000000..207e69c12f4e
--- /dev/null
+++ b/app-admin/setools/setools-3.3.8-r5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 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-r5.ebuild,v 1.1 2014/05/28 16:58:19 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+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/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
+	http://dev.gentoo.org/~swift/patches/setools/${P}-03-gentoo-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug java python"
+
+DEPEND=">=sys-libs/libsepol-2.1.4
+	>=sys-libs/libselinux-2.3
+	sys-devel/bison
+	sys-devel/flex
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	java? (
+		dev-lang/swig:1
+		>=virtual/jdk-1.4
+	)
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig:1
+	)
+	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 (Fedora-provided) setools fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Disable broken check for SWIG version.
+	sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
+	# Use swig1.3
+	sed -e 's/AC_PATH_PROG(\[SWIG\],\[swig\])/AC_PATH_PROG([SWIG],[swig1.3])/' -i m4/ac_pkg_swig.m4 || die "failed to set swig1.3"
+	# 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
+
+	# temporary work around bug #424581 until automake-1.12 is stable (then
+	# depend on it). Need to use MKDIR_P in the mean time for 1.12+.
+	has_version ">=sys-devel/automake-1.12.1" && { find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} +  || die; }
+
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo '#!/bin/sh' > py-compile
+
+	epatch_user
+}
+
+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
+}