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

(Portage version: 2.1.2.2)

6 files changed, 56 insertions, 36 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/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
 }