diff options
| author |   Mark Wright <gienah@gentoo.org> | 2014-06-22 13:52:20 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2014-06-22 13:52:20 +0000 |
| commit | b66c2ff39d3c9e9320207e501f5ff55a19c93097 (patch) | |
| tree | b6c1bb8854211c3ed0675462bfaede8867fc758d /sci-mathematics/kodkod | |
| parent | keyword ~ia64 wrt bug #493156 (diff) | |
| download | gentoo-2-b66c2ff39d3c9e9320207e501f5ff55a19c93097.tar.gz gentoo-2-b66c2ff39d3c9e9320207e501f5ff55a19c93097.tar.bz2 gentoo-2-b66c2ff39d3c9e9320207e501f5ff55a19c93097.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.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'sci-mathematics/kodkod')
| -rw-r--r-- | sci-mathematics/kodkod/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-mathematics/kodkod/kodkod-1.5.2.ebuild | 13 |
2 files changed, 16 insertions, 4 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/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 |