Add java-ant-2 to inherit to satisfy strict eant() requirements. Depend on javatoolki...

Package-Manager: portage-2.1.2-r12

diff --git a/dev-java/xdoclet/ChangeLog b/dev-java/xdoclet/ChangeLog
index 317a2b65ac79ab7d5e0dabce2d113c1337282dbd..8830f52fb59e4551706c14eaf65ecb9abd193c48 100644 (file)
--- a/dev-java/xdoclet/ChangeLog
+++ b/dev-java/xdoclet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xdoclet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.22 2007/02/21 23:46:44 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/ChangeLog,v 1.23 2007/02/27 16:58:09 caster Exp $
+
+  27 Feb 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/xdoclet-1.2.3-fix_javac.patch, xdoclet-1.2.3.ebuild:
+  Add java-ant-2 to inherit to satisfy strict eant() requirements. Depend on
+  javatoolkit version capable of rewriting with entities.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.

diff --git a/dev-java/xdoclet/Manifest b/dev-java/xdoclet/Manifest
index 52fb3d0959e66619f00bd926f940d21e6911fd21..c2621454921dba1052c03f0cca1ca6ec3722a793 100644 (file)
--- a/dev-java/xdoclet/Manifest
+++ b/dev-java/xdoclet/Manifest
@@ -10,10 +10,6 @@ AUX xdoclet-1.2.3-buildfile.patch 2518 RMD160 f63fa52f5728c2701b38ced31b88340569
 MD5 36b04e593588b126ef0e905e4ead4fcf files/xdoclet-1.2.3-buildfile.patch 2518
 RMD160 f63fa52f5728c2701b38ced31b883405693e08d4 files/xdoclet-1.2.3-buildfile.patch 2518
 SHA256 87e2c77a325d50683bd341b75c89518123178e9960385bab540c8cee3facd51d files/xdoclet-1.2.3-buildfile.patch 2518
-AUX xdoclet-1.2.3-fix_javac.patch 4175 RMD160 ecdf0edf4db9295976fefcaec427340d6851a58e SHA1 9281782f0cd71f14333fcf5fe5198207f391ed7a SHA256 0f1f195a993b48eb3b674d670a759a2816aa3ba66dd4cfe7c341696dac3e62c9
-MD5 148c8b375ec236beb8bcfdd2a3e5271b files/xdoclet-1.2.3-fix_javac.patch 4175
-RMD160 ecdf0edf4db9295976fefcaec427340d6851a58e files/xdoclet-1.2.3-fix_javac.patch 4175
-SHA256 0f1f195a993b48eb3b674d670a759a2816aa3ba66dd4cfe7c341696dac3e62c9 files/xdoclet-1.2.3-fix_javac.patch 4175
 AUX xdoclet-1.2.3-interface.patch 10893 RMD160 e7255548b64e4dc2248bd8d80b55a416c572244a SHA1 a762b29ba6715d154f4595485d3032c375414260 SHA256 29bed1be7a293586da850e4e8800c16834bb8960560b544c5adb24dc854bb95e
 MD5 0c3cfa2caf87830c10fb14bc83840c98 files/xdoclet-1.2.3-interface.patch 10893
 RMD160 e7255548b64e4dc2248bd8d80b55a416c572244a files/xdoclet-1.2.3-interface.patch 10893
@@ -28,14 +24,14 @@ EBUILD xdoclet-1.2.2.ebuild 1709 RMD160 70ca44aa07b58fd1b30239bc6eac1dc14ccee6ad
 MD5 9f19245098137ba73c57672c156fb23e xdoclet-1.2.2.ebuild 1709
 RMD160 70ca44aa07b58fd1b30239bc6eac1dc14ccee6ad xdoclet-1.2.2.ebuild 1709
 SHA256 be924d4558ac0c29e7ff76908fee7b7d4d809b456986f0eb51e1053833090a59 xdoclet-1.2.2.ebuild 1709
