[gentoo-commits] repo/gentoo:master commit in: dev-db/octopus/, dev-db/octopus/files/

[Patrice Clement]

commit:     0c3bcaccea0d454ebd12d3eb659cfb74abe82363
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 11:55:35 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 11:55:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3bcacc

dev-db/octopus: Removal. Fixes bug 564370.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-db/octopus/Manifest                            |   2 -
 .../octopus/files/octopus-3.0.1-gentoo-build.xml   | 497 ---------------------
 dev-db/octopus/files/octopus-jdk-1.5.patch         | 220 ---------
 dev-db/octopus/metadata.xml                        |  10 -
 dev-db/octopus/octopus-3.0.1-r3.ebuild             |  87 ----
 dev-db/octopus/octopus-3.0.1-r4.ebuild             |  87 ----
 6 files changed, 903 deletions(-)

diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
deleted file mode 100644
index 65f198f..0000000
--- a/dev-db/octopus/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST octopus-3.0-1.src.tar.gz 25968343 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac SHA512 5591fa2bd8098260c240ed7e7294c7ec1aa4212b14f949c9497496d60a3ea1e6db989ef948c134e984e92ba2cbeecb0b3530ad5e4d0ad687a5e1a5f37d618315 WHIRLPOOL 5b67c458c7f418fa330cd539096438f472c14fdfd666ef5768075d5e1fd3c4d5c55690104b414cfd8609791904af8466a93d7db2cebdfebd903e7fd54becd564
-DIST octopus-xmls-3.0.1.tar.bz2 22492 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095 SHA512 88add21ac12e6b3898ab40db724464153c30ff4bf4826f71c26fa6c2aa53602793b5decc44428d150579bcd433246a64514469cd005f6fc76506194ae4e20e66 WHIRLPOOL 42da61f432da0613816bc4f352d02b5415ede2d9b98f239d0e8591f4e67ddc6b87ed6993127ee1f138bb35ca2922f4747ce2512cca51ba582caccaf2a9fa271a

