[gentoo-commits] proj/java:master commit in: dev-java/cornerstone-sockets/files/, dev-java/cornerstone-connection/files/, ...

[James Le Cuirot]

commit:     17ebdd9ebc0a64ddaf5c94c2686a08e97da762ea
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jul 30 15:49:03 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 16:14:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=17ebdd9e

[dev-java/cornerstone-*] Drop only rdep of Apache Excalibur

 dev-java/cornerstone-connection/ChangeLog          | 24 -------------
 dev-java/cornerstone-connection/Manifest           |  2 --
 .../cornerstone-connection-2.1.ebuild              | 40 ----------------------
 .../cornerstone-connection/files/build.xml.patch   | 24 -------------
 dev-java/cornerstone-connection/metadata.xml       |  5 ---
 dev-java/cornerstone-sockets/ChangeLog             | 20 -----------
 dev-java/cornerstone-sockets/Manifest              |  2 --
 .../cornerstone-sockets-2.1.ebuild                 | 33 ------------------
 dev-java/cornerstone-sockets/files/build.xml.patch | 15 --------
 dev-java/cornerstone-sockets/metadata.xml          |  5 ---
 dev-java/cornerstone-threads/ChangeLog             | 24 -------------
 dev-java/cornerstone-threads/Manifest              |  2 --
 .../cornerstone-threads-2.1.ebuild                 | 30 ----------------
 dev-java/cornerstone-threads/files/build.xml.patch | 24 -------------
 dev-java/cornerstone-threads/metadata.xml          |  5 ---
 15 files changed, 255 deletions(-)

diff --git a/dev-java/cornerstone-connection/ChangeLog b/dev-java/cornerstone-connection/ChangeLog
deleted file mode 100644
index 8e3f55a..0000000
--- a/dev-java/cornerstone-connection/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for dev-java/cornerstone-connection
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jan 2009; Alistair Bush <ali_bush@g.o>
-  cornerstone-connection-2.1.ebuild:
-  QA Fixes.
-
-  26 May 2007; kiorky <kiorky@××××××××××.net>
-  cornerstone-connection-2.1.ebuild:
-  update according to excalibur eclass changes
-
-  26 May 2007; kiorky <kiorky@××××××××××.net>
-  cornerstone-connection-2.1.ebuild, files/build.xml.patch:
-  fix patches
-
-  26 May 2007; Vlastimil Babka <caster@g.o>
-  cornerstone-connection-2.1.ebuild:
-  Fix typo in RDEPEND.
-
-  24 Apr 2007; kiorky <kiorky@××××××××××.net>
-  +cornerstone-connection-2.1.ebuild, +files/build.xml.patch, +metadata.xml:
-  added  to the java-overlay as a maven dependency.see #175839
-

diff --git a/dev-java/cornerstone-connection/Manifest b/dev-java/cornerstone-connection/Manifest
deleted file mode 100644
index bede4e1..0000000
--- a/dev-java/cornerstone-connection/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cornerstone-connection-api-2.1-src.tar.gz 7117 SHA256 d7e0d6a4a2c4f1c2134c34319993e954b701f66f078e328e95f0f4ff1b0903d9
-DIST cornerstone-connection-impl-2.1-src.tar.gz 12046 SHA256 7135239b39998e3dd1ae9e36c3ac117be6db76fadc7aee8696b52ba02533d011

diff --git a/dev-java/cornerstone-connection/cornerstone-connection-2.1.ebuild b/dev-java/cornerstone-connection/cornerstone-connection-2.1.ebuild
deleted file mode 100644
index b18416c..0000000
--- a/dev-java/cornerstone-connection/cornerstone-connection-2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EXCALIBUR_MODULES="
-	${PN}-api
-	${PN}-impl"
-
-EXCALIBUR_MODULE_USES_PV="false"
-
-EXCALIBUR_TESTS="true"
-
-inherit excalibur-multi
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="=www-servers/jetty-5*
-	dev-java/tomcat-jasper
-	dev-java/plexus-component-api
-	dev-java/plexus-utils
-	dev-java/cornerstone-threads
-	dev-java/cornerstone-sockets
-	=dev-java/avalon-framework-4.2*
-	dev-java/junit
-	dev-java/commons-logging
-	dev-java/junitperf
-	dev-java/excalibur-thread"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-EXCALIBUR_JAR_FROM="avalon-framework-4.2 commons-logging jetty-5 tomcat-jasper-2 plexus-component-api excalibur-thread cornerstone-threads cornerstone-sockets"
-
-EXCALIBUR_TEST_JAR_FROM="junit junitperf"
-
-src_unpack(){
-	excalibur-multi_src_unpack "${FILESDIR}/build.xml.patch"
-}

