From 5262aea492396684846af4a98904dac5b734a38a Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 5 Sep 2016 15:39:02 +0200
Subject: dev-java/oscache: Remove last-rited pkg, #584562

---
 dev-java/oscache/Manifest                |  1 -
 dev-java/oscache/metadata.xml            |  8 ----
 dev-java/oscache/oscache-2.0.2-r3.ebuild | 71 --------------------------------
 profiles/package.mask                    |  5 ---
 4 files changed, 85 deletions(-)
 delete mode 100644 dev-java/oscache/Manifest
 delete mode 100644 dev-java/oscache/metadata.xml
 delete mode 100644 dev-java/oscache/oscache-2.0.2-r3.ebuild

diff --git a/dev-java/oscache/Manifest b/dev-java/oscache/Manifest
deleted file mode 100644
index def73131079c..000000000000
--- a/dev-java/oscache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST oscache-2.0.2-full.zip 2533146 SHA256 d909d10aec024d9f53475030843afbb3c3bd18ee1a77b3e9e486a6f0fb336d52 SHA512 18799280bd81506a610659d8e8fb4a1405ff32d1275a227c6306d5197cf3ba8d907227cbbfec4bb570ab7e9fe6342828fd42702644cf19a51e1c66bba8d11cd3 WHIRLPOOL d35959a4c996d000c28d2f5f28f8c527f3a08283912a2a949d1577768d074e1e2517b6ef7b122aee0366e9d723187dc9572acd6b800cb7f13633a1824b4b4b51
diff --git a/dev-java/oscache/metadata.xml b/dev-java/oscache/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/oscache/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/oscache/oscache-2.0.2-r3.ebuild b/dev-java/oscache/oscache-2.0.2-r3.ebuild
deleted file mode 100644
index f2d852cf605a..000000000000
--- a/dev-java/oscache/oscache-2.0.2-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2
-
-DESCRIPTION="OSCache is a widely used, high performance J2EE caching framework"
-SRC_URI="https://oscache.dev.java.net/files/documents/629/2653/${P}-full.zip"
-HOMEPAGE="http://www.opensymphony.com/oscache/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-COMMON_DEP="
-		dev-java/commons-collections
-		dev-java/commons-logging
-		java-virtuals/servlet-api:2.3
-		java-virtuals/jms
-		dev-java/jgroups"
-RDEPEND=">=virtual/jre-1.3
-		${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.3
-		${COMMON_DEP}
-		app-arch/unzip"
-IUSE=""
-
-S=${WORKDIR}
-
-java_prepare() {
-	find . -name "*.jar" -print -delete || die
-}
-
-src_compile() {
-	local build_dir="${S}"/build
-	local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servlet-api-2.3,jms,jgroups):${build_dir}:."
-	mkdir ${build_dir}
-
-	echo "Building core..."
-	cd "${S}"/src/core/java
-	ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
-
-	echo "Building cluster support plugin..."
-	cd "${S}"/src/plugins/clustersupport/java
-	find . -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
-	ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
-
-	echo "Building disk persistence plugin..."
-	cd "${S}"/src/plugins/diskpersistence/java
-	ejavac ${classpath} -nowarn -d ${build_dir} `find . -name "*.java"` || die "compile failed"
-
-	if use doc ; then
-		echo "Building documentation..."
-		mkdir "${S}"/javadoc
-		cd ${build_dir}
-		local sourcepath="${S}/src/core/java:${S}/src/plugins/diskpersistence/java:${S}/src/plugins/clustersupport/java"
-		javadoc ${classpath} -sourcepath ${sourcepath} -d "${S}"/javadoc \
-			$(find com/opensymphony/oscache -type d | tr '/' '.') \
-			|| die "failed to create javadoc"
-	fi
-
-	cd "${S}"
-	jar cf ${PN}.jar -C build . || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	dodoc readme.txt
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index bcdf73b174aa..d769f0fab948 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -641,11 +641,6 @@ dev-perl/Test-Tester
 # experimental features and accept a more unstable release.
 >=www-client/chromium-54
 
-# Patrice Clement <monsieurp@gentoo.org> (31 Jul 2016)
-# Upstream is dead and the ebuild is a complete mess. Does not compile with
-# recent JVMs. Masked for removal in 30 days. See bug #584562.
-dev-java/oscache
-
 # Michał Górny <mgorny@gentoo.org> (18 Jul 2016)
 # Pre-release of a complete rewrite, provided for early testing. Not all
 # functionality is provided yet. Use --pretend to make sure correct
-- 
cgit v1.2.3-65-gdbad