move dev-java/regexp dev-java/regexp-bin

17 files changed, 33 insertions, 102 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index e109425cb634..ec7b9f771113 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.24 2004/07/30 17:18:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.25 2004/07/30 21:38:25 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:
+  move dev-java/regexp dev-java/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 29d35a3ab9bf..44a2ffe5d4b7 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.11 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ 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 )
-	regexp? ( >=dev-java/regexp-1.3 )
+	regexp? ( >=dev-java/regexp-bin-1.3 )
 	jython? ( >=dev-java/jython-bin-2.1 )
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
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 ed499fc48a90..5e729cd19193 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.10 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ 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/regexp-1.3
+	>=dev-java/regexp-bin-1.3
 	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
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 c62c21c774aa..6fb34c1bd1c2 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.11 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ 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/regexp-1.3
+	>=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 5937a3837135..45065d54a1bc 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.11 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -28,7 +28,7 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
-	>=dev-java/regexp-1.3
+	>=dev-java/regexp-bin-1.3
 	>=dev-java/jython-bin-2.1
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 
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 3f56ca154449..c2b5236e1776 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.2 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ DEPEND="=dev-java/ant-${PVR}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
-	>=dev-java/regexp-1.3
+	>=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-r2.ebuild b/dev-java/ant-optional/ant-optional-1.6.2-r2.ebuild
index 251fe82837a0..c7f6529ebdd2 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.2 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ DEPEND="=dev-java/ant-${PVR}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
-	>=dev-java/regexp-1.3
+	>=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 5e50d94d7076..18bf66d3713c 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.5 2004/07/30 17:18:24 axxo Exp $
+# $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 $
 
 inherit java-pkg eutils
 
@@ -29,7 +29,7 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/rhino-1.5_rc4
 	>=dev-java/jdepend-2.6
 	>=dev-java/jsch-0.1.12
-	>=dev-java/regexp-1.3
+	>=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/axion/ChangeLog b/dev-java/axion/ChangeLog
index 51461a5f1f3f..3873bad32278 100644
--- a/dev-java/axion/ChangeLog
+++ b/dev-java/axion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/axion
 # Copyright 2000-2004 Gentoo Foundation; Distributed unde the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/ChangeLog,v 1.4 2004/06/27 16:58:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/ChangeLog,v 1.5 2004/07/30 21:36:12 axxo Exp $
+
+  30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> axion-1.0_rc2.ebuild:
+  move dev-java/regexp dev-java/regexp-bin
 
   27 Jun 2004; Chris Aniszczyk <zx@gentoo.org> axion-1.0_rc2.ebuild:
   Marking stable on x86
diff --git a/dev-java/axion/axion-1.0_rc2.ebuild b/dev-java/axion/axion-1.0_rc2.ebuild
index 769fdf3e9369..722f94a3edc6 100644
--- a/dev-java/axion/axion-1.0_rc2.ebuild
+++ b/dev-java/axion/axion-1.0_rc2.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/axion/axion-1.0_rc2.ebuild,v 1.5 2004/06/27 16:58:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/axion-1.0_rc2.ebuild,v 1.6 2004/07/30 21:36:12 axxo Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,7 @@ RDEPEND=">=dev-java/commons-collections-2.1
 	=dev-java/commons-primitives-1.0*
 	=dev-java/commons-codec-1.2*
 	=dev-java/log4j-1.2*
-	=dev-java/regexp-1.3*
+	=dev-java/regexp-bin-1.3*
 	"
 DEPEND="${RDEPEND}
 	jikes? >=dev-java/jikes-1.19
diff --git a/dev-java/bcel/ChangeLog b/dev-java/bcel/ChangeLog
index b5f31a1bbea6..c5ad572c04d9 100644
--- a/dev-java/bcel/ChangeLog
+++ b/dev-java/bcel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/bcel
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.10 2004/06/24 22:18:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/ChangeLog,v 1.11 2004/07/30 21:35:04 axxo Exp $
+
+  30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> bcel-5.1.ebuild:
+  move dev-java/regexp dev-java/regexp-bin
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> bcel-5.1.ebuild:
   Fix use invocation
diff --git a/dev-java/bcel/bcel-5.1.ebuild b/dev-java/bcel/bcel-5.1.ebuild
index 0291d69326d3..251102c59d6b 100644
--- a/dev-java/bcel/bcel-5.1.ebuild
+++ b/dev-java/bcel/bcel-5.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/bcel/bcel-5.1.ebuild,v 1.13 2004/06/24 22:18:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1.ebuild,v 1.14 2004/07/30 21:35:04 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,7 +13,7 @@ RESTRICT="nomirror"
 KEYWORDS="x86 ~ppc sparc amd64"
 IUSE="doc jikes"
 DEPEND=">=virtual/jdk-1.2
