From: Miroslav Šulc Date: Sat, 6 Jan 2007 15:06:51 +0000 (+0000) Subject: Ebuild corrected and improved X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f80999e36c032b31fea4c18e242963fa93cf46b;p=gentoo.git Ebuild corrected and improved Package-Manager: portage-2.1.2_rc4-r6 --- 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 + 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 + 06 Jan 2007; Miroslav Å ulc +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/Manifest b/dev-java/jfreechart/Manifest index 06e9249773b1..36c92ae01729 100644 --- a/dev-java/jfreechart/Manifest +++ b/dev-java/jfreechart/Manifest @@ -17,14 +17,14 @@ EBUILD jfreechart-1.0.2.ebuild 1266 RMD160 69fb21d361c36efdadaf5170410313ba76573 MD5 c7950e1ae82bb088a76c7bafde740269 jfreechart-1.0.2.ebuild 1266 RMD160 69fb21d361c36efdadaf5170410313ba76573071 jfreechart-1.0.2.ebuild 1266 SHA256 b6e4a2fbdab325dbe39aa1010fcb77d2c66a30fb8b3702f4bb1b79cad25fe833 jfreechart-1.0.2.ebuild 1266 -EBUILD jfreechart-1.0.3.ebuild 1437 RMD160 08f828c6ffd56fe3f859fc9828b182c8cdafed64 SHA1 678cf6a6938576673a11de6429df3d17651f9135 SHA256 0185088bec7d2f6c8a62152d3491845bc893b19d53e734a21638b03f2378e9ac -MD5 9afbe9f2b1e479bcbe2d0abc46ccfd6a jfreechart-1.0.3.ebuild 1437 -RMD160 08f828c6ffd56fe3f859fc9828b182c8cdafed64 jfreechart-1.0.3.ebuild 1437 -SHA256 0185088bec7d2f6c8a62152d3491845bc893b19d53e734a21638b03f2378e9ac jfreechart-1.0.3.ebuild 1437 -MISC ChangeLog 2206 RMD160 0ce0cc07f1ae1928999d72693086b9d621b215d6 SHA1 9112193f4704979de4fde8762f5dbf001671ddb6 SHA256 bc2db23e9c8b365f157e5d794bbe7eec4aea6425313137ae2c78b94ec167437c -MD5 9455f4df8025cdbb34ab4fe951540f69 ChangeLog 2206 -RMD160 0ce0cc07f1ae1928999d72693086b9d621b215d6 ChangeLog 2206 -SHA256 bc2db23e9c8b365f157e5d794bbe7eec4aea6425313137ae2c78b94ec167437c ChangeLog 2206 +EBUILD jfreechart-1.0.3.ebuild 1797 RMD160 6eacbf632e7573b61d50d60a325cfd2ec5f0dc0c SHA1 b9e73b04ae8a8d874858d229ae45c772fdb159b3 SHA256 01c2fb77baa00cc609113b6f07a4c45d02e5cf9cd0e1d8f933c548170a62e71b +MD5 d0869e85b78d9c13cad52c7de49d851a jfreechart-1.0.3.ebuild 1797 +RMD160 6eacbf632e7573b61d50d60a325cfd2ec5f0dc0c jfreechart-1.0.3.ebuild 1797 +SHA256 01c2fb77baa00cc609113b6f07a4c45d02e5cf9cd0e1d8f933c548170a62e71b jfreechart-1.0.3.ebuild 1797 +MISC ChangeLog 2448 RMD160 2a27df92557eab210cda417abe69b154040e0c19 SHA1 42f10b2a9d07845bc86b0c72df622054e9fe01e9 SHA256 a911b30fd2c30a69c94209dcbc859bef8d93bff754affc4e01528c7e9c140a19 +MD5 d6db2950febd818bacda44f7a1afb3d6 ChangeLog 2448 +RMD160 2a27df92557eab210cda417abe69b154040e0c19 ChangeLog 2448 +SHA256 a911b30fd2c30a69c94209dcbc859bef8d93bff754affc4e01528c7e9c140a19 ChangeLog 2448 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 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}" +}