Version bump, bug #159820.
authorVlastimil Babka <caster@gentoo.org>
Sun, 21 Jan 2007 21:56:58 +0000 (21:56 +0000)
committerVlastimil Babka <caster@gentoo.org>
Sun, 21 Jan 2007 21:56:58 +0000 (21:56 +0000)
Package-Manager: portage-2.1.2-r1

dev-java/ant-core/ChangeLog
dev-java/ant-core/Manifest
dev-java/ant-core/ant-core-1.7.0.ebuild [new file with mode: 0644]
dev-java/ant-core/files/1.7.0-ant [new file with mode: 0755]
dev-java/ant-core/files/digest-ant-core-1.7.0 [new file with mode: 0644]

index 0127721ddf801e375ddb44b3f42a1670383cd2e6..13651e26aa9996c9a109073ce704b9600107fd26 100644 (file)
@@ -1,11 +1,17 @@
 # ChangeLog for dev-java/ant-core
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.59 2006/12/09 12:52:38 caster Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.60 2007/01/21 21:56:58 caster Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+*ant-core-1.7.0 (21 Jan 2007)
+
+  21 Jan 2007; Vlastimil Babka <caster@gentoo.org> +files/1.7.0-ant,
+  +ant-core-1.7.0.ebuild:
+  Version bump, bug #159820.
+
   09 Dec 2006; Vlastimil Babka <caster@gentoo.org>
   ant-core-1.6.5-r14.ebuild:
   Block on dev-java/ant-optional because some people still seem to have it. If
index e35d470381d6d60ca62442eb98e66da797f965e6..743e0583368247d07060d0bd64c5c5a279cd66cf 100644 (file)
@@ -2,19 +2,29 @@ AUX 1.6.5-ant 5207 RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c SHA1 ad745a52
 MD5 123ab261c3aebaf247db2551a0a890b0 files/1.6.5-ant 5207
 RMD160 95b043c0f0cab82b8a3b18625214b42945b7c69c files/1.6.5-ant 5207
 SHA256 47f223399a08e199e219a4da2e42c43d37138f5ef1024b6f238ab6c8de007be5 files/1.6.5-ant 5207
+AUX 1.7.0-ant 5996 RMD160 d523fc2f9cef31e77980de4d367265e205856a0e SHA1 356bc5bfe466969d292b3b6fae4b3f4d97239945 SHA256 d90dac639da2564d16b11f02dad6327bce40082ca00d671c77826a4cda6a1537
+MD5 d879b18274f8546055d70902ec74652f files/1.7.0-ant 5996
+RMD160 d523fc2f9cef31e77980de4d367265e205856a0e files/1.7.0-ant 5996
+SHA256 d90dac639da2564d16b11f02dad6327bce40082ca00d671c77826a4cda6a1537 files/1.7.0-ant 5996
 AUX build.sh-exit-fix.patch 345 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d SHA1 3bc6dfe6c9cfe7a55023e95dbfab169493f3555c SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b
 MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
 SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/build.sh-exit-fix.patch 345
+DIST ant-1.7.0-gentoo.tar.bz2 11720 RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea SHA1 41acb8398a5ac9713dec30d6305b5abc6c014fff SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
+DIST apache-ant-1.7.0-src.tar.bz2 6831017 RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab SHA1 3f01c35265ba50a49caafe1fb34ec8998bf45eb3 SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779
 EBUILD ant-core-1.6.5-r14.ebuild 1883 RMD160 8fc379df9e583076cd2314e10d6f9986299b44cf SHA1 428a16d0c296f3c982ce22ed8f8e06d8a0ff5f64 SHA256 b02128de706b3d18831d8c73ac79180d1efebd835716c604227da8932780a800
 MD5 cf61cd3889944dd8a7adf4191980cdb4 ant-core-1.6.5-r14.ebuild 1883
 RMD160 8fc379df9e583076cd2314e10d6f9986299b44cf ant-core-1.6.5-r14.ebuild 1883
 SHA256 b02128de706b3d18831d8c73ac79180d1efebd835716c604227da8932780a800 ant-core-1.6.5-r14.ebuild 1883