-	>=dev-java/regexp-1.2
+	>=dev-java/regexp-bin-1.2
 	jikes? ( dev-java/jikes )"
 RDEPEND="${DEPEND}"
 DEP_APPEND="regexp"
diff --git a/dev-java/regexp/ChangeLog b/dev-java/regexp/ChangeLog
deleted file mode 100644
index fd6006ed3a3a..000000000000
--- a/dev-java/regexp/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-# ChangeLog for dev-java/regexp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.10 2004/06/24 22:41:42 agriffis Exp $
-
-  20 Jan 2004; Adrian Almenar <strider@gentoo.org> regexp-1.3.ebuild:
-  Stable on sparc.
-
-  19 Jan 2004; Adrian Almenar <strider@gentoo.org> regexp-1.3.ebuild:
-  Added ~ppc keyword.
-
-  19 Jan 2004; Adrian Almenar <strider@gentoo.org> regexp-1.3.ebuild:
-  Added amd64 keyword.
-
-  25 Dec 2003; Jason Wever <weeve@gentoo.org> regexp-1.3.ebuild:
-  Added ~sparc keyword.
-
-  20 Nov 2003; Adrian Almenar <strider@gentoo.org> regexp-1.3.ebuild:
-  Moved to stable.
-
-*regexp-1.3 (16 Sep 2003)
-
-  16 Sep 2003; Adrian Almenar <strider@gentoo.org> regexp-1.3.ebuild:
-  Version Bump. For now this is a binary install
-
-*regexp-1.2 (04 Nov 2002)
-
-  26 Apr 2003; Adrian Almenar <strider@gentoo.org> regexp-1.2.ebuild:
-  Updated SRC_URI so this ebuild uses apache mirrors.
-
-  04 Nov 2002; Adrian Almenar <strider@gentoo.org> regexp-1.2.ebuild ChangeLog files/digest-regexp-1.2:
-  Changed from jakarta-regexp to regexp since all jakarta projects dont have 
-  jakarta- preffix. Renamed final jar from jakarta-regexp-${PV}.jar to 
-  regexp-${PV}.jar. Also added $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/ChangeLog,v 1.10 2004/06/24 22:41:42 agriffis Exp $ to the ebuild. Removed superfluous 
-  A=${P}.tar.gz
-
-*jakarta-regexp-1.2 (03 Jun 2002)
-
-  03 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> jakarta-regexp-1.2.ebuild :
-
-  Added KEYWORDS.
-
-  03 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> jakarta-regexp-1.2.ebuild files/digest-jakarta-regexp-1.2 :
-
-  Regexp is a 100% Pure Java Regular Expression package that was graciously 
-  donated to the Apache Software Foundation by Jonathan Locke. He originally 
-  wrote this software back in 1996 and it has stood up quite well to the test 
-  of time. It includes complete Javadoc documentation as well as a simple 
-  Applet for visual debugging and testing suite for compatibility. 
-
-  Ebuild contributed by Jordan Armstrong <jordan@papercrane.net>
-
diff --git a/dev-java/regexp/Manifest b/dev-java/regexp/Manifest
deleted file mode 100644
index 8b9b6d411993..000000000000
--- a/dev-java/regexp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 70b9e689ac5c6a961ff2f2fe5786684d regexp-1.3.ebuild 639
-MD5 ccc38a4133067604b05a546408431a03 ChangeLog 2103
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-regexp-1.3 70
diff --git a/dev-java/regexp/files/digest-regexp-1.3 b/dev-java/regexp/files/digest-regexp-1.3
deleted file mode 100644
index 804595133e20..000000000000
--- a/dev-java/regexp/files/digest-regexp-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4322f82bea908ca4a7db270f7fa4850d jakarta-regexp-1.3.tar.gz 127069
diff --git a/dev-java/regexp/metadata.xml b/dev-java/regexp/metadata.xml
deleted file mode 100644
index 838c00a4a448..000000000000
--- a/dev-java/regexp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>
diff --git a/dev-java/regexp/regexp-1.3.ebuild b/dev-java/regexp/regexp-1.3.ebuild
deleted file mode 100644
index be860d85641b..000000000000
--- a/dev-java/regexp/regexp-1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/regexp/regexp-1.3.ebuild,v 1.8 2004/06/24 22:41:42 agriffis Exp $
-
-DESCRIPTION="100% Pure Java Regular Expression package"
-SRC_URI="mirror://apache/jakarta/regexp/source/jakarta-${PN}-${PV}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
-SLOT="1"
-IUSE="doc"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 ~ppc sparc amd64"
-DEPEND=">=virtual/jdk-1.3"
-
-S=${WORKDIR}/jakarta-${PN}-${PV}
-
-src_install() {
-	mv jakarta-regexp-${PV}.jar regexp-${PV}.jar
-	dojar regexp-${PV}.jar
-	use doc && dohtml -r docs/*
-}