Cleanup ebuild and add unit test support.

Package-Manager: portage-2.1.2-r1

4 files changed, 41 insertions, 41 deletions

diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index 0d63ee2aa965..7a40c0772f98 100644
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-io
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.12 2006/12/09 09:13:15 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.13 2007/01/20 15:15:25 betelgeuse Exp $
+
+  20 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> commons-io-1.2.ebuild:
+  Cleanup ebuild and add unit test support.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> commons-io-1.2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index ffaf67d92e90..97b7237091cf 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -13,7 +13,7 @@ AUX commons-io-1.2-gentoo.diff 508 RMD160 fd5ad828bde427ce8bfc62214b84d85132a974
 MD5 c85588e58e9dcc2fcde64e1d4615bb12 files/commons-io-1.2-gentoo.diff 508
 RMD160 fd5ad828bde427ce8bfc62214b84d85132a9743d files/commons-io-1.2-gentoo.diff 508
 SHA256 925de8632fae344eb2564b0e0e26d41329bcd9e511813b561d1371366413f75b files/commons-io-1.2-gentoo.diff 508
-DIST commons-io-1.0-src.tar.gz 132118
+DIST commons-io-1.0-src.tar.gz 132118 RMD160 4d14bf89b27031d6c4459ec7d18757acae5a6e34 SHA1 09acfdc3c7fa6f5eeacd685a2b1d3da0fe7a9707 SHA256 8cf89ec0adda70e57e456619f296a67715503b44021d8a72643c36ce50474e10
 DIST commons-io-1.1-src.tar.gz 197922 RMD160 ad7be482ee4eebcdc193fe78497ed17394309ab1 SHA1 25a9302eaee611655ead3cd7e1a087e8ab745a99 SHA256 375983a026c86afee9b07405a616b3614de3f844b2530d54a5f12c06a666b92c
 DIST commons-io-1.2-src.tar.gz 205563 RMD160 cd1914721f5c2d460f0fe4e7ba2e1e23099bff2a SHA1 3f8758a3918e748d9a40500d3712292fdbcdd2df SHA256 9c9983fed8b5c633b156e429eb7885e70d6268eb23b00c16366702158daf8a22
 EBUILD commons-io-1.0.ebuild 1358 RMD160 0526b6e397ddafd468e5a74a0e97ad329c199a0c SHA1 198c5c617f0d1f104f4680a1a836ac4ec0ab2941 SHA256 a5513bf32eff45ccb8f7b2fdcc64a3a205edd94497b5d80dea1d8b6bffde1f6f
@@ -28,21 +28,21 @@ EBUILD commons-io-1.1.ebuild 1541 RMD160 d188a2a900f556188b3f223c2d89022bad98f0c
 MD5 2e690cf54f3a49a57d07fc455679c04f commons-io-1.1.ebuild 1541
 RMD160 d188a2a900f556188b3f223c2d89022bad98f0c2 commons-io-1.1.ebuild 1541
 SHA256 ab5207fab72022c676299501c54b7fce01b812002a356f04de94be57d45cdcfd commons-io-1.1.ebuild 1541
-EBUILD commons-io-1.2.ebuild 1476 RMD160 3392cfe30ab6ab4b9088074090f9224e806200c8 SHA1 2486a575bb3eaf23ca3ecde5ba884edc76d0c725 SHA256 0b27ce5ae1af9df5cd86be0d8037ea23c336d8be9c0d46777c190b06c85ffaba
-MD5 d3d1923e1f10ff799def59becd6de8fc commons-io-1.2.ebuild 1476
-RMD160 3392cfe30ab6ab4b9088074090f9224e806200c8 commons-io-1.2.ebuild 1476
-SHA256 0b27ce5ae1af9df5cd86be0d8037ea23c336d8be9c0d46777c190b06c85ffaba commons-io-1.2.ebuild 1476
-MISC ChangeLog 1920 RMD160 47eca170381e542fe955d91a9dabe7ab357225fd SHA1 5c3a1813e9973326be26b8fe4fe1148f088e70ec SHA256 eab2addf40e6e66b0fd32e46df1ab7c46a9eb353ad9485455da42ab51f394991
-MD5 96a968c298b7ea55bd768b692308d56d ChangeLog 1920
-RMD160 47eca170381e542fe955d91a9dabe7ab357225fd ChangeLog 1920
-SHA256 eab2addf40e6e66b0fd32e46df1ab7c46a9eb353ad9485455da42ab51f394991 ChangeLog 1920
+EBUILD commons-io-1.2.ebuild 1361 RMD160 eef4d1a762017fe997978c0e4c3e0d28f4d14e21 SHA1 cdab68da30867738a2926482ec22061cb409d974 SHA256 41d8acde5aef4091eaa3150cf30581da3d60422467a6665f628b232086b60048
+MD5 84c92f5b4e1c819da19b71d6890620f6 commons-io-1.2.ebuild 1361
+RMD160 eef4d1a762017fe997978c0e4c3e0d28f4d14e21 commons-io-1.2.ebuild 1361
+SHA256 41d8acde5aef4091eaa3150cf30581da3d60422467a6665f628b232086b60048 commons-io-1.2.ebuild 1361
+MISC ChangeLog 2042 RMD160 9927b9c44e9ea09153910e50efcd1a9d370271ae SHA1 95db27a6b0a286b8aa5956d3013c1dcd4fbbedb5 SHA256 6dd56357aec26315622e39bdbf21ace3bf7ed6aaec7da6a5a5b1f1e651a1dafb
+MD5 c935b2dba10a8d50d92325af1137b869 ChangeLog 2042
+RMD160 9927b9c44e9ea09153910e50efcd1a9d370271ae ChangeLog 2042
+SHA256 6dd56357aec26315622e39bdbf21ace3bf7ed6aaec7da6a5a5b1f1e651a1dafb ChangeLog 2042
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 5c8037358c1bd4650695b23df55e89fe files/digest-commons-io-1.0 70
-RMD160 be8311c54a4ef88784a81c46cdfe9bdf1fe186c4 files/digest-commons-io-1.0 70
-SHA256 ece0180cb3c5ab9fe2438ffe170ccd441288dd4edb32e85b743e4d857cc286d3 files/digest-commons-io-1.0 70
+MD5 aa85f940529afe57cc19115db02dbf0f files/digest-commons-io-1.0 256
+RMD160 b9ad9527beecdf81537bf34e9d32728d6da3162d files/digest-commons-io-1.0 256
+SHA256 d92b0c34896c8b46702117553039e451c3b272a1aa77b5ed20e7bb5c9072d9e8 files/digest-commons-io-1.0 256
 MD5 bc1ffbee448015bc91fa01027dde0fc4 files/digest-commons-io-1.1 256
 RMD160 cf11facacd17ab742a02e9e9e996b77144b1d1a6 files/digest-commons-io-1.1 256
 SHA256 e61a0c2ef412f92221612ef4339403b97a7251b950e4e0216f383b6a193dad47 files/digest-commons-io-1.1 256
