8 files changed, 21 insertions, 15 deletions
diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index ff51b44a2637..e109425cb634 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.23 2004/07/29 14:52:09 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.24 2004/07/30 17:18:24 axxo Exp $
+
+  30 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:
+  Moved dev-java/jython to dev-java/jython-bin.
 
 *ant-optional-1.6.2-r2 (29 Jul 2004)
 
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 3400202c548e..29d35a3ab9bf 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.10 2004/07/14 01:43:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.11 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-1.6.0-r2
 	jdepend? ( >=dev-java/jdepend-2.6 )
 	jsch? ( >=dev-java/jsch-0.1.12 )
 	regexp? ( >=dev-java/regexp-1.3 )
-	jython? ( >=dev-java/jython-2.1 )
+	jython? ( >=dev-java/jython-bin-2.1 )
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
 S="${WORKDIR}/apache-ant-${PV}"
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 8b83d1f184e6..ed499fc48a90 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.9 2004/07/14 01:43:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.10 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-1.6.0-r3
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
-	>=dev-java/jython-2.1
+	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
 S="${WORKDIR}/apache-ant-${PV}"
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 3c40df4d4496..c62c21c774aa 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.10 2004/07/14 01:43:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild,v 1.11 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-${PV}-r1
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
-	>=dev-java/jython-2.1
+	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"
 
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 33fda4913bef..5937a3837135 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.10 2004/07/14 01:43:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.11 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
-	>=dev-java/jython-2.1
+	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
 S="${WORKDIR}/apache-ant-${PV}"
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 f8aa64cdc08b..3f56ca154449 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.1 2004/07/23 21:28:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild,v 1.2 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-${PVR}
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
-	>=dev-java/jython-2.1
+	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"
 
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 a4589031e7c0..251fe82837a0 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.1 2004/07/29 14:52:09 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild,v 1.2 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-${PVR}
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
-	>=dev-java/jython-2.1
+	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"
 
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 b822a3f85ac0..5e50d94d7076 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.4 2004/07/23 21:28:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.5 2004/07/30 17:18:24 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
-	>=dev-java/jython-2.1
+	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"