Huge version bump. Closes #39621

6 files changed, 86 insertions, 6 deletions

diff --git a/net-www/cocoon/ChangeLog b/net-www/cocoon/ChangeLog
index f051f8fb27c0..582d886227ac 100644
--- a/net-www/cocoon/ChangeLog
+++ b/net-www/cocoon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/cocoon
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/ChangeLog,v 1.8 2003/02/12 08:46:57 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/ChangeLog,v 1.9 2004/03/12 03:16:28 zx Exp $
+
+*cocoon-2.1.4 (11 Mar 2004)
+
+  11 Mar 2004; Chris Aniszczyk <zx@gentoo.org> cocoon-2.1.4.ebuild:
+  Version bump. Lots of changes.
+  Thanks to Joerg Schaible <joerg.schaible@gmx.de> for the ebuild. Closes #39621
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/net-www/cocoon/Manifest b/net-www/cocoon/Manifest
index b83234be655b..c3deb059051c 100644
--- a/net-www/cocoon/Manifest
+++ b/net-www/cocoon/Manifest
@@ -1,6 +1,8 @@
+MD5 7234b20bc044b88696ff2b383b5f116d cocoon-2.1.4.ebuild 2034
+MD5 c0ccd972083c17009966a6a9297ea18f cocoon-2.0.2.ebuild 2149
+MD5 06cc00c55b9935595f62bebf7d44ba66 ChangeLog 1471
 MD5 4d2b324e1a75765047279e1f1ab664d0 files/cocoon.properties 15046
 MD5 2866a11bf629c74f1758a1ee091c44e5 files/digest-cocoon-2.0.2 70
+MD5 feb46c8882b1927440e2f11e132eb22b files/digest-cocoon-2.1.4 70
 MD5 54c9c8347c6bf0f8d996be4c4a6144bf files/web.xml 826
 MD5 bdc0e4cb4618c54ec5d1d80b90938832 files/cocoon-2.0.2.patch 804
-MD5 3ee22f046d76c37056f35d71d63e86cb cocoon-2.0.2.ebuild 2150
-MD5 28371e596309d30bf4111b36e5809399 ChangeLog 1472
diff --git a/net-www/cocoon/cocoon-2.0.2.ebuild b/net-www/cocoon/cocoon-2.0.2.ebuild
index 102a916cde4b..d0f5edfdfae6 100644
--- a/net-www/cocoon/cocoon-2.0.2.ebuild
+++ b/net-www/cocoon/cocoon-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/cocoon-2.0.2.ebuild,v 1.12 2003/09/08 08:19:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/cocoon-2.0.2.ebuild,v 1.13 2004/03/12 03:16:28 zx Exp $
 
 DESCRIPTION="A Web Publishing Framework for Apache"
 HOMEPAGE="http://xml.apache.org/cocoon/"
diff --git a/net-www/cocoon/cocoon-2.1.4.ebuild b/net-www/cocoon/cocoon-2.1.4.ebuild
new file mode 100644
index 000000000000..ac9f678b0fd1
--- /dev/null
+++ b/net-www/cocoon/cocoon-2.1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/cocoon-2.1.4.ebuild,v 1.1 2004/03/12 03:16:28 zx 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"
+IUSE="doc"
+IUSE="doc jikes"
+
+DEPEND=">=virtual/jdk-1.4
+		>=dev-java/ant-1.5.3
+		jikes? ( >dev-java/jikes-1.18 )"
+RDEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	echo -e "# Gentoo build properties" > local.build.properties
+	use jikes && echo -e "compiler=jikes\n" >> local.build.properties
+	[ ! `use doc` ] && echo -e "exclude.javadocs=true\n" >> local.build.properties
+	[ ! `use doc` ] && echo -e "exclude.webapp.javadocs=true\n" >> local.build.properties
+	[ ! `use doc` ] && echo -e "exclude.webapp.documentation=true\n" >> local.build.properties
+	[ ! `use doc` ] && echo -e "exclude.idldocs=true\n" >> local.build.properties
+	[ ! `use doc` ] && echo -e "exclude.webapp.idldocs=true\n" >> local.build.properties
+}
+
+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 && 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/net-www/cocoon/files/digest-cocoon-2.1.4 b/net-www/cocoon/files/digest-cocoon-2.1.4
new file mode 100644
index 000000000000..6aed4386a028
--- /dev/null
+++ b/net-www/cocoon/files/digest-cocoon-2.1.4
@@ -0,0 +1 @@
+MD5 65a099094217ef0621e832ad5aa1cfc9 cocoon-2.1.4-src.tar.gz 38577140
diff --git a/net-www/cocoon/metadata.xml b/net-www/cocoon/metadata.xml
new file mode 100644
index 000000000000..838c00a4a448
--- /dev/null
+++ b/net-www/cocoon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+</pkgmetadata>