Use empty ant classpath so asm doesn't get pulled in there and break building. Prefer 1.5 over 1.4.

Package-Manager: portage-2.1.3

3 files changed, 24 insertions, 19 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index 426952533822..f31dd31eaa0f 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.76 2007/06/17 10:48:19 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.77 2007/08/23 08:36:09 betelgeuse Exp $
+
+  23 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> jedit-4.2-r2.ebuild:
+  Use empty ant classpath so asm doesn't get pulled in there and break
+  building. Prefer 1.5 over 1.4.
 
   17 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> jedit-4.3_pre9.ebuild:
   Migrate to splitted ant.
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index e7620b6bd263..c2e0bee4c7b2 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST jedit4.3pre9source.tar.bz2 1415361 RMD160 7a9c4a4942edbb936de21d145c17afaf0419d205 SHA1 d74add2a25bfe6bb115b660c40b653f414433529 SHA256 7919bb603b1ad0e7ac4cd3e6a2486d2d702eebf444e65d5e3e8f8f868604aa4f
 DIST jedit42source.tar.gz 1685253 RMD160 5f0f59a64455c4dcaf3e0e7589527a9f6989a23d SHA1 404b3e76c749d0b488c005d3af19c335c102ba60 SHA256 12a5037126b87ae00157b0201818fa97b777c824543e87a79b6064c1357c78b2
-EBUILD jedit-4.2-r2.ebuild 2070 RMD160 d090d66f27f76ab72b652ac83bee3069c2f25995 SHA1 d7d6eb18b1fa9c011d9846411578adda1651b52d SHA256 53ff560d98d29b756ce2dd4db0cb7e5edb6b4cc05fbe56e70c6b7f5c74eb3348
-MD5 da5c3c54fd17823b0901adf6da5cd9dd jedit-4.2-r2.ebuild 2070
-RMD160 d090d66f27f76ab72b652ac83bee3069c2f25995 jedit-4.2-r2.ebuild 2070
-SHA256 53ff560d98d29b756ce2dd4db0cb7e5edb6b4cc05fbe56e70c6b7f5c74eb3348 jedit-4.2-r2.ebuild 2070
+EBUILD jedit-4.2-r2.ebuild 2123 RMD160 554c3137ae1c075eb8a45c931774daa9830915ea SHA1 7f59fcaa221ebf0a13dbac170c34024da596b926 SHA256 404fd62f23ed39b5c3eb1c24d40335ef5717407b5dd3945b626ffde78d9184f9
+MD5 bd6bb6aa8f84f9943dbf15719ce00cbf jedit-4.2-r2.ebuild 2123
+RMD160 554c3137ae1c075eb8a45c931774daa9830915ea jedit-4.2-r2.ebuild 2123
+SHA256 404fd62f23ed39b5c3eb1c24d40335ef5717407b5dd3945b626ffde78d9184f9 jedit-4.2-r2.ebuild 2123
 EBUILD jedit-4.3_pre9.ebuild 2489 RMD160 9ba358ab80e6bd87b88998df32118b3bf8550e80 SHA1 b677912aa80112dd943621813a5499cd2d845464 SHA256 9f3aa730aa163f6a143f420241eb857bdcf522e63056b68501fc5b33b77b1c8e
 MD5 9c880215cb46ec2cfb683d3fa38e4d51 jedit-4.3_pre9.ebuild 2489
 RMD160 9ba358ab80e6bd87b88998df32118b3bf8550e80 jedit-4.3_pre9.ebuild 2489
 SHA256 9f3aa730aa163f6a143f420241eb857bdcf522e63056b68501fc5b33b77b1c8e jedit-4.3_pre9.ebuild 2489
-MISC ChangeLog 10501 RMD160 af67cc6bedaa91b86b74cb95e6622a73a9a12b71 SHA1 04e24937e4706c7e3b3b7868ff8b9937e1544e5e SHA256 02dbb3fcbca18e2b0ba24bee575f743bb8e4789f1579b13c645c33bd5a7abb3e
-MD5 b5c780e720103b5395a1287c4631bf58 ChangeLog 10501
-RMD160 af67cc6bedaa91b86b74cb95e6622a73a9a12b71 ChangeLog 10501
-SHA256 02dbb3fcbca18e2b0ba24bee575f743bb8e4789f1579b13c645c33bd5a7abb3e ChangeLog 10501
+MISC ChangeLog 10680 RMD160 8613364e058282e784e87449b3eeab26d359390f SHA1 f88e396e6827847ca02b41f0d67f5a3e60bd5be9 SHA256 a343775a04ed61f24c521e239bb49c06cb2df56ea01d3122c7f4aef2917d9139
+MD5 7c22b4970c6175e78217194257af2764 ChangeLog 10680
+RMD160 8613364e058282e784e87449b3eeab26d359390f ChangeLog 10680
+SHA256 a343775a04ed61f24c521e239bb49c06cb2df56ea01d3122c7f4aef2917d9139 ChangeLog 10680
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -28,7 +28,7 @@ SHA256 d9b0ffa53301dc60f77e06f1d4329e5756f8b229076800d90d0385f7430b795f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGdRF8cxLzpIGCsLQRAtLbAKCM139ZxcXw1mgT2uKu4k/0fhVd1gCfcpoY
-vt/Z/DYdv0nhw5xJXXHh33Q=
-=Akak
+iD8DBQFGzUcDcxLzpIGCsLQRAgusAJ9yoeHw/PqkUf1RGXctrmDr0mA8VQCfaBDP
+9v4KepWsO21AToA1X7joV+M=
+=ZE6L
 -----END PGP SIGNATURE-----
diff --git a/app-editors/jedit/jedit-4.2-r2.ebuild b/app-editors/jedit/jedit-4.2-r2.ebuild
index 0261e2d82721..246ec22ea16b 100644
--- a/app-editors/jedit/jedit-4.2-r2.ebuild
+++ b/app-editors/jedit/jedit-4.2-r2.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/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.9 2007/05/29 09:21:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.10 2007/08/23 08:36:09 betelgeuse Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -18,15 +18,14 @@ IUSE="doc"
 RDEPEND=">=virtual/jre-1.4"
 # FIXME doesn't like Java 1.6 for some reason
 DEPEND="|| (
-		=virtual/jdk-1.4*
 		=virtual/jdk-1.5*
+		=virtual/jdk-1.4*
 	)
 	doc? (
 		=app-text/docbook-xml-dtd-4.3*
 		>=app-text/docbook-xsl-stylesheets-1.65.1
 		dev-libs/libxslt
-	)
-	>=dev-java/ant-core-1.5.4"
+	)"
 
 S="${WORKDIR}/jEdit"
 
@@ -46,9 +45,11 @@ src_unpack() {
 		echo "docbook.xsl=${xsl}" >> build.properties
 	fi
 }
-src_compile() {
-	eant dist $(use_doc javadoc docs-html)
-}
+
+# Fails to build if asm gets pulled in via ant classpath
+ANT_TASKS=" "
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="javadoc docs-html"
 
 src_install() {
 	dodir /usr/share/jedit