* [gentoo-commits] gentoo-x86 commit in sci-mathematics/kodkod: kodkod-1.5.2.ebuild ChangeLog
@ 2013-02-02 13:22 Mark Wright (gienah)
0 siblings, 0 replies; 4+ messages in thread
From: Mark Wright (gienah) @ 2013-02-02 13:22 UTC (permalink / raw
To: gentoo-commits
gienah 13/02/02 13:22:28
Modified: kodkod-1.5.2.ebuild ChangeLog
Log:
Fix bug 453162 - workaround Java 7 Changes in Most Specific Varargs Method Selection - by removing an overloaded method to allow the dumb javac to compile it.
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?r1=1.1&r2=1.2
Index: kodkod-1.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kodkod-1.5.2.ebuild 5 Dec 2012 10:41:32 -0000 1.1
+++ kodkod-1.5.2.ebuild 2 Feb 2013 13:22:28 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1 2012/12/05 10:41:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.2 2013/02/02 13:22:28 gienah Exp $
EAPI="5"
@@ -46,7 +46,8 @@
-i "${S}/lib/cryptominisat-2.9.1/wscript" \
-i "${S}/lib/lingeling-276/wscript" \
|| 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"
}
# note: kodkod waf fails when passed --libdir:
1.3 sci-mathematics/kodkod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 20 Jan 2013 13:17:39 -0000 1.2
+++ ChangeLog 2 Feb 2013 13:22:28 -0000 1.3
@@ -1,6 +1,13 @@
# 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.2 2013/01/20 13:17:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.3 2013/02/02 13:22:28 gienah Exp $
+
+ 02 Feb 2013; Mark Wright <gienah@gentoo.org>
+ +files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch,
+ kodkod-1.5.2.ebuild:
+ Fix bug 453162 - workaround Java 7 Changes in Most Specific Varargs Method
+ Selection - by removing an overloaded method to allow the dumb javac to
+ compile it.
20 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
Fix invalid metadata.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/kodkod: kodkod-1.5.2.ebuild ChangeLog
@ 2014-02-11 14:29 Mark Wright (gienah)
0 siblings, 0 replies; 4+ messages in thread
From: Mark Wright (gienah) @ 2014-02-11 14:29 UTC (permalink / raw
To: gentoo-commits
gienah 14/02/11 14:29:54
Modified: kodkod-1.5.2.ebuild ChangeLog
Log:
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.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path
1.3 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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?r1=1.2&r2=1.3
Index: kodkod-1.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kodkod-1.5.2.ebuild 2 Feb 2013 13:22:28 -0000 1.2
+++ kodkod-1.5.2.ebuild 11 Feb 2014 14:29:54 -0000 1.3
@@ -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 @@
|| 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 @@
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 @@
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
1.4 sci-mathematics/kodkod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?r1=1.3&r2=1.4
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 2 Feb 2013 13:22:28 -0000 1.3
+++ ChangeLog 11 Feb 2014 14:29:54 -0000 1.4
@@ -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,
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/kodkod: kodkod-1.5.2.ebuild ChangeLog
@ 2014-06-22 13:52 Mark Wright (gienah)
0 siblings, 0 replies; 4+ messages in thread
From: Mark Wright (gienah) @ 2014-06-22 13:52 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/kodkod: kodkod-1.5.2.ebuild ChangeLog
@ 2015-01-03 12:26 Michal Gorny (mgorny)
0 siblings, 0 replies; 4+ messages in thread
From: Michal Gorny (mgorny) @ 2015-01-03 12:26 UTC (permalink / raw
To: gentoo-commits
mgorny 15/01/03 12:26:50
Modified: kodkod-1.5.2.ebuild ChangeLog
Log:
Use python-any-r1 for waf.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.5 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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?r1=1.4&r2=1.5
Index: kodkod-1.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kodkod-1.5.2.ebuild 22 Jun 2014 13:52:20 -0000 1.4
+++ kodkod-1.5.2.ebuild 3 Jan 2015 12:26:50 -0000 1.5
@@ -1,12 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4 2014/06/22 13:52:20 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.5 2015/01/03 12:26:50 mgorny Exp $
EAPI="5"
JAVA_PKG_IUSE="doc source"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
-inherit java-pkg-2 waf-utils
+inherit java-pkg-2 python-any-r1 waf-utils
DESCRIPTION="a constraint solver for relational logic"
HOMEPAGE="http://alloy.mit.edu/kodkod/index.html"
@@ -29,6 +31,11 @@
JAVA_SRC_DIR="src"
LIBDIR="/usr/"$(get_libdir)"/${PN}"
+pkg_setup() {
+ python-any-r1_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
src_unpack() {
unpack "${A% *}"
cp "${DISTDIR}/${A#* }" "${S}/waf" || die "Could not copy waf"
1.6 sci-mathematics/kodkod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 22 Jun 2014 13:52:20 -0000 1.5
+++ ChangeLog 3 Jan 2015 12:26:50 -0000 1.6
@@ -1,6 +1,9 @@
# 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.5 2014/06/22 13:52:20 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.6 2015/01/03 12:26:50 mgorny Exp $
+
+ 03 Jan 2015; Michał Górny <mgorny@gentoo.org> kodkod-1.5.2.ebuild:
+ Use python-any-r1 for waf.
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-03 12:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-22 13:52 [gentoo-commits] gentoo-x86 commit in sci-mathematics/kodkod: kodkod-1.5.2.ebuild ChangeLog Mark Wright (gienah)
-- strict thread matches above, loose matches on Subject: below --
2015-01-03 12:26 Michal Gorny (mgorny)
2014-02-11 14:29 Mark Wright (gienah)
2013-02-02 13:22 Mark Wright (gienah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox