Style cleanup.

Package-Manager: portage-2.1.2.3

3 files changed, 20 insertions, 33 deletions

diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog
index e026a1607f26..b1aedd98b1c2 100644
--- a/dev-java/saxpath/ChangeLog
+++ b/dev-java/saxpath/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/saxpath
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.17 2006/12/09 09:24:54 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.18 2007/04/07 12:12:11 caster Exp $
+
+  07 Apr 2007; Vlastimil Babka <caster@gentoo.org> saxpath-1.0-r2.ebuild:
+  Style cleanup.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> saxpath-1.0-r2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 3c4afc69458e..821c206959bc 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -1,23 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX MANIFEST.MF 276 RMD160 52c5c2f61f0c0e7f7f5278562ecc814419edc5f1 SHA1 5f3424a59b723a35bc6acca3c36d8372dd58899c SHA256 b73b251bc3239bf854935722e39aedd94bb30eadb63795a5c4e6bfc89def10a1
 MD5 cb58720b66697c1ef1f47de80c839e00 files/MANIFEST.MF 276
 RMD160 52c5c2f61f0c0e7f7f5278562ecc814419edc5f1 files/MANIFEST.MF 276
 SHA256 b73b251bc3239bf854935722e39aedd94bb30eadb63795a5c4e6bfc89def10a1 files/MANIFEST.MF 276
 DIST saxpath-1.0.tar.gz 2166023 RMD160 59520216dc54bad5b01e351fd6ae89750b84a876 SHA1 7104f1252fc4296200d5282c8b2863b94ee70cff SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1
-EBUILD saxpath-1.0-r2.ebuild 1388 RMD160 5ee1a01f7e034193aeeb13a6a65cd97959859691 SHA1 1b86a7bb11f0c0482dacd4588d955846436d7555 SHA256 954392d6c8816fa81695a36a67d8fb25395a711abbd817fdf2ce92379903a9fc
-MD5 ffb2ef53b9f806b71934168a5a4f9d68 saxpath-1.0-r2.ebuild 1388
-RMD160 5ee1a01f7e034193aeeb13a6a65cd97959859691 saxpath-1.0-r2.ebuild 1388
-SHA256 954392d6c8816fa81695a36a67d8fb25395a711abbd817fdf2ce92379903a9fc saxpath-1.0-r2.ebuild 1388
+EBUILD saxpath-1.0-r2.ebuild 1206 RMD160 ce4fc95e1ef2c00638d1c758d2836b0c5b59f57f SHA1 860905d3cbfbfdd8c5ba86f545b43d3d154335f1 SHA256 810066ebcb91e3d8dca80347e1b795cd40f526059ec53ff19d1aaacb297823a3
+MD5 74dd8366274a62294f9e9618e1742da9 saxpath-1.0-r2.ebuild 1206
+RMD160 ce4fc95e1ef2c00638d1c758d2836b0c5b59f57f saxpath-1.0-r2.ebuild 1206
+SHA256 810066ebcb91e3d8dca80347e1b795cd40f526059ec53ff19d1aaacb297823a3 saxpath-1.0-r2.ebuild 1206
 EBUILD saxpath-1.0.ebuild 1187 RMD160 6be9c3b7c661e62368db3205dd76ebda993d054d SHA1 59b85d1d0e615c9f110740db1f90720192e7202e SHA256 2a6afb2a2d6503d10bd959452587eaacb6d0b285c9c80459a34a288fc9e8b959
 MD5 3f2174873aa94dee48e34e8fa748beef saxpath-1.0.ebuild 1187
 RMD160 6be9c3b7c661e62368db3205dd76ebda993d054d saxpath-1.0.ebuild 1187
 SHA256 2a6afb2a2d6503d10bd959452587eaacb6d0b285c9c80459a34a288fc9e8b959 saxpath-1.0.ebuild 1187
-MISC ChangeLog 2352 RMD160 adb3f3273f17f7d913496229527c8bd349bce50e SHA1 568c8802cc0a60140332f2ffda2a8bfa77ede0a5 SHA256 95c24d37e38a065e37801d7120b5a999e92134c09f53c1ac2a3843d5c59de228
-MD5 17a2f57b065d16b82b562fa42b603cbc ChangeLog 2352
-RMD160 adb3f3273f17f7d913496229527c8bd349bce50e ChangeLog 2352
-SHA256 95c24d37e38a065e37801d7120b5a999e92134c09f53c1ac2a3843d5c59de228 ChangeLog 2352
+MISC ChangeLog 2441 RMD160 df3fd01c7a7b633daf29729a1a3bcd251ccb581f SHA1 b234fdf21a0e6920f94a783360d1867911da6c63 SHA256 93687ab645ed48b447e35b26b269a78424dd8c6c3a510abdfbf0e0c4a1c6ccdd
+MD5 217b379a6ae317eb48fb603b581b20df ChangeLog 2441
+RMD160 df3fd01c7a7b633daf29729a1a3bcd251ccb581f ChangeLog 2441
+SHA256 93687ab645ed48b447e35b26b269a78424dd8c6c3a510abdfbf0e0c4a1c6ccdd ChangeLog 2441
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -28,10 +25,3 @@ SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/di
 MD5 29e91a0f0458d84f441434cb21ad1b01 files/digest-saxpath-1.0-r2 238
 RMD160 409c6b590344130a17a9e59eca9e4bf47fee9408 files/digest-saxpath-1.0-r2 238
 SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/digest-saxpath-1.0-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFeoDtAiZjviIA2XgRAgupAJ97j0su0ruRlPFj6YQi3ksBE+Lb8ACfeVeP
-+FqTpJIj7/yLjel+MqR0L4o=
-=scNd
------END PGP SIGNATURE-----
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
index 0630228d14a8..e2faba684a15 100644
--- a/dev-java/saxpath/saxpath-1.0-r2.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@@ -1,7 +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/saxpath/saxpath-1.0-r2.ebuild,v 1.3 2006/12/09 09:24:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0-r2.ebuild,v 1.4 2007/04/07 12:12:11 caster Exp $
 
+JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A Simple API for XPath."
@@ -10,20 +11,16 @@ SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
 LICENSE="saxpath"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source test"
 
 RDEPEND=">=virtual/jre-1.4"
 # doc needs ant-trax
 # test needs ant-junit
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
 	doc? ( dev-java/ant-tasks )
 	test? (
 		dev-java/junit
 		dev-java/ant-tasks
-	)
-	source? ( app-arch/zip )
-	${RDEPEND}"
+	)"
 
 S=${WORKDIR}/${P}-FCS
 
@@ -36,14 +33,11 @@ src_unpack() {
 	mkdir src/conf
 	cp ${FILESDIR}/MANIFEST.MF src/conf
 
-	# add a property to pass junit's classpath to javac compile-tests 
-	use test && xml-rewrite.py -f build.xml --change -e javac -a classpath \
-		-v '${gentoo.classpath}' -i 1
+	use test && java-ant_rewrite-classpath
 }
 
-src_compile() {
-	eant package $(use_doc doc javadoc)
-}
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="doc javadoc"
 
 src_test() {
 	eant -Dgentoo.classpath="$(java-pkg_getjar --build-only junit junit.jar)" \