diff --git a/dev-db/octopus/files/octopus-3.0.1-gentoo-build.xml b/dev-db/octopus/files/octopus-3.0.1-gentoo-build.xml
deleted file mode 100644
index fbd16ba..0000000
--- a/dev-db/octopus/files/octopus-3.0.1-gentoo-build.xml
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="octopus" default="jar">
-	<!-- some properties -->
-	<property name="dist.dir" value="dist" />
-	<property name="build.top.dir" value="build" />
-	<property name="docs.top.dir" value="docs" />
-	<property name="target.jdk" value="1.4" />
-
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${docs.top.dir}" />
-		<mkdir dir="${build.top.dir}" />
-
-		<mkdir dir="${build.octopus.dir}" />
-		<mkdir dir="${docs.octopus.dir}" />
-		
-		<mkdir dir="${build.octopus-generator.dir}" />
-		<mkdir dir="${docs.octopus-generator.dir}" />
-		
-		<mkdir dir="${build.octopus-task.dir}" />
-		<mkdir dir="${docs.octopus-task.dir}" />
-		
-		<mkdir dir="${build.octopus-test.dir}" />
-		<mkdir dir="${docs.octopus-test.dir}" />
-		
-		<mkdir dir="${build.csvjdbc.dir}" />
-		<mkdir dir="${docs.csvjdbc.dir}" />
-		
-		<mkdir dir="${build.xmljdbc.dir}" />
-		<mkdir dir="${docs.xmljdbc.dir}" />
-		
-		<mkdir dir="${build.log4jlogger.dir}" />
-		<mkdir dir="${docs.log4jlogger.dir}" />
-
-		<mkdir dir="${build.i18njdbc.dir}" />
-		<mkdir dir="${docs.i18njdbc.dir}" />
-		
-		<mkdir dir="${build.xmlutil.dir}" />
-		<mkdir dir="${docs.xmlutil.dir}" />
-	</target>	
-
-
-	<!-- jar all -->
-	<target name="jar-all" 
-		depends="jar-octopus, jar-xmlutil, jar-octopus-generator, jar-octopus-task, jar-octopus-test, jar-xmlutil, jar-csvjdbc, jar-xmljdbc, jar-log4jlogger, jar-i18njdbc" />
-
-	<!-- docs all -->
-	<target name="docs-all"
-		depends="docs-octopus, docs-xmlutil, docs-octopus-generator, docs-octopus-task, docs-octopus-test, docs-xmlutil, docs-csvjdbc, docs-xmljdbc, docs-log4jlogger, docs-i18njdbc" />
-
-	<!-- sourcezip all -->
-	<target name="sourcezip-all"
-		depends="sourcezip-octopus, sourcezip-xmlutil, sourcezip-octopus-generator, sourcezip-octopus-task, sourcezip-octopus-test, sourcezip-xmlutil, sourcezip-csvjdbc, sourcezip-xmljdbc, sourcezip-log4jlogger, sourcezip-i18njdbc" />
-	
-	
-	<!-- ############## -->
-	<!-- Octopus module -->
-	<!-- ############## -->
-	<property name="build.octopus.dir" value="build/Octopus" />
-	<property name="docs.octopus.dir" value="docs/Octopus" />
-	<property name="src.octopus.dir" value="Octopus" />
-	<property name="jar.octopus" value="${dist.dir}/Octopus.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-octopus" depends="init">
-		<javac srcdir="${src.octopus.dir}/src" 
-			destdir="${build.octopus.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}" />
-
-		<copy todir="${build.octopus.dir}">
-			<fileset dir="${src.octopus.dir}/xmls" />
-		</copy>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-octopus" depends="compile-octopus">
-		<jar jarfile="${jar.octopus}" basedir="${build.octopus.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-octopus" depends="init">
-		<javadoc sourcepath="${src.octopus.dir}/src"
-			packagenames="org.*"
-           		destdir="${docs.octopus.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-
-       <!-- zip Octopus sources -->
-        <target name="sourcezip-octopus">
-		<zip destfile="${dist.dir}/Octopus-src.zip">
-			<zipfileset dir="${src.octopus.dir}/src" />
-                </zip>
-        </target>
-
-
-
-	<!-- ############## -->
-	<!-- xmlutil module -->
-	<!-- ############## -->
-	<property name="build.xmlutil.dir" value="build/XMLutil" />
-	<property name="docs.xmlutil.dir" value="docs/XMLutil" />
-	<property name="src.xmlutil.dir" value="XMLutil" />
-	<property name="jar.xmlutil" value="${dist.dir}/xmlutil.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-xmlutil" depends="init">
-		<javac srcdir="${src.xmlutil.dir}/src/src" 
-			destdir="${build.xmlutil.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}" />
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-xmlutil" depends="compile-xmlutil">
-		<jar jarfile="${jar.xmlutil}" basedir="${build.xmlutil.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-xmlutil" depends="init">
-		<javadoc sourcepath="${src.xmlutil.dir}/src/src"
-			packagenames="org.*"
-           		destdir="${docs.xmlutil.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-
-       <!-- zip xmlutil sources -->
-        <target name="sourcezip-xmlutil">
-		<zip destfile="${dist.dir}/XMLutil-src.zip">
-			<zipfileset dir="${src.xmlutil.dir}/src/src" />
-                </zip>
-        </target>
-
-
-	
-	<!-- ####################### -->
-	<!-- OctopusGenerator module -->
-	<!-- ####################### -->
-	<property name="build.octopus-generator.dir" value="build/OctopusGenerator" />
-	<property name="docs.octopus-generator.dir" value="docs/OctopusGenerator" />
-	<property name="src.octopus-generator.dir" value="OctopusGenerator" />
-	<property name="jar.octopus-generator" value="${dist.dir}/OctopusGenerator.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-octopus-generator" depends="init, jar-xmlutil, jar-octopus">
-		<javac srcdir="${src.octopus-generator.dir}/src" 
-			destdir="${build.octopus-generator.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}">
-			<classpath>
-				<pathelement path="${jar.octopus}" />
-				<pathelement path="${jar.xmlutil}" />
-			</classpath>
-		</javac>
-		
-		<copy todir="${build.octopus-generator.dir}">
-			<fileset dir="${src.octopus-generator.dir}/src">
-				<exclude name="**/*.java" />
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-octopus-generator" depends="compile-octopus-generator">
-		<jar jarfile="${jar.octopus-generator}" basedir="${build.octopus-generator.dir}">
-			<manifest>
-				<attribute name="Main-Class" value="org.webdocwf.util.loader.wizard.WizardFrame" />
-			</manifest>
-		</jar>
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-octopus-generator" depends="init, jar-xmlutil, jar-octopus">
-		<javadoc sourcepath="${src.octopus-generator.dir}/src"
-			packagenames="org.*"
-           		destdir="${docs.octopus-generator.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API">
-			<classpath>
-				<pathelement path="${jar.octopus}" />
-				<pathelement path="${jar.xmlutil}" />
-			</classpath>
-		</javadoc>
-	</target>
-	
-       <!-- zip OctopusGenerator sources -->
-        <target name="sourcezip-octopus-generator">
-		<zip destfile="${dist.dir}/OctopusGenerator-src.zip">
-			<zipfileset dir="${src.octopus-generator.dir}/src" />
-                </zip>
-        </target>
-
-	
-
-	
-	
-	<!-- ################### -->
-	<!-- OctopusTasks module -->
-	<!-- ################### -->
-	<property name="build.octopus-task.dir" value="build/OctopusTask" />
-	<property name="docs.octopus-task.dir" value="docs/OctopusTask" />
-	<property name="src.octopus-task.dir" value="OctopusTask" />
-	<property name="jar.octopus-task" value="${dist.dir}/OctopusTask.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-octopus-task" depends="init">
-		<javac srcdir="${src.octopus-task.dir}/src" 
-			destdir="${build.octopus-task.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}" />
-	</target>
-	
-	<!-- build the jar file -->
-	<target name="jar-octopus-task" depends="compile-octopus-task">
-		<jar jarfile="${jar.octopus-task}" basedir="${build.octopus-task.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-octopus-task" depends="init">
-		<javadoc sourcepath="${src.octopus-task.dir}/src"
-			packagenames="org.*"
-           		destdir="${docs.octopus-task.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-	
-       <!-- zip OctopusTask sources -->
-        <target name="sourcezip-octopus-task">
-		<zip destfile="${dist.dir}/OctopusTask-src.zip">
-			<zipfileset dir="${src.octopus-task.dir}/src" />
-                </zip>
-        </target>
-	
-	
-	
-	<!-- ################## -->
-	<!-- OctopusTest module -->
-	<!-- ################## -->
-	<property name="build.octopus-test.dir" value="build/OctopusTest" />
-	<property name="docs.octopus-test.dir" value="docs/OctopusTest" />
-	<property name="src.octopus-test.dir" value="OctopusTest" />
-	<property name="jar.octopus-test" value="${dist.dir}/OctopusTest.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-octopus-test" depends="init, jar-octopus">
-		<javac srcdir="${src.octopus-test.dir}/src" 
-			destdir="${build.octopus-test.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}">
-			<classpath>
-				<pathelement path="${jar.octopus}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-octopus-test" depends="compile-octopus-test">
-		<jar jarfile="${jar.octopus-test}" basedir="${build.octopus-test.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-octopus-test" depends="init, jar-octopus">
-		<javadoc sourcepath="${src.octopus-test.dir}/src"
-			packagenames="org.*"
-           		destdir="${docs.octopus-test.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API">
-			<classpath>
-				<pathelement path="${jar.octopus}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-       <!-- zip OctopusTest sources -->
-        <target name="sourcezip-octopus-test">
-		<zip destfile="${dist.dir}/OctopusTest-src.zip">
-			<zipfileset dir="${src.octopus-test.dir}/src" />
-                </zip>
-        </target>
-	
-
-	
-	
-	<!-- ############## -->
-	<!-- Csvjdbc module -->
-	<!-- ############## -->
-	<property name="build.csvjdbc.dir" value="build/Csvjdbc" />
-	<property name="docs.csvjdbc.dir" value="docs/Csvjdbc" />
-	<property name="src.csvjdbc.dir" value="Csvjdbc" />
-	<property name="jar.csvjdbc" value="${dist.dir}/csvjdbc.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-csvjdbc" depends="init">
-		<javac srcdir="${src.csvjdbc.dir}/src/src/java" 
-			destdir="${build.csvjdbc.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}" />
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-csvjdbc" depends="compile-csvjdbc">
-		<jar jarfile="${jar.csvjdbc}" basedir="${build.csvjdbc.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-csvjdbc" depends="init">
-		<javadoc sourcepath="${src.csvjdbc.dir}/src/src/java"
-			packagenames="org.*"
-           		destdir="${docs.csvjdbc.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-
-       <!-- zip Csvjdbc sources -->
-        <target name="sourcezip-csvjdbc">
-		<zip destfile="${dist.dir}/Csvjdbc-src.zip">
-			<zipfileset dir="${src.csvjdbc.dir}/src/src/java" />
-                </zip>
-        </target>
-
-
-
-
-	<!-- ############## -->
-	<!-- xmljdbc module -->
-	<!-- ############## -->
-	<property name="build.xmljdbc.dir" value="build/XMLjdbc" />
-	<property name="docs.xmljdbc.dir" value="docs/XMLjdbc" />
-	<property name="src.xmljdbc.dir" value="XMLjdbc" />
-	<property name="jar.xmljdbc" value="${dist.dir}/xmljdbc.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-xmljdbc" depends="init, jar-xmlutil">
-		<javac srcdir="${src.xmljdbc.dir}/src/src" 
-			destdir="${build.xmljdbc.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}">
-			<classpath>
-				<pathelement path="${jar.xmlutil}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-xmljdbc" depends="compile-xmljdbc">
-		<jar jarfile="${jar.xmljdbc}" basedir="${build.xmljdbc.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-xmljdbc" depends="init, jar-xmlutil">
-		<javadoc sourcepath="${src.xmljdbc.dir}/src/src"
-			packagenames="org.*"
-           		destdir="${docs.xmljdbc.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API">
-			<classpath>
-				<pathelement path="${jar.xmlutil}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-       <!-- zip XMLjdbc sources -->
-        <target name="sourcezip-xmljdbc">
-		<zip destfile="${dist.dir}/XMLjdbc-src.zip">
-			<zipfileset dir="${src.xmljdbc.dir}/src" />
-                </zip>
-        </target>
-
-
-
-	
-	<!-- ################## -->
-	<!-- Log4jlogger module -->
-	<!-- ################## -->
-	<property name="build.log4jlogger.dir" value="build/Log4jlogger" />
-	<property name="docs.log4jlogger.dir" value="docs/Log4jlogger" />
-	<property name="src.log4jlogger.dir" value="Log4jlogger" />
-	<property name="jar.log4jlogger" value="${dist.dir}/Log4jlogger.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-log4jlogger" depends="init, jar-octopus">
-		<javac srcdir="${src.log4jlogger.dir}/src" 
-			destdir="${build.log4jlogger.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}">
-			<classpath>
-				<pathelement path="${jar.octopus}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-log4jlogger" depends="compile-log4jlogger">
-		<jar jarfile="${jar.log4jlogger}" basedir="${build.log4jlogger.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-log4jlogger" depends="init, jar-octopus">
-		<javadoc sourcepath="${src.log4jlogger.dir}/src"
-			packagenames="org.*"
-           		destdir="${docs.log4jlogger.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API">
-			<classpath>
-				<pathelement path="${jar.octopus}" />
-			</classpath>
-		</javadoc>
-	</target>
-
-       <!-- zip Log4jlogger sources -->
-        <target name="sourcezip-log4jlogger">
-		<zip destfile="${dist.dir}/Log4jlogger-src.zip">
-			<zipfileset dir="${src.log4jlogger.dir}/src" />
-                </zip>
-        </target>
-
-
-
-
-	<!-- ############### -->
-	<!-- i18njdbc module -->
-	<!-- ############### -->
-	<property name="build.i18njdbc.dir" value="build/i18njdbc" />
-	<property name="docs.i18njdbc.dir" value="docs/i18njdbc" />
-	<property name="src.i18njdbc.dir" value="i18njdbc" />
-	<property name="jar.i18njdbc" value="${dist.dir}/i18njdbc.jar" />
-
-	<!-- compile everything -->
-	<target name="compile-i18njdbc" depends="init">
-		<javac srcdir="${src.i18njdbc.dir}/src" 
-			destdir="${build.i18njdbc.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}" />
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar-i18njdbc" depends="compile-i18njdbc">
-		<jar jarfile="${jar.i18njdbc}" basedir="${build.i18njdbc.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs-i18njdbc" depends="init">
-		<javadoc sourcepath="${src.i18njdbc.dir}/src"
-			packagenames="org.*"
-           		destdir="${docs.i18njdbc.dir}"
-			author="true"
-			version="true"
-			use="true"
-			source="${target.jdk}"
-           		windowtitle="${ant.project.name} API" />
-	</target>
-
-       <!-- zip Octopus sources -->
-        <target name="sourcezip-i18njdbc">
-		<zip destfile="${dist.dir}/i18njdbc-src.zip">
-			<zipfileset dir="${src.i18njdbc.dir}/src" />
-                </zip>
-        </target>
-
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.top.dir}" />
-		<delete dir="${docs.top.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-	
-
-</project>