-MISC ChangeLog 22741 RMD160 b842672264b9ad03794ebba3e66340b65da59224 SHA1 1b350e062985f580390f73c6defd93b847482c1c SHA256 ac2e0741495accb6ce96384b35d5a8bfb624059419886bc99db8364009d04240
-MD5 2335597a41b9307d40e653ead637a4e6 ChangeLog 22741
-RMD160 b842672264b9ad03794ebba3e66340b65da59224 ChangeLog 22741
-SHA256 ac2e0741495accb6ce96384b35d5a8bfb624059419886bc99db8364009d04240 ChangeLog 22741
+EBUILD ant-core-1.7.0.ebuild 2138 RMD160 158314bad484308882854bd1b3e18062549e8319 SHA1 77fb916f6e14e0bc1fc3f586ff1309984d63d0aa SHA256 1bcc38a53e13f2e18937121bd72ee6d7fcb49e73a25b89f3b51c2c1155283ffd
+MD5 38525e33b39ca5b5979ed6dde9251302 ant-core-1.7.0.ebuild 2138
+RMD160 158314bad484308882854bd1b3e18062549e8319 ant-core-1.7.0.ebuild 2138
+SHA256 1bcc38a53e13f2e18937121bd72ee6d7fcb49e73a25b89f3b51c2c1155283ffd ant-core-1.7.0.ebuild 2138
+MISC ChangeLog 22897 RMD160 f5a0c075c9ecbcd7c8c30e3d28fb12e18de58e7e SHA1 61dc2a87f5d310cd9d833b10f0511baac2fd07b3 SHA256 ff571d2f5feaac97e37b62cd4c3fa38fd144e654e465f81ca72c3e901ff2bbc9
+MD5 2a12ef19797491d5a0b1e897307403d0 ChangeLog 22897
+RMD160 f5a0c075c9ecbcd7c8c30e3d28fb12e18de58e7e ChangeLog 22897
+SHA256 ff571d2f5feaac97e37b62cd4c3fa38fd144e654e465f81ca72c3e901ff2bbc9 ChangeLog 22897
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -22,3 +32,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r14 268
 RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r14 268
 SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r14 268
