Remove old.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

10 files changed, 9 insertions, 656 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 7394ee120c13..c277b559b83e 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.29 2009/11/10 14:34:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.30 2009/11/10 19:53:37 caster Exp $
+
+  10 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -jdbc-jaybird-2.0.1.ebuild, -files/archive-xml-2.0.1.patch,
+  -files/compile-xml-2.0.1.patch, -files/dist-xml-2.0.1.patch,
+  -jdbc-jaybird-2.1.0.ebuild, -jdbc-jaybird-2.1.0-r1.ebuild,
+  -files/compile-xml-2.1.0.patch, -jdbc-jaybird-2.1.2.ebuild,
+  -jdbc-jaybird-2.1.5.ebuild:
+  Remove old.
 
   10 Nov 2009; Markus Meier <maekke@gentoo.org>
   jdbc-jaybird-2.1.5-r1.ebuild:
diff --git a/dev-java/jdbc-jaybird/files/archive-xml-2.0.1.patch b/dev-java/jdbc-jaybird/files/archive-xml-2.0.1.patch
deleted file mode 100644
index 10a3055ca14a..000000000000
--- a/dev-java/jdbc-jaybird/files/archive-xml-2.0.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/archive.xml	2005-06-25 18:26:26.000000000 +0200
-+++ build/archive.xml	2006-10-19 16:39:56.000000000 +0200
-@@ -57,7 +57,7 @@
- 

-   </target>

- 

--  <target name="jar-test" depends="compile">

-+  <target name="jar-test" depends="compile" if="tests">

- 

-     <mkdir dir="${build.lib}"/>

-     <jar jarfile="${build.lib}/${archive.name.test}" manifest="${build.etc}/default.mf">

diff --git a/dev-java/jdbc-jaybird/files/compile-xml-2.0.1.patch b/dev-java/jdbc-jaybird/files/compile-xml-2.0.1.patch
deleted file mode 100644
index 2edd340e7502..000000000000
--- a/dev-java/jdbc-jaybird/files/compile-xml-2.0.1.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- build/compile.xml	2006-10-19 18:07:58.000000000 +0200
-+++ build/compile.xml	2006-10-19 18:17:17.000000000 +0200
-@@ -13,11 +13,12 @@
-     <ant antfile="build_native.xml"/>

-   </target>

-  

--  <target name="compile-examples">

-+  <target name="compile-examples" if="examples">

-   	<mkdir dir="${build.examples}"/>

-     <javac srcdir="${source.examples}"

-            destdir="${build.examples}"

--           target="${ant.java.version}"

-+		   source="1.4"
-+		   target="1.4"
-            debug="on"

-            deprecation="on"

-            optimize="on"

-@@ -40,25 +41,25 @@
-     </path>

-   </target>

- 

--  <target name="set-wire1.3-src" if="jdk1.3">

-+  <target name="set-wire1.3-src" if="never">

-     <path id="source.java.wire">

-       <pathelement path="${source.wire1.3}"/>

-     </path>

-   </target>

- 

--  <target name="set-wire1.4-src" unless="jdk1.3">

-+  <target name="set-wire1.4-src">

-     <path id="source.java.wire">

-       <pathelement path="${source.wire1.4}"/>

-     </path>

-   </target>

- 

--  <target name="set-pool1.4-src" unless="jdk1.5">

-+  <target name="set-pool1.4-src">

-     <path id="source.java.pool">

-       <pathelement path="${source.pool1.4}"/>

-     </path>

-   </target>

- 

--  <target name="set-pool1.5-src" if="jdk1.5">

-+  <target name="set-pool1.5-src" if="never">

-     <path id="source.java.pool">

-       <pathelement path="${source.pool1.5}"/>

-     </path>

-@@ -67,7 +68,8 @@
-   <target name="compile-driver" depends="set-jdbc-20-src,set-jdbc-30-src,set-wire1.3-src,set-wire1.4-src">

-     <mkdir dir="${build.classes}"/>

-     <javac destdir="${build.classes}"

--           target="${ant.java.version}"

-+		   source="1.4"
-+		   target="1.4"
-            debug="on"

-            deprecation="on"

-            optimize="on"

-@@ -85,7 +87,8 @@
-     <mkdir dir="${build.pool}"/>

-     <javac srcdir="${source.pool}"

-            destdir="${build.pool}"

--           target="${ant.java.version}"

-+		   source="1.4"
-+		   target="1.4"
-            debug="on"

-            deprecation="on"

-            optimize="on"

-@@ -101,7 +104,8 @@
-   	<mkdir dir="${build.compatibility}"/>

-     <javac srcdir="${source.compatibility}"