@@ -53,9 +53,9 @@ MD5 313a2af07d8d0fb3c8776ccc9dd58e8c files/digest-commons-io-1.2 256
 RMD160 e36e92280db0a42341c7d0ff11220cbde37143ab files/digest-commons-io-1.2 256
 SHA256 a297ee846d83225494f320601b5217e3ab923da5f67bdf8c12e0f8e81d086d23 files/digest-commons-io-1.2 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFen4xAiZjviIA2XgRAtcKAJ9L9gAv0gpSW3DzXttERNTZaSoubgCeO5X5
-09MaHXEaTTLW8dHFe3UlPfw=
-=L/rW
+iD8DBQFFsjIUcxLzpIGCsLQRAsu/AJ9sUXSZXG4i2nhg665l1mQmLpsm4wCZASkn
+rufdRIMemobiftIHY+5oEjg=
+=8tk9
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-io/commons-io-1.2.ebuild b/dev-java/commons-io/commons-io-1.2.ebuild
index 923ff02780f6..b4ef1af7635c 100644
--- a/dev-java/commons-io/commons-io-1.2.ebuild
+++ b/dev-java/commons-io/commons-io-1.2.ebuild
@@ -1,6 +1,6 @@
-# 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/commons-io/commons-io-1.2.ebuild,v 1.2 2006/12/09 09:13:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.2.ebuild,v 1.3 2007/01/20 15:15:25 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -12,43 +12,38 @@ SRC_URI="mirror://apache/jakarta/commons/io/source/${MY_P}.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE="doc source test"
 
 DEPEND="dev-java/ant-core
 	source? ( app-arch/zip )
-	>=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3"
+	test? ( dev-java/junit dev-java/ant-tasks )
+	>=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
 
 S="${WORKDIR}/${MY_P}"
 
-# junit tests are disabled for now.
-# one of the tests (FileUtilsCleanDirectoryTestCase) always fails when run as
-# root.
-# TODO report upstream
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
+	rm -v *.jar
 	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	mkdir -p build/lib
-	cd build/lib
-#	use junit && java-pkg_jar-from junit
+	java-ant_ignore-system-classes
+	java-ant_rewrite-classpath
 }
 
-src_compile() {
-	local antflags="jar -Dlibdir=build/lib"
-	use doc && antflags="${antflags} javadoc -Djavadocdir=dist/docs/api"
-#	use junit && antflags="${antflags} test"
-	eant ${antflags} || die "compile problem"
+# one of the tests (FileUtilsCleanDirectoryTestCase) used to always fail
+# when run as root, but I could not get this behaviour any more.
+
+src_test() {
+	eant test -Dgentoo.classpath="$(java-pkg_getjars junit)" \
+		-DJunit.present=true
 }
 
 src_install() {
 	java-pkg_newjar build/${P}.jar ${PN}.jar
 
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && java-pkg_dohtml -r dist/docs/api
+	dodoc RELEASE-NOTES.txt NOTICE.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/commons-io/files/digest-commons-io-1.0 b/dev-java/commons-io/files/digest-commons-io-1.0
index 704bdfd93bed..ee1509e9d395 100644
--- a/dev-java/commons-io/files/digest-commons-io-1.0
+++ b/dev-java/commons-io/files/digest-commons-io-1.0
@@ -1 +1,3 @@
 MD5 4d17035d061f4ccbbd88feb049df703d commons-io-1.0-src.tar.gz 132118
+RMD160 4d14bf89b27031d6c4459ec7d18757acae5a6e34 commons-io-1.0-src.tar.gz 132118
+SHA256 8cf89ec0adda70e57e456619f296a67715503b44021d8a72643c36ce50474e10 commons-io-1.0-src.tar.gz 132118