diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ant-core/Manifest | 12 | ||||
| -rw-r--r-- | dev-java/ant-core/ant-core-1.6.2.ebuild | 28 |
3 files changed, 13 insertions, 33 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 1407c5715042..ced177f34d2e 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ant # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.1 2004/09/10 19:45:18 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.2 2004/09/10 23:20:56 axxo Exp $ + + 11 Sep 2004; Thomas Matthijs <axxo@gentoo.org> ant-core-1.6.2.ebuild: + removed pkg_setup, not used anyway, moved the ppc threads_flags to + src_compile. Don't use global classpath when compiling *ant-core-1.6.2 (10 Sep 2004) diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index b6e814faf939..8a9f877557b1 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 40aa3e15b499670f159be6f3c96753d3 ant-core-1.5.4.ebuild 3037 -MD5 8cec8253518c1ee0751248c4b05681ad ant-core-1.6.2.ebuild 2224 +MD5 f691809e94125429ca57f20ff5751282 ant-core-1.6.2.ebuild 1679 MD5 913d10751ca851a8d51184584d6633c8 ChangeLog 13725 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220 MD5 b876b365c3d68c3dc528148056af16f9 files/1.5.4-ant 2278 @@ -11,10 +8,3 @@ MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4 70 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2 74 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBQgSk/rLF9B432nYRAnAhAKCYI/sDTtasIbOL9Bf6c2lbpQcsLACgy+6u -fXMZKrWF/CnK4ZhcD1kU+tE= -=4DlJ ------END PGP SIGNATURE----- diff --git a/dev-java/ant-core/ant-core-1.6.2.ebuild b/dev-java/ant-core/ant-core-1.6.2.ebuild index 8d3ad00afcf5..4d8fa4dae32e 100644 --- a/dev-java/ant-core/ant-core-1.6.2.ebuild +++ b/dev-java/ant-core/ant-core-1.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.6.2.ebuild,v 1.1 2004/09/10 19:45:18 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2.ebuild,v 1.2 2004/09/10 23:20:56 axxo Exp $ inherit java-pkg eutils @@ -24,24 +24,6 @@ RDEPEND=">=virtual/jdk-1.4 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} @@ -53,13 +35,17 @@ src_unpack() { src_compile() { addwrite "/proc/self/maps" + if [ `arch` == "ppc" ] ; then + # We're compiling _ON_ PPC + export THREADS_FLAG="green" + fi + local myc myc="${myc} -Ddist.dir=${D}/usr/share/${PN}" myc="${myc} -Djavac.target=1.4" - echo $CLASSPATH - ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die + CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die } src_install() { |