Changed deprecated junit USEflag to test, testing is done in src_test(). Dropped unnecessary xerces and xalan dependencies.

Package-Manager: portage-2.1.1

4 files changed, 82 insertions, 15 deletions

diff --git a/dev-java/saxpath/ChangeLog b/dev-java/saxpath/ChangeLog
index 1f2743c890a0..e5e4004f3ae3 100644
--- a/dev-java/saxpath/ChangeLog
+++ b/dev-java/saxpath/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2006/08/14 20:17:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/ChangeLog,v 1.14 2006/09/10 21:50:12 caster Exp $
+
+*saxpath-1.0-r2 (10 Sep 2006)
+
+  10 Sep 2006; Vlastimil Babka <caster@gentoo.org> +saxpath-1.0-r2.ebuild:
+  Changed deprecated junit USEflag to test, testing is done in src_test().
+  Dropped unnecessary xerces and xalan dependencies.
 
 *saxpath-1.0-r1 (14 Aug 2006)
 
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 8b85669aaedf..4de9f8ea14a6 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,14 +7,18 @@ EBUILD saxpath-1.0-r1.ebuild 1221 RMD160 fcc0c7bb2e75c2c62324011876a69a252b8fc4d
 MD5 3d213d09b4f7ec8cce075de99bf4fdaf saxpath-1.0-r1.ebuild 1221
 RMD160 fcc0c7bb2e75c2c62324011876a69a252b8fc4da saxpath-1.0-r1.ebuild 1221
 SHA256 b3e384e1609b0bcd73945b5b9864718077d33c86acd063b9306d9218c3e136c0 saxpath-1.0-r1.ebuild 1221
+EBUILD saxpath-1.0-r2.ebuild 1382 RMD160 5854b793075944248ab5ee4422c061c4294cb733 SHA1 84ed3eed5b5eb1d6f3dff709649093b84b984655 SHA256 5faa2560da2e2ba0f4de53b19575d914d69bf326369d5dd6072755c3f83817de
+MD5 aac8f8da2a7aa537a8a96359968973af saxpath-1.0-r2.ebuild 1382
+RMD160 5854b793075944248ab5ee4422c061c4294cb733 saxpath-1.0-r2.ebuild 1382
+SHA256 5faa2560da2e2ba0f4de53b19575d914d69bf326369d5dd6072755c3f83817de saxpath-1.0-r2.ebuild 1382
 EBUILD saxpath-1.0.ebuild 1202 RMD160 e5db24d476ee036b09a98cd9acecc607f52930cb SHA1 4ddc2de5c2dfcafbad8093b81dad7ca40bd3efaa SHA256 29332e057157cf41366f7463b18b18967c2f5546ab5bba4ac5bd9b2b3386adf3
 MD5 06d872a3a3cc226c677b972932699ea7 saxpath-1.0.ebuild 1202
 RMD160 e5db24d476ee036b09a98cd9acecc607f52930cb saxpath-1.0.ebuild 1202
 SHA256 29332e057157cf41366f7463b18b18967c2f5546ab5bba4ac5bd9b2b3386adf3 saxpath-1.0.ebuild 1202
-MISC ChangeLog 1708 RMD160 7b62860dc529a91fdab4e525cc76b46918372c8e SHA1 2db3c7a0212a693efaca9551812e2d2b8cfd933d SHA256 d301ed43c9e06129754b5177b387ea1e8a10ebeeafd7fc6333d17e5678cf1e02
-MD5 023ae459e9c4fb3a7c736564f1ada56f ChangeLog 1708
-RMD160 7b62860dc529a91fdab4e525cc76b46918372c8e ChangeLog 1708
-SHA256 d301ed43c9e06129754b5177b387ea1e8a10ebeeafd7fc6333d17e5678cf1e02 ChangeLog 1708
+MISC ChangeLog 1941 RMD160 1f669d081aea0901692848f0cdef29b9e59464f0 SHA1 20e5a85a6bd9800539156b52ea51678cdd486c1d SHA256 82b1b22f3b3017ae50ec3de11e50c16c824903b9cd616cb1373a26cdf64d92ce
+MD5 25cee9acf51f11689c08bfcc750290c6 ChangeLog 1941
+RMD160 1f669d081aea0901692848f0cdef29b9e59464f0 ChangeLog 1941
+SHA256 82b1b22f3b3017ae50ec3de11e50c16c824903b9cd616cb1373a26cdf64d92ce ChangeLog 1941
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -28,10 +29,6 @@ SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/di
 MD5 29e91a0f0458d84f441434cb21ad1b01 files/digest-saxpath-1.0-r1 238
 RMD160 409c6b590344130a17a9e59eca9e4bf47fee9408 files/digest-saxpath-1.0-r1 238
 SHA256 8726d9cd026692d2821902539a8b664dc64c879390d5694e3154153b89daf9bd files/digest-saxpath-1.0-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE4Npggo/w9rxVVVERArN8AJ9BLGjj4ovhxvgDEN9OjGZxhVgTFgCbBpx/
-g2CrSh9WAslumtwgMtcEF1Y=
-=nCH8
------END PGP SIGNATURE-----
+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
diff --git a/dev-java/saxpath/files/digest-saxpath-1.0-r2 b/dev-java/saxpath/files/digest-saxpath-1.0-r2
new file mode 100644
index 000000000000..55af3577d2a5
--- /dev/null
+++ b/dev-java/saxpath/files/digest-saxpath-1.0-r2
@@ -0,0 +1,3 @@
+MD5 cc95ecc7dfb689a29bd42323490ee702 saxpath-1.0.tar.gz 2166023
+RMD160 59520216dc54bad5b01e351fd6ae89750b84a876 saxpath-1.0.tar.gz 2166023
+SHA256 90c07abb3e3f09c398c02d84b44b651aa59d724aa6fabf45aa44a2365a6725c1 saxpath-1.0.tar.gz 2166023
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
new file mode 100644
index 000000000000..f99963c383fb
--- /dev/null
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 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.1 2006/09/10 21:50:12 caster Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Simple API for XPath."
+HOMEPAGE="http://saxpath.sourceforge.net/"
+SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
+LICENSE="saxpath"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -f *.jar lib/*.jar
+
+	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
+}
+
+src_compile() {
+	eant package $(use_doc doc javadoc)
+}
+
+src_test() {
+	eant -Dgentoo.classpath="$(java-pkg_getjar --build-only junit junit.jar)" \
+		test
+}
+
+src_install() {
+	java-pkg_dojar build/saxpath.jar
+
+	if use doc; then
+		mv build/doc/javadoc build/doc/apidocs
+		java-pkg_dohtml -r build/doc/*
+	fi
+	use source && java-pkg_dosrc src/java/main/*
+}