Removing older version with same keywords.
authorJoshua Nichols <nichoj@gentoo.org>
Sun, 12 Mar 2006 04:21:56 +0000 (04:21 +0000)
committerJoshua Nichols <nichoj@gentoo.org>
Sun, 12 Mar 2006 04:21:56 +0000 (04:21 +0000)
Package-Manager: portage-2.1_pre6

dev-java/ant-core/ChangeLog
dev-java/ant-core/ant-core-1.5.4-r2.ebuild [deleted file]
dev-java/ant-core/files/1.5.4-ant [deleted file]
dev-java/ant-core/files/digest-ant-core-1.5.4-r2 [deleted file]

index 1dd62a4dcce200623c582ee44773e7c3fbab80c1..80ba64b91b1b491aee841314788d48e3f2f3637a 100644 (file)
@@ -1,11 +1,15 @@
 # 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.37 2006/02/05 11:05:30 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.38 2006/03/12 04:21:56 nichoj 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.
 
+  12 Mar 2006; <nichoj@gentoo.org> -files/1.5.4-ant,
+  -ant-core-1.5.4-r2.ebuild:
+  Removing older version with same keywords.
+
   05 Feb 2006; Simon Stelling <blubb@gentoo.org>
   +files/build.sh-exit-fix.patch, -files/build.sh-exit-fix.patch.gz,
   +files/rpmbuild.patch, -files/rpmbuild.patch.gz, ant-core-1.5.4-r2.ebuild,
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
deleted file mode 100644 (file)
index 816cbda..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2006 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.7 2006/02/05 11:05:30 blubb 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 source"
-
-DEPEND="virtual/libc
-       !<dev-java/ant-1.5.4-r2
-       >=virtual/jdk-1.3
-       source? ( app-arch/zip )
-       >=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.3"
-
-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
-       # This patch will be used until ant 1.6 is released
-       epatch ${FILESDIR}/rpmbuild.patch
-}
-
-src_compile() {
-       addwrite "/proc/self/maps"
-       local myclasspath deps
-
-       [ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die
-
-       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
-               myclasspath="/usr/share/junit/lib/junit.jar"
-               deps="junit"
-               if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then
-                       myclasspath="${myclasspath}:/usr/share/xalan/lib/xalan.jar"
-                       deps="${deps} xalan"
-               fi
-       fi
-
-       # Add Xerces in if we have it
-       if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
-               myclasspath="${myclasspath}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
-               deps="${deps} xerces"
-       fi
-
-       # Add oro in if we have it
-       if [ -f "/usr/share/oro/lib/oro.jar" ] ; then
-               myclasspath="${myclasspath}:/usr/share/oro/lib/oro.jar"
-               deps="${deps} oro"
-       fi
-
-       # Add beanutils if we have it
-       if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
-               myclasspath="${myclasspath}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
-               deps="${deps} commons-beanutils"
-       fi
-
-       # add antlr if we have it
-       if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then
-               myclasspath="${myclasspath}:/usr/share/antlr/lib/antlr.jar"
-               deps="${deps} antlr"
-       fi
-
-       # add bcel if we have it
-       if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then
-               myclasspath="${myclasspath}:/usr/share/bcel/lib/bcel.jar"
-               deps="${deps} bcel"
-       fi
-
-       DEP_APPEND=${deps} CLASSPATH=${myclasspath} \
-               ./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
-
-       use source && java-pkg_dosrc src/main/*
-
-       dodoc README WHATSNEW KEYS
-       use doc && dohtml welcome.html
-       use doc && java-pkg_dohtml -r docs/*
-}
diff --git a/dev-java/ant-core/files/1.5.4-ant b/dev-java/ant-core/files/1.5.4-ant
deleted file mode 100644 (file)
index c940b86..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/bash
-
-#   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
-#   reserved.
-#   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.5.4-ant,v 1.2 2004/09/17 16:02:33 axxo Exp $
-
-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
-
-# load system-wide ant configuration
-if [ -f "/etc/ant.conf" ] ; then 
-  . /etc/ant.conf
-fi
-
-# provide default values for people who don't use RPMs
-if [ -z "$rpm_mode" ] ; then
-  rpm_mode=false;
-fi
-if [ -z "$usejikes" ] ; then
-  usejikes=false;
-fi
-
-# load user ant configuration
-if [ -f "$HOME/.antrc" ] ; then 
-  . "$HOME/.antrc"
-fi
-
-ANT_HOME=/usr/share/ant-core
-
-# 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 [ -n "$CLASSPATH" ] ; then
-  LOCALCLASSPATH="$CLASSPATH"
-fi
-
-# add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core`"
-
-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
-
-# 2002-11-02, karltk@gentoo.org:
-# The Blackdown JDK on PPC hiccups with native threads
-#
-if [ "`arch`" == "ppc" ] ; then
-       export THREADS_FLAG="green"
-fi
-
-"$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"
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
deleted file mode 100644 (file)
index 8080242..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61ce45f5e62d304def5027d7ca36211e apache-ant-1.5.4-src.zip 6610843