Cleaned up the ebuild and fixed javadoc installation.

(Portage version: 2.1.2_rc2-r3)

4 files changed, 62 insertions, 7 deletions

diff --git a/dev-java/jakarta-regexp/ChangeLog b/dev-java/jakarta-regexp/ChangeLog
index 1642179c2b96..1aa007b46a31 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.15 2006/12/03 18:06:21 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.16 2006/12/03 18:18:25 betelgeuse Exp $
+
+*jakarta-regexp-1.4-r1 (03 Dec 2006)
+
+  03 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  jakarta-regexp-1.4.ebuild, +jakarta-regexp-1.4-r1.ebuild:
+  Cleaned up the ebuild and fixed javadoc installation.
 
 *jakarta-regexp-1.3-r4 (03 Dec 2006)
 
diff --git a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.4-r1 b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.4-r1
new file mode 100644
index 000000000000..ef47cc8a752b
--- /dev/null
+++ b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.4-r1
@@ -0,0 +1,3 @@
+MD5 d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz 137768
+RMD160 720c3443963b141d76333d9f7aab70624f903ee3 jakarta-regexp-1.4.tar.gz 137768
+SHA256 c4e34004123f4f72f5cac293795f3c547691baa5cdfcd1198852d525e3cdc563 jakarta-regexp-1.4.tar.gz 137768
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
new file mode 100644
index 000000000000..9fc98391dea3
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 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.4-r1.ebuild,v 1.1 2006/12/03 18:18:25 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+SLOT="1.4"
+IUSE="doc source"
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm *.jar
+	mkdir lib
+}
+
+src_compile() {
+	eant $(use_doc javadocs) jar
+}
+
+src_install() {
+	cd "${S}/build"
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	cd "${S}"
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+		java-pkg_dohtml docs/*.html
+		dodoc docs/*.txt
+	fi
+
+	use source && java-pkg_dosrc ${S}/src/java/*
+}
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild
index 7daa53cefa58..2003120e092d 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4.ebuild,v 1.4 2006/10/05 17:20:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild,v 1.5 2006/12/03 18:18:25 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -24,15 +24,19 @@ src_unpack() {
 }
 
 src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-	eant ${antflags} || die "compile problem"
+	eant $(use_doc javadocs) jar
 }
 
 src_install() {
-	cd ${S}/build
+	cd "${S}/build"
 	java-pkg_newjar ${P}.jar ${PN}.jar
+	cd "${S}"
+
+	if use doc; then
+		java-pkg_dojavadoc docs/api
+		java-pkg_dohtml docs/*.html
+		dodoc docs/*.txt
+	fi
 
-	use doc && java-pkg_dohtml -r docs/api/*
 	use source && java-pkg_dosrc ${S}/src/java/*
 }