Fix bug 458462 - sci-mathematics/kodkod-1.5.2: fails to build with JAVA_PKG_STRICT, fix by me. Remove dosym which was a workaround to EAPI 5 subslot depends that has since been fixed in the java eclasses.

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

3 files changed, 42 insertions, 11 deletions

diff --git a/sci-mathematics/kodkod/ChangeLog b/sci-mathematics/kodkod/ChangeLog
index 6615db093f68..2be977692d14 100644
--- a/sci-mathematics/kodkod/ChangeLog
+++ b/sci-mathematics/kodkod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/kodkod
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.3 2013/02/02 13:22:28 gienah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.4 2014/02/11 14:29:54 gienah Exp $
+
+  11 Feb 2014; Mark Wright <gienah@gentoo.org> kodkod-1.5.2.ebuild:
+  Fix bug 458462 - sci-mathematics/kodkod-1.5.2: fails to build with
+  JAVA_PKG_STRICT, fix by me. Remove dosym which was a workaround to EAPI 5
+  subslot depends that has since been fixed in the java eclasses.
 
   02 Feb 2013; Mark Wright <gienah@gentoo.org>
   +files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch,
diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
index f311b5649685..2d376e424ee4 100644
--- a/sci-mathematics/kodkod/Manifest
+++ b/sci-mathematics/kodkod/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch 1045 SHA256 87727817e23d03156acc5a56238124e265f0eef13f441ea5ba6802df1e94ca34 SHA512 ff30065387503ffa1fb74de988a36526f3680a648faae1a6826db6b91c2dfaac0f63ff6dba32e5fcef11a7b5727a385dfd9301d030f45213e091886c40ea7867 WHIRLPOOL 413786b0562f86e378d96494f71a81da4b6eedb0b66c2b64c908c7adf8b309d62c5d3999a0aca9d135601f1c337c05a927b73926c2c52e0232edd114d2f4c9f1
 DIST kodkod-1.5.2.zip 2092639 SHA256 c54e2181f1e094bf34d52d3ab47b313c4d4464dc25c2cbb3ffd80929d1004a41 SHA512 d55d84e1daabe37c6994fd434c157d5eaecd1d0b2bbe4ab5a2d5e0e529a378d0cb8dc1eac5b89336706f899b23b9682dfd1033f4a2caec76485b12966e091df0 WHIRLPOOL 9919b7bb4de3cf8d53804cfb4a8c5874575acadc6fc7f0afcabd31847947e2f1f77ffb5565fe283088bafb9421fdc8d1245243a58e7f5d97004ecf66d7f1ac12
 DIST waf-1.7.6 89646 SHA256 99a8ae36d856da288308388a349aae4264afee09edb2e7dfedbcfcddc83c0609 SHA512 b068dfa54092fd845112c8a1db7cda449c905bdc5fd31c04c8330e54c29aa5119c36c9fd0562172dd389dbc87eae41d7a54be1f3757a52228c1f204934c96d76 WHIRLPOOL 5bb74c776c0584ea69ae5a65eea0e342f9e66156811e4a5047f24e79be6a48c6bae8da680bf3ca01aead082419ce324a555d6aece3bb8976c59e3d5556a12926
