move jython -> jython-bin

9 files changed, 32 insertions, 26 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index a0f9325d5f2d..d827b38fbfd6 100644
--- a/dev-java/ant-optional/ChangeLog
+++ b/dev-java/ant-optional/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-optional
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.26 2004/07/31 11:32:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.27 2004/07/31 11:36:14 axxo Exp $
+
+  31 Jul 2004; Thomas Matthijs <axxo@gentoo.org> ant-optional-1.6.0-r2.ebuild,
+  ant-optional-1.6.0-r3.ebuild, ant-optional-1.6.1-r1.ebuild,
+  ant-optional-1.6.1.ebuild, ant-optional-1.6.2-r1.ebuild,
+  ant-optional-1.6.2-r2.ebuild, ant-optional-1.6.2.ebuild:
+  move jython -> jython-bin
 
   31 Jul 2004; Thomas Matthijs <axxo@gentoo.org> ant-optional-1.6.0-r2.ebuild,
   ant-optional-1.6.0-r3.ebuild, ant-optional-1.6.1-r1.ebuild,
diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest
index 4b881def2a19..74830211260f 100644
--- a/dev-java/ant-optional/Manifest
+++ b/dev-java/ant-optional/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7f56fb9fe20e963b6ff19c85d4efa206 ant-optional-1.6.0-r2.ebuild 4835
-MD5 b5cd8e2948f48dee3cef5e9eef05bf84 ant-optional-1.6.1-r1.ebuild 4683
-MD5 d89461bafd0350516c8d82ccab184281 ant-optional-1.6.2.ebuild 1986
-MD5 71e3864b7f340ea1b91d0c6ac4db6a86 ant-optional-1.6.2-r2.ebuild 1990
-MD5 237b323c63e5525532f804e1ae083cc8 ant-optional-1.6.0-r3.ebuild 4619
-MD5 dbf3417924b1248b413e13a3f28a8ded ant-optional-1.6.1.ebuild 4613
-MD5 1a1c047318697bf3931d42002d4e4b43 ChangeLog 4109
+MD5 05542241c2a310f2b3a635afbf928962 ant-optional-1.6.0-r2.ebuild 4839
+MD5 300012c05a99d10482971463f408e885 ant-optional-1.6.1-r1.ebuild 4687
+MD5 08176e431767dbf0e154b678e5ffa25a ant-optional-1.6.2.ebuild 1990
+MD5 98d7663eb34c366ea2645dc0084e9caf ant-optional-1.6.2-r2.ebuild 1994
+MD5 850f866019b93accb6bd722aadd73c89 ant-optional-1.6.0-r3.ebuild 4623
+MD5 6c376dc8fa270f9f92a5081a3f935418 ant-optional-1.6.1.ebuild 4617
+MD5 c2aea188a87a203947f79e269c6ecd1c ChangeLog 4397
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d99ea9becdc5112ed9e00f56f3392d8d ant-optional-1.6.2-r1.ebuild 1990
+MD5 cf6e334bf576e08b4b9018893d06f7c2 ant-optional-1.6.2-r1.ebuild 1994
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r2 74
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r3 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1-r1 74
@@ -20,7 +20,7 @@ MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBC4O4/rLF9B432nYRAqGGAJ4/nAB+N1fC4lhc7x6+n8/yPrLdrACfebRA
-pcWS+qIsxHJEsy5+oA6PyyY=
-=D93Y
+iD8DBQFBC4SX/rLF9B432nYRAgZdAJ9/hp0XaOH0yRAED2njz57At2pbDgCaA/sR
+Z5GJooGx9lgy4jwkaDGKVtw=
+=sea2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild b/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
index 2b36570ddfc5..d13d31651a62 100644
--- a/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.0-r2.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-optional/ant-optional-1.6.0-r2.ebuild,v 1.13 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.14 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,7 +44,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
+	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
 		export CLASSPATH="${CLASSPATH}`java-config --classpath=${i}`"
 	done
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
diff --git a/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild b/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
index d39d27b3d261..69edd2f0c07b 100644
--- a/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.0-r3.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-optional/ant-optional-1.6.0-r3.ebuild,v 1.12 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.13 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -43,7 +43,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
+	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
 		export CLASSPATH="${CLASSPATH}`java-config --classpath=${i}`"
 	done
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
diff --git a/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild b/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild
index f871524bfbc1..51561619a4b7 100644
--- a/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.1-r1.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-optional/ant-optional-1.6.1-r1.ebuild,v 1.13 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild,v 1.14 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,7 +44,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
+	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
 		export CLASSPATH="${CLASSPATH}`java-config --classpath=${i}`"
 	done
 	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${CLASSPATH} || die
diff --git a/dev-java/ant-optional/ant-optional-1.6.1.ebuild b/dev-java/ant-optional/ant-optional-1.6.1.ebuild
index ec708c2bed88..0287123ac20b 100644
--- a/dev-java/ant-optional/ant-optional-1.6.1.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.1.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-optional/ant-optional-1.6.1.ebuild,v 1.13 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.14 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -42,7 +42,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
+	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces"; do
 		export CLASSPATH="${CLASSPATH}`java-config --classpath=${i}`"
 	done
 	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${CLASSPATH} || die
diff --git a/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild b/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild
index 07c507370c92..de350b3029fb 100644
--- a/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.2-r1.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-optional/ant-optional-1.6.2-r1.ebuild,v 1.4 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild,v 1.5 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,7 +44,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
 	use javamail && packages="${packages},sun-javamail-bin,sun-jaf-bin"
 
 	libs=$(java-config -p ${packages})
diff --git a/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild b/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild
index 593237b08bd9..95afca6c9365 100644
--- a/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.2-r2.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-optional/ant-optional-1.6.2-r2.ebuild,v 1.4 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild,v 1.5 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,7 +44,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
 	use javamail && packages="${packages},sun-javamail-bin,sun-jaf-bin"
 
 	libs=$(java-config -p ${packages})
diff --git a/dev-java/ant-optional/ant-optional-1.6.2.ebuild b/dev-java/ant-optional/ant-optional-1.6.2.ebuild
index 36e94e97b161..49dd81f6cc0c 100644
--- a/dev-java/ant-optional/ant-optional-1.6.2.ebuild
+++ b/dev-java/ant-optional/ant-optional-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-optional/ant-optional-1.6.2.ebuild,v 1.7 2004/07/31 11:32:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.8 2004/07/31 11:36:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -44,7 +44,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython-bin,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
 	use javamail && packages="${packages},sun-javamail-bin,sun-jaf-bin"
 
 	libs=$(java-config -p ${packages})