Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jigsaw/
Date: Tue, 01 Dec 2015 21:20:41
Message-Id: 1449004810.c374f97ab44de0ceabefcb5c631bfba3c994696c.monsieurp@gentoo
1 commit: c374f97ab44de0ceabefcb5c631bfba3c994696c
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 1 18:47:40 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 21:20:10 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c374f97a
7
8 dev-java/jigsaw: Clean up old.
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
12
13 dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild | 2 +-
14 dev-java/jigsaw/jigsaw-2.2.6.ebuild | 62 ----------------------------------
15 2 files changed, 1 insertion(+), 63 deletions(-)
16
17 diff --git a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
18 index a376501..58f4df3 100644
19 --- a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
20 +++ b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2012 Gentoo Foundation
23 +# Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27
28 diff --git a/dev-java/jigsaw/jigsaw-2.2.6.ebuild b/dev-java/jigsaw/jigsaw-2.2.6.ebuild
29 deleted file mode 100644
30 index db4345b..0000000
31 --- a/dev-java/jigsaw/jigsaw-2.2.6.ebuild
32 +++ /dev/null
33 @@ -1,62 +0,0 @@
34 -# Copyright 1999-2012 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=4
39 -
40 -JAVA_PKG_IUSE="doc source"
41 -
42 -# Jigsaw is actually a WWW server, it would be nice to package it as such, not
43 -# as a raw library like this ebuild does.
44 -
45 -inherit java-pkg-2 java-ant-2 eutils
46 -
47 -DESCRIPTION="W3 Consortium's Java-based Web server libraries"
48 -HOMEPAGE="http://jigsaw.w3.org/"
49 -SRC_URI="http://jigsaw.w3.org/Distrib/${PN}_${PV}.tar.bz2"
50 -
51 -LICENSE="W3C"
52 -SLOT="0"
53 -KEYWORDS="~amd64 ~x86"
54 -
55 -IUSE=""
56 -
57 -COMMON_DEP="dev-java/jakarta-oro:2.0
58 - java-virtuals/servlet-api:2.3
59 - dev-java/xerces:2
60 - dev-java/jtidy"
61 -
62 -RDEPEND=">=virtual/jre-1.5
63 - ${COMMON_DEP}"
64 -DEPEND=">=virtual/jdk-1.5
65 - app-arch/unzip
66 - ${COMMON_DEP}"
67 -
68 -EANT_DOC_TARGET="javadocs"
69 -
70 -S="${WORKDIR}/Jigsaw"
71 -
72 -src_prepare() {
73 - rm -f classes/*.jar
74 - mkdir -p "${S}/jars" || die "mkdir failed"
75 -
76 - epatch "${FILESDIR}/${P}-build.xml.patch"
77 -
78 - java-pkg_jar-from --into jars/ jakarta-oro-2.0
79 - java-pkg_jar-from --into jars/ servlet-api-2.3
80 - java-pkg_jar-from --into jars/ xerces-2
81 - java-pkg_jar-from --into jars/ jtidy
82 -
83 - cd jars/
84 - ln -s $(java-config --tools)
85 -}
86 -
87 -src_install() {
88 - java-pkg_dojar classes/jigsaw.jar
89 - java-pkg_dojar classes/jigadmin.jar
90 - java-pkg_dojar classes/jigedit.jar
91 -
92 - use doc && java-pkg_dojavadoc ant.build/javadocs
93 -
94 - dodoc ANNOUNCE README
95 -}