Updated dev-java/javamail references to dev-java/sun-javamail-bin

5 files changed, 19 insertions, 13 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index 18044bf42e6e..9816a5e10522 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.12 2004/03/23 20:25:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.13 2004/05/02 01:13:27 karltk Exp $
+
+  02 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  ant-optional-1.6.0-r2.ebuild, ant-optional-1.6.0-r3.ebuild,
+  ant-optional-1.6.1.ebuild, ant-optional-1.6.1-r1.ebuild: Changed deps
+  for dev-java/javamail and dev-java/jaf to dev-java/sun-javamail-bin and
+  dev-java/sun-jaf-bin.
 
   23 Mar 2004; David Holm <dholm@gentoo.org> ant-optional-1.6.1-r1.ebuild:
   Backed out of ~ppc.
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 4c8621350c24..5e7db1dff316 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 Technologies, Inc.
 # 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.7 2004/04/16 02:21:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.8 2004/05/02 01:13:27 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -31,7 +31,7 @@ DEPEND="=dev-java/ant-1.6.0-r2
 	jsch? ( >=dev-java/jsch-0.1.12 )
 	regexp? ( >=dev-java/regexp-1.3 )
 	jython? ( >=dev-java/jython-2.1 )
-	javamail? ( >=dev-java/javamail-1.3 )"
+	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
@@ -44,7 +44,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,javamail,jaf,jdepend,jsch,junit,jython,log4j,oro,regexp,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,log4j,oro,regexp,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 6696cc735339..5de3236fba80 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 Technologies, Inc.
 # 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.6 2004/04/16 02:22:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.7 2004/05/02 01:13:27 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -31,7 +31,7 @@ DEPEND="=dev-java/ant-1.6.0-r3
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
 	>=dev-java/jython-2.1
-	javamail? ( >=dev-java/javamail-1.3 )"
+	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
@@ -43,7 +43,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,javamail,jaf,jdepend,jsch,junit,jython,log4j,oro,regexp,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,log4j,oro,regexp,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 bb1ebd9a9f22..39b084c6e31f 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 Technologies, Inc.
 # 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.5 2004/04/16 02:22:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild,v 1.6 2004/05/02 01:13:27 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-${PV}-r1
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
 	>=dev-java/jython-2.1
-	javamail? ( >=dev-java/javamail-1.3 )"
+	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/apache-ant-${PV}"
@@ -43,7 +43,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,javamail,jaf,jdepend,jsch,junit,jython,log4j,oro,regexp,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,log4j,oro,regexp,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 421458ce5928..5c4cae38a458 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 Technologies, Inc.
 # 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.6 2004/04/16 02:23:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.7 2004/05/02 01:13:27 karltk Exp $
 
 inherit java-pkg eutils
 
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/jsch-0.1.12
 	>=dev-java/regexp-1.3
 	>=dev-java/jython-2.1
-	javamail? ( >=dev-java/javamail-1.3 )"
+	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
@@ -42,7 +42,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,javamail,jaf,jdepend,jsch,junit,jython,log4j,oro,regexp,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,log4j,oro,regexp,rhino,xalan,xerces"; do
 		export CLASSPATH="${CLASSPATH}`java-config --classpath=${i}`"
 	done
 	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${CLASSPATH} || die