move regexp -> regexp-bin

8 files changed, 21 insertions, 15 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index ec7b9f771113..a0f9325d5f2d 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.25 2004/07/30 21:38:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.26 2004/07/31 11:32:28 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 regexp -> regexp-bin
 
   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,
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 44a2ffe5d4b7..2b36570ddfc5 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.12 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,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-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 5e729cd19193..d39d27b3d261 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.11 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,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-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 6fb34c1bd1c2..f871524bfbc1 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.12 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,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,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 45065d54a1bc..ec708c2bed88 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.12 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,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-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 c2b5236e1776..07c507370c92 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.3 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,rhino,xalan,xerces-2"
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,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 c7f6529ebdd2..593237b08bd9 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.3 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,rhino,xalan,xerces-2"
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,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 18bf66d3713c..36e94e97b161 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.6 2004/07/30 21:38:25 axxo Exp $
+# $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 $
 
 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,rhino,xalan,xerces-2"
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,log4j,oro,regexp-bin,rhino,xalan,xerces-2"
 	use javamail && packages="${packages},sun-javamail-bin,sun-jaf-bin"
 
 	libs=$(java-config -p ${packages})