Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 138 insertions, 7 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/Manifest b/dev-java/jfreechart/Manifest
index 75e17c43b453..812193d36b53 100644
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX jfreechart-1.0.13-build.xml.patch 2919 RMD160 4e00fbd1fbcbbe54b0019f0c0e34cfd9aa688c32 SHA1 60c39395fbc240888364cb8b01dea568f78e21ae SHA256 4969addf776a91c81f853d830fb3fc12fe6bb255610b3fb2ad07c043dbad9f2f
 AUX jfreechart-1.0.4-build.xml.patch 396 RMD160 2d5017a38f172b76482171854fcc99670ee822f1 SHA1 c98c4d2bd8e4996cb2c591b28e5181867233620e SHA256 2f94895138b874ac2e5023e17eb6bb4daccb3e9eb709c81c5e908ef20fdd57d9
 DIST jfreechart-1.0.10.tar.gz 5072945 RMD160 eae2f2e81b1f385dffd9117e0f5fbecdb748f14d SHA1 0b0ae9e24b3940d042a92a40d4f11229ba9294db SHA256 38d0ab928344e847799ed9e5e7cebb4cc9425b73d5b6672ac13b352147b24536
+DIST jfreechart-1.0.13.tar.gz 6306139 RMD160 6e041807364fc1be091a1bb0b46c11437c2d9c09 SHA1 368827495d38c8da914ff5ba532d315d38af975c SHA256 8b8286cc86d898961f307bcba1f8b6f6471bd0e921562adf573f2758b090c175
 DIST jfreechart-1.0.9.tar.gz 5105044 RMD160 12c115d4821f1b48f10d0f8773d67bf5eea1531b SHA1 9c9edb2ab01a35fb91dd12a813b97072e5a1fb6e SHA256 9b73cdc0361bd8a5a69431ff69eaa58250e43664cd07cb0a7c682097f52f251b
 EBUILD jfreechart-1.0.10.ebuild 1957 RMD160 f224402c62ae295be372dee4d3bcbb70e2a640bc SHA1 c2136df718e24e0c7de79de164fb0d82ad63d11b SHA256 c981891c76886337fc2b05a4b45befaa4a8495e8d33b753664f097aa1f13df41
+EBUILD jfreechart-1.0.13.ebuild 1823 RMD160 797aea72358796e4dfdcbe082772066717aebf8f SHA1 f54ab746ea33c42f83234855baf09d9956c4dd1a SHA256 f9d0753fd678746ff4bc54ebf7127764fa30f137ac7bc259b0a4735fc0c6adc5
 EBUILD jfreechart-1.0.9-r1.ebuild 1956 RMD160 9227a5f7e5cb32769bef49bbcb001617a9361391 SHA1 0a851ef7f7033f543cd9c63afd7f570e2ee82a15 SHA256 0bfae99a8037eb0d0819589b80b6d6a55a4f1a2ad96ded1341d47ccc9e83b92f
-MISC ChangeLog 7078 RMD160 f815a9a09999798b4347b4a6cb1076bb6e76183e SHA1 7c93fe4ab5dd0af0a0fbe56b6b35d2c30fb9c1af SHA256 b2213edc9571b51af4ff29d664732505949b3ceaf7fae28c4ef371ace9317ff3
+MISC ChangeLog 7243 RMD160 fc619b8db3176706c4ef78feaadb705df6395ad6 SHA1 33f7a1d35e3ac22dbbb3c182bf6f0e6eac633d9e SHA256 6f2027345ed74ad4e50c94b1645168992bbac150371796b2afd15970fc69348a
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjo/bcACgkQcxLzpIGCsLQ2XwCeL/EBtnkgZguLzJeN6Hd/z80e
-WBwAni0CHYhE7qkUvH0aVxMDT26iRSMZ
-=pHty
+iEYEARECAAYFAkoIjzwACgkQRh6X64ivZaIuSgCfT+A2hqoJpFfG69c/22UCyBWX
+DRoAnRn/zEvEajmhZO4eY8KfWdh+tNe3
+=6QG4
 -----END PGP SIGNATURE-----
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}"
+}