New upstream version. Dont install a versioned jar any longer.

(Portage version: 2.0.51.22-r1)

5 files changed, 72 insertions, 26 deletions

diff --git a/dev-java/ecs/ChangeLog b/dev-java/ecs/ChangeLog
index 0b0bea99849c..df0c79b5ffbd 100644
--- a/dev-java/ecs/ChangeLog
+++ b/dev-java/ecs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2005/03/27 17:36:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.12 2005/06/12 18:27:52 luckyduck Exp $
+
+*ecs-1.4.2 (12 Jun 2005)
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> ecs-1.4.1-r1.ebuild,
+  +ecs-1.4.2.ebuild:
+  New upstream version. Dont install a versioned jar any longer.
 
   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.
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
index afc819ceee0f..43a9293cd12a 100644
--- a/dev-java/ecs/Manifest
+++ b/dev-java/ecs/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bb2708a83c4037733eec3682a777e377 ecs-1.4.1-r1.ebuild 1297
+MD5 afd16525cf947fb7eafc35e3aff649bc ecs-1.4.1-r1.ebuild 1258
+MD5 58667a56e358b766394a0a87ca39eeb2 ecs-1.4.2.ebuild 1276
 MD5 2e4085c7ba33c78c3024b4172e001bf6 ChangeLog 1279
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a9060f0311fe1863e9b4060dfda897f8 files/digest-ecs-1.4.1-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCTuPO06ebR+OMO78RAqzaAJ0RoA4Aeb8z/y7RuoBZhkeCC3kX7QCfaLLD
-Mo2rX3MgGMBWliDBUNrCSnk=
-=KdJ5
------END PGP SIGNATURE-----
+MD5 df482eb2495f04b61ed8242919fb8607 files/digest-ecs-1.4.2 66
diff --git a/dev-java/ecs/ecs-1.4.1-r1.ebuild b/dev-java/ecs/ecs-1.4.1-r1.ebuild
index 0e6e1faa9329..2042ba53f613 100644
--- a/dev-java/ecs/ecs-1.4.1-r1.ebuild
+++ b/dev-java/ecs/ecs-1.4.1-r1.ebuild
@@ -1,28 +1,30 @@
 # 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.5 2005/04/02 18:26:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ecs-1.4.1-r1.ebuild,v 1.6 2005/06/12 18:27:52 luckyduck Exp $
 
 inherit java-pkg
 
-DESCRIPTION="Java library to generate markup language text such as HTML and XML."
+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"
+SRC_URI="http://jakarta.apache.org/builds/jakarta-ecs/release/v${PV}/${P}.tar.gz"
+
 LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="doc jikes source"
+
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.4
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/jakarta-regexp-1.3*
-	>=dev-java/xerces-2.6.2-r1"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="doc jikes source"
+	=dev-java/xerces-2.6*"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/lib
-	rm -f *.jar
+
+	cd ${S}/lib && rm -f *.jar
 	java-pkg_jar-from xerces-2 xercesImpl.jar xerces.jar
 	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
 }
@@ -37,9 +39,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar bin/*.jar
 
-	if use doc; then
-		dodoc AUTHORS  COPYING  ChangeLog  INSTALL  README
-		java-pkg_dohtml -r docs/*
-	fi
+	dodoc AUTHORS ChangeLog INSTALL README
+	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/ecs/ecs-1.4.2.ebuild b/dev-java/ecs/ecs-1.4.2.ebuild
new file mode 100644
index 000000000000..846d4ee486da
--- /dev/null
+++ b/dev-java/ecs/ecs-1.4.2.ebuild
@@ -0,0 +1,47 @@
+# 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.2.ebuild,v 1.1 2005/06/12 18:27:52 luckyduck Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Java library to generate markup language text such as HTML and XML"
+HOMEPAGE="http://jakarta.apache.org/ecs"
+SRC_URI="mirror://apache/jakarta/ecs/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc jikes source"
+
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/jakarta-regexp-1.3*
+	=dev-java/xerces-2.6*"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/lib && rm -f *.jar
+	java-pkg_jar-from xerces-2 xercesImpl.jar xerces.jar
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
+}
+
+src_compile() {
+	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_newjar bin/${P}.jar ${PN}.jar
+
+	dodoc AUTHORS ChangeLog INSTALL README
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/ecs/files/digest-ecs-1.4.2 b/dev-java/ecs/files/digest-ecs-1.4.2
new file mode 100644
index 000000000000..7c4372dc69d5
--- /dev/null
+++ b/dev-java/ecs/files/digest-ecs-1.4.2
@@ -0,0 +1 @@
+MD5 55bf0cad9db51d30446b2ae8f83f7410 ecs-1.4.2-src.tar.gz 3435157