Ebuild corrected and improved

(Portage version: 2.1.2_rc4-r6)

2 files changed, 25 insertions, 11 deletions

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index dbeb712ef80e..bd7b4facf9fc 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,15 +1,21 @@
 # ChangeLog for dev-java/jfreechart
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.12 2007/01/06 14:10:55 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.13 2007/01/06 15:06:51 fordfrog Exp $
+
+  06 Jan 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  jfreechart-1.0.3.ebuild:
+  Changed back to passing path to jars using ant properties, corrected
+  duplicite compilation of jfreechart.jar and added info about bugreport about
+  failing tests.
 
 *jfreechart-1.0.3 (06 Jan 2007)
 
-  06 Jan 2007; Miroslav Šulc <miroslav.sulc@startnet.cz>
+  06 Jan 2007; Miroslav Šulc <fordfrog@gentoo.org>
   +files/jfreechart-1.0.3-build.xml.patch, +jfreechart-1.0.3.ebuild:
   Version bump, updated license, dropped ~ppc as it is not present in itext,
   dropped gnu-jaxp dep as it is needed only for JDK 1.3, added support for
   tests which currently fail (reported upstream), ebuild currently installs
-  jfreechart-experimental.jar too
+  jfreechart-experimental.jar too.
 
 *jfreechart-1.0.2 (11 Sep 2006)
 *jfreechart-0.9.21-r1 (11 Sep 2006)
diff --git a/dev-java/jfreechart/jfreechart-1.0.3.ebuild b/dev-java/jfreechart/jfreechart-1.0.3.ebuild
index be89d6cebcf7..46c8293d57a7 100644
--- a/dev-java/jfreechart/jfreechart-1.0.3.ebuild
+++ b/dev-java/jfreechart/jfreechart-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.3.ebuild,v 1.1 2007/01/06 14:10:55 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.3.ebuild,v 1.2 2007/01/06 15:06:51 fordfrog Exp $
 
 inherit java-pkg-2 java-ant-2 versionator
 
@@ -30,19 +30,18 @@ src_unpack() {
 
 	cd "${S}"
 	rm -f lib/* *.jar
-	cd "${S}/lib"
-	java-pkg_jar-from itext iText.jar itext-1.4.6.jar
-	java-pkg_jar-from jcommon-1.0 jcommon.jar jcommon-1.0.6.jar
-	java-pkg_jar-from servletapi-2.3
-	use test && java-pkg_jar-from junit
 }
 
 src_compile() {
-	eant -f ant/build.xml compile compile-experimental $(use_doc)
+	# Note that compile-experimental depends on compile so it is sufficient to run
+	# just compile-experimental
+	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
 }
 
 src_test() {
-	ANT_TASKS="ant-junit" eant -f ant/build.xml test
+	einfo "Please note that tests currently fail. See bug:"
+	einfo "http://sourceforge.net/tracker/index.php?func=detail&aid=1629382&group_id=15494&atid=115494"
+	ANT_TASKS="ant-junit" eant -f ant/build.xml test $(get_jars)
 }
 
 src_install() {
@@ -53,3 +52,12 @@ src_install() {
 	use source && java-pkg_dosrc source/org
 }
 
+get_jars() {
+	local antflags="
+		-Ditext.jar=$(java-pkg_getjars itext) \
+		-Djcommon.jar=$(java-pkg_getjars jcommon-1.0) \
+		-Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
+	use test && antflags="${antflags} \
+		-Djunit.jar=$(java-pkg_getjars junit)"
+	echo "${antflags}"
+}