From d613b095587bbdb14e4351665dc9c3978d137f03 Mon Sep 17 00:00:00 2001 From: Karl Trygve Kalleberg Date: Mon, 25 Jul 2005 23:56:27 +0000 Subject: Ant 1.6.2 now supports -lib properly. (Portage version: 2.0.51.19) --- dev-java/ant-core/ChangeLog | 9 ++- dev-java/ant-core/ant-core-1.6.2-r4.ebuild | 78 ++++++++++++++++++++++++ dev-java/ant-core/files/1.6.2-ant | 4 +- dev-java/ant-core/files/digest-ant-core-1.6.2-r4 | 1 + 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 dev-java/ant-core/ant-core-1.6.2-r4.ebuild create mode 100644 dev-java/ant-core/files/digest-ant-core-1.6.2-r4 (limited to 'dev-java/ant-core') diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 01a9756de21e..c1b772a46c3b 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.28 2005/07/24 11:33:03 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.29 2005/07/25 23:56:27 karltk Exp $ # ant-core blocks lower versions of ant-tasks, # since it will not run when there is a version mismatch betwean the 2 @@ -12,6 +12,13 @@ +ant-core-1.6.5-r1.ebuild: revision bump too make sure ppl have the new wrapper +*ant-core-1.6.2-r4 (25 Jul 2005) + + 25 Jul 2005; Karl Trygve Kalleberg + ant-core-1.6.2-r4.ebuild: + Fixed -lib issue in the script file. Can now depend on the new + script. Gone straight to stable since it's pretty major. + 09 Jul 2005; Thomas Matthijs ant-core-1.5.4-r2.ebuild, ant-core-1.6.2-r3.ebuild, ant-core-1.6.5.ebuild: Fix deps, add source useflag diff --git a/dev-java/ant-core/ant-core-1.6.2-r4.ebuild b/dev-java/ant-core/ant-core-1.6.2-r4.ebuild new file mode 100644 index 000000000000..44d3705a12a6 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.6.2-r4.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r4.ebuild,v 1.1 2005/07/25 23:56:27 karltk Exp $ + +inherit java-pkg eutils + +MY_PN=${PN/-core} + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." +HOMEPAGE="http://ant.apache.org/" +SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="x86 amd64 ppc sparc ppc64" +IUSE="doc source" + +DEPEND="virtual/libc + !=virtual/jdk-1.4" +RDEPEND=">=virtual/jdk-1.4 + >=dev-java/java-config-1.2" + +S="${WORKDIR}/apache-ant-${PV}" + +src_unpack() { + unpack ${A} + cd ${S} + + # also see #77365 and + # http://sourceforge.net/mailarchive/forum.php?thread_id=6173225&forum_id=12628 + epatch ${FILESDIR}/${PV}-scp.patch + + # Patch build.sh to die with non-zero exit code in case of errors. + # This patch may be useful for all ant versions. + epatch ${FILESDIR}/build.sh-exit-fix.patch.gz +} + +src_compile() { + addwrite "/proc/self/maps" + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi + + + local myc + myc="${myc} -Ddist.dir=${D}/usr/share/${PN}" + myc="${myc} -Djavac.target=1.4" + echo $CLASSPATH + CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die + + use doc && ./build.sh dist_javadocs +} + +src_install() { + newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper" + + dodir /usr/share/${PN}/bin + for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do + dobin ${S}/src/script/${each} + dosym /usr/bin/${each} /usr/share/${PN}/bin/${each} + done + + dodir /etc/env.d + echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant + + java-pkg_dojar build/lib/ant.jar + java-pkg_dojar build/lib/ant-launcher.jar + + use source && java-pkg_dosrc src/main/* + + dodoc README WHATSNEW KEYS + use doc && dohtml welcome.html + use doc && java-pkg_dohtml -r docs/* + use doc && java-pkg_dohtml -r dist/docs/manual/api/* +} diff --git a/dev-java/ant-core/files/1.6.2-ant b/dev-java/ant-core/files/1.6.2-ant index 62dce8689425..27c93cb4ded1 100644 --- a/dev-java/ant-core/files/1.6.2-ant +++ b/dev-java/ant-core/files/1.6.2-ant @@ -15,7 +15,7 @@ # limitations under the License. # Edited for Gentoo Linux -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.7 2005/05/14 16:09:55 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.8 2005/07/25 23:56:27 karltk Exp $ # Extract launch and ant arguments, (see details below). ant_exec_args= @@ -105,7 +105,7 @@ else fi # add in the dependency .jar files -LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`" +LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`" if [ -n "$JAVA_HOME" ] ; then if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.2-r4 b/dev-java/ant-core/files/digest-ant-core-1.6.2-r4 new file mode 100644 index 000000000000..511c4167d672 --- /dev/null +++ b/dev-java/ant-core/files/digest-ant-core-1.6.2-r4 @@ -0,0 +1 @@ +MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237 -- cgit v1.2.3-65-gdbad