diff --git a/dev-db/octopus/files/octopus-jdk-1.5.patch b/dev-db/octopus/files/octopus-jdk-1.5.patch
deleted file mode 100644
index 4d49969..0000000
--- a/dev-db/octopus/files/octopus-jdk-1.5.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -Naur XMLutil.bak/src/src/org/enhydra/xml/AttrImpl.java XMLutil/src/src/org/enhydra/xml/AttrImpl.java
---- XMLutil/src/src/org/enhydra/xml/AttrImpl.java	2009-09-18 17:39:19.000000000 +1200
-+++ XMLutil/src/src/org/enhydra/xml/AttrImpl.java	2009-09-18 18:03:36.000000000 +1200
-@@ -20,6 +20,7 @@
- 
- import org.w3c.dom.Attr;
- import org.w3c.dom.Element;
-+import org.w3c.dom.TypeInfo;
- 
- 
- /**
-@@ -186,4 +187,18 @@
- 	public Element getOwnerElement() {
- 		return owner;
- 	}
--}
-\ No newline at end of file
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public TypeInfo getSchemaTypeInfo() {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public boolean isId() {
-+		return false;
-+	}
-+}
-diff -Naur XMLutil.bak/src/src/org/enhydra/xml/CharacterDataImpl.java XMLutil/src/src/org/enhydra/xml/CharacterDataImpl.java
---- XMLutil/src/src/org/enhydra/xml/CharacterDataImpl.java	2009-09-18 17:39:19.000000000 +1200
-+++ XMLutil/src/src/org/enhydra/xml/CharacterDataImpl.java	2009-09-18 18:06:38.000000000 +1200
-@@ -177,5 +177,4 @@
- 		return super.getNamespaceURI();
- 	}
- 
--
- }
-diff -Naur XMLutil.bak/src/src/org/enhydra/xml/ElementImpl.java XMLutil/src/src/org/enhydra/xml/ElementImpl.java
---- XMLutil/src/src/org/enhydra/xml/ElementImpl.java	2009-09-18 17:39:19.000000000 +1200
-+++ XMLutil/src/src/org/enhydra/xml/ElementImpl.java	2009-09-18 18:25:24.000000000 +1200
-@@ -33,6 +33,7 @@
- import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.TypeInfo;
- 
- /**
-  * @author Tweety
-@@ -564,4 +565,33 @@
- 			    sb.append("</" + this.nodeName + ">");
- //        }
- 	}
-+	
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public TypeInfo getSchemaTypeInfo() {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public void setIdAttribute(String name,
-+			boolean idId)
-+		throws DOMException { }
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public void setIdAttributeNS(String name,
-+			String localName,
-+			boolean isId)
-+		throws DOMException {}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public void setIdAttributeNode(Attr idAttr,
-+			boolean isId)
-+		throws DOMException {}
- }
-diff -Naur XMLutil.bak/src/src/org/enhydra/xml/NodeImpl.java XMLutil/src/src/org/enhydra/xml/NodeImpl.java
---- XMLutil/src/src/org/enhydra/xml/NodeImpl.java	2009-09-18 17:39:19.000000000 +1200
-+++ XMLutil/src/src/org/enhydra/xml/NodeImpl.java	2009-09-18 18:19:58.000000000 +1200
-@@ -33,6 +33,7 @@
- import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
-+import org.w3c.dom.UserDataHandler;
- 
- /**
-  * @author Tweety
-@@ -784,6 +785,92 @@
- 		return sb.toString();
- 	}
- 
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public String getBaseURI() {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public short compareDocumentPosition(Node other)
-+		throws DOMException {
-+		throw new DOMException(DOMException.NOT_SUPPORTED_ERR,
-+			"Unimplemented method");
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public String getTextContent() throws DOMException {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public void setTextContent(String textContent)
-+		throws DOMException { }
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public boolean isSameNode(Node other) {
-+		return false;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public String lookupPrefix(String namespaceURI) {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public boolean isDefaultNamespace(String namespaceURI) {
-+		return true;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public String lookupNamespaceURI(String prefix) {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public boolean isEqualNode(Node arg) {
-+		return false;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public Object getFeature(String feature, String version) {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public Object setUserData(String key, Object data,
-+		UserDataHandler handler) {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public Object getUserData(String key) {
-+		return null;
-+	}
-+
- 
- 	/**
- 	 * Method beginToString should be redefined in extended classes.
-diff -Naur XMLutil.bak/src/src/org/enhydra/xml/TextImpl.java XMLutil/src/src/org/enhydra/xml/TextImpl.java
---- XMLutil/src/src/org/enhydra/xml/TextImpl.java	2009-09-18 17:39:19.000000000 +1200
-+++ XMLutil/src/src/org/enhydra/xml/TextImpl.java	2009-09-18 18:27:04.000000000 +1200
-@@ -161,4 +161,26 @@
- 
-     }
- 
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public boolean isElementContentWhitespace() {
-+		return false;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public String getWholeText() {
-+		return null;
-+	}
-+
-+	/**
-+	 * Unimplemented method included in DOM Level 3 (aka 1.5).
-+	 */
-+	public Text replaceWholeText(String content)
-+		throws DOMException {
-+		return null;
-+	}
-+
- }

