summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2014-06-22 13:52:30 +0000
committerMark Wright <gienah@gentoo.org>2014-06-22 13:52:30 +0000
commiteb80c0f023f0f2673b858112a022fe279bd7ae51 (patch)
tree45d5035aa7e759e0ec7a17851f1bc3b45731e37f /sci-mathematics
parentkeyword ~ia64 wrt bug #493156 (diff)
downloadhistorical-eb80c0f023f0f2673b858112a022fe279bd7ae51.tar.gz
historical-eb80c0f023f0f2673b858112a022fe279bd7ae51.tar.bz2
historical-eb80c0f023f0f2673b858112a022fe279bd7ae51.zip
Use waf 1.7.16 instead of 1.7.6 in kodkod to try to fix Bug 513978. Specify the classpath to javadoc. Use the javadoc -Xdoclint:none option for java 1.8 and later versions.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/kodkod/ChangeLog7
-rw-r--r--sci-mathematics/kodkod/Manifest12
-rw-r--r--sci-mathematics/kodkod/kodkod-1.5.2.ebuild13
3 files changed, 22 insertions, 10 deletions
diff --git a/sci-mathematics/kodkod/ChangeLog b/sci-mathematics/kodkod/ChangeLog
index 2be977692d14..22e62ed70041 100644
--- a/sci-mathematics/kodkod/ChangeLog
+++ b/sci-mathematics/kodkod/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-mathematics/kodkod
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.5 2014/06/22 13:52:20 gienah Exp $
+
+ 22 Jun 2014; Mark Wright <gienah@gentoo.org> kodkod-1.5.2.ebuild:
+ Use waf 1.7.16 instead of 1.7.6 in kodkod to try to fix Bug 513978. Specify
+ the classpath to javadoc. Use the javadoc -Xdoclint:none option for java 1.8
+ and later versions.
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
diff --git a/sci-mathematics/kodkod/Manifest b/sci-mathematics/kodkod/Manifest
index 2d376e424ee4..b0f5a32ffa66 100644
--- a/sci-mathematics/kodkod/Manifest
+++ b/sci-mathematics/kodkod/Manifest
@@ -3,14 +3,14 @@ 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 3443 SHA256 c5116a7dacbffb842877ffc5885e40ff6c4a640181abf86da22d207175499dd6 SHA512 36accfa5f15a7974f59a191387e765927d645144fc640a6285ba97643481703fb92e8c2571cfb281e43b8af3e8063dd083c139f3afa45bbf45fd6af7bd0bdf9f WHIRLPOOL bbff579a9ff928cbd221b6322bf1d91219426e89777cd8524931ce981300fef88d66a7bb75a992ab76b00b82e836f11f06b153130141c5d79e8059cb238a4d01
-MISC ChangeLog 1156 SHA256 c1a624e839b76567444da6c1853fdfc8bc6a0503885e70ebbbcd97e1fbf5a2a6 SHA512 6902714e5e15d0239ab8d7a1b8fae9f26bacb7d0765be25251f4af48ee53b8c927fad0e857d7e512ba5c53ec07a08a19ea7a40da751bdf7526623e2355151f99 WHIRLPOOL 3d32a5e9c12d752e933e576e13043bd2466f8985223cfcfa2b5d0daf6419fb0b17dc5db11d45533790fb1a6248afce16409f2e719639a68f8f9ea38ff3f94810
+DIST waf-1.7.16 91846 SHA256 b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61 SHA512 ccdf27cac76f525e11bde20d01c3f81b738b4c990934ee290a390fcf1b278da05047bcee76973c80be4557689344f6df33c13e232b278258745e2f19eeed5ebf WHIRLPOOL 79b59876606a93c7a13548799c8797f40515cbf8bc2944018de758df3e8cd9698e4304d5d26a03ae883195ec02d6e0b12e6fc7160e4ef31446d7c3d05f98983a
+EBUILD kodkod-1.5.2.ebuild 3757 SHA256 0a9f404b1491546f6661d2813c4e2636a80291b165494c17cdb3885803490752 SHA512 77447337b2d15d1db6ed7c5ca32fa89ea35b2a93b5cec314d41881e121d4e726428dc6de3d199643eadea5b780feb13e70b53833f8d270ed35df7976dbc33d28 WHIRLPOOL 45a2b5c3cf627536173a04f307589d37b62c051ad226d139d3b80032d1db7b3017220278daff958005f37abdd0fdc4b9792e783d9915fd5e88e23f513b46c91f
+MISC ChangeLog 1405 SHA256 75b13b4274cbf008545a8150e9dd0fe4cd4c166259e966353738820c0fd219c2 SHA512 3195635880572f432f1fbeb424ce232b0a363fe5d95777b315d1987eeb9ed6683098f7b609afbe16af3833422f30efa86044d7b5799135f548c1c05e83f22d27 WHIRLPOOL 17ad58fdc29865d286499e610fd0f883f7873bf39df6417c95f54d5606fdd22e474c252168c3192a66f7e93f5b1a5d0f5a122f9d913da3f931f4428eadd0efcd
MISC metadata.xml 798 SHA256 74928d2fab41145e7be09baed056d967e2b8039d2cf19bb76d93dc760af8b383 SHA512 e824fda882b8079e26001bfedf50843a30d16956184088e4fb12805da2b1b65e1ecc85556f74c43f0c211c7f5c00df64695688f9c98b4ee4b199b458dda40ca2 WHIRLPOOL 1d2004703df7a3f126545a755d26f4216c4d3fd9ab8b0a190c4a4807af136b6a7f975728456462604ab939fcf9d18cd1af68f12ac2b3f567ecf11486cb211419
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iF4EAREIAAYFAlL6M/EACgkQoBEVQmGOlx94ywEAntusso2FfN9nWnGszwJzQTqs
-I8ujh6VUbU2EgQv9vJUBANDVk7M2oivpFUM1So95lLf34oflEDt5V+uLiceGbFMw
-=0MaN
+iF4EAREIAAYFAlOm35wACgkQoBEVQmGOlx9MdAD/Vlv6PhmAcJW9EdVu7Ao+LeH+
+btBllwssj7F+jNzOljMA/2mnOp7TQhmIcoAYmtd6QQKjx7OjrlmPSvbVhxzZn/PS
+=ri4B
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/kodkod/kodkod-1.5.2.ebuild b/sci-mathematics/kodkod/kodkod-1.5.2.ebuild
index 28686a339a36..ac96d56cbd5f 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-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.3 2014/02/11 14:29:54 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.4 2014/06/22 13:52:20 gienah Exp $
EAPI="5"
@@ -11,7 +11,7 @@ inherit java-pkg-2 waf-utils
DESCRIPTION="a constraint solver for relational logic"
HOMEPAGE="http://alloy.mit.edu/kodkod/index.html"
SRC_URI="http://alloy.mit.edu/kodkod/${PV}/${P}.zip
- http://waf.googlecode.com/files/waf-1.7.6"
+ http://waf.googlecode.com/files/waf-1.7.16"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
@@ -85,7 +85,14 @@ 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) \
+ local doclint="-Xdoclint:none"
+ local jv="$(javac -version 2>&1 | cut -d' ' -f 2)"
+ if [[ "${jv}" == 1.6* ]] || [[ "${jv}" == 1.7* ]]; then
+ doclint=""
+ fi
+ javadoc ${doclint} -sourcepath "${S}"/src/kodkod:"${S}"/build/src/kodkod \
+ -classpath $(find "${PWD}" -name \*.jar -print | xargs | sed -e 's@ @:@g') \
+ $(find . -name \*.java -print) \
|| die "javadoc failed"
popd
fi