+MD5 a7b309b2642e68941a45f02dd5a5c96d files/digest-ant-core-1.7.0 518
+RMD160 d03eca1d95f01c905fe3b77f5a2c39ac67d13c22 files/digest-ant-core-1.7.0 518
+SHA256 99ca534318f44bd6e836a90ba168e57156af32905f50619d14887361de2823b9 files/digest-ant-core-1.7.0 518
diff --git a/dev-java/ant-core/ant-core-1.7.0.ebuild b/dev-java/ant-core/ant-core-1.7.0.ebuild
new file mode 100644 (file)
index 0000000..9f60d43
--- /dev/null
@@ -0,0 +1,85 @@
+# Copyright 1999-2007 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.7.0.ebuild,v 1.1 2007/01/21 21:56:58 caster Exp $
+
+inherit java-pkg-2
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
+       mirror://gentoo/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jdk-1.4
+       !<dev-java/ant-tasks-${PV}
+       !dev-java/ant-optional"
+DEPEND="${RDEPEND}
+       source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # remove bundled xerces
+       rm -v lib/*.jar
+
+       # use our split-ant build.xml
+       mv -f ${WORKDIR}/build.xml .
+}
+
+src_compile() {
+       export ANT_HOME=""
+
+       local bsyscp
+
+       # this ensures that when building ant with bootstrapped ant,
+       # only the source is used for resolving references, and not
+       # the classes in bootstrapped ant
+       # but jikes in kaffe has issues with this...    
+       if ! java-pkg_current-vm-matches kaffe; then
+               bsyscp="-Dbuild.sysclasspath=ignore"
+       fi
+
+       ./build.sh ${bsyscp} jars-core $(use_doc javadocs) \
+               || die "build failed"
+}
+
+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
+
+       echo "ANT_HOME=\"/usr/share/${PN}\"" > ${T}/20ant
+       doenvd ${T}/20ant || die "failed to install env.d file"
+
+       java-pkg_dojar build/lib/ant.jar
+       java-pkg_dojar build/lib/ant-bootstrap.jar
+       java-pkg_dojar build/lib/ant-launcher.jar
+
+       use source && java-pkg_dosrc src/main/*
+
+       dodoc README WHATSNEW KEYS
+
+       if use doc; then
+               dohtml welcome.html
+               dohtml -r docs/*
+               java-pkg_dojavadoc build/javadocs
+       fi
+}
+
+pkg_postinst() {
+       elog "The way of packaging ant in Gentoo has changed since version 1.7.0."
+       elog "For more info, please see http://overlays.gentoo.org/proj/java/wiki/Split_Ant"
+}
diff --git a/dev-java/ant-core/files/1.7.0-ant b/dev-java/ant-core/files/1.7.0-ant
new file mode 100755 (executable)
index 0000000..e5d1a71
--- /dev/null
@@ -0,0 +1,197 @@
+#! /bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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-core/files/1.7.0-ant,v 1.1 2007/01/21 21:56:58 caster 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 (ONLY if ANT_HOME has NOT been set)
+  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+      if [ -f "/etc/ant.conf" ] ; then
+          . /etc/ant.conf
+      fi
+  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
+
+export WANT_JAVA_CONFIG=2
+
+# Always get JAVA_HOME from java-config.
+# Use GENTOO_VM to change which VM is used instead.
+export JAVA_HOME="$(java-config -g JAVA_HOME)"
+
+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-core
+
+# set ANT_LIB location
+ANT_LIB="${ANT_HOME}/lib"
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+      JAVACMD="$JAVA_HOME/bin/java"
+  else
+    JAVACMD=`which java 2> /dev/null `
+    if [ -z "$JAVACMD" ] ; then
+        JAVACMD=java
+    fi
+  fi
+fi
+
+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 ANT_TASKS is not set, default to "all"
+ANT_TASKS="${ANT_TASKS:-all}"
+
+# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/
+if [[ "${ANT_TASKS}" == "all" ]]; then
+       ANT_TASKS=""
+       # but only if it exists
+       if [[ -d /usr/share/ant/tasks ]]; then
+               ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks/*
+       fi
+       if [[ -d /usr/share/ant/tasks-1.7.0 ]]; then
+               ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks-1.7.0/*
+       fi
+# if set to "none", make ANT_TASKS empty list
+elif [[ "${ANT_TASKS}" == "none" ]]; then
+       ANT_TASKS=""
+fi
+# otherwise ANT_TASKS defines explicit task list
+
+# construct the tasks list separated with commas to pass to java-config
+TASKS_LIST=""
+for task in $ANT_TASKS; do
+  TASKS_LIST="${TASKS_LIST},$(basename $task)"
+done
+TASKS_LIST=${TASKS_LIST#,}
+
+# get the classpath for optional tasks and their dependency .jar files
+if [[ -n "${TASKS_LIST}" ]] ; then
+  ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\""
+  ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\""
+else
+  ANT_TASKS_CLASSPATH=""
+  ANT_TASKS_LIBPATH=""
+fi
+
+TOOLS_JAR="$(java-config --tools)"
+
+if [[ -n "${TOOLS_JAR}" ]] ; then
+  LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}"
+else
+  echo "Warning: Unable to determine tools.jar location."
+  echo "  If build fails because sun.* classes could not be found,"
+  echo "  Make sure you are using a JDK, not JRE as your user/system VM."
+  echo "  and that you have java-config version 2.0.30 or above installed."
+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
+
+ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \
+       -Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \
+       ${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \
+       ${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\" ${ant_exec_args}"
+
+if $ant_exec_debug ; then
+    echo $ant_exec_command
+fi
+eval $ant_exec_command
diff --git a/dev-java/ant-core/files/digest-ant-core-1.7.0 b/dev-java/ant-core/files/digest-ant-core-1.7.0
new file mode 100644 (file)
index 0000000..0359273
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 9e834373c21fe197ac66f4da51dd47a5 ant-1.7.0-gentoo.tar.bz2 11720
+RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea ant-1.7.0-gentoo.tar.bz2 11720
+SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c ant-1.7.0-gentoo.tar.bz2 11720
+MD5 22b378e27ab300e4d73bf09d91c7e2a6 apache-ant-1.7.0-src.tar.bz2 6831017
+RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab apache-ant-1.7.0-src.tar.bz2 6831017
+SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 apache-ant-1.7.0-src.tar.bz2 6831017