-EBUILD xdoclet-1.2.3.ebuild 1863 RMD160 b5ad88a87c41f352980fd923cb2c9f75613f268a SHA1 a77582fc099919b9776adab59e33f739be582b42 SHA256 68286195a776e7c465c22b1cb625cee2d7dc00cc90ff24b813a9ca55c373bae6
-MD5 41d02d4ea0efe9d8835acbc49cdc4949 xdoclet-1.2.3.ebuild 1863
-RMD160 b5ad88a87c41f352980fd923cb2c9f75613f268a xdoclet-1.2.3.ebuild 1863
-SHA256 68286195a776e7c465c22b1cb625cee2d7dc00cc90ff24b813a9ca55c373bae6 xdoclet-1.2.3.ebuild 1863
-MISC ChangeLog 3337 RMD160 ff2bb4aa737aeb9e917b2f5a258edc895f6aac0b SHA1 d51c34a60a734f7f4f745ccfbb899776e2f48d6b SHA256 0e79b389e0f6109e402786f7ffa62cf7f2d6b44bf26973c3a93de0475620adbb
-MD5 f85f08592933c537a80303026555d741 ChangeLog 3337
-RMD160 ff2bb4aa737aeb9e917b2f5a258edc895f6aac0b ChangeLog 3337
-SHA256 0e79b389e0f6109e402786f7ffa62cf7f2d6b44bf26973c3a93de0475620adbb ChangeLog 3337
+EBUILD xdoclet-1.2.3.ebuild 1683 RMD160 fb07c2bbac69680dbbfdf5edd3214ad676bafb10 SHA1 cfc7372a135913a3acbe30fc111366ef90cf4691 SHA256 dd56bc666bb5866900890505a5a05eb7899cd88d8d3796667eeb410143012d21
+MD5 381897c21e8b05ca03dfcad66640d139 xdoclet-1.2.3.ebuild 1683
+RMD160 fb07c2bbac69680dbbfdf5edd3214ad676bafb10 xdoclet-1.2.3.ebuild 1683
+SHA256 dd56bc666bb5866900890505a5a05eb7899cd88d8d3796667eeb410143012d21 xdoclet-1.2.3.ebuild 1683
+MISC ChangeLog 3587 RMD160 334d6a35803a5e9582d73f546d4c874dda380de0 SHA1 1aca4c5151ca67be35e851835271eb4224488bdb SHA256 42466fc94aac3f985104c74aadcb4f846719903c223cb148360c922c3ad7070a
+MD5 e90e1987b34bc369b308928618d224ea ChangeLog 3587
+RMD160 334d6a35803a5e9582d73f546d4c874dda380de0 ChangeLog 3587
+SHA256 42466fc94aac3f985104c74aadcb4f846719903c223cb148360c922c3ad7070a ChangeLog 3587
 MISC metadata.xml 511 RMD160 9949aa2b27a30f5789fca5df4b8890e15370f119 SHA1 df74ef39673e2ba456e542d8ee0812024310daec SHA256 19e82088da5d5f42c2ae94fd65a787a66004fda31cc5333908d3a520111e3614
 MD5 2f0b8cbc0e0adf36b678725712a3e3b7 metadata.xml 511
 RMD160 9949aa2b27a30f5789fca5df4b8890e15370f119 metadata.xml 511

