Remove old.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

11 files changed, 10 insertions, 679 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/Manifest b/dev-java/jdbc-jaybird/Manifest
index 06168f3aa085..7108f7bf2824 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,29 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX archive-xml-2.0.1.patch 387 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 SHA1 b53eec1c235b34d178e8851ab3e37d39e118c382 SHA256 6cfe878c1244d9201c5ed996abb70d0de76e21b27fa4899259a82da91dcc9de5
 AUX archive-xml-2.1.0.patch 399 RMD160 b84c5992739ce8db698dbe6562e3cae2f8099d3c SHA1 5bdf1fef96ce163cc90a8c6836ac3c9fc9f33f14 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a
-AUX compile-xml-2.0.1.patch 2905 RMD160 d5b616b649d284d99336232ed153d5c89e79db69 SHA1 1bbc825d884f19ae5e04d57fab9283f8a453cf01 SHA256 6305741ff6808857ceabd53c0c1578b218e954c531e8617e40c265ba5637f14c
-AUX compile-xml-2.1.0.patch 765 RMD160 6c05eda9ae904d06d8adb0cbaaf8c72a1881c736 SHA1 4259d97a0beab831c0fc3dc28038980bdec42b54 SHA256 f06048766fe9d9e3daf3824fd0c78a3e03cafc5de68e8a0c05d576170f499079
 AUX compile_xml-2.1.2.patch 892 RMD160 82f69ec15d1b1b13a9fc01ef14a956a368738f49 SHA1 2340cafff9e86bc6827a2749dcd367d5b16652d6 SHA256 dcf1f38895dbe194532ee4f10f47aa1736db50d9689bea6625328339cda24a97
-AUX dist-xml-2.0.1.patch 377 RMD160 8b385d472e126a5994a7862a5dbe304cf304932b SHA1 2714eacc7511394f663abcf5cbae29904a4d9f4e SHA256 dad962de758f785af7e0b4731a70ca2f32dc74acd5028572f93b4aa957d4a1dd
-DIST JayBird-2.0.1-src.zip 4899770 RMD160 50e3fb99668ca08116fec3838892e1e6ff4b8e7d SHA1 21adf4a88660c10f7afb2daddec2c4826d068fd7 SHA256 ad3d6ad4199419752281c0e11f445fd109542499d162b5356e98e6eceb25a914
-DIST Jaybird-2.1.0-src.zip 5004088 RMD160 1066f39a393ff14812c907c38aeb094c407114da SHA1 a99c4b0ed90ff1252d6f5b076bfad8087eda6faf SHA256 a96cff648af0ef01b48e3471525d2447a76015e609bbf81a54c372d2963e0214
-DIST Jaybird-2.1.2-src.zip 5835474 RMD160 089e606c073e43d247b8ec121955bcd3b9367ae7 SHA1 8c614373dd18ca05d5de1ae31dd7a955097517ac SHA256 fde4ce32e3bbedb6f2953c541b8d5d94ddeeb6f7aeaf38f3f9dd186f8925612c
 DIST Jaybird-2.1.5-src.zip 6047595 RMD160 08cce25d28a265c04a040dda22f9a1da25fd68c4 SHA1 6ef99462fb9ee8a2820418875e360b0c2282b951 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868
-EBUILD jdbc-jaybird-2.0.1.ebuild 2837 RMD160 2c127d8b1625d64754fa18311868b0c6314452eb SHA1 cddf0e6ec30a5d459343bc8f5b3f120b1d4fcc52 SHA256 d5c2cc16f392fd01f366f99f69b40c5c99e3e412bf11f57e9f41bc5570b2035d
-EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2824 RMD160 6ab2f83ae6f4aa17398a36b044b1b706ed97a02d SHA1 9ee0ff0673c8349491dc44012417d1667ee39c2f SHA256 c11f6a9161fa865dcfdebb219d1cfd924a0c88b03bbc1105817dc753840c5c40
-EBUILD jdbc-jaybird-2.1.0.ebuild 2630 RMD160 85592522b38e57a43ef14def193517610d4d50a8 SHA1 b4d7928557538d186b3bfe5b8931e1b82c0e34a2 SHA256 edb4e3c109cf06e8c41f74beca6a829928250106b55b8251924620f27d5d5e2e
-EBUILD jdbc-jaybird-2.1.2.ebuild 2853 RMD160 261881f7049ada3509eba8d61ab241d9afdd91a9 SHA1 abdb5bb38f1199e404298dafb69b26f49770e185 SHA256 197314c5a4d8aafbac92ecb62f9665aac3e0abd9a71ade71014499a9bc0d73e8
 EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2664 RMD160 51b0ac14b2ef4906434838c5849332ac146e48f9 SHA1 67d67007b0cb67398a09b48da375aa67c5c1562b SHA256 49c406ec6f56c9effadb1c7a63eea577405cac282836afe3a410626860f0ff51
 EBUILD jdbc-jaybird-2.1.5-r2.ebuild 2933 RMD160 80c0a7cba5e7bf989f768e843c04b58738bc882c SHA1 2612c1243a8327db3c01022972fef896961c26fd SHA256 32945cc8b5d1cf24693d0f5b9bbb410abbe6d0f02d4cfbc266bacc1c68d0a97b
-EBUILD jdbc-jaybird-2.1.5.ebuild 2986 RMD160 c4e06210bd8c821d3f57cf8de755f3a7db36767b SHA1 8ec272a076de6cb9c0d9dc2ab02a4cc65e77b8d8 SHA256 21c9e420c3fff1f5f9a77d54f30c7fdacab10e2590caffe48b624584ed73cb6e
-MISC ChangeLog 5790 RMD160 75559c2e14d94a89a4e351388a0f99c817539674 SHA1 fd97ddd0abda4329d9a9c0da5459de6ca224ce35 SHA256 81fb5518bcbd52f875dbdbd4d1bde83c61f15debf1857a198bb80a52816fa7ae
+MISC ChangeLog 6134 RMD160 913e033b6a4ded88f4d26a66059f34b50297a7e4 SHA1 f35c164eb06c68a323d387afcc0bf0207f63b171 SHA256 5ac902123c59a58c46aa099a354c99cb397bfb6dda15b2546389d5bcafd584cc
 MISC metadata.xml 414 RMD160 a7cdce874ba139f5314bcb45cf8393cc3fc01eb6 SHA1 162a57f24ec42e9204e70841d1a20a24ab8cdfc1 SHA256 d3635c61fd3bc2e887561ab219c5cf0ab20a8e9a6ca0f27d104585f1db3319a4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr5egwACgkQkKaRLQcq0GKQDwCgm02SqjlIYO1kI26ARU7kSIWH
-aC8Anig4S9/W0+DUzPJMwKViwK0FYvO2
-=Eufp
------END PGP SIGNATURE-----
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
-}