New upstream release. Fixes #72853.

4 files changed, 77 insertions, 14 deletions

diff --git a/dev-java/cocoon/ChangeLog b/dev-java/cocoon/ChangeLog
index 286440df7a1c..609849e37525 100644
--- a/dev-java/cocoon/ChangeLog
+++ b/dev-java/cocoon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/cocoon
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.5 2004/11/29 08:58:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/ChangeLog,v 1.6 2004/12/19 00:15:21 karltk Exp $
+
+*cocoon-2.1.6 (19 Dec 2004)
+
+  19 Dec 2004; <karltk@gentoo.org> +cocoon-2.1.6.ebuild:
+  New upstream release. Fixes #72853.
 
 *cocoon-2.1.5.1 (21 Oct 2004)
 
diff --git a/dev-java/cocoon/Manifest b/dev-java/cocoon/Manifest
index 0fdcff5e0b25..60d5360480be 100644
--- a/dev-java/cocoon/Manifest
+++ b/dev-java/cocoon/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ba4d2861ca0b1082d319ecab37f9e0db ChangeLog 2757
 MD5 670cc021c2ff8dc61c4903480d2f08ef cocoon-2.1.4.ebuild 1886
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 2fe6e54033fdc4a8306b9d103543edad cocoon-2.1.6.ebuild 1890
 MD5 c0ba4b84b1e22a681896fb4a71f009b7 cocoon-2.1.5.1.ebuild 1890
+MD5 ba4d2861ca0b1082d319ecab37f9e0db ChangeLog 2757
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 4d2b324e1a75765047279e1f1ab664d0 files/cocoon.properties 15046
+MD5 74fd7843c1c4ec683c7c4c36d78e164d files/digest-cocoon-2.1.5.1 72
 MD5 feb46c8882b1927440e2f11e132eb22b files/digest-cocoon-2.1.4 70
+MD5 64a2711e00dea02883b045891dd66070 files/digest-cocoon-2.1.6 70
 MD5 54c9c8347c6bf0f8d996be4c4a6144bf files/web.xml 826
-MD5 74fd7843c1c4ec683c7c4c36d78e164d files/digest-cocoon-2.1.5.1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBquTaArHZZzCEUG0RAr1nAJ91q1tlEPOiRraugZRxFp2GzRbbowCdEoSC
-I7M8OP+6nw1YKQ8e3tXcbiE=
-=kcvm
------END PGP SIGNATURE-----
diff --git a/dev-java/cocoon/cocoon-2.1.6.ebuild b/dev-java/cocoon/cocoon-2.1.6.ebuild
new file mode 100644
index 000000000000..6249de332354
--- /dev/null
+++ b/dev-java/cocoon/cocoon-2.1.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cocoon/cocoon-2.1.6.ebuild,v 1.1 2004/12/19 00:15:21 karltk Exp $
+
+inherit java-pkg
+
+DESCRIPTION="A Web Publishing Framework for Apache"
+HOMEPAGE="http://cocoon.apache.org/"
+SRC_URI="mirror://apache/cocoon/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-1.5.3"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	echo -e "# Gentoo build properties" > local.build.properties
+	if ! use doc; then
+		echo -e "exclude.javadocs=true\n" >> local.build.properties
+		echo -e "exclude.webapp.javadocs=true\n" >> local.build.properties
+		echo -e "exclude.webapp.documentation=true\n" >> local.build.properties
+		echo -e "exclude.idldocs=true\n" >> local.build.properties
+		echo -e "exclude.webapp.idldocs=true\n" >> local.build.properties
+	fi
+}
+
+src_compile() {
+	sh build.sh war standalone-demo || die
+}
+
+src_install() {
+	java-pkg_dowar build/${P}/${PN}.war
+	java-pkg_dojar build/${P}/cocoon.jar
+	JARDESTTREE=lib/core java-pkg_dojar lib/core/*.jar
+	insinto /usr/share/${PN}/lib
+	doins ${S}/build/${P}/cocoon-*.jar ${S}/lib/jars.xml
+	for i in endorsed optional local; do
+		dodir /usr/share/${PN}/lib/${i}
+		insinto /usr/share/${PN}/lib/${i}
+		doins ${S}/lib/${i}/*
+	done
+
+	dodoc CREDITS.txt INSTALL.txt KEYS README.txt
+	docinto legal
+	dodoc legal/*
+
+	docinto api
+	use doc && java-pkg_dohtml -r build/webapp/api/*
+}
+
+pkg_postinst() {
+	einfo "This ebuild does no longer install the Cocoon webapp into"
+	einfo "any servlet container anymore. Copy /usr/share/${PN}/webapps/${PN}.war"
+	einfo "to your servlet container's webapps directory and restart the"
+	einfo "server."
+	einfo
+	ewarn "Note: To run in Tomcat its version has to be >= 4.0.4"
+}
diff --git a/dev-java/cocoon/files/digest-cocoon-2.1.6 b/dev-java/cocoon/files/digest-cocoon-2.1.6
new file mode 100644
index 000000000000..ca2af137209f
--- /dev/null
+++ b/dev-java/cocoon/files/digest-cocoon-2.1.6
@@ -0,0 +1 @@
+MD5 d7a3a5b2c89452df95f85eeb031bbbae cocoon-2.1.6-src.tar.gz 44430985