summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2002-05-03 19:50:00 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2002-05-03 19:50:00 +0000
commit7407e55cfa495cf8d77c6126b1690b06bc8ced0a (patch)
tree3a5bd42702a5826be3e153675e3d3841b1a6edff /dev-java
parentadded nano-basics-guide (diff)
downloadhistorical-7407e55cfa495cf8d77c6126b1690b06bc8ced0a.tar.gz
historical-7407e55cfa495cf8d77c6126b1690b06bc8ced0a.tar.bz2
historical-7407e55cfa495cf8d77c6126b1690b06bc8ced0a.zip
Fixes #2306.
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant/ChangeLog11
-rw-r--r--dev-java/ant/ant-1.4.1-r3.ebuild (renamed from dev-java/ant/ant-1.4.1-r2.ebuild)2
-rw-r--r--dev-java/ant/files/digest-ant-1.4.1-r3 (renamed from dev-java/ant/files/digest-ant-1.4.1-r2)0
-rw-r--r--dev-java/ant/files/gentoo-ant-1.4.12
4 files changed, 12 insertions, 3 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index d3d536bd3f7f..df95b4c113ff 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-java/ant
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.2 2002/04/10 12:10:43 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.3 2002/05/03 19:50:00 karltk Exp $
+
+*ant-1.4.1-r3 (03 May 2002)
+
+ 03 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r3.ebuild files/digest-ant-1.4.1-r3:
+
+ Now handles the case of multiple occurrences of JAVA_HOME in the Java
+ environment setting, thanks to Florian L. Klein <kleinf@gmx.de>.
+
+ Removed ant-1.4.1-r2.ebuild files/digest-ant-1.4.1-r2
*ant-1.4.1-r2 (10 Apr 2002)
diff --git a/dev-java/ant/ant-1.4.1-r2.ebuild b/dev-java/ant/ant-1.4.1-r3.ebuild
index eb2ebab68d88..9014d3d9899e 100644
--- a/dev-java/ant/ant-1.4.1-r2.ebuild
+++ b/dev-java/ant/ant-1.4.1-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r2.ebuild,v 1.2 2002/04/28 04:12:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r3.ebuild,v 1.1 2002/05/03 19:50:00 karltk Exp $
S=${WORKDIR}/jakarta-ant-${PV}
DESCRIPTION="Build system for Java"
diff --git a/dev-java/ant/files/digest-ant-1.4.1-r2 b/dev-java/ant/files/digest-ant-1.4.1-r3
index 020707ceee14..020707ceee14 100644
--- a/dev-java/ant/files/digest-ant-1.4.1-r2
+++ b/dev-java/ant/files/digest-ant-1.4.1-r3
diff --git a/dev-java/ant/files/gentoo-ant-1.4.1 b/dev-java/ant/files/gentoo-ant-1.4.1
index c7ecea773f9d..a547e91f6ba9 100644
--- a/dev-java/ant/files/gentoo-ant-1.4.1
+++ b/dev-java/ant/files/gentoo-ant-1.4.1
@@ -8,7 +8,7 @@ else
echo "!!! /etc/env.d/20java not found, please configure your system VM with java-config"
fi
-JAVA_HOME=`grep JAVA_HOME $envfile | sed "s/JAVA_HOME=//"`
+JAVA_HOME=`grep "^JAVA_HOME" $envfile | sed "s/JAVA_HOME=//"`
if [ -f $HOME/.antrc ] ; then
. $HOME/.antrc