Change HOMEPAGE from http://www.jfree.org/ to http://www.jfree.org/jcommon/ and add src_test to 1.0.8.

Package-Manager: portage-2.1.2.2

7 files changed, 90 insertions, 60 deletions

diff --git a/dev-java/jcommon/ChangeLog b/dev-java/jcommon/ChangeLog
index 5e1f5b56f496..5b4992619387 100644
--- a/dev-java/jcommon/ChangeLog
+++ b/dev-java/jcommon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jcommon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/ChangeLog,v 1.13 2007/02/10 00:45:56 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/ChangeLog,v 1.14 2007/03/17 12:14:52 betelgeuse Exp $
+
+  17 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> jcommon-0.9.7.ebuild,
+  jcommon-0.9.7-r1.ebuild, jcommon-0.9.7-r2.ebuild, jcommon-1.0.5.ebuild,
+  jcommon-1.0.8.ebuild:
+  Change HOMEPAGE from http://www.jfree.org/ to http://www.jfree.org/jcommon/
+  and add src_test to 1.0.8.
 
 *jcommon-1.0.8 (10 Feb 2007)
 
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
index a4ab5f9555ff..2798755ff23b 100644
--- a/dev-java/jcommon/Manifest
+++ b/dev-java/jcommon/Manifest
@@ -1,30 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jcommon-0.9.7.tar.gz 820330 RMD160 8b4028353355db09a514ac17bb8c39621a69c38d SHA1 2ed215961f380ed81b61ac7c8f240644a87bbee4 SHA256 09e551eaa47fead05b88dc4747ad7f1e02ca976dde659b4a2f568110abc659e1
 DIST jcommon-1.0.5.tar.gz 1112841 RMD160 d88930c45fdb6fd3fef1c9f5a0e70aa5d7deb302 SHA1 8c717ef21d08c7e5bf1e28a15da94a70eb98f4a7 SHA256 abcdf092af62ca50543b9b2721c9d58453832c2cf4027df81fd5cd09a6a14e21
 DIST jcommon-1.0.8.tar.gz 1121431 RMD160 77e3d8a7018af360fe68f85f26ffd1a04a3bbba2 SHA1 e894fceeb1eeaf67353883cf6bd9de54b99d431e SHA256 b01697f4149540ddaf3489ae588451564698e11f81dc27031a7a17a3928638c1