diff --git a/dev-java/xdoclet/files/xdoclet-1.2.3-fix_javac.patch b/dev-java/xdoclet/files/xdoclet-1.2.3-fix_javac.patch
deleted file mode 100644 (file)
index 524ca67..0000000
--- a/dev-java/xdoclet/files/xdoclet-1.2.3-fix_javac.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Only in xdoclet-1.2.3-patched/core: .build.xml.swp
-diff -ru xdoclet-1.2.3/core/build.xml xdoclet-1.2.3-patched/core/build.xml
---- xdoclet-1.2.3/core/build.xml       2003-10-08 19:41:29.000000000 -0400
-+++ xdoclet-1.2.3-patched/core/build.xml       2006-09-08 01:04:25.000000000 -0400
-@@ -118,6 +118,8 @@
-         <javac
-             destdir="${core.classes.dir}"
-             classpathref="core.class.path"
-+                      target="1.3"
-+                      source="1.3"
-             debug="${compile.debug}"
-             deprecation="${compile.deprecation}"
-             optimize="${compile.optimize}"
-diff -ru xdoclet-1.2.3/core/test/build.xml xdoclet-1.2.3-patched/core/test/build.xml
---- xdoclet-1.2.3/core/test/build.xml  2002-09-08 14:07:11.000000000 -0400
-+++ xdoclet-1.2.3-patched/core/test/build.xml  2006-09-08 00:43:31.000000000 -0400
-@@ -156,6 +156,8 @@
- 
-         <javac
-             destdir="${ejb.classes.dir}"
-+                      target="1.3"
-+                      source="1.3"
-             debug="on">
- 
-             <classpath refid="testsuite.class.path" />
-@@ -170,7 +172,11 @@
-     </target>
- 
-     <target name="unittest-ejb">
--        <javac destdir="${build.dir}/junit/classes" debug="on">
-+        <javac
-+                      destdir="${build.dir}/junit/classes"
-+                      target="1.3"
-+                      source="1.3"
-+                      debug="on">
-             <classpath refid="testsuite.class.path" />
-             <src path="${java.dir}"/>
- 
-@@ -208,7 +214,11 @@
- 
-     <target name="test-xdoclet" depends="prepare">
- 
--        <javac destdir="${build.dir}/junit/classes" debug="on">
-+        <javac
-+                      destdir="${build.dir}/junit/classes"
-+                      target="1.3"
-+                      source="1.3"
-+                      debug="on">
-             <classpath refid="testsuite.class.path" />
-             <src path="${java.dir}"/>
- 
-@@ -316,6 +326,8 @@
-             srcdir="${java.dir};${generated.java.dir}"
-             destdir="${build.dir}/web/WEB-INF/classes"
-             includes="xdoclet/retest/bean/web/*.java"
-+                      target="1.3"
-+                      source="1.3"
-             debug="on">
- 
-             <classpath refid="testsuite.class.path" />
-@@ -325,6 +337,8 @@
-             srcdir="${java.dir};${generated.java.dir}"
-             destdir="${build.dir}/jmx"
-             includes="xdoclet/retest/bean/jmx/*.java"
-+                      target="1.3"
-+                      source="1.3"
-             debug="on">
- 
-             <classpath refid="testsuite.class.path" />
-diff -ru xdoclet-1.2.3/modules/mockobjects/build-orig.xml xdoclet-1.2.3-patched/modules/mockobjects/build-orig.xml
---- xdoclet-1.2.3/modules/mockobjects/build-orig.xml   2003-02-05 20:46:10.000000000 -0500
-+++ xdoclet-1.2.3-patched/modules/mockobjects/build-orig.xml   2006-09-08 00:44:14.000000000 -0400
-@@ -30,7 +30,7 @@
- 
-   <target name="compile" description="Compile classes">
-     <mkdir dir="target/classes" />
--    <javac srcdir="src/main;src/test" destdir="target/classes" classpathref="classpath" />
-+    <javac srcdir="src/main;src/test" destdir="target/classes" classpathref="classpath" source="1.3" target="1.3"/>
-     <copy todir="target/classes">
-       <fileset dir="src/main">
-         <include name="**/*.j"/>
-@@ -62,4 +62,4 @@
-     <delete dir="src/test" />
-   </target>
- 
--</project>
-\ No newline at end of file
-+</project>
-diff -ru xdoclet-1.2.3/modules/mockobjects/build.xml xdoclet-1.2.3-patched/modules/mockobjects/build.xml
---- xdoclet-1.2.3/modules/mockobjects/build.xml        2003-02-05 20:46:10.000000000 -0500
-+++ xdoclet-1.2.3-patched/modules/mockobjects/build.xml        2006-09-08 00:43:54.000000000 -0400
-@@ -40,6 +40,8 @@
-     
-     <javac srcdir="${mockobjects.sample.src};${mockobjects.src}"
-            destdir="${mockobjects.sample.classes}"
-+                 source="1.3"
-+                 target="1.3"
-            classpathref="mockobjects.class.path"/>
- 
-   </target>
-diff -ru xdoclet-1.2.3/modules/modules-common.ent xdoclet-1.2.3-patched/modules/modules-common.ent
---- xdoclet-1.2.3/modules/modules-common.ent   2005-04-15 20:02:14.000000000 -0400
-+++ xdoclet-1.2.3-patched/modules/modules-common.ent   2006-09-08 00:44:53.000000000 -0400
-@@ -198,6 +198,8 @@
-             debug="${compile.debug}"
-             deprecation="${compile.deprecation}"
-             optimize="${compile.optimize}"
-+                      source="1.3"
-+                      target="1.3"
-         >
-             <src path="${module.src.dir}"/>
-         </javac>

