Stylistic cleanup and fix broken javadoc installation.

Package-Manager: portage-2.1.2.3

4 files changed, 40 insertions, 30 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/Manifest b/dev-java/xsdlib/Manifest
index 9891be0b5767..4fb8a4a83e12 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,24 +1,27 @@
-AUX build-20050627-r1.xml 1817 RMD160 ae9a20e20ec524d446809b8de3169287bd855b03 SHA1 e6f9650161fe39d68be8349ca0acd7b80463f9b3 SHA256 61d284b46a693bb77eb6b818b2a5fa042d442535ff793967c109eabbf704a6a9
-MD5 6fa3757ff4f41105754bce24069ed4f4 files/build-20050627-r1.xml 1817
-RMD160 ae9a20e20ec524d446809b8de3169287bd855b03 files/build-20050627-r1.xml 1817
-SHA256 61d284b46a693bb77eb6b818b2a5fa042d442535ff793967c109eabbf704a6a9 files/build-20050627-r1.xml 1817
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX build-20050627-r1.xml 1789 RMD160 8d20197ce03bec975add834489df20bf9a06a255 SHA1 515e6ae89384c6c9721376c4601105c19fde0b9f SHA256 c344245d5d3cde471083ca28d90d2cdd3b1a63d58a699e4187b9aaef323121bc
+MD5 b66d02de011b4297a1bd59ae7a821135 files/build-20050627-r1.xml 1789
+RMD160 8d20197ce03bec975add834489df20bf9a06a255 files/build-20050627-r1.xml 1789
+SHA256 c344245d5d3cde471083ca28d90d2cdd3b1a63d58a699e4187b9aaef323121bc files/build-20050627-r1.xml 1789
 AUX build-20050627.xml 1817 RMD160 ae9a20e20ec524d446809b8de3169287bd855b03 SHA1 e6f9650161fe39d68be8349ca0acd7b80463f9b3 SHA256 61d284b46a693bb77eb6b818b2a5fa042d442535ff793967c109eabbf704a6a9
 MD5 6fa3757ff4f41105754bce24069ed4f4 files/build-20050627.xml 1817
 RMD160 ae9a20e20ec524d446809b8de3169287bd855b03 files/build-20050627.xml 1817
 SHA256 61d284b46a693bb77eb6b818b2a5fa042d442535ff793967c109eabbf704a6a9 files/build-20050627.xml 1817
 DIST xsdlib.20050627.zip 803869 RMD160 9eb3d8aad5f2e2f3abc9e9651f2699fa534b501c SHA1 032e6b4a13de9bf04701583c4fcbfb170d2b4bc6 SHA256 af9906f1353b3e990e699a4cecbbefd6436ca2084dd7d7a6a3d766860765be41
-EBUILD xsdlib-20050627-r1.ebuild 1248 RMD160 7f18ee7c0da46f5564b7bbd4bd56e4148c45fea7 SHA1 3d6b1d9ac5c80d165e6306822c251c08271a48f9 SHA256 57f602d650a1e2d79fda86f9a4580c24e66c9c1af183bf226c476812838621d0
-MD5 fde79bafa907882559afdaf5c10f85d1 xsdlib-20050627-r1.ebuild 1248
-RMD160 7f18ee7c0da46f5564b7bbd4bd56e4148c45fea7 xsdlib-20050627-r1.ebuild 1248
-SHA256 57f602d650a1e2d79fda86f9a4580c24e66c9c1af183bf226c476812838621d0 xsdlib-20050627-r1.ebuild 1248
+EBUILD xsdlib-20050627-r1.ebuild 1217 RMD160 1e7096b80fb3dce03f3496f327c798ef42279175 SHA1 5373fb65e760c27c0aea1cb8d8c89b04d45b4dd5 SHA256 80ee65f3153973ef6b02bc1ad04787b16f2fd18e9251e920966c749a315be7de
+MD5 09b33d7cbb6e02499806d6d8f84e6740 xsdlib-20050627-r1.ebuild 1217
+RMD160 1e7096b80fb3dce03f3496f327c798ef42279175 xsdlib-20050627-r1.ebuild 1217
+SHA256 80ee65f3153973ef6b02bc1ad04787b16f2fd18e9251e920966c749a315be7de xsdlib-20050627-r1.ebuild 1217
 EBUILD xsdlib-20050627.ebuild 1306 RMD160 d0aeae5b1ba60cd369b512600655c295a0868d2a SHA1 eda935c497d5f9aad2ed51eeeb79aa44419a0524 SHA256 f4ec0aef029d1d5c08e5154d483557351b47c1c1d6f9e9e11997927883c8cd2c
 MD5 30ea8a2c577a44bd81d62752ee6df8ce xsdlib-20050627.ebuild 1306
 RMD160 d0aeae5b1ba60cd369b512600655c295a0868d2a xsdlib-20050627.ebuild 1306
 SHA256 f4ec0aef029d1d5c08e5154d483557351b47c1c1d6f9e9e11997927883c8cd2c xsdlib-20050627.ebuild 1306
-MISC ChangeLog 1760 RMD160 688837fafc0df7e057a4452a82d35ebd496c9c9e SHA1 c6c894b3a05834b71ba4ab46141fc1382a882277 SHA256 719d1717805567eb7316d27dbfa9d2f55d45d195a66cbc17487899c28dfe94d4
-MD5 49139fd98a4b5c2b4c13377a096e77fa ChangeLog 1760
-RMD160 688837fafc0df7e057a4452a82d35ebd496c9c9e ChangeLog 1760
-SHA256 719d1717805567eb7316d27dbfa9d2f55d45d195a66cbc17487899c28dfe94d4 ChangeLog 1760
+MISC ChangeLog 1934 RMD160 965a9451af0822a49cf38ca3a83aa2198677ce67 SHA1 5aa901e0e6bb975baeb0b7db58c771b3020c68c9 SHA256 f42460015701ed38687dc56ac7247113e95907cc623799059a475b3392df6d53
+MD5 f316f439ee4665b58733a1b133ebb135 ChangeLog 1934
+RMD160 965a9451af0822a49cf38ca3a83aa2198677ce67 ChangeLog 1934
+SHA256 f42460015701ed38687dc56ac7247113e95907cc623799059a475b3392df6d53 ChangeLog 1934
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -29,3 +32,10 @@ SHA256 fc1e40af9d9e641ebe1546fdd4a62320bf9353d7cb565b7877b46249da5b0d61 files/di
 MD5 f357b4c2c77c6b2805b5c53cdac4f0ae files/digest-xsdlib-20050627-r1 238
 RMD160 f6ca27371f23ead541a0dbb55ff397bd5206fe42 files/digest-xsdlib-20050627-r1 238
 SHA256 fc1e40af9d9e641ebe1546fdd4a62320bf9353d7cb565b7877b46249da5b0d61 files/digest-xsdlib-20050627-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGH05TcxLzpIGCsLQRAhHHAJ4rpr04RbNhxDggkkAEwz0XqGlhxACcCm9t
+UXTg2L4Di6zP1QijIlUkL5E=
+=+88a
+-----END PGP SIGNATURE-----
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/*
 }