Updated DEPEND to >=virtual/jdk-1.4 because jakarta-regexp needs package org.xml.sax to compile and removed jakarta-regexp-1.3.1-r1 as it is a copy of r2.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 12 insertions, 58 deletions

diff --git a/dev-java/jakarta-regexp/ChangeLog b/dev-java/jakarta-regexp/ChangeLog
index c9c252cd6089..f08010fdae38 100644
--- a/dev-java/jakarta-regexp/ChangeLog
+++ b/dev-java/jakarta-regexp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jakarta-regexp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.6 2005/04/09 18:24:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.7 2005/08/07 12:42:13 betelgeuse Exp $
+
+  07 Aug 2005; Petteri Räty <betelgeuse@gentoo.org>
+  -jakarta-regexp-1.3-r1.ebuild, jakarta-regexp-1.3-r2.ebuild:
+  Updated DEPEND to >=virtual/jdk-1.4 because jakarta-regexp needs package
+  org.xml.sax to compile and removed jakarta-regexp-1.3.1-r1 as it is a copy of 
+  r2.
 
 *jakarta-regexp-1.3-r2 (09 Apr 2005)
 
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index 93ad85a044b4..61e3ef66d88d 100644
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 78fea13282b656143aef5d650adbaa82 jakarta-regexp-1.3-r2.ebuild 1082
-MD5 7f56c97b39419b006a7f68bb41bd9597 jakarta-regexp-1.3-r1.ebuild 1082
-MD5 215846e9017665216b060928d48d5007 ChangeLog 747
+MD5 89c48d76734984d0da7c602b77158cb5 ChangeLog 1027
+MD5 abac46f0d7f997cc5613a2d5ce6eeac8 jakarta-regexp-1.3-r2.ebuild 1098
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-jakarta-regexp-1.3-r1 70
 MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-jakarta-regexp-1.3-r2 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz/Vs/rLF9B432nYRAhyVAKCEf1tG7xdcXtseomJp/xXDE9FIKQCeJZ7o
-ZaHK3yui6j7WAZMMJimUK+k=
-=Iqsy
------END PGP SIGNATURE-----
diff --git a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r1 b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r1
deleted file mode 100644
index 804595133e20..000000000000
--- a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4322f82bea908ca4a7db270f7fa4850d jakarta-regexp-1.3.tar.gz 127069
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild
deleted file mode 100644
index 6619936b8b0c..000000000000
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild,v 1.2 2005/07/09 16:03:30 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="100% Pure Java Regular Expression package"
-SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/"
-SLOT="1.3"
-IUSE="doc jikes source"
-LICENSE="Apache-1.1"
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mkdir lib
-	sed -i 's:./jakarta-site2::' build.xml || die "sed failed"
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	cd ${S}/build
-	java-pkg_newjar ${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dohtml -r docs/api/*
-	use source && java-pkg_dosrc ${S}/src/java/*
-}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild
index 3e5f593ebdde..e1ca843915a0 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild,v 1.2 2005/07/09 16:03:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild,v 1.3 2005/08/07 12:42:13 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -11,7 +11,7 @@ SLOT="1.3"
 IUSE="doc jikes source"
 LICENSE="Apache-1.1"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
-DEPEND=">=virtual/jdk-1.3
+DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	jikes? ( dev-java/jikes )
 	source? ( app-arch/zip )"
@@ -20,6 +20,7 @@ RDEPEND=">=virtual/jre-1.3"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	rm *.jar
 	mkdir lib
 	sed -i 's:./jakarta-site2::' build.xml || die "sed failed"
 }