diff options
| -rw-r--r-- | dev-java/ant-optional/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/ant-optional/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild | 65 | ||||
| -rw-r--r-- | dev-java/ant-optional/files/digest-ant-optional-1.6.2-r2 | 1 | ||||
| -rw-r--r-- | dev-java/ant/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/ant/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/ant/ant-1.6.2-r2.ebuild | 86 | ||||
| -rw-r--r-- | dev-java/ant/files/1.6.2-r2/ant | 164 | ||||
| -rw-r--r-- | dev-java/ant/files/digest-ant-1.6.2-r2 | 1 |
9 files changed, 336 insertions, 2 deletions
diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog index 61322a9a4d68..ff51b44a2637 100644 --- a/dev-java/ant-optional/ChangeLog +++ b/dev-java/ant-optional/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/ant-optional # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.22 2004/07/23 21:28:29 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.23 2004/07/29 14:52:09 axxo Exp $ + +*ant-optional-1.6.2-r2 (29 Jul 2004) + + 29 Jul 2004; Thomas Matthijs <axxo@gentoo.org> + +ant-optional-1.6.2-r2.ebuild: + actualy use the fixed wrapper script *ant-optional-1.6.2-r1 (23 Jul 2004) diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest index c12f31612a66..81be9cb7472e 100644 --- a/dev-java/ant-optional/Manifest +++ b/dev-java/ant-optional/Manifest @@ -1,6 +1,7 @@ MD5 18cf25cf521f2fce405ff54ba713b6af ant-optional-1.6.0-r2.ebuild 4827 MD5 f42b995fefed019cb3474c9cc66100b2 ant-optional-1.6.1-r1.ebuild 4675 MD5 f72638291acf0ad48dc71a0b06cae7ac ant-optional-1.6.2.ebuild 1974 +MD5 c7249186b952476188942034f199bb82 ant-optional-1.6.2-r2.ebuild 1978 MD5 9a43937da4c7e9089d8ecfa1bd224af9 ant-optional-1.6.0-r3.ebuild 4610 MD5 d4583291297ac4e244f8364c2c393f70 ant-optional-1.6.1.ebuild 4605 MD5 e784a9fcb92db3f4f22af8a501272e2e ChangeLog 3050 @@ -10,5 +11,6 @@ MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r2 74 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r3 74 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1-r1 74 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2-r1 74 +MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2-r2 74 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1 74 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2 74 diff --git a/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild b/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild new file mode 100644 index 000000000000..a4589031e7c0 --- /dev/null +++ b/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild,v 1.1 2004/07/29 14:52:09 axxo Exp $ + +inherit java-pkg eutils + +DESCRIPTION="Apache ANT Optional Tasks Jar Files" +HOMEPAGE="http://ant.apache.org/" +SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="javamail" + +DEPEND="=dev-java/ant-${PVR} + >=dev-java/java-config-1.2 + >=dev-java/log4j-1.2.8 + >=dev-java/xerces-2.6.1 + >=dev-java/xalan-2.5.2 + >=dev-java/junit-3.8 + >=dev-java/bsh-1.2-r7 + >=dev-java/antlr-2.7.2 + >=dev-java/commons-beanutils-1.6.1 + >=dev-java/commons-logging-1.0.3 + >=dev-java/commons-net-1.1.0 + >=dev-java/bcel-5.1 + >=dev-java/oro-2.0.7 + >=dev-java/rhino-1.5_rc4 + >=dev-java/jdepend-2.6 + >=dev-java/jsch-0.1.12 + >=dev-java/regexp-1.3 + >=dev-java/jython-2.1 + javamail? ( >=dev-java/sun-javamail-bin-1.3 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/apache-ant-${PV}" + +src_compile() { + addwrite "/proc/self/maps" + export JAVA_HOME=${JDK_HOME} + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi + + packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,log4j,oro,regexp,rhino,xalan,xerces-2" + use javamail && packages="${packages},sun-javamail-bin,sun-jaf-bin" + + libs=$(java-config -p ${packages}) + ./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${libs} || die "build failed" +} + +src_install() { + local jars="antlr apache-bcel junit vaj apache-bsf apache-log4j weblogic \ + apache-resolver apache-oro netrexx xalan1 nodeps apache-regexp \ + commons-logging javamail starteam xslp commons-net jdepend stylebook \ + icontract jmf swing jai jsch trax" + + dodir /usr/share/ant/lib + for jar in ${jars}; do + java-pkg_dojar build/lib/ant-${jar}.jar + dosym /usr/share/ant-optional/lib/ant-${jar}.jar /usr/share/ant/lib/ + done +} diff --git a/dev-java/ant-optional/files/digest-ant-optional-1.6.2-r2 b/dev-java/ant-optional/files/digest-ant-optional-1.6.2-r2 new file mode 100644 index 000000000000..511c4167d672 --- /dev/null +++ b/dev-java/ant-optional/files/digest-ant-optional-1.6.2-r2 @@ -0,0 +1 @@ +MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237 diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog index 5cdfbddcd88f..04653ecd5172 100644 --- a/dev-java/ant/ChangeLog +++ b/dev-java/ant/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/ant # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.68 2004/07/23 21:29:25 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.69 2004/07/29 14:54:47 axxo Exp $ + +*ant-1.6.2-r2 (29 Jul 2004) + + 29 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/1.6.2-r2/ant, + +ant-1.6.2-r2.ebuild: + actualy use the fixed wrapper script *ant-1.6.2-r1 (23 Jul 2004) diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest index 52f3e76a6246..a115e216fdeb 100644 --- a/dev-java/ant/Manifest +++ b/dev-java/ant/Manifest @@ -5,6 +5,7 @@ MD5 050ac1afea674f2d58b6cea499f83cec ant-1.6.0-r2.ebuild 1608 MD5 0a9e579c0585e31fa0f608df4fc596ab ant-1.5.4-r1.ebuild 3013 MD5 feb875c667f1fe035a07b0709bfa3b83 ant-1.6.1-r1.ebuild 2233 MD5 cdb8b5b010df8ff5460d310b98b2f086 ant-1.6.1.ebuild 2222 +MD5 ebee8e16862756583593773b4e916ba3 ant-1.6.2-r2.ebuild 2216 MD5 70419153107f6844f4213d5a0a60b768 ant-1.6.0-r3.ebuild 1595 MD5 25235377b7e53ec9d7cdafa546e27997 ChangeLog 11460 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 @@ -19,9 +20,11 @@ MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r2 74 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1-r1 74 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r1 74 +MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r2 74 MD5 fd83525620afc338170992218d51f90f files/1.6.0-r2/ant 2444 MD5 b175a3f82c4b6326054b651bf39217fd files/1.6.0-r3/ant 2444 MD5 7a4c99f771d994984ae6c0c37a154d5d files/1.6.2-r1/ant 4697 +MD5 7a4c99f771d994984ae6c0c37a154d5d files/1.6.2-r2/ant 4697 MD5 b67a6f940547c8b90c5dea6a675917f6 files/1.5.3/ant 2211 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916 MD5 f8c9e03bf0f5924ebf9162718bf15169 files/1.5.4/ant 2275 diff --git a/dev-java/ant/ant-1.6.2-r2.ebuild b/dev-java/ant/ant-1.6.2-r2.ebuild new file mode 100644 index 000000000000..c214cfa414b2 --- /dev/null +++ b/dev-java/ant/ant-1.6.2-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r2.ebuild,v 1.1 2004/07/29 14:54:47 axxo Exp $ + +inherit java-pkg eutils + +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-${PN}-${PV}-src.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc" + +DEPEND="virtual/libc + >=virtual/jdk-1.4 + >=dev-java/java-config-1.2 + !<dev-java/ant-optional-${PVR}" +RDEPEND=">=virtual/jdk-1.4 + app-shells/bash + >=dev-java/java-config-1.2" +PDEPEND="=dev-java/ant-optional-${PVR}" + +S="${WORKDIR}/apache-ant-${PV}" + +pkg_setup() { + if [ -n "$JAVA_HOME" ] ; then + export CLASSPATH=".:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar:$JAVA_HOME/jre/lib/rt.jar:." + else + einfo "Warning: JAVA_HOME environment variable is not set (or not exported)." + einfo " If build fails because sun.* classes could not be found" + einfo " you will need to set the JAVA_HOME environment variable" + einfo " to the installation directory of java." + einfo " Try using java-config script" + die + fi + + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi +} + +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 +} + +src_compile() { + addwrite "/proc/self/maps" + + local myc + myc="${myc} -Ddist.dir=${D}/usr/share/ant" + myc="${myc} -Djavac.target=1.4" + + echo $CLASSPATH + ./build.sh -Ddist.dir=${D}/usr/share/ant || die +} + +src_install() { + cp ${FILESDIR}/${PVR}/ant ${S}/src/ant + + exeinto /usr/bin + doexe src/ant + + dodir /usr/share/ant/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/ant/bin/${each} + done + + insinto /etc/env.d + doins ${FILESDIR}/20ant + + java-pkg_dojar build/lib/ant.jar + java-pkg_dojar build/lib/ant-launcher.jar + + dodoc LICENSE LICENSE.* README WHATSNEW KEYS + use doc && dohtml welcome.html + use doc && dohtml -r docs/* +} diff --git a/dev-java/ant/files/1.6.2-r2/ant b/dev-java/ant/files/1.6.2-r2/ant new file mode 100644 index 000000000000..5141c76c77bd --- /dev/null +++ b/dev-java/ant/files/1.6.2-r2/ant @@ -0,0 +1,164 @@ +#! /bin/bash + +# Copyright 2001-2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Edited for Gentoo Linux +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r2/ant,v 1.1 2004/07/29 14:54:47 axxo Exp $ + +# Extract launch and ant arguments, (see details below). +ant_exec_args= +no_config=false +use_jikes_default=false +ant_exec_debug=false +show_help=false +for arg in "$@" ; do + if [ "$arg" = "--noconfig" ] ; then + no_config=true + elif [ "$arg" = "--usejikes" ] ; then + use_jikes_default=true + elif [ "$arg" = "--execdebug" ] ; then + ant_exec_debug=true + elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then + show_help=true + ant_exec_args="$ant_exec_args -h" + else + if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then + show_help=true + fi + ant_exec_args="$ant_exec_args \"$arg\"" + fi +done + +# Source/default ant configuration +if $no_config ; then + rpm_mode=false + usejikes=$use_jikes_default +else + # load system-wide ant configuration + if [ -f "/etc/ant.conf" ] ; then + . /etc/ant.conf + fi + + # load user ant configuration + if [ -f "$HOME/.ant/ant.conf" ] ; then + . $HOME/.ant/ant.conf + fi + if [ -f "$HOME/.antrc" ] ; then + . "$HOME/.antrc" + fi + + # provide default configuration values + if [ -z "$rpm_mode" ] ; then + rpm_mode=false + fi + if [ -z "$usejikes" ] ; then + usejikes=$use_jikes_default + fi +fi + +if [ -f $HOME/.gentoo/java-env ] ; then + source $HOME/.gentoo/java-env +else + JAVA_HOME=`java-config --jdk-home` + CLASSPATH=`java-config --classpath`:${CLASSPATH} +fi + +if [ -z $JAVA_HOME ] ; then + echo "Error: No JDK found!" + echo "Try using java-config script to set your JDK" + echo "Remember that you need a JDK not a JRE" + exit 1 +fi + +ANT_HOME=/usr/share/ant + +# set ANT_LIB location +ANT_LIB="${ANT_HOME}/lib" + +JAVACMD="`java-config --java`" + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." + echo " We cannot execute $JAVACMD" + exit 1 +fi + +if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar +else + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH +fi + + +if [ -n "$JAVA_HOME" ] ; then + if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar" + fi + + if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip" + fi + +else + echo "Warning: JAVA_HOME environment variable is not set (or not exported)." + echo " If build fails because sun.* classes could not be found" + echo " you will need to set the JAVA_HOME environment variable" + echo " to the installation directory of java." + echo " Try using java-config script" +fi + +# Allow Jikes support (off by default) +if $usejikes; then + ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes" +fi + +# Show script help if requested +if $show_help ; then + echo $0 '[script options] [options] [target [target2 [target3] ..]]' + echo 'Script Options:' + echo ' --help, --h print this message and ant help' + echo ' --noconfig suppress sourcing of /etc/ant.conf,' + echo ' $HOME/.ant/ant.conf, and $HOME/.antrc' + echo ' configuration files' + echo ' --usejikes enable use of jikes by default, unless' + echo ' set explicitly in configuration files' + echo ' --execdebug print ant exec line generated by this' + echo ' launch script' + echo ' ' +fi + +# Execute ant using eval/exec to preserve spaces in paths, +# java options, and ant args +ant_sys_opts= + + +if [ -n "$JIKESPATH" ]; then + ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"" +fi + +# 2002-11-02, karltk@gentoo.org: +# The Blackdown JDK on PPC hiccups with native threads +# +if [ "`arch`" == "ppc" ] ; then + export THREADS_FLAG="green" +fi + + +ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\" $ant_exec_args" + +if $ant_exec_debug ; then + echo $ant_exec_command +fi +eval $ant_exec_command diff --git a/dev-java/ant/files/digest-ant-1.6.2-r2 b/dev-java/ant/files/digest-ant-1.6.2-r2 new file mode 100644 index 000000000000..511c4167d672 --- /dev/null +++ b/dev-java/ant/files/digest-ant-1.6.2-r2 @@ -0,0 +1 @@ +MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237 |