diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-05-05 14:08:09 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-05-05 14:08:09 +0000 |
| commit | 50ca203a424bd7b7f010dca573621315d5125f89 (patch) | |
| tree | 9f941d9f76865d71ac5f9313d2f34ba0a27e86e4 /dev-java/emma | |
| parent | Cleanup (diff) | |
| download | gentoo-2-50ca203a424bd7b7f010dca573621315d5125f89.tar.gz gentoo-2-50ca203a424bd7b7f010dca573621315d5125f89.tar.bz2 gentoo-2-50ca203a424bd7b7f010dca573621315d5125f89.zip | |
Add patch to allow compilation with JDK 1.5+.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/emma')
| -rw-r--r-- | dev-java/emma/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/emma/emma-2.0.5312.ebuild | 13 | ||||
| -rw-r--r-- | dev-java/emma/files/emma-2.0.5312-java15api.patch | 13 |
3 files changed, 28 insertions, 4 deletions
diff --git a/dev-java/emma/ChangeLog b/dev-java/emma/ChangeLog index a984776c8e94..bc35a251938c 100644 --- a/dev-java/emma/ChangeLog +++ b/dev-java/emma/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/emma # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.3 2007/02/03 22:56:36 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.4 2007/05/05 14:08:09 caster Exp $ + + 05 May 2007; Vlastimil Babka <caster@gentoo.org> + +files/emma-2.0.5312-java15api.patch, emma-2.0.5312.ebuild: + Add patch to allow compilation with JDK 1.5+. 03 Feb 2007; Steve Dibb <beandog@gentoo.org> emma-2.0.5312.ebuild: add ~amd64, bug 161618 diff --git a/dev-java/emma/emma-2.0.5312.ebuild b/dev-java/emma/emma-2.0.5312.ebuild index b409cd7bfd5f..16776efc5a81 100644 --- a/dev-java/emma/emma-2.0.5312.ebuild +++ b/dev-java/emma/emma-2.0.5312.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.ebuild,v 1.3 2007/02/03 22:56:36 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312.ebuild,v 1.4 2007/05/05 14:08:09 caster Exp $ inherit java-pkg-2 java-ant-2 @@ -15,14 +15,21 @@ KEYWORDS="~amd64 ~ppc ~x86" # No support for javadocs in build.xml IUSE="source" -RDEPEND="=virtual/jre-1.4*" -DEPEND="=virtual/jdk-1.4* +RDEPEND=">=virtual/jre-1.4" +DEPEND=">=virtual/jdk-1.4 dev-java/ant-core app-arch/unzip source? ( app-arch/zip )" EANT_BUILD_TARGET="build" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-java15api.patch" +} + src_install() { java-pkg_dojar dist/${PN}.jar java-pkg_jarinto /usr/share/ant-core/lib/ diff --git a/dev-java/emma/files/emma-2.0.5312-java15api.patch b/dev-java/emma/files/emma-2.0.5312-java15api.patch new file mode 100644 index 000000000000..e7a28ba2883f --- /dev/null +++ b/dev-java/emma/files/emma-2.0.5312-java15api.patch @@ -0,0 +1,13 @@ +diff --git a/core/java12/com/vladium/emma/rt/InstrClassLoader.java b/core/java12/com/vladium/emma/rt/InstrClassLoader.java +index 4ea4f80..2c14287 100644 +--- a/core/java12/com/vladium/emma/rt/InstrClassLoader.java ++++ b/core/java12/com/vladium/emma/rt/InstrClassLoader.java +@@ -343,7 +343,7 @@ final class InstrClassLoader extends URLClassLoader + // support ProtectionDomains with non-null class source URLs:
+ // [however, disable anything related to sealing or signing]
+
+- final CodeSource csrc = new CodeSource (srcURL, null);
++ final CodeSource csrc = new CodeSource (srcURL, (java.security.cert.Certificate[]) null);
+
+ // allow getPackage() to return non-null on the class we are about to
+ // define (however, don't bother emulating the original manifest info since
|