Fix building with USE=doc, bug #204538.

Package-Manager: portage-2.1.4_rc14

3 files changed, 19 insertions, 16 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index ef65860f3f58..152b190e043a 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,9 @@
 # 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.81 2007/12/20 10:39:45 caster Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.82 2008/01/06 18:44:39 caster Exp $
+
+  06 Jan 2008; Vlastimil Babka <caster@gentoo.org> jedit-4.2-r2.ebuild:
+  Fix building with USE=doc, bug #204538.
 
 *jedit-4.3_pre12 (20 Dec 2007)
 
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 43d7e66bfeea..b370918b43c3 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -5,10 +5,10 @@ SHA256 c46101784fcfcd5def1cc9caa3319906e3ae95a3853636428cea7a1c0f8bab1d files/je
 DIST jedit4.3pre11source.tar.bz2 1461550 RMD160 fa845acc1e298851e135b27d035027103a9824b5 SHA1 87897cd8dd7ac8a31a71a672cd778a742a5b103c SHA256 78cc5ab5215f064ae866f71bd90db4adeb1d744fd5cdcc1f1946a4c1bbdff250
 DIST jedit4.3pre12source.tar.bz2 1474075 RMD160 1803630b928cb5f0651cf3a59ad9495052ce29b0 SHA1 9e15eca30c2b5fb436594e1701e85d7fe1ecf918 SHA256 554f61a59142b95bea30b23341c6b640d006041eac848ab1b0438beba05a1b41
 DIST jedit42source.tar.gz 1685253 RMD160 5f0f59a64455c4dcaf3e0e7589527a9f6989a23d SHA1 404b3e76c749d0b488c005d3af19c335c102ba60 SHA256 12a5037126b87ae00157b0201818fa97b777c824543e87a79b6064c1357c78b2
-EBUILD jedit-4.2-r2.ebuild 2121 RMD160 f86a14f9394055a04712f544fb9df13f3b8c46cc SHA1 df5e51fcc81df251afdc385f4db3cc486879b227 SHA256 97281533b6863db083a118b7cfdd954a07ed4a590ae2b9458c95f38d095cb5f8
-MD5 562b0a49a17a452c1dfabb11233a2b35 jedit-4.2-r2.ebuild 2121
-RMD160 f86a14f9394055a04712f544fb9df13f3b8c46cc jedit-4.2-r2.ebuild 2121
-SHA256 97281533b6863db083a118b7cfdd954a07ed4a590ae2b9458c95f38d095cb5f8 jedit-4.2-r2.ebuild 2121
+EBUILD jedit-4.2-r2.ebuild 2157 RMD160 1f503b8808e446fdaa22e8bada143455a64962a1 SHA1 e4030f30ab7bbf334d2d882e5a5976a5aad29a7d SHA256 e578d5593c16a09564b2c0b0bb4e3d90647c1835ff4fd05bc06a77cde289f322
+MD5 d2fad968c6706915e6efe2eaaa226e7b jedit-4.2-r2.ebuild 2157
+RMD160 1f503b8808e446fdaa22e8bada143455a64962a1 jedit-4.2-r2.ebuild 2157
+SHA256 e578d5593c16a09564b2c0b0bb4e3d90647c1835ff4fd05bc06a77cde289f322 jedit-4.2-r2.ebuild 2157
 EBUILD jedit-4.3_pre11.ebuild 2609 RMD160 770ef994e1413899deeab84ad212afe1d74cb58a SHA1 ac418634cf4ff37ead7a6a4e6b6cf3b2c45034bc SHA256 4156082be714c684852fceb559f0b32e4dcdb93caf20b502aaacc4a4838aa4b4
 MD5 595365256aa93d95baab518f5409fdb7 jedit-4.3_pre11.ebuild 2609
 RMD160 770ef994e1413899deeab84ad212afe1d74cb58a jedit-4.3_pre11.ebuild 2609
@@ -17,10 +17,10 @@ EBUILD jedit-4.3_pre12.ebuild 2605 RMD160 20196bcf58d2fe61607b4268b8a42183d9dfb0
 MD5 ab034bbefb9c60f6c0b5251496934b5d jedit-4.3_pre12.ebuild 2605
 RMD160 20196bcf58d2fe61607b4268b8a42183d9dfb0e6 jedit-4.3_pre12.ebuild 2605
 SHA256 0036a8fc23d734aa48bad4e9710f873d848f6364861cab5274b99ec7e21b826e jedit-4.3_pre12.ebuild 2605
-MISC ChangeLog 11411 RMD160 72c4fc080422984c6bb61d6696a2c1d72cf09251 SHA1 76f8d18e42144caebcd8017c6ed26d61eb8c1f63 SHA256 866b44c3af22bd5145f36d12e51944de3069b66b58f402aaa6bc5a9e23334a8b
-MD5 e0a64b5ffac9c8b991021dcb059e7e04 ChangeLog 11411
-RMD160 72c4fc080422984c6bb61d6696a2c1d72cf09251 ChangeLog 11411
-SHA256 866b44c3af22bd5145f36d12e51944de3069b66b58f402aaa6bc5a9e23334a8b ChangeLog 11411
+MISC ChangeLog 11526 RMD160 73c4255ca0c344ee2cec69344dfdcf1fe36dd14f SHA1 0e43ee96f8f80d1d1694612063a8c16059188410 SHA256 5572df7b8f83cd080356341a005c64c1679a22a68069ae608808bc5e35b8be74
+MD5 87b436a886653b32f088490d3ede2cc3 ChangeLog 11526
+RMD160 73c4255ca0c344ee2cec69344dfdcf1fe36dd14f ChangeLog 11526
+SHA256 5572df7b8f83cd080356341a005c64c1679a22a68069ae608808bc5e35b8be74 ChangeLog 11526
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/app-editors/jedit/jedit-4.2-r2.ebuild b/app-editors/jedit/jedit-4.2-r2.ebuild
index 9e5414639130..8ddcfd295e07 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
+# Copyright 1999-2008 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.12 2007/12/20 10:39:45 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.13 2008/01/06 18:44:39 caster Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -45,10 +45,10 @@ src_unpack() {
 	java-pkg_filter-compiler jikes
 }
 
-# Fails to build if asm gets pulled in via ant classpath
-ANT_TASKS=" "
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="javadoc docs-html"
+src_compile() {
+	# Fails to build if asm gets pulled in via ant classpath
+	ANT_TASKS="none" eant dist $(use_doc javadoc docs-html -Dtools.jar=$(java-config --tools))
+}
 
 src_install() {
 	dodir /usr/share/jedit