From af435c0c3f5596078875402995987f1e9a80aeb1 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Sun, 15 Nov 2015 14:19:44 +0000
Subject: [PATCH] dev-java/{common-grant,cos}: Removal. Fixes bug 562370.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/commons-grant/Manifest               |  1 -
 .../commons-grant/commons-grant-1.0.ebuild    | 54 ------------------
 .../files/commons-grant-1.0_beta5-gentoo.diff | 38 -------------
 dev-java/commons-grant/metadata.xml           |  5 --
 dev-java/cos/Manifest                         |  1 -
 dev-java/cos/cos-20021105-r3.ebuild           | 57 -------------------
 dev-java/cos/files/build-20021105.xml         | 54 ------------------
 dev-java/cos/metadata.xml                     |  5 --
 8 files changed, 215 deletions(-)
 delete mode 100644 dev-java/commons-grant/Manifest
 delete mode 100644 dev-java/commons-grant/commons-grant-1.0.ebuild
 delete mode 100644 dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
 delete mode 100644 dev-java/commons-grant/metadata.xml
 delete mode 100644 dev-java/cos/Manifest
 delete mode 100644 dev-java/cos/cos-20021105-r3.ebuild
 delete mode 100644 dev-java/cos/files/build-20021105.xml
 delete mode 100644 dev-java/cos/metadata.xml

