[gentoo-commits] gentoo-x86 commit in sci-mathematics/kodkod: kodkod-1.5.2.ebuild ChangeLog

["Mark Wright (gienah)" <gienah@gentoo.org>]

gienah      14/06/22 13:52:20

  Modified:             kodkod-1.5.2.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.4                  sci-mathematics/kodkod/kodkod-1.5.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?r1=1.3&r2=1.4

Index: kodkod-1.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kodkod-1.5.2.ebuild	11 Feb 2014 14:29:54 -0000	1.3
+++ kodkod-1.5.2.ebuild	22 Jun 2014 13:52:20 -0000	1.4
@@ -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 @@
 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 @@
 	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



1.5                  sci-mathematics/kodkod/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	11 Feb 2014 14:29:54 -0000	1.4
+++ ChangeLog	22 Jun 2014 13:52:20 -0000	1.5
@@ -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