diff --git a/dev-java/cornerstone-connection/files/build.xml.patch b/dev-java/cornerstone-connection/files/build.xml.patch
deleted file mode 100644
index ad3f834..0000000
--- a/dev-java/cornerstone-connection/files/build.xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru old/cornerstone-connection-impl-2.1/build.xml new/cornerstone-connection-impl-2.1/build.xml
---- old/cornerstone-connection-impl-2.1/build.xml	2007-05-26 11:07:24.914496473 +0200
-+++ new/cornerstone-connection-impl-2.1/build.xml	2007-05-26 11:08:04.242098433 +0200
-@@ -46,6 +46,13 @@
-       </src>
-       <classpath refid="build.classpath">
-       </classpath>
-+                  <classpath >
-+              <fileset dir="../.." >
-+                                      <include name="**/*.jar" >
-+                                                      </include>
-+                              </fileset>
-+       </classpath>
-+
-     </javac>
-     <copy todir="${classesdir}">
-       <fileset dir=".">
-@@ -171,4 +178,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ Pas de fin de ligne à la fin du fichier.
-+</project>

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

diff --git a/dev-java/cornerstone-sockets/ChangeLog b/dev-java/cornerstone-sockets/ChangeLog
deleted file mode 100644
index 43ae02d..0000000
--- a/dev-java/cornerstone-sockets/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-# ChangeLog for dev-java/cornerstone-sockets
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jan 2009; Alistair Bush <ali_bush@g.o>
-  cornerstone-sockets-2.1.ebuild:
-  QA Fixes.
-
-  26 May 2007; kiorky <kiorky@××××××××××.net>
-  cornerstone-sockets-2.1.ebuild:
-  update according to excalibur eclass changes
-
-  26 May 2007; Vlastimil Babka <caster@g.o>
-  cornerstone-sockets-2.1.ebuild:
-  Fix typo in RDEPEND.
-
-  24 Apr 2007; kiorky <kiorky@××××××××××.net>
-  +cornerstone-sockets-2.1.ebuild, +files/build.xml.patch, +metadata.xml:
-  added  to the java-overlay as a maven dependency.see #175838
-

diff --git a/dev-java/cornerstone-sockets/Manifest b/dev-java/cornerstone-sockets/Manifest
deleted file mode 100644
index 7eddfa2..0000000
--- a/dev-java/cornerstone-sockets/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cornerstone-sockets-api-2.1-src.tar.gz 6572 SHA256 faacaf766705a2a7410d724b803f20376dd8b9e69043ebbc5a6ef6785c7c7f58
-DIST cornerstone-sockets-impl-2.1-src.tar.gz 14233 SHA256 eec84fe0d45accf02002e03cb44aae786c91a9b63b061695d68aba9e1b29d3c1

diff --git a/dev-java/cornerstone-sockets/cornerstone-sockets-2.1.ebuild b/dev-java/cornerstone-sockets/cornerstone-sockets-2.1.ebuild
deleted file mode 100644
index c45699e..0000000
--- a/dev-java/cornerstone-sockets/cornerstone-sockets-2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EXCALIBUR_MODULES="
-	${PN}-api
-	${PN}-impl"
-
-EXCALIBUR_MODULE_USES_PV="false"
-
-EXCALIBUR_TESTS="true"
-
-inherit excalibur-multi
-
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="dev-java/junit dev-java/junitperf =dev-java/avalon-framework-4.2*"
-DEPEND="${RDEPEND}"
-
-IUSE=""
-
-S=${WORKDIR}
-
-EXCALIBUR_JAR_FROM="avalon-framework-4.2"
-
-EXCALIBUR_TEST_JAR_FROM="junit junitperf "
-
-
-src_unpack(){
-	excalibur-multi_src_unpack "${FILESDIR}"/build.xml.patch
-}
-