diff --git a/dev-java/commons-grant/Manifest b/dev-java/commons-grant/Manifest
deleted file mode 100644
index 350c40a728c7..000000000000
--- a/dev-java/commons-grant/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651 SHA256 c6cc1cd6b51668ba18f6fab17863d4f3bc9889a20a0f70261dbf00fd08ec482d SHA512 4f18e337d853ac150524bc56ade1864c7622bd4fda6ddae37857410340b3b9155850b6c2279636345e762a4d6bf13a2d7c91861d5dc5f2d2d91942ba30d8b58b WHIRLPOOL ea18dbe3f95b63d7501146bdad805f35a900e3a21ed4e37e8e1e55e3ff38d64fc115682821aadf4e1391ee2162e7d4af406da4cd4d542402f4ae2bacc48bc7fa
diff --git a/dev-java/commons-grant/commons-grant-1.0.ebuild b/dev-java/commons-grant/commons-grant-1.0.ebuild
deleted file mode 100644
index 0d75a479fc22..000000000000
--- a/dev-java/commons-grant/commons-grant-1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Note: Upstream is dead... only place to find is on the ibiblio maven repo
-# and on jpackage.org
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils rpm
-MY_PN="jakarta-${PN}"
-SNAPSHOT_DATE="20040118"
-MY_PV="${PV%%_*}.b5.cvs${SNAPSHOT_DATE}"
-MY_PV="${MY_PV//_beta/.b}"
-MY_P="${MY_PN}-${MY_PV}"
-JPACKAGE_REVISION="4"
-
-DESCRIPTION="A small collection of hacks to make using Ant in an embedded envinronment much easier"
-# This link seems dead, but I don't have anywhere else to turn
-HOMEPAGE="http://jakarta.apache.org/commons/sandbox/grant/"
-SRC_URI="mirror://jpackage/1.6/generic/free/SRPMS/${MY_P}-${JPACKAGE_REVISION}jpp.src.rpm"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3
-	dev-java/ant-core"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc source"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack(){
-	rpm_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}_beta5-gentoo.diff
-
-	mkdir -p target/lib
-	cd target/lib
-	java-pkg_jar-from ant-core
-}
-
-src_install(){
-	java-pkg_newjar target/${PN}-1.0-beta-4.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-#No unit tests although the target exists
-#src_test() {
-#	eant test || die "Test failed"
-#}
diff --git a/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff b/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
deleted file mode 100644
index 98e6a97965bd..000000000000
--- a/dev-java/commons-grant/files/commons-grant-1.0_beta5-gentoo.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-*** build.xml.orig	Thu Nov 11 17:24:13 2004
---- build.xml	Thu Nov 11 17:25:02 2004
-***************
-*** 20,29 ****
-    <target name="init" description="o Initializes some properties">
-      <mkdir dir="${libdir}">
-      </mkdir>
-!     <condition property="noget">
-        <equals arg2="only" arg1="${build.sysclasspath}">
-        </equals>
-!     </condition>
-    </target>
-    <target name="compile" description="o Compile the code" depends="get-deps">
-      <mkdir dir="${classesdir}">
---- 20,30 ----
-    <target name="init" description="o Initializes some properties">
-      <mkdir dir="${libdir}">
-      </mkdir>
-!     <!--<condition property="noget">
-        <equals arg2="only" arg1="${build.sysclasspath}">
-        </equals>
-!     </condition>-->
-!     <property name="noget" value="true"></property>
-    </target>
-    <target name="compile" description="o Compile the code" depends="get-deps">
-      <mkdir dir="${classesdir}">
-***************
-*** 111,114 ****
-      <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-      </unjar>
-    </target>
-! </project>
-\ No newline at end of file
---- 112,115 ----
-      <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-      </unjar>
-    </target>
-! </project>
diff --git a/dev-java/commons-grant/metadata.xml b/dev-java/commons-grant/metadata.xml
deleted file mode 100644
index 838c00a4a448..000000000000
--- a/dev-java/commons-grant/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/cos/Manifest b/dev-java/cos/Manifest
deleted file mode 100644
index 524f6a52aebc..000000000000
--- a/dev-java/cos/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cos-05Nov2002.zip 372387 SHA256 96f9959e8252eddacce24b592a9c4c1dbf0082749115d7e75619504f70df1d90 SHA512 971d54bc39af883bd199aabc05f47872f206d75552f4b8809ba0f25dd5494b562e108eb85cdaf39151fd290e37f5959ef501ac502114bba69a1752cb0732cfed WHIRLPOOL 60c150c57d6029f20f834f9a00cc956a2bed6d7adc9b3786af5cecd643a1893081989045c13d15fd8c1cb23f653c4a295c7dd0d6a47e8f7711da6ed6721f30ff
diff --git a/dev-java/cos/cos-20021105-r3.ebuild b/dev-java/cos/cos-20021105-r3.ebuild
deleted file mode 100644
index 797750afad9a..000000000000
--- a/dev-java/cos/cos-20021105-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=05Nov2002
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="The com.oreilly.servlet package is a class library for servlet developers"
-HOMEPAGE="http://servlets.com/cos/"
-SRC_URI="http://servlets.com/${PN}/${MY_P}.zip"
-
-LICENSE="cos"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="${JAVA_PKG_IUSE}"
-
-RDEPEND=">=virtual/jre-1.4
-	java-virtuals/servlet-api:2.3"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip:0
-	${RDEPEND}"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	rm -r lib classes *.war || die
-
-	# TODO: Not sure how to fix the compilation error for this class;
-	# so, we'll just delete it for now...
-	rm src/com/oreilly/servlet/CacheHttpServlet.java || die
-
-	cp "${FILESDIR}"/build-${PV}.xml build.xml || die
-
-	cat > build.properties <<-EOF
-		classpath=$(java-pkg_getjars servlet-api-2.3)
-	EOF
-}
-
-src_compile() {
-	eant -Dproject.name=${PN} jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	dodoc readme.txt license.txt
-
-	use doc && java-pkg_dojavadoc dist/doc/api
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/cos/files/build-20021105.xml b/dev-java/cos/files/build-20021105.xml
deleted file mode 100644
index 4153ebfa4868..000000000000
--- a/dev-java/cos/files/build-20021105.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="pkg" value="${package.name}"/>
-   <property name="jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="${build}/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-   </target>
-   
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api">
-      	<fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-java/cos/metadata.xml b/dev-java/cos/metadata.xml
deleted file mode 100644
index 7303cef96964..000000000000
--- a/dev-java/cos/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>
-- 
2.26.2