-            destdir="${build.compatibility}"

--           target="${ant.java.version}"

-+		   source="1.4"
-+		   target="1.4"
-            debug="on"

-            deprecation="on"

-            optimize="on"

-@@ -121,11 +125,12 @@
-     </path>

-   </target>

- 

--  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test">

-+  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test" if="tests">

-     <mkdir dir="${build.test}"/>

-     <javac srcdir="${source.test}"

-            destdir="${build.test}"

--           target="${ant.java.version}"

-+		   source="1.4"
-+		   target="1.4"
-            debug="on"

-            deprecation="on"

-            optimize="on"

diff --git a/dev-java/jdbc-jaybird/files/compile-xml-2.1.0.patch b/dev-java/jdbc-jaybird/files/compile-xml-2.1.0.patch
deleted file mode 100644
index 8be350423ad9..000000000000
--- a/dev-java/jdbc-jaybird/files/compile-xml-2.1.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- client-java/build/compile.xml	2006-05-09 12:30:36.000000000 -0400
-+++ build/compile.xml	2006-05-09 12:38:08.000000000 -0400
-@@ -13,7 +13,7 @@
-     <ant antfile="build_native.xml"/>

-   </target>

-  

--  <target name="compile-examples">

-+  <target name="compile-examples" if="examples">

-   	<mkdir dir="${build.examples}"/>

-     <javac srcdir="${source.examples}"

-            destdir="${build.examples}"

-@@ -121,7 +121,7 @@
-     </path>

-   </target>

- 

--  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test">

-+  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test" if="tests">

-     <mkdir dir="${build.test}"/>

-     <javac srcdir="${source.test}"

-            destdir="${build.test}"

diff --git a/dev-java/jdbc-jaybird/files/dist-xml-2.0.1.patch b/dev-java/jdbc-jaybird/files/dist-xml-2.0.1.patch
deleted file mode 100644
index fd4c3c35afa6..000000000000
--- a/dev-java/jdbc-jaybird/files/dist-xml-2.0.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/dist.xml	2006-10-19 18:07:20.000000000 +0200
-+++ build/dist.xml	2006-10-19 18:10:11.000000000 +0200
-@@ -5,6 +5,7 @@
-     <mkdir dir="${build.docs}"/>

-     <javadoc packagenames="${packages}"

-              sourcepath="${source.java};${source.pool}"

-+			 source="1.4"
-              destdir="${build.docs}"

-              author="true"