-EBUILD kodkod-1.5.2.ebuild 2890 SHA256 595cef6bfb447b714b5d270329719a1311a719208e1a93613201f8a691a3655b SHA512 5d8668843946fe49a9e9c315ac65c17039c7cb06b248b6ec102129723acc2f24212f16739f5d2f15356c75288d34f5bd94b4b0a417db3edced071878c33d1c5e WHIRLPOOL 43cf2b2b47c61f4df79c67a5fd3da85d64537833bfddff6e6daa882e99f1a4b632020582e366b2798ad5e9005f94de3cb267e64bdc36430cb5d9a240317c934b
-MISC ChangeLog 876 SHA256 e6d089a1bd506ee2fdb0b4de59594cfa6ba0bcbca636317ab80ea6aa56aea660 SHA512 3d1bf98073300083adee381e527a7ab55b4d8ba62e873d0aee58601e4fd38e7270e9064c971cbe477a7c4993ee24f212e8b58346092ad8b458c678e404e3b133 WHIRLPOOL a8caaca0cf1bcc16ec0fb72d0e7fe76416eb968a5fdf5ad0f86a1c1cb456388ab8fa0b34dd3ceae7d6716be307521cb13e1b2414b69e10e8cf71ffc12ef3a1ee
+EBUILD kodkod-1.5.2.ebuild 3443 SHA256 c5116a7dacbffb842877ffc5885e40ff6c4a640181abf86da22d207175499dd6 SHA512 36accfa5f15a7974f59a191387e765927d645144fc640a6285ba97643481703fb92e8c2571cfb281e43b8af3e8063dd083c139f3afa45bbf45fd6af7bd0bdf9f WHIRLPOOL bbff579a9ff928cbd221b6322bf1d91219426e89777cd8524931ce981300fef88d66a7bb75a992ab76b00b82e836f11f06b153130141c5d79e8059cb238a4d01
+MISC ChangeLog 1156 SHA256 c1a624e839b76567444da6c1853fdfc8bc6a0503885e70ebbbcd97e1fbf5a2a6 SHA512 6902714e5e15d0239ab8d7a1b8fae9f26bacb7d0765be25251f4af48ee53b8c927fad0e857d7e512ba5c53ec07a08a19ea7a40da751bdf7526623e2355151f99 WHIRLPOOL 3d32a5e9c12d752e933e576e13043bd2466f8985223cfcfa2b5d0daf6419fb0b17dc5db11d45533790fb1a6248afce16409f2e719639a68f8f9ea38ff3f94810
 MISC metadata.xml 798 SHA256 74928d2fab41145e7be09baed056d967e2b8039d2cf19bb76d93dc760af8b383 SHA512 e824fda882b8079e26001bfedf50843a30d16956184088e4fb12805da2b1b65e1ecc85556f74c43f0c211c7f5c00df64695688f9c98b4ee4b199b458dda40ca2 WHIRLPOOL 1d2004703df7a3f126545a755d26f4216c4d3fd9ab8b0a190c4a4807af136b6a7f975728456462604ab939fcf9d18cd1af68f12ac2b3f567ecf11486cb211419
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlENEyQACgkQoBEVQmGOlx+CfwEA3CgLbWkc4krYXerYJnQEDaEC
-Ig9bGj33pK/o/OoK/sEA/19kr8EHwyiyT7SIZ4I5pld/oKwoZFJtFT1/XKIQDnhv
-=1cVv
+iF4EAREIAAYFAlL6M/EACgkQoBEVQmGOlx94ywEAntusso2FfN9nWnGszwJzQTqs
+I8ujh6VUbU2EgQv9vJUBANDVk7M2oivpFUM1So95lLf34oflEDt5V+uLiceGbFMw
+=0MaN
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
index fe3a5f32b2c5..28686a339a36 100644
--- a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
+++ b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.2 2013/02/02 13:22:28 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.3 2014/02/11 14:29:54 gienah Exp $
 
 EAPI="5"
 
@@ -48,6 +48,23 @@ src_prepare() {
 		|| die "Could not fix wscripts to respect LDFLAGS"
 	# Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build
 	epatch "${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch"
+
+	# Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with JAVA_PKG_STRICT
+	local x=""
+	for i in $JAVACFLAGS
+	do
+		if [ "${x}" == "" ]; then
+			x="'${i}'"
+		else
+			x="${x}, '${i}'"
+		fi
+	done
+	for j in $(find . -name wscript -print)
+	do
+		sed -e "s@def configure(conf):@def configure(conf):\n    conf.env.JAVACFLAGS = [${x}]@" \
+			-i "${j}" \
+			|| die "Could not set JAVACFLAGS in ${j}"
+	done
 }
 
 # note: kodkod waf fails when passed --libdir:
@@ -64,6 +81,16 @@ src_configure() {
 		configure || die "configure failed"
 }
 
+src_compile() {
+	waf-utils_src_compile
+	if has doc ${JAVA_PKG_IUSE} && use doc; then
+		pushd src/kodkod || die "Could not cd to src/kodkod"
+		javadoc $(find . -name \*.java -print) \
+			|| die "javadoc failed"
+		popd
+	fi
+}
+
 src_install() {
 	insinto "/usr/"$(get_libdir)
 	dodir ${LIBDIR}
@@ -76,7 +103,6 @@ src_install() {
 		einfo "java-pkg_dojar $i"
 		java-pkg_dojar $i
 	done
-	dosym "/usr/share/${PN}-${SLOT}/package.env" "/usr/share/${PN}/package.env"
 
 	# javadoc
 	if has doc ${JAVA_PKG_IUSE} && use doc; then