diff options
| author |   Karl Trygve Kalleberg <karltk@gentoo.org> | 2002-04-10 12:10:43 +0000 |
|---|---|---|
| committer | Karl Trygve Kalleberg <karltk@gentoo.org> | 2002-04-10 12:10:43 +0000 |
| commit | d3c9989a1da0b34ba3e98203575b56e7c9d24b1a (patch) | |
| tree | 1280ad8b607398fe4fe8df6d87f8848ac5273b37 /dev-java | |
| parent | $HOMEPAGE fix0r (diff) | |
| download | gentoo-2-d3c9989a1da0b34ba3e98203575b56e7c9d24b1a.tar.gz gentoo-2-d3c9989a1da0b34ba3e98203575b56e7c9d24b1a.tar.bz2 gentoo-2-d3c9989a1da0b34ba3e98203575b56e7c9d24b1a.zip | |
Fixed #1359
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ant/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-java/ant/ant-1.4.1-r2.ebuild (renamed from dev-java/ant/ant-1.4.1-r1.ebuild) | 2 | ||||
| -rw-r--r-- | dev-java/ant/files/digest-ant-1.4.1-r2 (renamed from dev-java/ant/files/digest-ant-1.4.1-r1) | 0 | ||||
| -rw-r--r-- | dev-java/ant/files/gentoo-ant-1.4.1 | 10 |
4 files changed, 21 insertions, 2 deletions
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog index b99a86491452..d3d536bd3f7f 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.1 2002/02/01 21:53:11 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.2 2002/04/10 12:10:43 karltk Exp $ + +*ant-1.4.1-r2 (10 Apr 2002) + + 10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ant-1.4.1-r2.ebuild files/digest-ant-1.4.1-r2: + + The JAVA_HOME env var is now picked from $HOME/.gentoo/java-env if it exists, + /etc/env.d/20java if not. An error is emitted if both files are missing. + + Removed ant-1.4.1-r1.ebuild files/digest-ant-1.4.1-r1 *ant-1.4.1-r1 (1 Feb 2002) diff --git a/dev-java/ant/ant-1.4.1-r1.ebuild b/dev-java/ant/ant-1.4.1-r2.ebuild index ace59292b664..684ce9127a27 100644 --- a/dev-java/ant/ant-1.4.1-r1.ebuild +++ b/dev-java/ant/ant-1.4.1-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2001 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-r1.ebuild,v 1.4 2002/01/28 23:00:28 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r2.ebuild,v 1.1 2002/04/10 12:10:43 karltk Exp $ A="jakarta-ant-${PV}-src.tar.gz" S=${WORKDIR}/jakarta-ant-${PV} diff --git a/dev-java/ant/files/digest-ant-1.4.1-r1 b/dev-java/ant/files/digest-ant-1.4.1-r2 index 020707ceee14..020707ceee14 100644 --- a/dev-java/ant/files/digest-ant-1.4.1-r1 +++ b/dev-java/ant/files/digest-ant-1.4.1-r2 diff --git a/dev-java/ant/files/gentoo-ant-1.4.1 b/dev-java/ant/files/gentoo-ant-1.4.1 index ecd694f34961..c7ecea773f9d 100644 --- a/dev-java/ant/files/gentoo-ant-1.4.1 +++ b/dev-java/ant/files/gentoo-ant-1.4.1 @@ -1,5 +1,15 @@ #! /bin/sh +if [ -f $HOME/.gentoo/java-env ] ; then + envfile=$HOME/.gentoo/java-env +elif [ -f /etc/env.d/20java ] ; then + envfile=/etc/env.d/20java +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=//"` + if [ -f $HOME/.antrc ] ; then . $HOME/.antrc fi |