Stylistic cleanup and fix broken javadoc installation.

(Portage version: 2.1.2.3)

3 files changed, 18 insertions, 18 deletions

diff --git a/dev-java/xsdlib/ChangeLog b/dev-java/xsdlib/ChangeLog
index 6f89e36d419d..2a7c21bd1ae5 100644
--- a/dev-java/xsdlib/ChangeLog
+++ b/dev-java/xsdlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xsdlib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xsdlib/ChangeLog,v 1.13 2007/01/04 04:59:50 tgall Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xsdlib/ChangeLog,v 1.14 2007/04/13 09:32:59 betelgeuse Exp $
+
+  13 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  files/build-20050627-r1.xml, xsdlib-20050627-r1.ebuild:
+  Stylistic cleanup and fix broken javadoc installation.
 
   03 Jan 2007; Tom Gall <tgall@gentoo.org> xsdlib-20050627.ebuild:
   stable on ppc64
diff --git a/dev-java/xsdlib/files/build-20050627-r1.xml b/dev-java/xsdlib/files/build-20050627-r1.xml
index e2cc15a1c8dc..a6683bae55c8 100644
--- a/dev-java/xsdlib/files/build-20050627-r1.xml
+++ b/dev-java/xsdlib/files/build-20050627-r1.xml
@@ -51,9 +51,7 @@
    </target>
 
    <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath">
-      	<fileset dir="${src}"/>
-      </javadoc>
+	   <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath" sourcepath="${src}" />
    </target>
 
    <target name="clean">
diff --git a/dev-java/xsdlib/xsdlib-20050627-r1.ebuild b/dev-java/xsdlib/xsdlib-20050627-r1.ebuild
index 1d2e13149b57..0759e2d00ec6 100644
--- a/dev-java/xsdlib/xsdlib-20050627-r1.ebuild
+++ b/dev-java/xsdlib/xsdlib-20050627-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/xsdlib/xsdlib-20050627-r1.ebuild,v 1.4 2006/12/09 09:27:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xsdlib/xsdlib-20050627-r1.ebuild,v 1.5 2007/04/13 09:32:59 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,22 +14,20 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 LICENSE="as-is Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/xerces-2.7
 	dev-java/relaxng-datatype"
 DEPEND=">=virtual/jdk-1.3
 	app-arch/unzip
-	dev-java/ant-core
 	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/build-${PVR}.xml build.xml
+	cd "${S}"
+	cp "${FILESDIR}/build-${PVR}.xml" build.xml -i || die
 
-	rm *.jar
+	rm -v *.jar || die
 	mkdir lib && cd lib
 	java-pkg_jarfrom relaxng-datatype
 	java-pkg_jarfrom xerces-2
@@ -35,17 +35,15 @@ src_unpack() {
 
 src_compile() {
 	local antflags="-Dproject.name=${PN} jar"
-	use doc && antflags="${antflags} javadoc"
-
-	eant ${antflags} || die "Compilation failed"
+	eant ${antflags} $(use_doc)
 }
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
 
-	dodoc README.txt
-	dohtml HowToUse.html
+	dodoc README.txt || die
+	dohtml HowToUse.html || die
 
-	use doc && java-pkg_dohtml -r dist/doc/api
+	use doc && java-pkg_dojavadoc dist/doc/api
 	use source && java-pkg_dosrc src/* src-apache/*
 }