Version bump

(Portage version: 2.1.2_rc4-r6)

4 files changed, 117 insertions, 2 deletions

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index 187dd6b476a3..dbeb712ef80e 100644
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jfreechart
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.11 2006/09/11 12:59:25 nelchael Exp $
+# 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 $
+
+*jfreechart-1.0.3 (06 Jan 2007)
+
+  06 Jan 2007; Miroslav Šulc <miroslav.sulc@startnet.cz>
+  +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-1.0.2 (11 Sep 2006)
 *jfreechart-0.9.21-r1 (11 Sep 2006)
diff --git a/dev-java/jfreechart/files/digest-jfreechart-1.0.3 b/dev-java/jfreechart/files/digest-jfreechart-1.0.3
new file mode 100644
index 000000000000..83e1d77f7789
--- /dev/null
+++ b/dev-java/jfreechart/files/digest-jfreechart-1.0.3
@@ -0,0 +1,3 @@
+MD5 e0aa991ad62d10c12b82a002be29549d jfreechart-1.0.3.tar.gz 5307298
+RMD160 6dde2729f9cb0c2325c4be744178b25403f44efa jfreechart-1.0.3.tar.gz 5307298
+SHA256 a863d36bac966b074d36fc3e220af7c8b862180447b503911558413b0586da5f jfreechart-1.0.3.tar.gz 5307298
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.3-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.3-build.xml.patch
new file mode 100644
index 000000000000..69b3c474fea8
--- /dev/null
+++ b/dev-java/jfreechart/files/jfreechart-1.0.3-build.xml.patch
@@ -0,0 +1,48 @@
+--- build.xml.original	2007-01-06 12:40:56.000000000 +0100
++++ build.xml	2007-01-06 13:28:40.000000000 +0100
+@@ -311,4 +311,45 @@
+         <delete dir="${basedir}/distribution" />    
+     </target>
+ 
++    <target name="compile-tests" depends="compile,compile-experimental"
++            description="Compile the test code">
++        <mkdir dir="${basedir}/build-tests"/>
++        <javac destdir="${basedir}/build-tests" srcdir="${basedir}/tests" source="1.3"
++               target="1.3" debug="true" deprecation="true"
++               optimize="false">
++            <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}/build-tests"/>
++            </classpath>
++        </javac>
++        <copy todir="${basedir}/build-tests">
++            <fileset dir="${basedir}/tests" excludes="**/*.java"/>
++        </copy>
++    </target>
++
++    <target name="test" depends="compile-tests"
++            description="Run the test cases">
++        <mkdir dir="${basedir}/build-tests-reports"/>
++        <junit printSummary="yes" haltonerror="true" haltonfailure="true"
++               fork="true" dir=".">
++            <sysproperty key="basedir" value="."/>
++            <formatter type="plain" usefile="false"/>
++            <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}/build-tests"/>
++            </classpath>
++            <batchtest todir="${basedir}/build-tests-reports">
++                <fileset dir="${basedir}/tests">
++                    <include name="**/*Tests.java"/>
++                </fileset>
++            </batchtest>
++        </junit>
++    </target>
++
+ </project>
diff --git a/dev-java/jfreechart/jfreechart-1.0.3.ebuild b/dev-java/jfreechart/jfreechart-1.0.3.ebuild
new file mode 100644
index 000000000000..be89d6cebcf7
--- /dev/null
+++ b/dev-java/jfreechart/jfreechart-1.0.3.ebuild
@@ -0,0 +1,55 @@
+# 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 $
+
+inherit java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="JFreeChart is a free Java class library for generating charts"
+HOMEPAGE="http://www.jfree.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc source test"
+COMMON_DEPEND="
+	>=dev-java/itext-1.4.6
+	>=dev-java/jcommon-1.0.0
+	=dev-java/servletapi-2.3*"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	dev-java/ant-core
+	test? ( =dev-java/junit-3.8* )"
+RDEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+
+	cd "${S}/ant"
+	epatch ${FILESDIR}/${P}-build.xml.patch
+
+	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)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant -f ant/build.xml test
+}
+
+src_install() {
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	java-pkg_newjar ${P}-experimental.jar ${PN}-experimental.jar
+	dodoc README.txt CHANGELOG.txt
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc source/org
+}
+