moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336. introduced support for the jikes and source useflag.

(Portage version: 2.0.51.19)

3 files changed, 26 insertions, 13 deletions

diff --git a/dev-java/ecs/ChangeLog b/dev-java/ecs/ChangeLog
index 4b68b21987ea..0b0bea99849c 100644
--- a/dev-java/ecs/ChangeLog
+++ b/dev-java/ecs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ecs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.10 2005/02/06 01:03:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.11 2005/03/27 17:36:54 luckyduck Exp $
+
+  27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> ecs-1.4.1-r1.ebuild:
+  moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336.
+  introduced support for the jikes and source useflag.
 
   06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ecs-1.4.1-r1.ebuild,
   -ecs-1.4.1.ebuild:
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
index 56a518eb58a8..95ce7ce2e7ee 100644
--- a/dev-java/ecs/Manifest
+++ b/dev-java/ecs/Manifest
@@ -1,4 +1,4 @@
-MD5 f9dd5237a94ce5a81c24b129bfdde5ec ecs-1.4.1-r1.ebuild 971
-MD5 63c09af27dc9a797a046bce57e0a7fee ChangeLog 1070
+MD5 b0c7e2c9c6ee441f20645bcf17d0ba80 ecs-1.4.1-r1.ebuild 1289
+MD5 49da79bd71c44de5ad20224e5dd2fbad ChangeLog 1279
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a9060f0311fe1863e9b4060dfda897f8 files/digest-ecs-1.4.1-r1 62
diff --git a/dev-java/ecs/ecs-1.4.1-r1.ebuild b/dev-java/ecs/ecs-1.4.1-r1.ebuild
index 7000e8af8557..1b0bb9cd742c 100644
--- a/dev-java/ecs/ecs-1.4.1-r1.ebuild
+++ b/dev-java/ecs/ecs-1.4.1-r1.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/ecs/ecs-1.4.1-r1.ebuild,v 1.3 2005/02/06 01:03:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ecs-1.4.1-r1.ebuild,v 1.4 2005/03/27 17:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -8,29 +8,38 @@ DESCRIPTION="Java library to generate markup language text such as HTML and XML.
 HOMEPAGE="http://jakarta.apache.org/ecs"
 SRC_URI="http://jakarta.apache.org/builds/jakarta-ecs/release/v${PV}/${PN}-${PV}.tar.gz"
 LICENSE="Apache-1.1"
-DEPEND="virtual/jdk
-	>=dev-java/ant-1.4
-	>=dev-java/regexp-1.2
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-core-1.4
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/regexp-1.3*
 	>=dev-java/xerces-2.6.2-r1"
-RDEPEND="virtual/jre"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="doc"
+IUSE="doc jikes source"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 	rm -f *.jar
 	java-pkg_jar-from xerces-2 xercesImpl.jar xerces.jar
-	java-pkg_jar-from regexp
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
 }
 
 src_compile() {
-	ant -f build/build-ecs.xml || die "compilation failed"
+	local antflags="jar"
+	use doc && antflags="${antflags} javadocs"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant -f build/build-ecs.xml ${antflags} || die "compilation failed"
 }
 
 src_install() {
 	java-pkg_dojar bin/*.jar
-	dodoc AUTHORS  COPYING  ChangeLog  INSTALL  README
-	use doc && java-pkg_dohtml -r docs/*
+
+	if use doc; then
+		dodoc AUTHORS  COPYING  ChangeLog  INSTALL  README
+		java-pkg_dohtml -r docs/*
+	fi
+	use source && java-pkg_dosrc src/java/*
 }