[gentoo-commits] proj/java:master commit in: dev-java/carol/, dev-java/carol/files/

[gentoo-commits] proj/java:master commit in: dev-java/carol/, dev-java/carol/files/

[James Le Cuirot]

commit:     46ece99949b0a7459be25350e0b25324a3444a0c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug  5 21:11:09 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 21:31:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=46ece999

[dev-java/carol] Drop, last release from 2005, dead SRC_URI

 dev-java/carol/ChangeLog                     |  7 ----
 dev-java/carol/Manifest                      |  1 -
 dev-java/carol/carol-2.0.5-r1.ebuild         | 58 ----------------------------
 dev-java/carol/files/carol-2.0.5-jikes.patch | 13 -------
 dev-java/carol/metadata.xml                  |  6 ---
 5 files changed, 85 deletions(-)

diff --git a/dev-java/carol/ChangeLog b/dev-java/carol/ChangeLog
deleted file mode 100644
index 66ab1f0..0000000
--- a/dev-java/carol/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog for dev-java/carol
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jan 2009; Alistair Bush <ali_bush@gentoo.org> ChangeLog:
-  Add ChangeLog for QA.
-

diff --git a/dev-java/carol/Manifest b/dev-java/carol/Manifest
deleted file mode 100644
index 13f5269..0000000
--- a/dev-java/carol/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST carol-2.0.5-src.tgz 8172755 SHA256 4d166fba793964ef0bc32e4ddfdf91c8a03d2bda931e4d7eb69f62a04213d46c

diff --git a/dev-java/carol/carol-2.0.5-r1.ebuild b/dev-java/carol/carol-2.0.5-r1.ebuild
deleted file mode 100644
index f9c0af3..0000000
--- a/dev-java/carol/carol-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="CAROL is a library allowing to use different RMI implementations."
-HOMEPAGE="http://carol.objectweb.org/"
-SRC_URI="http://download.fr2.forge.objectweb.org/${PN}/${MY_P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-collections
-	dev-java/commons-logging
-	=dev-java/irmi-1.0*
-	=dev-java/jacorb-2.2*
-	=dev-java/mx4j-3.0*
-	dev-java/velocity
-	dev-java/jgroups"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	
-	epatch ${FILESDIR}/${P}-jikes.patch
-	cd externals
-	rm *.jar
-	java-pkg_jar-from commons-collections
-	java-pkg_jar-from commons-logging commons-logging-api.jar
-	java-pkg_jar-from irmi-1.0
-	java-pkg_jar-from jacorb-2.2 jacorb.jar
-	java-pkg_jar-from mx4j-3.0 mx4j.jar
-	java-pkg_jar-from velocity
-	java-pkg_jar-from jgroups jgroups-core.jar
-}
-
-src_compile() {
-	eant jar $(use_doc jdoc -Ddist.jdoc=output/dist/api)
-	
-
-	# This is provided by irmi... TODO patch this
-	rm output/dist/lib/irmi.jar
-}
-
-src_install() {
-	java-pkg_dojar output/dist/lib/*.jar
-
-	use doc && java-pkg_dohtml -r output/dist/api
-}

diff --git a/dev-java/carol/files/carol-2.0.5-jikes.patch b/dev-java/carol/files/carol-2.0.5-jikes.patch
deleted file mode 100644
index 2a93594..0000000
--- a/dev-java/carol/files/carol-2.0.5-jikes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Files carol-2.0.5-src/externals/velocity-dep-1.4.jar and carol-2.0.5-src-patched/externals/velocity-dep-1.4.jar differ
-diff -ru carol-2.0.5-src/src/org/objectweb/carol/cmi/WeakCache.java carol-2.0.5-src-patched/src/org/objectweb/carol/cmi/WeakCache.java
---- carol-2.0.5-src/src/org/objectweb/carol/cmi/WeakCache.java	2005-05-25 07:19:47.000000000 -0400
-+++ carol-2.0.5-src-patched/src/org/objectweb/carol/cmi/WeakCache.java	2005-07-10 13:38:15.000000000 -0400
-@@ -78,7 +78,7 @@
-         public void run() {
-             while (true) {
-                 try {
--                    WeakRef wr = (WeakRef) rQueue.remove();
-+                    WeakCache.WeakRef wr = (WeakCache.WeakRef) rQueue.remove();
-                     wr.remove();
-                 } catch (InterruptedException e) {
-                     // Ignored

diff --git a/dev-java/carol/metadata.xml b/dev-java/carol/metadata.xml
deleted file mode 100644
index 604e0a4..0000000
--- a/dev-java/carol/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
-