From 10b18ec2ef373c36e379c2fa15154387c745f8aa Mon Sep 17 00:00:00 2001 From: Thomas Matthijs Date: Wed, 22 Sep 2004 16:45:40 +0000 Subject: ant wrapper wasn't being installed, sorry. --- dev-java/ant-core/ChangeLog | 8 +- dev-java/ant-core/Manifest | 16 ++-- dev-java/ant-core/ant-core-1.5.4-r1.ebuild | 104 ----------------------- dev-java/ant-core/ant-core-1.5.4-r2.ebuild | 104 +++++++++++++++++++++++ dev-java/ant-core/files/digest-ant-core-1.5.4-r1 | 1 - dev-java/ant-core/files/digest-ant-core-1.5.4-r2 | 1 + 6 files changed, 120 insertions(+), 114 deletions(-) delete mode 100644 dev-java/ant-core/ant-core-1.5.4-r1.ebuild create mode 100644 dev-java/ant-core/ant-core-1.5.4-r2.ebuild delete mode 100644 dev-java/ant-core/files/digest-ant-core-1.5.4-r1 create mode 100644 dev-java/ant-core/files/digest-ant-core-1.5.4-r2 (limited to 'dev-java/ant-core') diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index dbf2debcfe66..19fa4762a619 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.5 2004/09/18 21:58:01 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.6 2004/09/22 16:45:40 axxo Exp $ + +*ant-core-1.5.4-r2 (22 Sep 2004) + + 22 Sep 2004; Thomas Matthijs -ant-core-1.5.4-r1.ebuild, + +ant-core-1.5.4-r2.ebuild: + ant wrapper wasn't being installed, sorry. 18 Sep 2004; Sven Wegener : Fixed ChangeLog header. diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index c64d1fce4f36..8b09248f1fd4 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -1,20 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 bf6f3616d2a02ed606f06d1d67eaf4a9 ant-core-1.5.4-r2.ebuild 3039 MD5 037813c558155f6d4db1cd8a1179456b ant-core-1.6.2.ebuild 1774 +MD5 a8ebf2fa3fd674cb450e8f9e1fa4415c ChangeLog 14490 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220 -MD5 e52af96e1f5a0cdc880563db4f205ce5 ant-core-1.5.4-r1.ebuild 3040 -MD5 c88d71d5562141c3526d7cf0686c1d9d ChangeLog 14309 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283 MD5 5c9edba8c5a6444d657c7243946012bf files/1.6.2-ant 5009 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256 -MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2 74 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164 -MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r1 70 +MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70 +MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2 74 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) +Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBTK9vI1lqEGTUzyQRAiuIAKC7sGIhC+gyCRf+73lcyZsPF/lhdQCgjjQA -h0Zb4pkHn63gamwqnN7mOlw= -=TdOD +iD8DBQFBUaxW/rLF9B432nYRAqJdAJ0WjaNav3z5MTYJhf2GXAVd39IAbwCgiSRJ +oGCNfTOp/7G3f3uJY6N8Aoc= +=6Snn -----END PGP SIGNATURE----- diff --git a/dev-java/ant-core/ant-core-1.5.4-r1.ebuild b/dev-java/ant-core/ant-core-1.5.4-r1.ebuild deleted file mode 100644 index dd07cb752e63..000000000000 --- a/dev-java/ant-core/ant-core-1.5.4-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2004 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.5.4-r1.ebuild,v 1.1 2004/09/17 16:02:33 axxo 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="http://archive.apache.org/dist/ant/source/apache-${MY_PN}-${PV}-src.zip" - -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="x86 ppc sparc amd64" -IUSE="doc" - -DEPEND="virtual/libc - >=virtual/jdk-1.3 - >=app-arch/unzip-5.50-r1" -RDEPEND=">=virtual/jdk-1.3 - app-shells/bash" - -S="${WORKDIR}/apache-ant-${PV}" - -src_unpack() { - unpack ${A} - cd ${S} - - # 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 - # This patch will be used until ant 1.6 is released - epatch ${FILESDIR}/rpmbuild.patch.gz -} - -src_compile() { - addwrite "/proc/self/maps" - - [ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die - - export JAVA_HOME=${JDK_HOME} - if [ `arch` == "ppc" ] ; then - # We're compiling _ON_ PPC - export THREADS_FLAG="green" - fi - - # Make sure junit tasks get built if we have junit - if [ -f "/usr/share/junit/lib/junit.jar" ] ; then - export CLASSPATH="/usr/share/junit/lib/junit.jar" - export DEP_APPEND="junit" - if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then - export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar" - export DEP_APPEND="${DEP_APPEND} xalan" - fi - fi - - # Add Xerces in if we have it - if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then - export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar" - export DEP_APPEND="${DEP_APPEND} xerces" - fi - - # Add oro in if we have it - if [ -f "/usr/share/oro/lib/oro.jar" ] ; then - export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar" - export DEP_APPEND="${DEP_APPEND} oro" - fi - - # Add beanutils if we have it - if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then - export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar" - export DEP_APPEND="${DEP_APPEND} commons-beanutils" - fi - - # add antlr if we have it - if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then - export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar" - export DEP_APPEND="${DEP_APPEND} antlr" - fi - - # add bcel if we have it - if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then - export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar" - export DEP_APPEND="${DEP_APPEND} bcel" - fi - - ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die -} - -src_install() { - cp ${FILESDIR}/${PVR}-ant ${S}/src/ant - - exeinto /usr/bin - doexe src/ant - for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do - dobin ${S}/src/script/${each} - done - - java-pkg_dojar build/lib/*.jar - - dodoc LICENSE LICENSE.* README WHATSNEW KEYS - use doc && dohtml welcome.html - use doc && dohtml -r docs/* -} diff --git a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild new file mode 100644 index 000000000000..cfcc4739d1d8 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2004 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.5.4-r2.ebuild,v 1.1 2004/09/22 16:45:40 axxo 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="http://archive.apache.org/dist/ant/source/apache-${MY_PN}-${PV}-src.zip" + +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="x86 ppc sparc amd64" +IUSE="doc" + +DEPEND="virtual/libc + >=virtual/jdk-1.3 + >=app-arch/unzip-5.50-r1" +RDEPEND=">=virtual/jdk-1.3 + app-shells/bash" + +S="${WORKDIR}/apache-ant-${PV}" + +src_unpack() { + unpack ${A} + cd ${S} + + # 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 + # This patch will be used until ant 1.6 is released + epatch ${FILESDIR}/rpmbuild.patch.gz +} + +src_compile() { + addwrite "/proc/self/maps" + + [ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die + + export JAVA_HOME=${JDK_HOME} + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi + + # Make sure junit tasks get built if we have junit + if [ -f "/usr/share/junit/lib/junit.jar" ] ; then + export CLASSPATH="/usr/share/junit/lib/junit.jar" + export DEP_APPEND="junit" + if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then + export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar" + export DEP_APPEND="${DEP_APPEND} xalan" + fi + fi + + # Add Xerces in if we have it + if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then + export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar" + export DEP_APPEND="${DEP_APPEND} xerces" + fi + + # Add oro in if we have it + if [ -f "/usr/share/oro/lib/oro.jar" ] ; then + export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar" + export DEP_APPEND="${DEP_APPEND} oro" + fi + + # Add beanutils if we have it + if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then + export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar" + export DEP_APPEND="${DEP_APPEND} commons-beanutils" + fi + + # add antlr if we have it + if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then + export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar" + export DEP_APPEND="${DEP_APPEND} antlr" + fi + + # add bcel if we have it + if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then + export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar" + export DEP_APPEND="${DEP_APPEND} bcel" + fi + + ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die +} + +src_install() { + cp ${FILESDIR}/${PV}-ant ${S}/src/ant + + exeinto /usr/bin + doexe src/ant + for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do + dobin ${S}/src/script/${each} + done + + java-pkg_dojar build/lib/*.jar + + dodoc LICENSE LICENSE.* README WHATSNEW KEYS + use doc && dohtml welcome.html + use doc && dohtml -r docs/* +} diff --git a/dev-java/ant-core/files/digest-ant-core-1.5.4-r1 b/dev-java/ant-core/files/digest-ant-core-1.5.4-r1 deleted file mode 100644 index 80802420362a..000000000000 --- a/dev-java/ant-core/files/digest-ant-core-1.5.4-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 61ce45f5e62d304def5027d7ca36211e apache-ant-1.5.4-src.zip 6610843 diff --git a/dev-java/ant-core/files/digest-ant-core-1.5.4-r2 b/dev-java/ant-core/files/digest-ant-core-1.5.4-r2 new file mode 100644 index 000000000000..80802420362a --- /dev/null +++ b/dev-java/ant-core/files/digest-ant-core-1.5.4-r2 @@ -0,0 +1 @@ +MD5 61ce45f5e62d304def5027d7ca36211e apache-ant-1.5.4-src.zip 6610843 -- cgit v1.2.3-65-gdbad