-EBUILD jcommon-0.9.7-r1.ebuild 997 RMD160 fd0c2c76905daa346339a1ea4a71226d820eaf57 SHA1 a87c7831af96eb019479117723ec4fec792701c9 SHA256 5a526936a17f249aad5686c612dbfa687436826a55095ecd8a7cd17fd5b5850b
-MD5 5016f642e87bad2f55f839629d33a7c0 jcommon-0.9.7-r1.ebuild 997
-RMD160 fd0c2c76905daa346339a1ea4a71226d820eaf57 jcommon-0.9.7-r1.ebuild 997
-SHA256 5a526936a17f249aad5686c612dbfa687436826a55095ecd8a7cd17fd5b5850b jcommon-0.9.7-r1.ebuild 997
-EBUILD jcommon-0.9.7-r2.ebuild 968 RMD160 1db05558a50e378c9fde1695033095a0d348257f SHA1 4b16edd03f6998e8fc6cbab83aa4b7d8ea5e605b SHA256 83a519cdb45937ff3c697615fa35ab54b5f9c4aa86226ed757b65dcae42d925f
-MD5 e73d2186ad55e968f32580cac097b4fe jcommon-0.9.7-r2.ebuild 968
-RMD160 1db05558a50e378c9fde1695033095a0d348257f jcommon-0.9.7-r2.ebuild 968
-SHA256 83a519cdb45937ff3c697615fa35ab54b5f9c4aa86226ed757b65dcae42d925f jcommon-0.9.7-r2.ebuild 968
-EBUILD jcommon-0.9.7.ebuild 982 RMD160 a533930824fec34bbd2ba1bb33a80760241b2c9b SHA1 f844eb3826413bd6e71f37ef634c159c0662386b SHA256 2e57426bf6e592b6de4b8142dcb97df3eb825e0cd3266b3408c3117677a71aea
-MD5 3595ff6898abc699dfe5bdbce449ed05 jcommon-0.9.7.ebuild 982
-RMD160 a533930824fec34bbd2ba1bb33a80760241b2c9b jcommon-0.9.7.ebuild 982
-SHA256 2e57426bf6e592b6de4b8142dcb97df3eb825e0cd3266b3408c3117677a71aea jcommon-0.9.7.ebuild 982
-EBUILD jcommon-1.0.5.ebuild 1156 RMD160 038ed305287e33922d59cc59f5d97f1d93d9c95c SHA1 790437ab599cb6dd2577c6cb01eeaef340aea0fc SHA256 fca49396ce0f62214c6738c3a7501faf136fd80338b17e60416eac195b7cd483
-MD5 a4db7eac1b13380c5398d04a8f5a8b20 jcommon-1.0.5.ebuild 1156
-RMD160 038ed305287e33922d59cc59f5d97f1d93d9c95c jcommon-1.0.5.ebuild 1156
-SHA256 fca49396ce0f62214c6738c3a7501faf136fd80338b17e60416eac195b7cd483 jcommon-1.0.5.ebuild 1156
-EBUILD jcommon-1.0.8.ebuild 1081 RMD160 55d79399c6bced600832282665be842f245b6467 SHA1 e93810460286620f6a532b0a21a15a1138afb709 SHA256 aafbf513f6fb4edbf9c04b2c981fe80af4421846a7ef36210655cebf0655b2f0
-MD5 5758b57a265bae98612c0a0170b729c8 jcommon-1.0.8.ebuild 1081
-RMD160 55d79399c6bced600832282665be842f245b6467 jcommon-1.0.8.ebuild 1081
-SHA256 aafbf513f6fb4edbf9c04b2c981fe80af4421846a7ef36210655cebf0655b2f0 jcommon-1.0.8.ebuild 1081
-MISC ChangeLog 2077 RMD160 825d808ae5b11a6dfc60f33bae45d40741b58ee7 SHA1 09b61bc225e67cedfef3e77110b6dac2bcfc8fab SHA256 b160f6503ccc72afe4aaf7d17a4844a2f0b3e8376be0e45fdab377e6816645eb
-MD5 22a413a71aa3728070c188b2390e321e ChangeLog 2077
-RMD160 825d808ae5b11a6dfc60f33bae45d40741b58ee7 ChangeLog 2077
-SHA256 b160f6503ccc72afe4aaf7d17a4844a2f0b3e8376be0e45fdab377e6816645eb ChangeLog 2077
+EBUILD jcommon-0.9.7-r1.ebuild 1005 RMD160 2be47f15860aab774a437f1eb314ce31ec1362d7 SHA1 eb68bcad2ddb7c0479b87d9298519b96d714346d SHA256 254564bf998fb757c7219997f59f3c594dfa1f7f1d502d3c42ff556277b45172
+MD5 704f644ad5453acb267a5d3d97f0559f jcommon-0.9.7-r1.ebuild 1005
+RMD160 2be47f15860aab774a437f1eb314ce31ec1362d7 jcommon-0.9.7-r1.ebuild 1005
+SHA256 254564bf998fb757c7219997f59f3c594dfa1f7f1d502d3c42ff556277b45172 jcommon-0.9.7-r1.ebuild 1005
+EBUILD jcommon-0.9.7-r2.ebuild 1210 RMD160 18385c5d6f82a100b0956482cc2144eb5c35c2cf SHA1 651bded21a864a88acb8f510fbe402ac33d7c454 SHA256 8a44e5aae5022d8059f1b4bce547824596585f815b2c19f3d19613226f6c4cb3
+MD5 f160a469e3f64bf18c7428b6761ee496 jcommon-0.9.7-r2.ebuild 1210
+RMD160 18385c5d6f82a100b0956482cc2144eb5c35c2cf jcommon-0.9.7-r2.ebuild 1210
+SHA256 8a44e5aae5022d8059f1b4bce547824596585f815b2c19f3d19613226f6c4cb3 jcommon-0.9.7-r2.ebuild 1210
+EBUILD jcommon-0.9.7.ebuild 990 RMD160 9613ca0f551fbc19e9274be8c3c2ee481a6bfbe7 SHA1 64ab4ab33ac55cfb161154e172b6c7b89594b2be SHA256 592044be97c6ac1b9ac331da44780360245c5132beddb3e0c030976f3a1d0512
+MD5 10a25bbae0049622edaf7b1208057a23 jcommon-0.9.7.ebuild 990
+RMD160 9613ca0f551fbc19e9274be8c3c2ee481a6bfbe7 jcommon-0.9.7.ebuild 990
+SHA256 592044be97c6ac1b9ac331da44780360245c5132beddb3e0c030976f3a1d0512 jcommon-0.9.7.ebuild 990
+EBUILD jcommon-1.0.5.ebuild 1168 RMD160 803c3ac5cb43b74f312ccafd8f6e277e7c9232fe SHA1 e57fe2a2b4d53d02b413e78767e98bf73677566c SHA256 e3749fd5a9195afded1c01427e32083b5430e639d3738072ad6d3ff186558651
+MD5 0ab989c07b2435c1cf6babbb10c38fd6 jcommon-1.0.5.ebuild 1168
+RMD160 803c3ac5cb43b74f312ccafd8f6e277e7c9232fe jcommon-1.0.5.ebuild 1168
+SHA256 e3749fd5a9195afded1c01427e32083b5430e639d3738072ad6d3ff186558651 jcommon-1.0.5.ebuild 1168
+EBUILD jcommon-1.0.8.ebuild 1412 RMD160 2ab2106bde6098b089a7f28922e136e8e8db8087 SHA1 0a410c647bcecde5c9fdc21d8ea3aae77becf3d9 SHA256 076219d2602a680a0aa55513ddabffe2178cab977861e8dc1346dd0a9d1d2065
+MD5 58e729fd54c468656f652fb9c4706da3 jcommon-1.0.8.ebuild 1412
+RMD160 2ab2106bde6098b089a7f28922e136e8e8db8087 jcommon-1.0.8.ebuild 1412
+SHA256 076219d2602a680a0aa55513ddabffe2178cab977861e8dc1346dd0a9d1d2065 jcommon-1.0.8.ebuild 1412
+MISC ChangeLog 2360 RMD160 d00c293c0cbf83d82fcdaec19e4860725f960695 SHA1 4cd4833d65614ee1b157b1acbbbe01bf251a3492 SHA256 076e04ad6d62933784ebdac2fc2d79ae81564670a10f5c35c474d175605ba6ae
+MD5 9d1015d052d5afdfc9c91764f7af7263 ChangeLog 2360
+RMD160 d00c293c0cbf83d82fcdaec19e4860725f960695 ChangeLog 2360
+SHA256 076e04ad6d62933784ebdac2fc2d79ae81564670a10f5c35c474d175605ba6ae ChangeLog 2360
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -44,3 +47,10 @@ SHA256 b288200e4956f7ceb1aa906bc299601957bb38e57cf61fe77b329405aa6f4a39 files/di
 MD5 39d7e69f6f4885a6c070b972934ebad7 files/digest-jcommon-1.0.8 244
 RMD160 015dd4bb43d5e9fb5fc0bb7797137fddaf74e790 files/digest-jcommon-1.0.8 244
 SHA256 d38bd86a772137ca3ad8926475f3f23a7bd7b1be16df63532afc1e1beef7058a files/digest-jcommon-1.0.8 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF+9vHcxLzpIGCsLQRApzFAJ43I3sFExKnoTMZ6Id/1xiWllKUTwCfVsga
