added a build.xml file for ant, added source useflag, generall cleanups. fixes bug...

Package-Manager: portage-2.0.51-r12

diff --git a/dev-java/xml-commons-resolver/ChangeLog b/dev-java/xml-commons-resolver/ChangeLog
index b7fbf9cc968af75748e5da9bbad989c8cfd4868f..8112c48d4f255e3016cc5adef2f3975fb648d912 100644 (file)
--- a/dev-java/xml-commons-resolver/ChangeLog
+++ b/dev-java/xml-commons-resolver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xml-commons-resolver
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/ChangeLog,v 1.5 2004/11/30 21:44:59 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/ChangeLog,v 1.6 2005/01/17 17:09:43 luckyduck Exp $
+
+  17 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/xml-commons-resolver-1.1-build.xml, xml-commons-resolver-1.1.ebuild:
+  added a build.xml file for ant, added source useflag, generall cleanups. fixes
+  bug #78352.
 
   30 Nov 2004; Sven Wegener <swegener@gentoo.org>
   xml-commons-resolver-1.1.ebuild:

diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 86f929bb27e59a0db6d53112141f03a3e12e9774..d9dead213050eac747d85201968efb0cfac520ee 100644 (file)
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 01c494fd8cc9bcb3acebab702cb598f4 xml-commons-resolver-1.1.ebuild 829
-MD5 99273e1cc60821433d5c6374f504c9ba ChangeLog 943
+MD5 b629097d3da66f472717cac8f67c1039 xml-commons-resolver-1.1.ebuild 1077
+MD5 e706512b70cdc420f4b992db727b24a2 ChangeLog 1170
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 c0c9047ccd57e4f7c4abb514e1bf3e14 files/digest-xml-commons-resolver-1.1 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBrOnkI1lqEGTUzyQRAnVgAJ9igsFNt8mQAyg94CEBrFB++zjvaQCeOXMi
-kSe0WfuCY4m84aL3qEQ0d20=
-=Spi3
------END PGP SIGNATURE-----
+MD5 5124f36f583226aa536b7293a38f9f17 files/xml-commons-resolver-1.1-build.xml 1649

diff --git a/dev-java/xml-commons-resolver/files/xml-commons-resolver-1.1-build.xml b/dev-java/xml-commons-resolver/files/xml-commons-resolver-1.1-build.xml
new file mode 100644 (file)
index 0000000..fdf8347
--- /dev/null
+++ b/dev-java/xml-commons-resolver/files/xml-commons-resolver-1.1-build.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<project name="xml-commons-resolver" default="jar">
+       <!-- some properties -->
+       <property name="src.dir" value="src" />
+       <property name="build.dir" value="build" />
+       <property name="docs.dir" value="docs" />
+       <property name="dist.dir" value="dist" />
+       <property name="lib.dir" value="lib" />
+       <property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
+       <property name="target.jdk" value="1.3" />
+
+       <!-- init -->
+       <target name="init">
+               <mkdir dir="${dist.dir}" />
+               <mkdir dir="${build.dir}" />
+               <mkdir dir="${docs.dir}" />
+       </target>       
+
+       <!-- compile everything -->
+       <target name="compile" depends="init">
+               <mkdir dir="${build.dir}" />
+               <javac srcdir="${src.dir}" 
+                       destdir="${build.dir}"
+                       source="${target.jdk}"
+                       target="${target.jdk}" />
+       </target>
+
+       <!-- build the jar file -->
+       <target name="jar" depends="compile">
+               <jar jarfile="${jarfile}" basedir="${build.dir}" />
+       </target>
+       
+       <!-- generate javadocs -->
+       <target name="docs" depends="init">
+               <javadoc sourcepath="${src.dir}"
+                       packagenames="org.*"
+                       destdir="${docs.dir}"
+                       author="true"
+                       version="true"
+                       use="true"
+                       windowtitle="${ant.project.name} API" />
+       </target>
+       
+       <!-- clean up -->
+       <target name="clean">
+               <delete dir="${build.dir}" />
+               <delete dir="${docs.dir}" />
+               <delete dir="${dist.dir}" />
+               <delete dir="${lib.dir}" />
+       </target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+               <zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>

diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild
index 5158225f6137b05dca81b7831dd88c0bcf1c4fba..8d374340b544fdb16b96ae497fb168d0d28e87ee 100644 (file)
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild,v 1.5 2004/11/30 21:44:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild,v 1.6 2005/01/17 17:09:43 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -9,18 +9,35 @@ HOMEPAGE="http://xml.apache.org/commons/"
 SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
 DEPEND=">=virtual/jdk-1.3
                dev-java/ant"
+RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
+IUSE="doc source"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       cp ${FILESDIR}/${P}-build.xml ${S}/build.xml
+}
 
 src_compile() {
-       cd src
-       find org -name "*.java" ${exclude} | xargs javac || die "Failed to compile"
-       find org -name "*.class" | xargs jar cmf manifest.resolver ${PN}.jar
+       local antflags="jar"
+       use doc && antflags="${antflags} docs"
+       use source && antflags="${antflags} sourcezip"
+       ant ${antflags} || die "ant build failed"
 }
 
 src_install() {
-       java-pkg_dojar src/${PN}.jar
-       use doc && java-pkg_dohtml -r docs/ apidocs/
+       java-pkg_dojar dist/${PN}.jar
+
+       dodoc KEYS
+       use doc && java-pkg_dohtml -r docs/*
+
+       if use source; then
+               dodir /usr/share/doc/${PF}/source/
+               cp dist/${PN}-src.zip ${D}/usr/share/doc/${PF}/source/
+       fi
+
 }