| 1 |
gienah 14/02/11 14:29:54 |
| 2 |
|
| 3 |
Modified: kodkod-1.5.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sci-mathematics/kodkod/kodkod-1.5.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: kodkod-1.5.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- kodkod-1.5.2.ebuild 2 Feb 2013 13:22:28 -0000 1.2 |
| 23 |
+++ kodkod-1.5.2.ebuild 11 Feb 2014 14:29:54 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.2 2013/02/02 13:22:28 gienah Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/kodkod-1.5.2.ebuild,v 1.3 2014/02/11 14:29:54 gienah Exp $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
|
| 33 |
@@ -48,6 +48,23 @@ |
| 34 |
|| die "Could not fix wscripts to respect LDFLAGS" |
| 35 |
# Fix bug 453162 - sci-mathematics/kodkod-1.5.2: fails to build |
| 36 |
epatch "${FILESDIR}/${PN}-1.5.2-changes-in-most-specific-varargs-method-selection.patch" |
| 37 |
+ |
| 38 |
+ # Fix Bug 458462 sci-mathematics/kodkod-1.5.2: fails to build with JAVA_PKG_STRICT |
| 39 |
+ local x="" |
| 40 |
+ for i in $JAVACFLAGS |
| 41 |
+ do |
| 42 |
+ if [ "${x}" == "" ]; then |
| 43 |
+ x="'${i}'" |
| 44 |
+ else |
| 45 |
+ x="${x}, '${i}'" |
| 46 |
+ fi |
| 47 |
+ done |
| 48 |
+ for j in $(find . -name wscript -print) |
| 49 |
+ do |
| 50 |
+ sed -e "s@def configure(conf):@def configure(conf):\n conf.env.JAVACFLAGS = [${x}]@" \ |
| 51 |
+ -i "${j}" \ |
| 52 |
+ || die "Could not set JAVACFLAGS in ${j}" |
| 53 |
+ done |
| 54 |
} |
| 55 |
|
| 56 |
# note: kodkod waf fails when passed --libdir: |
| 57 |
@@ -64,6 +81,16 @@ |
| 58 |
configure || die "configure failed" |
| 59 |
} |
| 60 |
|
| 61 |
+src_compile() { |
| 62 |
+ waf-utils_src_compile |
| 63 |
+ if has doc ${JAVA_PKG_IUSE} && use doc; then |
| 64 |
+ pushd src/kodkod || die "Could not cd to src/kodkod" |
| 65 |
+ javadoc $(find . -name \*.java -print) \ |
| 66 |
+ || die "javadoc failed" |
| 67 |
+ popd |
| 68 |
+ fi |
| 69 |
+} |
| 70 |
+ |
| 71 |
src_install() { |
| 72 |
insinto "/usr/"$(get_libdir) |
| 73 |
dodir ${LIBDIR} |
| 74 |
@@ -76,7 +103,6 @@ |
| 75 |
einfo "java-pkg_dojar $i" |
| 76 |
java-pkg_dojar $i |
| 77 |
done |
| 78 |
- dosym "/usr/share/${PN}-${SLOT}/package.env" "/usr/share/${PN}/package.env" |
| 79 |
|
| 80 |
# javadoc |
| 81 |
if has doc ${JAVA_PKG_IUSE} && use doc; then |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.4 sci-mathematics/kodkod/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.4&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?rev=1.4&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/kodkod/ChangeLog?r1=1.3&r2=1.4 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v |
| 94 |
retrieving revision 1.3 |
| 95 |
retrieving revision 1.4 |
| 96 |
diff -u -r1.3 -r1.4 |
| 97 |
--- ChangeLog 2 Feb 2013 13:22:28 -0000 1.3 |
| 98 |
+++ ChangeLog 11 Feb 2014 14:29:54 -0000 1.4 |
| 99 |
@@ -1,6 +1,11 @@ |
| 100 |
# ChangeLog for sci-mathematics/kodkod |
| 101 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.3 2013/02/02 13:22:28 gienah Exp $ |
| 103 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/kodkod/ChangeLog,v 1.4 2014/02/11 14:29:54 gienah Exp $ |
| 105 |
+ |
| 106 |
+ 11 Feb 2014; Mark Wright <gienah@g.o> kodkod-1.5.2.ebuild: |
| 107 |
+ Fix bug 458462 - sci-mathematics/kodkod-1.5.2: fails to build with |
| 108 |
+ JAVA_PKG_STRICT, fix by me. Remove dosym which was a workaround to EAPI 5 |
| 109 |
+ subslot depends that has since been fixed in the java eclasses. |
| 110 |
|
| 111 |
02 Feb 2013; Mark Wright <gienah@g.o> |
| 112 |
+files/kodkod-1.5.2-changes-in-most-specific-varargs-method-selection.patch, |
Archives