+7yS7qbKTBzd1asi/wdV86sI=
+=1wwD
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jcommon/jcommon-0.9.7-r1.ebuild b/dev-java/jcommon/jcommon-0.9.7-r1.ebuild
index 6a946b6b6d36..5be84c702c54 100644
--- a/dev-java/jcommon/jcommon-0.9.7-r1.ebuild
+++ b/dev-java/jcommon/jcommon-0.9.7-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 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/jcommon/jcommon-0.9.7-r1.ebuild,v 1.6 2005/10/08 11:03:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-0.9.7-r1.ebuild,v 1.7 2007/03/17 12:14:52 betelgeuse Exp $
 
 inherit java-pkg
 
 DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects."
-HOMEPAGE="http://www.jfree.org"
+HOMEPAGE="http://www.jfree.org/jcommon"
 SRC_URI="mirror://sourceforge/jfreechart/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-java/jcommon/jcommon-0.9.7-r2.ebuild b/dev-java/jcommon/jcommon-0.9.7-r2.ebuild
index 079275ef9d4c..7ed6160a49b8 100644
--- a/dev-java/jcommon/jcommon-0.9.7-r2.ebuild
+++ b/dev-java/jcommon/jcommon-0.9.7-r2.ebuild
@@ -1,42 +1,46 @@
-# 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/jcommon/jcommon-0.9.7-r2.ebuild,v 1.1 2006/09/11 12:31:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-0.9.7-r2.ebuild,v 1.2 2007/03/17 12:14:52 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects."
-HOMEPAGE="http://www.jfree.org"
+HOMEPAGE="http://www.jfree.org/jcommon"
 SRC_URI="mirror://sourceforge/jfreechart/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		dev-java/junit"
