| 1 |
caster 10/01/08 19:04:26 |
| 2 |
|
| 3 |
Modified: ChangeLog emma-2.0.5312-r2.ebuild |
| 4 |
Removed: emma-2.0.5312-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix building with ibm-jdk-bin-1.6 on 64bits - bug #220463. |
| 7 |
(Portage version: 2.2_rc60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.20 dev-java/emma/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/emma/ChangeLog?rev=1.20&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/emma/ChangeLog?rev=1.20&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/emma/ChangeLog?r1=1.19&r2=1.20 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v |
| 19 |
retrieving revision 1.19 |
| 20 |
retrieving revision 1.20 |
| 21 |
diff -u -r1.19 -r1.20 |
| 22 |
--- ChangeLog 31 Aug 2008 13:32:47 -0000 1.19 |
| 23 |
+++ ChangeLog 8 Jan 2010 19:04:26 -0000 1.20 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-java/emma |
| 26 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.19 2008/08/31 13:32:47 maekke Exp $ |
| 28 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.20 2010/01/08 19:04:26 caster Exp $ |
| 30 |
+ |
| 31 |
+ 08 Jan 2010; Vlastimil Babka <caster@g.o> -emma-2.0.5312-r1.ebuild, |
| 32 |
+ emma-2.0.5312-r2.ebuild: |
| 33 |
+ Fix building with ibm-jdk-bin-1.6 on 64bits - bug #220463. |
| 34 |
|
| 35 |
31 Aug 2008; Markus Meier <maekke@g.o> emma-2.0.5312-r2.ebuild: |
| 36 |
amd64 stable, bug #212344 |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.7 dev-java/emma/emma-2.0.5312-r2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild?rev=1.7&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild?rev=1.7&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild?r1=1.6&r2=1.7 |
| 45 |
|
| 46 |
Index: emma-2.0.5312-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild,v |
| 49 |
retrieving revision 1.6 |
| 50 |
retrieving revision 1.7 |
| 51 |
diff -u -r1.6 -r1.7 |
| 52 |
--- emma-2.0.5312-r2.ebuild 31 Aug 2008 13:32:47 -0000 1.6 |
| 53 |
+++ emma-2.0.5312-r2.ebuild 8 Jan 2010 19:04:26 -0000 1.7 |
| 54 |
@@ -1,9 +1,9 @@ |
| 55 |
-# Copyright 1999-2008 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild,v 1.6 2008/08/31 13:32:47 maekke Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild,v 1.7 2010/01/08 19:04:26 caster Exp $ |
| 60 |
|
| 61 |
# No support for javadocs in build.xml |
| 62 |
-EAPI=1 |
| 63 |
+EAPI=2 |
| 64 |
JAVA_PKG_IUSE="source" |
| 65 |
|
| 66 |
inherit base java-pkg-2 java-ant-2 |
| 67 |
@@ -24,10 +24,14 @@ |
| 68 |
DEPEND=">=virtual/jdk-1.4 |
| 69 |
app-arch/unzip" |
| 70 |
|
| 71 |
-PATCHES=( "${FILESDIR}/${P}-java15api.patch" ) |
| 72 |
- |
| 73 |
EANT_BUILD_TARGET="build" |
| 74 |
|
| 75 |
+java_prepare() { |
| 76 |
+ epatch "${FILESDIR}/${P}-java15api.patch" |
| 77 |
+ # bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463 |
| 78 |
+ sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml |
| 79 |
+} |
| 80 |
+ |
| 81 |
src_install() { |
| 82 |
java-pkg_dojar dist/${PN}.jar |
| 83 |
java-pkg_dojar dist/${PN}_ant.jar |
Archives