diff --git a/dev-java/xdoclet/xdoclet-1.2.3.ebuild b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
index fc54d223ba3a758f09da1908a48644487af55658..279922a8ad813b51938165c82814b8de11601c29 100644 (file)
--- a/dev-java/xdoclet/xdoclet-1.2.3.ebuild
+++ b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.3.ebuild,v 1.2 2006/09/08 05:26:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xdoclet/xdoclet-1.2.3.ebuild,v 1.3 2007/02/27 16:58:09 caster Exp $
 
-inherit java-pkg-2 eutils
+JAVA_PKG_IUSE="source"
+inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="XDoclet is an extended Javadoc Doclet engine."
 HOMEPAGE="http://xdoclet.sf.net/"
@@ -10,10 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source"
+IUSE=""
 
-RDEPEND=">=virtual/jre-1.3
-       =dev-java/bsf-2.3*
+CDEPEND="=dev-java/bsf-2.3*
        dev-java/commons-collections
        dev-java/commons-logging
        dev-java/log4j
@@ -21,10 +21,14 @@ RDEPEND=">=virtual/jre-1.3
        dev-java/velocity
        dev-java/xjavadoc
        dev-java/junit"
-DEPEND=">=virtual/jdk-1.3
-       ${RDEPEND}
+# needs javatoolkit with proper xml-rewriting with entities
+DEPEND=">=dev-java/javatoolkit-0.2.0-r1
+       >=virtual/jdk-1.4
        dev-java/ant
-       source? ( app-arch/zip )"
+       ${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+       ${CDEPEND}"
+
 
 src_unpack() {
        unpack ${A}
@@ -32,11 +36,6 @@ src_unpack() {
        cd ${S}
        epatch ${FILESDIR}/${P}-interface.patch
        epatch ${FILESDIR}/${P}-buildfile.patch
-       # Fix javac tasks to have source="1.3" target="1.3"
-       # because using xml-rewrite.py from java-ant-2 breaks the build,
-       # because it doesn't support entities
-       # TODO file upstream. Perhaps cleanup patch to use ant properties.
-       epatch ${FILESDIR}/${P}-fix_javac.patch
 
        cd ${S}/lib && rm -f *.jar
        java-pkg_jar-from xjavadoc
@@ -54,8 +53,7 @@ src_unpack() {
 # TODO investigate why compiling needs junit, ie is build not sane enough to
 # devide building of test classes separate from rest of classes?
 src_compile() {
-       local antflags="core modules maven"
-       eant ${antflags}
+       eant core modules maven
 }
 
 src_install() {