+#		test? ( dev-java/junit )"
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jdk-1.4"
 
 src_unpack() {
-
 	unpack ${A}
-	cd ${S}
-	rm *.jar
-
+	cd "${S}"
+	rm -v *.jar lib/*.jar || die
 }
 
-src_compile() {
+EANT_BUILD_XML="ant/build.xml"
+EANT_BUILD_TARGET="compile"
 
-	local antflags="compile"
-	use doc && antflags="${antflags} javadoc"
-	eant -f ant/build.xml ${antflags} || die "compile failed"
+RESTRICT="test"
+# A couple of these fail
 
+src_test() {
+	cd lib/ || die
+	java-pkg_jar-from junit
+	cd ..
+	eant -f ant/build.xml compile-junit-tests
+	java -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit)" \
+		junit.textui.TestRunner \
+		org.jfree.junit.JCommonTestSuite || die "Tests failed"
 }
 
 src_install() {
-
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	dodoc README.txt
-	use doc && java-pkg_dohtml -r javadoc
+	java-pkg_newjar ${P}.jar
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc source/*
-
 }
diff --git a/dev-java/jcommon/jcommon-0.9.7.ebuild b/dev-java/jcommon/jcommon-0.9.7.ebuild
index eeb02b732dd9..893d482398a3 100644
--- a/dev-java/jcommon/jcommon-0.9.7.ebuild
+++ b/dev-java/jcommon/jcommon-0.9.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 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/jcommon/jcommon-0.9.7.ebuild,v 1.8 2005/10/08 11:03:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-0.9.7.ebuild,v 1.9 2007/03/17 12:14:52 betelgeuse Exp $
 
 inherit java-pkg
 
 DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects."
-HOMEPAGE="http://www.jfree.org"
+HOMEPAGE="http://www.jfree.org/jcommon"
 SRC_URI="mirror://sourceforge/jfreechart/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-java/jcommon/jcommon-1.0.5.ebuild b/dev-java/jcommon/jcommon-1.0.5.ebuild
index 77f9bde97618..be1f91ae8019 100644
--- a/dev-java/jcommon/jcommon-1.0.5.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.5.ebuild,v 1.2 2007/02/03 10:40:56 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.5.ebuild,v 1.3 2007/03/17 12:14:52 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 versionator
 
 DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects."
-HOMEPAGE="http://www.jfree.org"
+HOMEPAGE="http://www.jfree.org/jcommon"
 
 SRC_URI="mirror://sourceforge/jfreechart/${P}.tar.gz"
 LICENSE="LGPL-2"
diff --git a/dev-java/jcommon/jcommon-1.0.8.ebuild b/dev-java/jcommon/jcommon-1.0.8.ebuild
index 2fc1e2ae74c2..ce1bcc168b89 100644
--- a/dev-java/jcommon/jcommon-1.0.8.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.8.ebuild,v 1.1 2007/02/10 00:45:56 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.8.ebuild,v 1.2 2007/03/17 12:14:52 betelgeuse Exp $
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2 versionator
 
 DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects."
-HOMEPAGE="http://www.jfree.org"
+HOMEPAGE="http://www.jfree.org/jcommon"
 MY_P=${PN}-$(replace_version_separator 3 -)
 SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
@@ -15,15 +15,15 @@ SLOT="1.0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug"
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core"
+		test? ( dev-java/junit )"
 RDEPEND=">=virtual/jdk-1.4"
 
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	rm *.jar ${S}/lib/*.jar
+	cd "${S}"
+	rm -v *.jar ${S}/lib/*.jar || die
 }
 
 src_compile() {
@@ -32,10 +32,20 @@ src_compile() {
 	fi
 	eant -f ant/build.xml compile $(use_doc) $antflags
 }
+src_test() {
+	cd lib/ || die
+	java-pkg_jar-from junit
+	cd ..
+	eant -f ant/build.xml compile-junit-tests
+	java -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit)" \
+		junit.textui.TestRunner \
+		-Djava.awt.headless=true \
+		org.jfree.junit.JCommonTestSuite || die "Tests failed"
+}
 
 src_install() {
 	java-pkg_newjar ${P}.jar ${PN}.jar
-	dodoc README.txt
+	dodoc README.txt || die
 	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc source/com source/org
 }