Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-09-04 12:58:55 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-09-04 12:58:55 +0000
commit811d71bca984d7e11030c3ae985583992a5cb8e0 (patch)
tree12d5a1bf0c47be1e96b9894d54ea81cbd78aa205
parentUpdated all ebuilds to make aterm not use lazy bindings. (Manifest recommit) (diff)
downloadgentoo-2-811d71bca984d7e11030c3ae985583992a5cb8e0.tar.gz
gentoo-2-811d71bca984d7e11030c3ae985583992a5cb8e0.tar.bz2
gentoo-2-811d71bca984d7e11030c3ae985583992a5cb8e0.zip
move jython-bin -> jython, regexp-bin -> regexp
Diffstat
-rw-r--r--dev-java/ant-tasks/ChangeLog5
-rw-r--r--dev-java/ant-tasks/Manifest12
-rw-r--r--dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild12
-rw-r--r--dev-java/ant/ChangeLog6
-rw-r--r--dev-java/ant/Manifest12
-rw-r--r--dev-java/ant/ant-1.6.2-r5.ebuild4
-rw-r--r--dev-java/ant/files/1.6.2-r5/ant4
7 files changed, 21 insertions, 34 deletions
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 179a8d7abaed..53a0510db498 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/ant-optional
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.5 2004/09/01 20:43:00 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.6 2004/09/04 12:58:55 axxo Exp $
+
+ 04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> ant-tasks-1.6.2-r4.ebuild:
+ move jython-bin -> jython, regexp-bin -> regexp-bin
01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> ant-tasks-1.6.2-r4.ebuild:
block on ant-optional
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index bab8ddcebb70..61e95160e242 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cb234871a7afe8fba90ce81e15ddc23d ant-tasks-1.6.2-r4.ebuild 3606
+MD5 2623384e71ff88db4bc9fecc9cce10ae ant-tasks-1.6.2-r4.ebuild 3596
MD5 2c646807bc3b3c82b8171ad5071fd312 ChangeLog 6169
MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r4 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBNjSn/rLF9B432nYRAhXUAJ9NHTSDR3SBy3puhdO1wLI8i3YOiQCghHY8
-l73azoPYDQG9k6gLcJMXFAY=
-=lael
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild
index 2e0fbc03d545..f195e28222ec 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r4.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.3 2004/09/01 20:43:00 axxo Exp $
+# $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 $
inherit java-pkg eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+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
@@ -30,8 +30,8 @@ DEPEND="=dev-java/ant-1.6.2-r5
!norhino? ( >=dev-java/rhino-1.5_rc4 )
!nojdepend? ( >=dev-java/jdepend-2.6 )
!nojsch? ( >=dev-java/jsch-0.1.12 )
- !noregexp? ( >=dev-java/regexp-bin-1.3 )
- !nojython? ( >=dev-java/jython-bin-2.1 )
+ !noregexp? ( >=dev-java/regexp-1.3-r1 )
+ !nojython? ( >=dev-java/jython-2.1-r5 )
javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
RDEPEND="${DEPEND}"
@@ -54,10 +54,10 @@ src_compile() {
use nocommonsnet || p="${p},commons-net"
use nojdepend || p="${p},jdepend"
use nojsch || p="${p},jsch"
- use nojython || p="${p},jython-bin"
+ use nojython || p="${p},jython"
use nolog4j || p="${p},log4j"
use nooro || p="${p},oro"
- use noregexp || p="${p},regexp-bin"
+ use noregexp || p="${p},regexp"
use norhino || p="${p},rhino"
use noxalan || p="${p},xalan"
use noxerces || p="${p},xerces-2"
diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 16e3d1722fe5..21f752838983 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/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/ChangeLog,v 1.78 2004/09/01 20:43:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.79 2004/09/04 12:58:31 axxo Exp $
+
+ 04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-r5/ant,
+ ant-1.6.2-r5.ebuild:
+ move jython-bin -> jython, regexp-bin -> regexp
01 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-r5/ant,
ant-1.6.2-r5.ebuild:
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index b9f67fb64ce7..abb4ff93fb17 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 5f6b6c258c3edf75842d1753a95dc309 ant-1.6.2-r3.ebuild 2224
MD5 0a9e579c0585e31fa0f608df4fc596ab ant-1.5.4-r1.ebuild 3013
MD5 feb875c667f1fe035a07b0709bfa3b83 ant-1.6.1-r1.ebuild 2233
@@ -23,13 +20,6 @@ MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r5 74
MD5 b175a3f82c4b6326054b651bf39217fd files/1.6.0-r3/ant 2444
MD5 7f78a7891b6440422489d4e55c08384a files/1.6.2-r2/ant 4697
MD5 9e239f4c98abe5ae2f940e2e01d6d898 files/1.6.2-r3/ant 4965
-MD5 5236d8ac87bfd7f3ee2013423990ec88 files/1.6.2-r5/ant 4984
+MD5 2306ca0eed409ccf6d6265b354eb51a3 files/1.6.2-r5/ant 4962
MD5 f8c9e03bf0f5924ebf9162718bf15169 files/1.5.4/ant 2275
MD5 25a7ebba11a8442506388faea61f5abc files/1.6.1/ant 2492
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBNjSt/rLF9B432nYRAraLAJ9VIwQDnQdd7WBcq4aAT0l96l1EcQCfSRh1
-HA8++IUXMnqCEBgWc6WG8AM=
-=W19d
------END PGP SIGNATURE-----
diff --git a/dev-java/ant/ant-1.6.2-r5.ebuild b/dev-java/ant/ant-1.6.2-r5.ebuild
index dcdf4c367c69..c167aeaa26d8 100644
--- a/dev-java/ant/ant-1.6.2-r5.ebuild
+++ b/dev-java/ant/ant-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/ant-1.6.2-r5.ebuild,v 1.2 2004/09/01 20:43:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.2-r5.ebuild,v 1.3 2004/09/04 12:58:31 axxo Exp $
inherit java-pkg eutils
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ppc sparc"
IUSE="doc"
DEPEND="virtual/libc
diff --git a/dev-java/ant/files/1.6.2-r5/ant b/dev-java/ant/files/1.6.2-r5/ant
index e4e948c53e6b..48600fd48a97 100644
--- a/dev-java/ant/files/1.6.2-r5/ant
+++ b/dev-java/ant/files/1.6.2-r5/ant
@@ -15,7 +15,7 @@
# limitations under the License.
# Edited for Gentoo Linux
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r5/ant,v 1.2 2004/09/01 20:43:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/files/1.6.2-r5/ant,v 1.3 2004/09/04 12:58:31 axxo Exp $
# Extract launch and ant arguments, (see details below).
ant_exec_args=
@@ -102,7 +102,7 @@ else
fi
# add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,regexp-bin,rhino,jython,jython-bin,jta,jaf,javamail 2> /dev/null`"
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-logging,commons-net,oro,jdepend,jsch,regexp,rhino,jython,jta,jaf,javamail 2> /dev/null`"
if [ -n "$JAVA_HOME" ] ; then
if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then