Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-java/oscache/
Date: Mon, 05 Sep 2016 13:54:20
Message-Id: 1473083632.5262aea492396684846af4a98904dac5b734a38a.mgorny@gentoo
1 commit: 5262aea492396684846af4a98904dac5b734a38a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 5 13:39:02 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 5 13:53:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5262aea4
7
8 dev-java/oscache: Remove last-rited pkg, #584562
9
10 dev-java/oscache/Manifest | 1 -
11 dev-java/oscache/metadata.xml | 8 ----
12 dev-java/oscache/oscache-2.0.2-r3.ebuild | 71 --------------------------------
13 profiles/package.mask | 5 ---
14 4 files changed, 85 deletions(-)
15
16 diff --git a/dev-java/oscache/Manifest b/dev-java/oscache/Manifest
17 deleted file mode 100644
18 index def7313..00000000
19 --- a/dev-java/oscache/Manifest
20 +++ /dev/null
21 @@ -1 +0,0 @@
22 -DIST oscache-2.0.2-full.zip 2533146 SHA256 d909d10aec024d9f53475030843afbb3c3bd18ee1a77b3e9e486a6f0fb336d52 SHA512 18799280bd81506a610659d8e8fb4a1405ff32d1275a227c6306d5197cf3ba8d907227cbbfec4bb570ab7e9fe6342828fd42702644cf19a51e1c66bba8d11cd3 WHIRLPOOL d35959a4c996d000c28d2f5f28f8c527f3a08283912a2a949d1577768d074e1e2517b6ef7b122aee0366e9d723187dc9572acd6b800cb7f13633a1824b4b4b51
23
24 diff --git a/dev-java/oscache/metadata.xml b/dev-java/oscache/metadata.xml
25 deleted file mode 100644
26 index 952a4b9..00000000
27 --- a/dev-java/oscache/metadata.xml
28 +++ /dev/null
29 @@ -1,8 +0,0 @@
30 -<?xml version="1.0" encoding="UTF-8"?>
31 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
32 -<pkgmetadata>
33 - <maintainer type="project">
34 - <email>java@g.o</email>
35 - <name>Java</name>
36 - </maintainer>
37 -</pkgmetadata>
38
39 diff --git a/dev-java/oscache/oscache-2.0.2-r3.ebuild b/dev-java/oscache/oscache-2.0.2-r3.ebuild
40 deleted file mode 100644
41 index f2d852c..00000000
42 --- a/dev-java/oscache/oscache-2.0.2-r3.ebuild
43 +++ /dev/null
44 @@ -1,71 +0,0 @@
45 -# Copyright 1999-2014 Gentoo Foundation
46 -# Distributed under the terms of the GNU General Public License v2
47 -# $Id$
48 -
49 -EAPI="2"
50 -JAVA_PKG_IUSE="doc"
51 -
52 -inherit java-pkg-2
53 -
54 -DESCRIPTION="OSCache is a widely used, high performance J2EE caching framework"
55 -SRC_URI="https://oscache.dev.java.net/files/documents/629/2653/${P}-full.zip"
56 -HOMEPAGE="http://www.opensymphony.com/oscache/"
57 -LICENSE="Apache-2.0"
58 -SLOT="0"
59 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
60 -COMMON_DEP="
61 - dev-java/commons-collections
62 - dev-java/commons-logging
63 - java-virtuals/servlet-api:2.3
64 - java-virtuals/jms
65 - dev-java/jgroups"
66 -RDEPEND=">=virtual/jre-1.3
67 - ${COMMON_DEP}"
68 -DEPEND=">=virtual/jdk-1.3
69 - ${COMMON_DEP}
70 - app-arch/unzip"
71 -IUSE=""
72 -
73 -S=${WORKDIR}
74 -
75 -java_prepare() {
76 - find . -name "*.jar" -print -delete || die
77 -}
78 -
79 -src_compile() {
80 - local build_dir="${S}"/build
81 - local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servlet-api-2.3,jms,jgroups):${build_dir}:."
82 - mkdir ${build_dir}
83 -
84 - echo "Building core..."
85 - cd "${S}"/src/core/java
86 - ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
87 -
88 - echo "Building cluster support plugin..."
89 - cd "${S}"/src/plugins/clustersupport/java
90 - find . -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
91 - ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
92 -
93 - echo "Building disk persistence plugin..."
94 - cd "${S}"/src/plugins/diskpersistence/java
95 - ejavac ${classpath} -nowarn -d ${build_dir} `find . -name "*.java"` || die "compile failed"
96 -
97 - if use doc ; then
98 - echo "Building documentation..."
99 - mkdir "${S}"/javadoc
100 - cd ${build_dir}
101 - local sourcepath="${S}/src/core/java:${S}/src/plugins/diskpersistence/java:${S}/src/plugins/clustersupport/java"
102 - javadoc ${classpath} -sourcepath ${sourcepath} -d "${S}"/javadoc \
103 - $(find com/opensymphony/oscache -type d | tr '/' '.') \
104 - || die "failed to create javadoc"
105 - fi
106 -
107 - cd "${S}"
108 - jar cf ${PN}.jar -C build . || die "jar failed"
109 -}
110 -
111 -src_install() {
112 - java-pkg_dojar *.jar
113 - dodoc readme.txt
114 - use doc && java-pkg_dojavadoc javadoc
115 -}
116
117 diff --git a/profiles/package.mask b/profiles/package.mask
118 index bcdf73b..d769f0f 100644
119 --- a/profiles/package.mask
120 +++ b/profiles/package.mask
121 @@ -641,11 +641,6 @@ dev-perl/Test-Tester
122 # experimental features and accept a more unstable release.
123 >=www-client/chromium-54
124
125 -# Patrice Clement <monsieurp@g.o> (31 Jul 2016)
126 -# Upstream is dead and the ebuild is a complete mess. Does not compile with
127 -# recent JVMs. Masked for removal in 30 days. See bug #584562.
128 -dev-java/oscache
129 -
130 # Michał Górny <mgorny@g.o> (18 Jul 2016)
131 # Pre-release of a complete rewrite, provided for early testing. Not all
132 # functionality is provided yet. Use --pretend to make sure correct