Added back dev-java/jython as optional dep.

8 files changed, 23 insertions, 30 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index d827b38fbfd6..343e57a28264 100644
--- a/dev-java/ant-optional/ChangeLog
+++ b/dev-java/ant-optional/ChangeLog
@@ -1,6 +1,6 @@
 # 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.27 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.28 2004/07/31 21:21:10 karltk 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,
@@ -32,6 +32,9 @@
   +ant-optional-1.6.2-r2.ebuild:
   actualy use the fixed wrapper script
 
+  30 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  Prepared (mostly) for the move of dev-java/jython to dev-java/jython-bin.
+
 *ant-optional-1.6.2-r1 (23 Jul 2004)
 
   23 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest
index 74830211260f..ea03bb7b815e 100644
--- a/dev-java/ant-optional/Manifest
+++ b/dev-java/ant-optional/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-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 36ca9217ff589cdc00a211f347350597 ant-optional-1.6.0-r2.ebuild 4870
+MD5 56792d85b7a247d3108c9faab4f0ba35 ant-optional-1.6.1-r1.ebuild 4718
+MD5 48ae04be4a4aed4c86dd078e746ed912 ant-optional-1.6.2.ebuild 2021
 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 ba4f3be5feb93b428b55a54ff404ef9c ant-optional-1.6.0-r3.ebuild 4654
+MD5 051b346f5c099e758c8e14fdfe83bdc4 ant-optional-1.6.1.ebuild 4648
+MD5 c3fad5689da7b8afa7696c4ce5d2224f ChangeLog 4533
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 cf6e334bf576e08b4b9018893d06f7c2 ant-optional-1.6.2-r1.ebuild 1994
+MD5 89e17b56fc9d57b1f54aa0dd816e7aaa ant-optional-1.6.2-r1.ebuild 2025
 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
@@ -17,10 +14,3 @@ MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2-r1 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2-r2 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-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 d13d31651a62..2525dd8e5b94 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.14 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.15 2004/07/31 21:21:10 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -29,8 +29,8 @@ DEPEND="=dev-java/ant-1.6.0-r2
 	rhino? ( >=dev-java/rhino-1.4 )
 	jdepend? ( >=dev-java/jdepend-2.6 )
 	jsch? ( >=dev-java/jsch-0.1.12 )
+	jython? ( || ( >=dev-java/jython-2.1 >=dev-java/jython-bin-2.1 ) )
 	regexp? ( >=dev-java/regexp-bin-1.3 )
-	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 69edd2f0c07b..171511c2df24 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.13 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.14 2004/07/31 21:21:10 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -29,8 +29,8 @@ DEPEND="=dev-java/ant-1.6.0-r3
 	>=dev-java/rhino-1.4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
+	|| ( >=dev-java/jython-2.1 >=dev-java/jython-bin-2.1 )
 	>=dev-java/regexp-bin-1.3
-	>=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 51561619a4b7..435adf0d48c2 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.14 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild,v 1.15 2004/07/31 21:21:10 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -29,8 +29,8 @@ DEPEND="=dev-java/ant-${PV}-r1
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
+	|| ( >=dev-java/jython-2.1 >=dev-java/jython-bin-2.1 )
 	>=dev-java/regexp-bin-1.3
-	>=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 0287123ac20b..51d79ae85f11 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.14 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.15 2004/07/31 21:21:10 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -28,8 +28,8 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
+	|| ( >=dev-java/jython-2.1 >=dev-java/jython-bin-2.1 )
 	>=dev-java/regexp-bin-1.3
-	>=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 de350b3029fb..b396bfb6ea1a 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.5 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild,v 1.6 2004/07/31 21:21:10 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -29,8 +29,8 @@ DEPEND="=dev-java/ant-${PVR}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
+	|| ( >=dev-java/jython-2.1 >=dev-java/jython-bin-2.1 )
 	>=dev-java/regexp-bin-1.3
-	>=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 49dd81f6cc0c..aee0d96bac2d 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.8 2004/07/31 11:36:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.9 2004/07/31 21:21:10 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -29,8 +29,8 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
+	|| ( >=dev-java/jython-2.1 >=dev-java/jython-bin-2.1 )
 	>=dev-java/regexp-bin-1.3
-	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"