summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-09-10 19:42:39 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-09-10 19:42:39 +0000
commit7e7fc2483a07704381910f42f135528ac024b94b (patch)
treec2b43d6a170f60fd57a24003bd11e5178c07f8f9 /dev-java/ant-tasks
parentThis is now a metapackage for ant-core & ant-tasks (Manifest recommit) (diff)
downloadgentoo-2-7e7fc2483a07704381910f42f135528ac024b94b.tar.gz
gentoo-2-7e7fc2483a07704381910f42f135528ac024b94b.tar.bz2
gentoo-2-7e7fc2483a07704381910f42f135528ac024b94b.zip
revision bump: ant moved to ant-core
Diffstat (limited to 'dev-java/ant-tasks')
-rw-r--r--dev-java/ant-tasks/ChangeLog8
-rw-r--r--dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild (renamed from dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild)12
-rw-r--r--dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5 (renamed from dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4)0
3 files changed, 13 insertions, 7 deletions
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 1b9a0ad61939..9dc77586d509 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/ant-tasks
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.7 2004/09/05 06:03:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.8 2004/09/10 19:41:12 axxo Exp $
+
+*ant-tasks-1.6.2-r5 (10 Sep 2004)
+
+ 10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -ant-tasks-1.6.2-r4.ebuild,
+ +ant-tasks-1.6.2-r5.ebuild:
+ revision bump: ant moved to ant-core
05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
Fixed ChangeLog header.
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild
index f195e28222ec..5a8b671bf29e 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r5.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-tasks/ant-tasks-1.6.2-r4.ebuild,v 1.4 2004/09/04 12:58:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild,v 1.1 2004/09/10 19:41:12 axxo Exp $
inherit java-pkg eutils
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="x86 ~amd64 ppc sparc"
IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
-DEPEND="=dev-java/ant-1.6.2-r5
+DEPEND="=dev-java/ant-${PV}*
!dev-java/ant-optional
>=dev-java/java-config-1.2
>=dev-java/junit-3.8
@@ -45,7 +45,7 @@ src_compile() {
export THREADS_FLAG="green"
fi
- local p="ant,junit"
+ local p="ant-core,junit"
use noantlr || p="${p},antlr"
use nobcel || p="${p},bcel"
use nobeanutils || p="${p},commons-beanutils"
@@ -67,7 +67,7 @@ src_compile() {
packages=${p}
libs=$(java-config -p ${packages})
- ./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${libs} || die "build failed"
+ ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
}
src_install() {
@@ -88,10 +88,10 @@ src_install() {
use noxalan || jars="${jars} xalan1"
use javamail && jars="${jars} javamail"
- dodir /usr/share/ant/lib
+ dodir /usr/share/ant-core/lib
for jar in ${jars}; do
java-pkg_dojar build/lib/ant-${jar}.jar
- dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant/lib/
+ dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant-core/lib/
done
}
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5