diff --git a/dev-db/octopus/metadata.xml b/dev-db/octopus/metadata.xml
deleted file mode 100644
index 1ba6121..0000000
--- a/dev-db/octopus/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<longdescription>
-		A Java-based Extraction, Transformation, and Loading (ETL) tool.
-		It may connect to any JDBC data sources and perform transformations
-		defined in an XML file.
-	</longdescription>
-</pkgmetadata>

diff --git a/dev-db/octopus/octopus-3.0.1-r3.ebuild b/dev-db/octopus/octopus-3.0.1-r3.ebuild
deleted file mode 100644
index 7e182f6..0000000
--- a/dev-db/octopus/octopus-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,87 +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 source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV=${PV//./-}
-MY_PV=${MY_PV/-/.}
-DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-${MY_PV}.src.tar.gz
-	mirror://gentoo/${PN}-xmls-${PV}.tar.bz2"
-HOMEPAGE="http://octopus.objectweb.org"
-LICENSE="LGPL-2.1"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-COMMON_DEP="
-	>=dev-java/xerces-2.7
-	>=dev-java/log4j-1.2.8
-	=dev-java/rhino-1.6*
-	=dev-java/junit-3.8*
-	>=dev-java/ant-core-1.4"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-# uses enum as identifier
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-TOPDIR="${PN}-$(get_version_component_range 1-2)"
-S=${WORKDIR}/${TOPDIR}/Octopus-src
-
-java_prepare() {
-	rm -fr ${TOPDIR}/maven
-
-	mv "${WORKDIR}/xmls" "${S}/modules/Octopus"
-
-	cd "${S}"/modules
-	cp "${FILESDIR}/${P}-gentoo-build.xml" build.xml
-	java-ant_rewrite-classpath build.xml
-	java-pkg_filter-compiler jikes
-	java-ant_rewrite-bootclasspath 1.5
-
-	epatch "${FILESDIR}/${PN}-jdk-1.5.patch"
-}
-
-EANT_GENTOO_CLASSPATH="xerces-2,rhino-1.6,ant-core,junit,log4j"
-
-src_compile() {
-	cd "${S}/modules"
-
-	use source && antflags="${antflags} sourcezip-all"
-
-	eant jar-all $(use_doc docs-all) ${antflags}
-}
-
-RESTRICT="test"
-
-# Would need maven to work properly as the build.xml just launches maven
-#src_test() {
-#	eant test
-#}
-
-src_install() {
-	dodoc ChangeLog.txt ReleaseNotes.txt
-
-	cd "${S}/modules"
-	java-pkg_dojar dist/*.jar
-
-	if use source; then
-		dodir /usr/share/doc/${PF}/source
-		cp dist/*-src.zip "${D}usr/share/doc/${PF}/source"
-	fi
-	if use doc; then
-		docinto html/api
-		# Has multiple javadoc subdirs here
-		java-pkg_dohtml -r docs/*
-	fi
-}

diff --git a/dev-db/octopus/octopus-3.0.1-r4.ebuild b/dev-db/octopus/octopus-3.0.1-r4.ebuild
deleted file mode 100644
index 3bd56f3..0000000
--- a/dev-db/octopus/octopus-3.0.1-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV=${PV//./-}
-MY_PV=${MY_PV/-/.}
-DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-${MY_PV}.src.tar.gz
-	mirror://gentoo/${PN}-xmls-${PV}.tar.bz2"
-HOMEPAGE="http://octopus.objectweb.org"
-LICENSE="LGPL-2.1"
-SLOT="3.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEP="
-	>=dev-java/xerces-2.7
-	>=dev-java/log4j-1.2.8
-	=dev-java/rhino-1.6*
-	=dev-java/junit-3.8*
-	>=dev-java/ant-core-1.4"
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-# uses enum as identifier
-JAVA_PKG_WANT_SOURCE="1.4"
-JAVA_PKG_WANT_TARGET="1.4"
-
-TOPDIR="${PN}-$(get_version_component_range 1-2)"
-S=${WORKDIR}/${TOPDIR}/Octopus-src
-
-java_prepare() {
-	rm -fr ${TOPDIR}/maven || die
-	mv "${WORKDIR}/xmls" "${S}/modules/Octopus" || die
-	cd "${S}"/modules || die
-
-	cp "${FILESDIR}/${P}-gentoo-build.xml" build.xml || die
-	java-ant_rewrite-classpath build.xml
-	java-pkg_filter-compiler jikes
-	java-ant_rewrite-bootclasspath 1.5
-
-	epatch "${FILESDIR}/${PN}-jdk-1.5.patch"
-}
-
-EANT_GENTOO_CLASSPATH="xerces-2,rhino-1.6,ant-core,junit,log4j"
-
-src_compile() {
-	cd "${S}/modules" || die
-
-	use source && antflags="${antflags} sourcezip-all"
-
-	eant jar-all $(use_doc docs-all) ${antflags}
-}
-
-RESTRICT="test"
-
-# Would need maven to work properly as the build.xml just launches maven
-#src_test() {
-#	eant test
-#}
-
-src_install() {
-	dodoc ChangeLog.txt ReleaseNotes.txt
-
-	cd "${S}/modules" || die
-	java-pkg_dojar dist/*.jar
-
-	if use source; then
-		dodir /usr/share/doc/${PF}/source
-		cp dist/*-src.zip "${D}usr/share/doc/${PF}/source"
-	fi
-
-	if use doc; then
-		docinto html/api
-		# Has multiple javadoc subdirs here
-		java-pkg_dohtml -r docs/*
-	fi
-}