-              version="true"

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
deleted file mode 100644
index 99cd56ca9c7a..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.16 2008/02/13 20:11:50 wltjr Exp $
-
-inherit eutils java-pkg-2
-
-At="JayBird-${PV}-src"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples source test"
-
-COMMON_DEPEND="dev-java/log4j"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	app-arch/unzip
-	dev-java/cpptasks
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/ant
-	)
-	source? ( app-arch/zip )
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="jaybird"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# make compiling of tests and examples optional, fix source/target
-	# disable checking for jdk version - default all to 1.4
-	# note that java-ant-2.eclass xml rewriting breaks here
-	epatch "${FILESDIR}/archive-xml-${PV}.patch"
-	epatch "${FILESDIR}/compile-xml-${PV}.patch"
-	epatch "${FILESDIR}/dist-xml-${PV}.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	# the build.xml unpacks this and uses stuff
-	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
-	rm -v *.jar *.zip
-	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
-
-	java-pkg_jar-from log4j log4j.jar log4j-core.jar
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	eant $(use test && echo "-Dtests=true") jars compile-native \
-		$(use_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full pool; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	cd "${S}/output/native"
-	sodest="/usr/lib/"
-	java-pkg_doso libjaybird2.so || die "java-pkg_doso ${sodest}libjaybird2.so failed"
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dojavadoc docs
-	dodoc etc/FAQ.txt
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	eant all-tests-pure-java
-}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
deleted file mode 100644
index 966d697ae50f..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.9 2008/02/13 20:11:50 wltjr Exp $
-
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-At="Jaybird-${PV/_/}-src"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jni"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/log4j"
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	app-arch/unzip
-	dev-java/log4j
-	jni? ( dev-java/cpptasks )
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="jaybird"
-
-# The build.xml breaks if -source gets rewritten
-# This ebuild should probably have a java5 use flag
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/archive-xml-${PV}.patch"
-	epatch "${FILESDIR}/compile-xml-${PV}.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	# the build.xml unpacks this and uses stuff
-	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
-	rm -v *.jar *.zip
-	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
-
-	java-pkg_jar-from log4j log4j.jar log4j-core.jar
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	eant $(use test && echo "-Dtests=true") jars \
-		$(use jni && echo "compile-native") \
-		$(use_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full pool; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	if use jni; then
-		cd "${S}/output/native"
-		sodest="/usr/lib/"
-		java-pkg_doso libjaybird21.so || die \
-			"java-pkg_doso ${sodest}libjaybird21.so failed"
-	fi
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/{*.txt,default.mf}
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	ANT_TASKS="ant-junit" eant all-tests-pure-java
-}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
deleted file mode 100644
index 1edebe5aba41..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.14 2008/02/13 20:11:50 wltjr Exp $
-
-inherit eutils java-pkg-2
-
-At="Jaybird-${PV/_/}-src"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc examples source test"
-
-COMMON_DEPEND="dev-java/log4j"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	app-arch/unzip
-	dev-java/cpptasks
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/ant
-	)
-	source? ( app-arch/zip )
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="jaybird"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/archive-xml-${PV}.patch"
-	epatch "${FILESDIR}/compile-xml-${PV}.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	# the build.xml unpacks this and uses stuff
-	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
-	rm -v *.jar *.zip
-	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
-
-	java-pkg_jar-from log4j log4j.jar log4j-core.jar
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	eant $(use test && echo "-Dtests=true") jars compile-native \
-		$(use_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full pool; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	cd "${S}/output/native"
-	sodest="/usr/lib/"
-	java-pkg_doso libjaybird21.so || die "java-pkg_doso ${sodest}libjaybird21.so failed"
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/{*.txt,default.mf}
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	eant all-tests-pure-java
-}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild
deleted file mode 100644
index 9381a264fd42..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild,v 1.1 2008/02/13 20:11:50 wltjr Exp $
-
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-At="Jaybird-${PV/_/}-src"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jni java5 java6"
-
-RDEPEND="java6? ( =virtual/jre-1.6* )
-	java5? ( =virtual/jre-1.5* )
-	!java6? ( !java5? ( =virtual/jre-1.4* ) )
-	dev-java/log4j"
-DEPEND="java6? ( =virtual/jdk-1.6* )
-	java5? ( =virtual/jdk-1.5* )
-	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
-	app-arch/unzip
-	dev-java/log4j
-	jni? ( dev-java/cpptasks )
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="jaybird"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
-	epatch "${FILESDIR}/compile_xml-${PV}.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	# the build.xml unpacks this and uses stuff
-	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
-	rm -v *.jar *.zip
-	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
-
-	java-pkg_jar-from log4j log4j.jar log4j-core.jar
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	eant $(use test && echo "-Dtests=true") jars \
-		$(use jni && echo "compile-native") \
-		$(use_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full pool; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	if use jni; then
-		cd "${S}/output/native"
-		sodest="/usr/lib/"
-		java-pkg_doso libjaybird21.so || die \
-			"java-pkg_doso ${sodest}libjaybird21.so failed"
-	fi
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/{*.txt,default.mf}
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	ANT_TASKS="ant-junit" eant all-tests-pure-java
-}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5.ebuild
deleted file mode 100644
index 0f1205215bdd..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5.ebuild,v 1.1 2008/06/30 21:28:00 wltjr Exp $
-
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-At="Jaybird-${PV/_/}-src"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="jni java5 java6"
-
-RDEPEND="java6? ( =virtual/jre-1.6* )
-	java5? ( =virtual/jre-1.5* )
-	!java6? ( !java5? ( =virtual/jre-1.4* ) )
-	dev-java/ant-core
-	dev-java/log4j"
-DEPEND="java6? ( =virtual/jdk-1.6* )
-	java5? ( =virtual/jdk-1.5* )
-	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
-	app-arch/unzip
-	dev-java/ant-core
-	dev-java/log4j
-	jni? ( dev-java/cpptasks )
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/ant-junit
-	)"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="jaybird"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
-	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
-
-	cd "${S}/lib/"
-	rm -v *.jar
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	# the build.xml unpacks this and uses stuff
-	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
-	rm -v *.jar *.zip
-	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
-
-	# Hack to add ant.jar to classpath without patch
-	java-pkg_jar-from ant-core ant.jar jaas.jar
-	java-pkg_jar-from log4j log4j.jar log4j-core.jar
-}
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	eant $(use test && echo "-Dtests=true") jars \
-		$(use jni && echo "compile-native") \
-		$(use_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full pool; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	if use jni; then
-		cd "${S}/output/native"
-		sodest="/usr/lib/"
-		java-pkg_doso libjaybird21.so || die \
-			"java-pkg_doso ${sodest}libjaybird21.so failed"
-	fi
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/{*.txt,default.mf}
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	ANT_TASKS="ant-junit" eant all-tests-pure-java
-}