diff options
| -rw-r--r-- | dev-java/emma/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/emma/Manifest | 15 | ||||
| -rw-r--r-- | dev-java/emma/emma-2.0.5312-r1.ebuild | 36 | ||||
| -rw-r--r-- | dev-java/emma/emma-2.0.5312-r2.ebuild | 14 |
4 files changed, 17 insertions, 56 deletions
diff --git a/dev-java/emma/ChangeLog b/dev-java/emma/ChangeLog index 4403ac6a95e2..330920398791 100644 --- a/dev-java/emma/ChangeLog +++ b/dev-java/emma/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/emma -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.19 2008/08/31 13:32:47 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.20 2010/01/08 19:04:26 caster Exp $ + + 08 Jan 2010; Vlastimil Babka <caster@gentoo.org> -emma-2.0.5312-r1.ebuild, + emma-2.0.5312-r2.ebuild: + Fix building with ibm-jdk-bin-1.6 on 64bits - bug #220463. 31 Aug 2008; Markus Meier <maekke@gentoo.org> emma-2.0.5312-r2.ebuild: amd64 stable, bug #212344 diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest index 73575ce330b5..9e187e4df8b9 100644 --- a/dev-java/emma/Manifest +++ b/dev-java/emma/Manifest @@ -1,16 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX emma-2.0.5312-java15api.patch 841 RMD160 56a8200d6135f642cd384185c7fcda401506f900 SHA1 8506742164e545e2a86c52764a1efdae1746d9b1 SHA256 c8e0b61ebb49a7705afb81642a01964cb4adc590f543aef09f18393d60606c68 DIST emma-2.0.5312-src.zip 421109 RMD160 404fe6d3212e04d65a6aebd511ce90b9dc7d9ffd SHA1 3f14c6bb30a0ee91bf938984c8188ffd9665c5f2 SHA256 2c6cd6177f2cf4b011ac23c3d301be3655ef1fb276b523d5a5155064917a9833 -EBUILD emma-2.0.5312-r1.ebuild 953 RMD160 ef7743c0bfef6d85636622ec2de48c4714d09c5b SHA1 5f08bd17906212b815134c3e853d6c4ba67671cf SHA256 372bc9c438dcce43940947d330877a9e7e8ba7e6ca3e058e3fc704114b2c6cd3 -EBUILD emma-2.0.5312-r2.ebuild 1023 RMD160 5c19531d680cca8258a9af9f4344e6d45508a661 SHA1 be199af22bb702eb847509fe1ca1a946bf14776a SHA256 96d44eccf0c96371f679bd8da441018df7f7b6cdb80e490bb9fb20bf7b4f2f9b -MISC ChangeLog 2797 RMD160 cf5a72d1dd644b5d3441b13d23ab1cf41fdc559e SHA1 a3e7e7274f06ac66531f5140446e425b67b8847e SHA256 f22968204567b83e0efc5026c24618e932924252960c8b3da11662a1dc69addc +EBUILD emma-2.0.5312-r2.ebuild 1173 RMD160 f1b2478e358753abd3c4b6a7a5098a604425197e SHA1 1c892b09af54b33b2274b5bda82d7f78421db57b SHA256 f92059271cd2149c667e6f55f1ca0f547016fc31612cfdca0928111e84c4adfc +MISC ChangeLog 2963 RMD160 c775a4e18d7c9c7f86c358187970a8bb0ef6d159 SHA1 dfe92da10760dbff700291bd41091a3992d23c8e SHA256 4da9247bfcf3aa97307cfdb22f53d9c6545b84ae5f9fd951ff5200d24d1f97b1 MISC metadata.xml 713 RMD160 fe61a1b2ab25f1fb747fc00d202f6f2e5bec69d5 SHA1 72bc9a8733f84dec0aac5debf003644d9effb9e6 SHA256 32aab925124196ba516f26838891601cfa1233e1cab12edd179cdf5ad056d735 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAki6nc8ACgkQkKaRLQcq0GLO0wCfXC6JT7bUoq0G/exnqOSN9olz -sbsAnj7f3O9zG+SaQpbaDfIvuWjgVrvQ -=P5Ta ------END PGP SIGNATURE----- diff --git a/dev-java/emma/emma-2.0.5312-r1.ebuild b/dev-java/emma/emma-2.0.5312-r1.ebuild deleted file mode 100644 index b407d64ca5c8..000000000000 --- a/dev-java/emma/emma-2.0.5312-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r1.ebuild,v 1.7 2008/04/07 11:46:44 corsair Exp $ - -# No support for javadocs in build.xml -JAVA_PKG_IUSE="source" - -inherit base java-pkg-2 java-ant-2 - -DESCRIPTION="a free Java code coverage tool" -HOMEPAGE="http://emma.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip" - -LICENSE="CPL-1.0" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" - -IUSE="" - -RDEPEND=">=virtual/jre-1.4 - >=dev-java/ant-core-1.7.0" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip" - -PATCHES="${FILESDIR}/${P}-java15api.patch" - -EANT_BUILD_TARGET="build" - -src_install() { - java-pkg_dojar dist/${PN}.jar - java-pkg_dojar dist/${PN}_ant.jar - java-pkg_register-ant-task - java-pkg_dolauncher ${PN} --main emmarun - # One of these does not have java sources - use source && java-pkg_dosrc */*/com 2> /dev/null -} diff --git a/dev-java/emma/emma-2.0.5312-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild index 80ba2ab364c7..c7c161606ba4 100644 --- a/dev-java/emma/emma-2.0.5312-r2.ebuild +++ b/dev-java/emma/emma-2.0.5312-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ # No support for javadocs in build.xml -EAPI=1 +EAPI=2 JAVA_PKG_IUSE="source" inherit base java-pkg-2 java-ant-2 @@ -24,10 +24,14 @@ RDEPEND=">=virtual/jre-1.4 DEPEND=">=virtual/jdk-1.4 app-arch/unzip" -PATCHES=( "${FILESDIR}/${P}-java15api.patch" ) - EANT_BUILD_TARGET="build" +java_prepare() { + epatch "${FILESDIR}/${P}-java15api.patch" + # bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463 + sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml +} + src_install() { java-pkg_dojar dist/${PN}.jar java-pkg_dojar dist/${PN}_ant.jar |