diff --git a/dev-java/cornerstone-sockets/files/build.xml.patch b/dev-java/cornerstone-sockets/files/build.xml.patch
deleted file mode 100644
index fdbc27d..0000000
--- a/dev-java/cornerstone-sockets/files/build.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- o/cornerstone-sockets-impl-2.1/build.xml	2007-04-22 18:17:31.507865080 +0200
-+++ n/cornerstone-sockets-impl-2.1/build.xml	2007-04-22 18:19:51.604696354 +0200
-@@ -42,6 +42,12 @@
-       </src>
-       <classpath refid="build.classpath" >
-       </classpath>
-+      <classpath> 
-+      <fileset dir="../.." > 
-+	       <include name="**/*.jar" >
-+	       </include> 
-+       </fileset> 
-+       </classpath> 
-     </javac>
-     <copy todir="${classesdir}" >
-       <fileset dir="." >

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

diff --git a/dev-java/cornerstone-threads/ChangeLog b/dev-java/cornerstone-threads/ChangeLog
deleted file mode 100644
index a8d43c0..0000000
--- a/dev-java/cornerstone-threads/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for dev-java/cornerstone-thread
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jan 2009; Alistair Bush <ali_bush@g.o>
-  cornerstone-threads-2.1.ebuild:
-  QA Fixes.
-
-  26 May 2007; kiorky <kiorky@××××××××××.net>
-  cornerstone-threads-2.1.ebuild:
-  update according to excalibur eclass changes
-
-  26 May 2007; kiorky <kiorky@××××××××××.net>
-  cornerstone-threads-2.1.ebuild, files/build.xml.patch:
-  fix patches
-
-  26 May 2007; Vlastimil Babka <caster@g.o>
-  cornerstone-threads-2.1.ebuild:
-  Fix typo in RDEPEND.
-
-  24 Apr 2007; kiorky <kiorky@××××××××××.net>
-  +cornerstone-threads-2.1.ebuild, +files/build.xml.patch, +metadata.xml:
-  added  to the java-experimental overlay as a maven dependency.see #175834
-

diff --git a/dev-java/cornerstone-threads/Manifest b/dev-java/cornerstone-threads/Manifest
deleted file mode 100644
index b38d0d0..0000000
--- a/dev-java/cornerstone-threads/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cornerstone-threads-api-2.1-src.tar.gz 6310 SHA256 d0cc38823ab5a3901878097c98b04399126eb2e7d874f1fc861e6e0421dd6ae8
-DIST cornerstone-threads-impl-2.1-src.tar.gz 8544 SHA256 2fe5c4adf9464ee011fb0ce9ffb704fd182f354d490864f4f82bbed0f8ccf84f

diff --git a/dev-java/cornerstone-threads/cornerstone-threads-2.1.ebuild b/dev-java/cornerstone-threads/cornerstone-threads-2.1.ebuild
deleted file mode 100644
index 9936301..0000000
--- a/dev-java/cornerstone-threads/cornerstone-threads-2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EXCALIBUR_MODULES="
-	${PN}-api
-	${PN}-impl"
-
-EXCALIBUR_MODULE_USES_PV="false"
-
-EXCALIBUR_TESTS="true"
-
-inherit excalibur-multi
-
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="dev-java/excalibur-thread dev-java/junit dev-java/junitperf"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-IUSE=""
-
-EXCALIBUR_JAR_FROM="excalibur-thread"
-EXCALIBUR_TEST_JAR_FROM="excalibur-thread junit junitperf"
-
-src_unpack(){
-	excalibur-multi_src_unpack  "${FILESDIR}/build.xml.patch"
-}
-

diff --git a/dev-java/cornerstone-threads/files/build.xml.patch b/dev-java/cornerstone-threads/files/build.xml.patch
deleted file mode 100644
index 20c36d1..0000000
--- a/dev-java/cornerstone-threads/files/build.xml.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur old/cornerstone-threads-impl-2.1/build.xml new/cornerstone-threads-impl-2.1/build.xml
---- old/cornerstone-threads-impl-2.1/build.xml	2007-05-26 11:16:50.226272590 +0200
-+++ new/cornerstone-threads-impl-2.1/build.xml	2007-05-26 11:17:32.242120765 +0200
-@@ -46,6 +46,13 @@
-       </src>
-       <classpath refid="build.classpath">
-       </classpath>
-+                        <classpath>
-+                                <fileset dir="../.." >
-+                                        <include name="**/*.jar" >
-+                                        </include>
-+                                </fileset>
-+                        </classpath>
-+
-     </javac>
-     <copy todir="${classesdir}">
-       <fileset dir=".">
-@@ -171,4 +178,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ Pas de fin de ligne à la fin du fichier.
-+</project>

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