Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/cocoon/
Date: Fri, 28 Aug 2015 20:02:42
Message-Id: 1440791548.e9d12d6db8a21162d22246c1d4466bd109f86a83.chewi@gentoo
1 commit: e9d12d6db8a21162d22246c1d4466bd109f86a83
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 19:52:28 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 19:52:28 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d12d6d
7
8 dev-java/cocoon: Removal wrt bug #423761
9
10 Holding back the removal of Java 6 and upstream is on life support.
11
12 dev-java/cocoon/Manifest | 1 -
13 dev-java/cocoon/cocoon-2.1.11.ebuild | 70 ------------------------------------
14 dev-java/cocoon/metadata.xml | 5 ---
15 3 files changed, 76 deletions(-)
16
17 diff --git a/dev-java/cocoon/Manifest b/dev-java/cocoon/Manifest
18 deleted file mode 100644
19 index a944626..0000000
20 --- a/dev-java/cocoon/Manifest
21 +++ /dev/null
22 @@ -1 +0,0 @@
23 -DIST cocoon-2.1.11-src.tar.gz 48674390 SHA256 4b1d9f8ebd75d6228b3d76802941a8f41bfc0836c21d9d8cab764521c800a60c SHA512 5893f44d2c4ce0e29397da69db3d09f8a10b267b105d899122958b238d7651a4973b1af980e4c9d0e3656fd76d61e7610b57dc694d5d3a2964ea6c58c6df113e WHIRLPOOL 1c6ef78ae6d477da6c67ac2e12418a0a72290750a5ff46d09405d00629dc502b07c0d4c02ae32f1045bd6ce256b109bb7b5e8af8b6725823578b7ea69fb558aa
24
25 diff --git a/dev-java/cocoon/cocoon-2.1.11.ebuild b/dev-java/cocoon/cocoon-2.1.11.ebuild
26 deleted file mode 100644
27 index c9baffa..0000000
28 --- a/dev-java/cocoon/cocoon-2.1.11.ebuild
29 +++ /dev/null
30 @@ -1,70 +0,0 @@
31 -# Copyright 1999-2008 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -# $Id$
34 -
35 -JAVA_PKG_IUSE="doc"
36 -
37 -inherit java-pkg-2 java-ant-2
38 -
39 -DESCRIPTION="A Web Publishing Framework for Apache"
40 -HOMEPAGE="http://cocoon.apache.org/"
41 -SRC_URI="mirror://apache/cocoon/${P}-src.tar.gz"
42 -
43 -LICENSE="Apache-1.1"
44 -SLOT="0"
45 -KEYWORDS="~x86 ~ppc ~amd64"
46 -IUSE=""
47 -
48 -DEPEND=">=virtual/jdk-1.5"
49 -RDEPEND=">=virtual/jre-1.5"
50 -
51 -# I know this way of building cocoon is not the best, it will be fixed for
52 -# cocoon-2.2
53 -
54 -src_unpack() {
55 - unpack ${A}
56 -
57 - cd "${S}"
58 - echo "# Gentoo build properties" > local.build.properties
59 - if ! use doc; then
60 - echo "exclude.javadocs=true" >> local.build.properties
61 - echo "exclude.webapp.javadocs=true" >> local.build.properties
62 - echo "exclude.webapp.documentation=true" >> local.build.properties
63 - echo "exclude.idldocs=true" >> local.build.properties
64 - echo "exclude.webapp.idldocs=true" >> local.build.properties
65 - fi
66 - java-ant_bsfix_files tools/targets/*-build.xml
67 - sed -i -e 's/maxmemory="192m"/maxmemory="384m"/' tools/src/blocks-build.xsl
68 -}
69 -
70 -src_compile() {
71 - sh build.sh war standalone-demo javadocs || die
72 -}
73 -
74 -src_install() {
75 - java-pkg_dowar build/${PN}/${PN}.war
76 - java-pkg_dojar build/${PN}/cocoon.jar
77 - java-pkg_jarinto /usr/share/${PN}/lib/core/
78 - java-pkg_dojar lib/core/*.jar
79 - insinto /usr/share/${PN}/lib
80 - doins "${S}/build/${PN}"/cocoon-*.jar "${S}/lib/jars.xml"
81 - for i in endorsed optional local; do
82 - dodir /usr/share/${PN}/lib/${i}
83 - insinto /usr/share/${PN}/lib/${i}
84 - doins "${S}/lib/${i}"/*
85 - done
86 -
87 - dodoc CREDITS.txt INSTALL.txt KEYS README.txt || die
88 -
89 - use doc && java-pkg_dojavadoc build/cocoon/javadocs
90 -
91 - docinto legal
92 - dodoc legal/*
93 -}
94 -
95 -pkg_postinst() {
96 - elog "This ebuild does no longer install the Cocoon webapp into"
97 - elog "any servlet container anymore. Copy /usr/share/${PN}/webapps/${PN}.war"
98 - elog "to your servlet container's webapps directory and restart the"
99 - elog "server."
100 -}
101
102 diff --git a/dev-java/cocoon/metadata.xml b/dev-java/cocoon/metadata.xml
103 deleted file mode 100644
104 index 838c00a..0000000
105 --- a/dev-java/cocoon/metadata.xml
106 +++ /dev/null
107 @@ -1,5 +0,0 @@
108 -<?xml version="1.0" encoding="UTF-8"?>
109 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
110 -<pkgmetadata>
111 -<herd>java</herd>
112 -</pkgmetadata>