move jython-bin -> jython, regexp-bin -> regexp

11 files changed, 57 insertions, 48 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
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index 1555a8a189b0..bb2233d045a8 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,4 +1,14 @@
-MD5 6c975b1cd290ab26e8f8b456bb948fc9 ChangeLog 965
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb0ac59fedcbcd430f9c40320a3db2bc bsf-2.3.0-r1.ebuild 1655
+MD5 372e74139154d2dcf30fe1888f1623ce ChangeLog 1066
 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
-MD5 e5a4d75faf2a6bd28de2f96ca6095b1e bsf-2.3.0-r1.ebuild 1650
 MD5 2d349b974ef57925e6b968aa654645b3 files/digest-bsf-2.3.0-r1 133
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBObyn/rLF9B432nYRAqzwAJ0WKF/vo4Z4Mjsd55fnl8XzR0+u8QCaA3+Q
+yUNk9iuqPCZ/mldkWOyR+68=
+=Q85M
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index cff19208302a..64c8b8c2d354 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3268b38185c3fec20d436047af03b256 jython-2.1-r5.ebuild 1757
+MD5 202d5af6c0ff7fe35c463380356c3364 jython-2.1-r5.ebuild 1748
 MD5 094cb27cc20bffd85f29638e4605638a jython-2.1-r4.ebuild 2126
-MD5 af7db62b8f96771b93cceff27fe1346c ChangeLog 1897
+MD5 52cbf73d43f8d38c8bc41cddd4d4a10e ChangeLog 2014
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 17272ca5f12bd9bb307210c12606d526 files/jythonc 67
 MD5 61d3aae70a79bd4b755cd408ad916037 files/jython 302
@@ -12,7 +12,7 @@ MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r5 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBOJI3/rLF9B432nYRAolxAKCzh24SnPHJiDz5F3TRpRR2YL6BTACfY7WE
-E0d5SyoXEVvG3nAgw7wc8Pg=
-=oejs
+iD8DBQFBOby7/rLF9B432nYRAnrzAKCh2inec6287r3+sl1cgCanQ8gAPQCgxGS4
+Ip2DiN7fWm9TnwiQYKZC7JQ=
+=c1A8
 -----END PGP SIGNATURE-----
diff --git a/dev-java/regexp/Manifest b/dev-java/regexp/Manifest
index c26e1b97dfe6..f417206b0eae 100644
--- a/dev-java/regexp/Manifest
+++ b/dev-java/regexp/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a0dcc99b9e3376b570463fb840f83d3 regexp-1.3-r1.ebuild 864
 MD5 d5da2af910ca2aefdfcff1f1c269b570 regexp-1.3.ebuild 864
+MD5 55147aa522e2d3a2d7b68dccdc6641d2 ChangeLog 487
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 4d99f17ac49cca620805f8606094b658 ChangeLog 329
+MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-regexp-1.3-r1 70
 MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-regexp-1.3 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBObz0/rLF9B432nYRAmM4AJ0XRaMr7sPrTtbnWrGsSj4QW6ym0gCguAZx
+Umvkj6Aahakp96KExSXShyI=
+=iyDa
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 34b8d848b90c..6a2ba60a1059 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 MD5 bce3b7151e40b69b3fcf3b312bba02ce xerces-2.6.2.ebuild 1915
 MD5 d944161cdeb44e875a0ec663393defb5 xerces-2.6.1.ebuild 1925
-MD5 cfb4acd09f92baf9fb4821508c39e37c xerces-2.6.2-r1.ebuild 1915
-MD5 ff6d435e605a0cf62ae1f4c4376f85c6 ChangeLog 3753
+MD5 655e0638f9c206764870572dd4290a7c xerces-2.6.2-r1.ebuild 1913
+MD5 3984eac4baf4779dd9c68a6485ca9da6 ChangeLog 3849
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 71aa676ab6e456064239b5974e7339b5 xerces-2.6.0.ebuild 1921
 MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2-r1 144
@@ -12,9 +12,9 @@ MD5 1fcb1a39009fabe31915e46883eb55b9 files/digest-xerces-2.6.0 144
 MD5 875f2b76895fcfaf8fdba951c858ce3d files/digest-xerces-2.6.1 144
 MD5 202c6353e68e489ff4ca668a0999534d files/digest-xerces-2.6.2 144
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBL5LB/rLF9B432nYRAvjHAJ4y7Y+7w4RU0KKinWgOBu2K+kGHYQCgn7g7
-j7/ufWJ8zXbv+riQhk75Kqo=
-=WsqC
+iD8DBQFBOb0N/rLF9B432nYRApFkAKCr7rmyAle/DCNxKoGt3GO9ieH+jwCcC9ax
+OMgbzig47FRz5Y84l4sD9nw=
+=48oE
 -----END PGP SIGNATURE-----