diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2005-08-14 21:13:19 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2005-08-14 21:13:19 +0000 |
| commit | e882bc89d63384ad82d5c6f0d9c0b1c4c2dcfa1c (patch) | |
| tree | 56db68e9336102e005d20ebfeb73e474980bd6cb /dev-java/ant-core | |
| parent | Adjusted dep wrt bug #102539 (diff) | |
| download | gentoo-2-e882bc89d63384ad82d5c6f0d9c0b1c4c2dcfa1c.tar.gz gentoo-2-e882bc89d63384ad82d5c6f0d9c0b1c4c2dcfa1c.tar.bz2 gentoo-2-e882bc89d63384ad82d5c6f0d9c0b1c4c2dcfa1c.zip | |
Updating to use toolchain-funcs
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-java/ant-core')
| -rw-r--r-- | dev-java/ant-core/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/ant-core/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/ant-core/ant-core-1.6.5-r1.ebuild | 14 |
3 files changed, 13 insertions, 9 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index c1b772a46c3b..6e1db545edca 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.29 2005/07/25 23:56:27 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.30 2005/08/14 21:13:19 compnerd Exp $ # ant-core blocks lower versions of ant-tasks, # since it will not run when there is a version mismatch betwean the 2 # Please unemerge ant-tasks when updating ant. + 14 Aug 2005; Saleem Abdulrasool <compnerd@gentoo.org> + ant-core-1.6.5-r1.ebuild: + Updated to use toolchain-func eclass to determine arch, minor style change + *ant-core-1.6.5-r1 (23 Jul 2005) 23 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -ant-core-1.6.5.ebuild, diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index dccbc709f02e..64bb513f6abf 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -2,7 +2,7 @@ MD5 cd27d8e483b3c181b28fe4a7eadaca3e ant-core-1.6.2-r4.ebuild 2061 MD5 a91d5f2459c3e4e8729668a7ccda42cf ant-core-1.5.4-r2.ebuild 3088 MD5 3cfecf9dbb1e8ae16fe19fdb8a17f8a2 ant-core-1.6.2-r3.ebuild 2059 MD5 0826bde007e783e15b02d0cd0d48bf01 ChangeLog 18243 -MD5 cc58025c7f0be0f1bdec26617063b698 ant-core-1.6.5-r1.ebuild 1945 +MD5 16bc94e618fdaf98bb92cdd44f8bd2eb ant-core-1.6.5-r1.ebuild 1972 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283 MD5 b22aa4539abd02d5aaca2621ed67cc29 files/1.6.2-ant 5044 diff --git a/dev-java/ant-core/ant-core-1.6.5-r1.ebuild b/dev-java/ant-core/ant-core-1.6.5-r1.ebuild index 3bd3466b8115..16226bf9e7b5 100644 --- a/dev-java/ant-core/ant-core-1.6.5-r1.ebuild +++ b/dev-java/ant-core/ant-core-1.6.5-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 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.5-r1.ebuild,v 1.1 2005/07/23 21:18:48 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r1.ebuild,v 1.2 2005/08/14 21:13:19 compnerd Exp $ -inherit java-pkg eutils +inherit java-pkg eutils toolchain-funcs MY_PN=${PN/-core} @@ -18,11 +18,11 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64" IUSE="doc source" DEPEND="virtual/libc - !<dev-java/ant-tasks-${PV} - source? ( app-arch/zip ) - >=virtual/jdk-1.4" + >=virtual/jdk-1.4 + !<dev-java/ant-tasks-${PV} + source? ( app-arch/zip )" RDEPEND=">=virtual/jdk-1.4 - >=dev-java/java-config-1.2" + >=dev-java/java-config-1.2" S="${WORKDIR}/apache-ant-${MY_PV}" @@ -37,7 +37,7 @@ src_unpack() { src_compile() { addwrite "/proc/self/maps" - if [ `arch` == "ppc" ] ; then + if [[ $(tc-arch) == "ppc" ]] ; then # We're compiling _ON_ PPC export THREADS_FLAG="green" fi |