commit: cd59ce4e235e3f6e732f0ad7a4e47ec3eeed354f Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Aug 5 19:01:41 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Aug 5 21:31:21 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=cd59ce4e
[dev-java/cewolf] Version bump, removes crimson DEPEND fixes unavailable dependency dev-java/gnu-jaxp dev-java/cewolf/Manifest | 2 +- dev-java/cewolf/cewolf-1.0.ebuild | 63 ------------------------- dev-java/cewolf/cewolf-1.2.4.ebuild | 46 ++++++++++++++++++ dev-java/cewolf/files/cewolf-1.0-build.xml | 75 ------------------------------ dev-java/cewolf/metadata.xml | 1 - 5 files changed, 47 insertions(+), 140 deletions(-) diff --git a/dev-java/cewolf/Manifest b/dev-java/cewolf/Manifest index 7c81517..8f37a6d 100644 --- a/dev-java/cewolf/Manifest +++ b/dev-java/cewolf/Manifest @@ -1 +1 @@ -DIST cewolf-1.0-bin-src.zip 4245403 SHA256 c62848c8c6bbf57b5c2ffb22037c8bbbf31fac43659b1b51d6a6b732b3d03baf +DIST cewolf-1.2.4.zip 4170752 SHA256 b49260f7d09f34eebb3fdda92b41c0ec014a5351703989d4d4db506dd9a0a1ab SHA512 affa4bdc83dbd96592b542e699acaaefda578340f591b21f838b4fee3efa3d975794c69a1a0d567d0b186b76b73bca52ec8768bae05a7d88e30fbe5c97b06184 WHIRLPOOL 03c8ae3d1ba41417b4eaf51a39a5c70b09a341a39ebfd91d5b02637f7b1f28b51b15091abf6a76e0b952b65f2037939f2255d9260ed9babd8b42a213cc80665f diff --git a/dev-java/cewolf/cewolf-1.0.ebuild b/dev-java/cewolf/cewolf-1.0.ebuild deleted file mode 100644 index 6112fca..0000000 --- a/dev-java/cewolf/cewolf-1.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Cewolf is a tag library for charts of all kinds. It enables every JSP to easily embedd chart images." -HOMEPAGE="http://cewolf.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}-bin-src.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="doc source" - -DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-core-1.6 - app-arch/unzip - source? ( app-arch/zip )" -RDEPEND=">=virtual/jre-1.4 - >=dev-java/jfreechart-1.0.0 - >=dev-java/jcommon-1.0.0 - >=dev-java/batik-1.6 - dev-java/commons-logging - =dev-java/servletapi-2.4* - >=dev-java/crimson-1.1.3 - >=dev-java/gnu-jaxp-1.0.0 - >=dev-java/log4j-1.2.12" - - -src_unpack() { - unpack ${A} - - cp "${FILESDIR}/${P}-build.xml" "${S}/build.xml" - - cd "${S}/lib" - rm $(ls *.jar|grep -v demo) - - for module in awt-util dom svggen util xml; do - java-pkg_jar-from batik-1.6 "batik-${module}.jar" - done - java-pkg_jar-from commons-logging - java-pkg_jar-from crimson-1 - java-pkg_jar-from gnu-jaxp - java-pkg_jar-from jcommon-1.0 - java-pkg_jar-from jfreechart-1.0 - # TODO jfreechart-demo - #java-pkg_jar-from junit - java-pkg_jar-from log4j - java-pkg_jar-from servletapi-2.4 -} - -src_compile() { - eant jar -Dnoget=true $(use_doc) -} - -src_install() { - java-pkg_dojar "target/${PN}.jar" - dodoc LICENSE.txt RELEASE.txt - - use doc && java-pkg_dohtml -r javadoc docs/* - use source && java-pkg_dosrc src/main/java/de -} diff --git a/dev-java/cewolf/cewolf-1.2.4.ebuild b/dev-java/cewolf/cewolf-1.2.4.ebuild new file mode 100644 index 0000000..de09dfa --- /dev/null +++ b/dev-java/cewolf/cewolf-1.2.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Cewolf is a tag library for charts of all kinds. It enables every JSP to easily embedd chart images." +HOMEPAGE="http://cewolf.sourceforge.net/"; +SRC_URI="mirror://sourceforge/${PN}/${P}.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc source" + +COMMON_DEPEND=" + >=dev-java/jfreechart-1.0.14:1.0 + >=dev-java/jcommon-1.0.18:1.0 + dev-java/batik:1.8 + dev-java/commons-logging:0 + java-virtuals/servlet-api:2.5 +" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + >=dev-java/ant-core-1.6 + >=virtual/jdk-1.5 + source? ( app-arch/zip ) +" +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.5 + >=dev-java/log4j-1.2.12 +" + +JAVA_GENTOO_CLASSPATH="batik-1.8,commons-logging,jcommon-1.0,jfreechart-1.0,servlet-api-2.5" +JAVA_SRC_DIR="src/main/java" + +S="${WORKDIR}/${P}" + +src_install() { + java-pkg-simple_src_install + dodoc LICENSE.txt + use doc && java-pkg_dohtml -r javadoc tagdoc + use source && java-pkg_dosrc src/main/java/de +} diff --git a/dev-java/cewolf/files/cewolf-1.0-build.xml b/dev-java/cewolf/files/cewolf-1.0-build.xml deleted file mode 100644 index 291efa8..0000000 --- a/dev-java/cewolf/files/cewolf-1.0-build.xml +++ /dev/null @@ -1,75 +0,0 @@ -<project name="cewolf" default="jar" basedir="."> - <property name="maven.build.output" value="target/classes"/> - <property name="maven.build.directory" value="target"/> - <property name="maven.build.final.name" value="cewolf"/> - <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/> - <property name="maven.test.output" value="target/test-classes"/> - <property name="cewolf.version" value="1.0"/> - <available classname="javax.imageio.ImageIO" property="ImageIO.present"/> - <path id="build.classpath"> - <pathelement location="${basedir}/lib/batik-awt-util.jar"/> - <pathelement location="${basedir}/lib/batik-dom.jar"/> - <pathelement location="${basedir}/lib/batik-svggen.jar"/> - <pathelement location="${basedir}/lib/batik-util.jar"/> - <pathelement location="${basedir}/lib/batik-xml.jar"/> - <pathelement location="${basedir}/lib/commons-logging-api.jar"/> - <pathelement location="${basedir}/lib/commons-logging.jar"/> - <pathelement location="${basedir}/lib/crimson.jar"/> - <pathelement location="${basedir}/lib/gnujaxp.jar"/> - <pathelement location="${basedir}/lib/jcommon.jar"/> - <pathelement location="${basedir}/lib/jfreechart.jar"/> - <pathelement location="${basedir}/lib/jsp-api.jar"/> - <pathelement location="${basedir}/lib/junit.jar"/> - <pathelement location="${basedir}/lib/log4j.jar"/> - <pathelement location="${basedir}/lib/servlet-api.jar"/> - </path> - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.directory}"/> - </target> - <target name="compile" depends="" description="Compile the code"> - <mkdir dir="${maven.build.output}"/> - <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false"> - <src> - <pathelement location="src/main/java"/> - </src> - <classpath refid="build.classpath" /> - </javac> - <copy todir="${maven.build.output}"> - <fileset dir="src/main/resources"/> - </copy> - </target> - <target name="jar" depends="compile,test" description="Clean the JAR"> - <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/> - </target> - <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present"> - <mkdir dir="${maven.test.output}"/> - </target> - <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"/> - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present"/> - </target> - <target name="junit-present" depends="test-junit-present" unless="junit.present"> - <echo>================================= WARNING ================================</echo> - <echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo> - <echo>==========================================================================</echo> - </target> - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${build.sysclasspath}" arg2="only"/> - </condition> - </target> - <target name="javadoc" depends=""> - <delete dir="${basedir}/javadoc" /> - <mkdir dir="${basedir}/javadoc" /> - <javadoc destdir="${basedir}/javadoc" - windowtitle="Cewolf Class Library (version ${cewolf.version})" - use="yes" - linksource="yes" - splitindex="yes"> - <classpath refid="build.classpath" /> - <packageset dir="${basedir}/src/main/java" defaultexcludes="yes"> - <include name="de/laures/cewolf/**"/> - </packageset> - </javadoc> - </target> -</project> diff --git a/dev-java/cewolf/metadata.xml b/dev-java/cewolf/metadata.xml index 604e0a4..7303cef 100644 --- a/dev-java/cewolf/metadata.xml +++ b/dev-java/cewolf/metadata.xml @@ -3,4 +3,3 @@ <pkgmetadata> <herd>java</herd> </pkgmetadata> -
