Version bump.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 130 insertions, 2 deletions

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index 6fe79a82c03c..fc1e3f8bfce3 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jfreechart
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.46 2008/10/05 17:47:25 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.47 2009/05/11 20:48:54 serkan Exp $
+
+*jfreechart-1.0.13 (11 May 2009)
+
+  11 May 2009; Serkan Kaba <serkan@gentoo.org> +jfreechart-1.0.13.ebuild,
+  +files/jfreechart-1.0.13-build.xml.patch:
+  Version bump.
 
   05 Oct 2008; Petteri Räty <betelgeuse@gentoo.org>
   jfreechart-1.0.9-r1.ebuild, jfreechart-1.0.10.ebuild:
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
new file mode 100644
index 000000000000..8665a15aa0e2
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
@@ -0,0 +1,58 @@
+diff -Nur jfreechart-1.0.13/ant/build.xml jfreechart-1.0.13_patched/ant/build.xml
+--- jfreechart-1.0.13/ant/build.xml	2009-04-20 11:23:40.000000000 +0300
++++ jfreechart-1.0.13_patched/ant/build.xml	2009-05-11 23:36:27.000000000 +0300
+@@ -40,11 +40,9 @@
+         <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
+         <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
+         <path id="build.classpath">
+-            <fileset dir="${basedir}/lib/">
+-                <include name="${jcommon.name}-${jcommon.version}.jar"/>
+-                <include name="servlet.jar"/>
+-                <include name="gnujaxp.jar" unless="JDK1.4+"/>
+-            </fileset>
++            <pathelement location="${jcommon.jar}"/>
++            <pathelement location="${servlet.jar}"/>
++            <pathelement location="${gnujaxp.jar}"/>
+         </path>
+ 
+     </target>
+@@ -324,7 +322,7 @@
+ 
+     <!-- COMPILE THE JUNIT TESTS. -->  
+     <target name="compile-tests" 
+-            depends="compile,compile-experimental"
++            depends="initialise"
+             description="Compile the test code">
+         
+         <mkdir dir="${basedir}/build-tests"/>
+@@ -338,8 +336,8 @@
+             <classpath>
+                 <path refid="build.classpath"/>
+                 <pathelement location="${junit.jar}"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
+                 <pathelement location="${basedir}/build-tests"/>
+             </classpath>
+         </javac>
+@@ -357,7 +355,7 @@
+         <junit printSummary="yes" 
+                haltonerror="true" 
+                haltonfailure="true"
+-               fork="true" 
++               fork="false" 
+                dir=".">
+             
+             <sysproperty key="basedir" value="."/>
+@@ -365,8 +363,8 @@
+             <classpath>
+                 <path refid="build.classpath"/>
+                 <pathelement location="${junit.jar}"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
+-                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
++                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
+                 <pathelement location="${basedir}/build-tests"/>
+             </classpath>
+             <batchtest todir="${basedir}/build-tests-reports">
diff --git a/dev-java/jfreechart/jfreechart-1.0.13.ebuild b/dev-java/jfreechart/jfreechart-1.0.13.ebuild
new file mode 100644
index 000000000000..a7b327027bb5
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.13.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.13.ebuild,v 1.1 2009/05/11 20:48:54 serkan Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFreeChart is a free Java class library for generating charts"
+HOMEPAGE="http://www.jfree.org/jfreechart"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+COMMON_DEPEND="
+	>=dev-java/itext-1.4.6:0
+	dev-java/jcommon:1.0
+	java-virtuals/servlet-api:2.3"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit:0 )"
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	rm -v *.jar lib/*.jar || die
+}
+
+src_compile() {
+	# 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() {
+	# X11 tests are disabled using java.awt.headless=true
+	ANT_TASKS="ant-junit" \
+	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
+		eant -f ant/build.xml test $(get_jars)
+}
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar
+	dodoc README.txt ChangeLog NEWS || die
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/org
+}
+
+get_jars() {
+	local antflags="
+		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
+		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
+		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
+	use test && antflags="${antflags} \
+		-Djunit.jar=$(java-pkg_getjars --build-only junit)"
+	echo "${antflags}"
+}