Removed older versoin in same slot. Per bug # 179788

Package-Manager: portage-2.1.2.7

4 files changed, 9 insertions, 116 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index d0054623dab8..a435be7aa221 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.15 2007/04/28 19:39:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.16 2007/05/29 19:16:00 wltjr Exp $
+
+  29 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -jdbc-jaybird-1.5.6.ebuild:
+  Removed older versoin in same slot. Per bug # 179788
 
   28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   jdbc-jaybird-2.1.0-r1.ebuild:
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index dfc74c44391d..ac8dc0038605 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX archive-xml-2.0.1.patch 387 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 SHA1 b53eec1c235b34d178e8851ab3e37d39e118c382 SHA256 6cfe878c1244d9201c5ed996abb70d0de76e21b27fa4899259a82da91dcc9de5
 MD5 4f432a684ef56a2acdbf3544104fff5c files/archive-xml-2.0.1.patch 387
 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 files/archive-xml-2.0.1.patch 387
@@ -21,13 +18,8 @@ AUX dist-xml-2.0.1.patch 377 RMD160 8b385d472e126a5994a7862a5dbe304cf304932b SHA
 MD5 435c1d2d1810515aa3a1dc739087f0ce files/dist-xml-2.0.1.patch 377
 RMD160 8b385d472e126a5994a7862a5dbe304cf304932b files/dist-xml-2.0.1.patch 377
 SHA256 dad962de758f785af7e0b4731a70ca2f32dc74acd5028572f93b4aa957d4a1dd files/dist-xml-2.0.1.patch 377
-DIST FirebirdSQL-1.5.6-src.zip 5073013 RMD160 95f855b67762d460d5ada06e7f7721cbfca9a0fc SHA1 73c7d79fc56a6ee925f8b73af08016a9cfbcac3b SHA256 a442191e450aa348270157cf0a5ebd683e4249c9c8d187a65f635b540fed83e7
 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
-EBUILD jdbc-jaybird-1.5.6.ebuild 2164 RMD160 1ef55f807a91a671656b830c107246de30651dc1 SHA1 222b11c21adbe0afedbf4590791a6f4d56d03b1d SHA256 9668de5aac7d0b38c8a2148b523a817967bcf7359625abfaa10c0bc7e9ae807a
-MD5 3fa1a5f283776f176758866caebd8415 jdbc-jaybird-1.5.6.ebuild 2164
-RMD160 1ef55f807a91a671656b830c107246de30651dc1 jdbc-jaybird-1.5.6.ebuild 2164
-SHA256 9668de5aac7d0b38c8a2148b523a817967bcf7359625abfaa10c0bc7e9ae807a jdbc-jaybird-1.5.6.ebuild 2164
 EBUILD jdbc-jaybird-2.0.1-r1.ebuild 2927 RMD160 0a853c217981b3236d05a086fd8b1561d938a1d0 SHA1 04d1f8c095142a02e9e71d07d4c69a7da6d50ab6 SHA256 5bcecce31510a6003891822480f782d1d1f4e4e88c3a499caf740bc05ecd6455
 MD5 d2a2c2710fa7cd463d7d9393cbe98fbc jdbc-jaybird-2.0.1-r1.ebuild 2927
 RMD160 0a853c217981b3236d05a086fd8b1561d938a1d0 jdbc-jaybird-2.0.1-r1.ebuild 2927
@@ -44,17 +36,14 @@ EBUILD jdbc-jaybird-2.1.0.ebuild 2684 RMD160 6ade0aef3215b195ae709b5cb89eed99edb
 MD5 1dec507c24c5189ec221033e56b58200 jdbc-jaybird-2.1.0.ebuild 2684
 RMD160 6ade0aef3215b195ae709b5cb89eed99edb2973a jdbc-jaybird-2.1.0.ebuild 2684
 SHA256 447ef0cf40d98ec1eebd719433cf6ce7b944b59d2a1a4f962822a825601118a2 jdbc-jaybird-2.1.0.ebuild 2684
-MISC ChangeLog 3334 RMD160 a07bf06d2447aa4e56e1bc9340c143e1566b0eb5 SHA1 ffc2446f1999e2825140f065bf4b53e6afc49ca0 SHA256 4dcde442ac07958377ca1c0f2b2b8028d7667dfc2599a54bcb05ff750e9b192e
-MD5 281615196b447245d3c5a558196c5166 ChangeLog 3334
-RMD160 a07bf06d2447aa4e56e1bc9340c143e1566b0eb5 ChangeLog 3334
-SHA256 4dcde442ac07958377ca1c0f2b2b8028d7667dfc2599a54bcb05ff750e9b192e ChangeLog 3334
+MISC ChangeLog 3472 RMD160 9398eaa8faabe0db3c772b07a7008d78cceb5033 SHA1 03302a14490691c1c70cda785bfd5bd4db98727b SHA256 4edab1436ff9af3433a95fff52a173e061eea7770828d4fab4adc423f406cc19
+MD5 13165e93d917ac0ff1fdc7d4dbe7332f ChangeLog 3472
+RMD160 9398eaa8faabe0db3c772b07a7008d78cceb5033 ChangeLog 3472
+SHA256 4edab1436ff9af3433a95fff52a173e061eea7770828d4fab4adc423f406cc19 ChangeLog 3472
 MISC metadata.xml 428 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 SHA1 76b3cd6dba37cfabeb1ef69314b1e05b8cd7bd12 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091
 MD5 37d8cbe784ce232ec1b6bd1e8cf5cde4 metadata.xml 428
 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 metadata.xml 428
 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091 metadata.xml 428
-MD5 60b0698c02ca2f552df9c9d691cede6c files/digest-jdbc-jaybird-1.5.6 259
-RMD160 1c71f93f49050ca46d1ee354ebcbc42b1549b61b files/digest-jdbc-jaybird-1.5.6 259
-SHA256 c0ef9550e74121b9b32f72ab8020d47ce5338d1c87538bdae8844f04ac6e51cc files/digest-jdbc-jaybird-1.5.6 259
 MD5 6c6a365fa003e27aa057f1b60b09bc71 files/digest-jdbc-jaybird-2.0.1 247
 RMD160 954d1ce9745c47233fc59a5eb7d4241840051671 files/digest-jdbc-jaybird-2.0.1 247
 SHA256 daac132ade2347576fc4870f504610e430c89211b336bfbcf262ee81e7473869 files/digest-jdbc-jaybird-2.0.1 247
@@ -67,10 +56,3 @@ SHA256 1bde00cf88acb3441873dada2c0efe24051a02bd5b35a0044ee28e169d516638 files/di
 MD5 2d275643a2fddc9000f8d416dd908e6b files/digest-jdbc-jaybird-2.1.0-r1 247
 RMD160 de7d5a5a54a1076bf0dc82ccba145e2843dd2c89 files/digest-jdbc-jaybird-2.1.0-r1 247
 SHA256 1bde00cf88acb3441873dada2c0efe24051a02bd5b35a0044ee28e169d516638 files/digest-jdbc-jaybird-2.1.0-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM6LwcxLzpIGCsLQRAtqPAJ904+QP+n8GPotASAgV+elmfifCVACfZDNK
-wtx1ccnBqVKQFeWexzp8Wfc=
-=HO/4
------END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6 b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6
deleted file mode 100644
index 7487cbbf439a..000000000000
--- a/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 483cc4fe22c5febd8caf947b7fff9a21 FirebirdSQL-1.5.6-src.zip 5073013
-RMD160 95f855b67762d460d5ada06e7f7721cbfca9a0fc FirebirdSQL-1.5.6-src.zip 5073013
-SHA256 a442191e450aa348270157cf0a5ebd683e4249c9c8d187a65f635b540fed83e7 FirebirdSQL-1.5.6-src.zip 5073013
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
deleted file mode 100644
index dfef1eebef5e..000000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild,v 1.3 2007/01/26 16:19:38 wltjr Exp $
-
-inherit eutils java-pkg-2
-
-At="FirebirdSQL-${PV}-src"
-DESCRIPTION="JDBC3 driver for Firebird SQL server"
-HOMEPAGE="http://firebird.sourceforge.net"
-SRC_URI="mirror://sourceforge/firebird/${At}.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc examples test source"
-
-COMMON_DEPEND="dev-java/log4j
-				dev-java/concurrent-util"
-RDEPEND="|| ( =virtual/jre-1.3 =virtual/jre-1.4* )
-		${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.3 =virtual/jdk-1.4* )
-		app-arch/unzip
-		test? (
-			dev-java/junit
-			dev-java/ant
-		)
-		!test? ( dev-java/ant-core )
-		source? ( app-arch/zip )
-		${COMMON_DEPEND}"
-
-S="${WORKDIR}/client-java"
-
-MY_PN="firebirdsql"
-
-pkg_setup() {
-	JAVA_PKG_WANT_SOURCE="1.2"
-	JAVA_PKG_WANT_TARGET="1.2"
-}
-
-src_unpack() {
-	unpack "${A}"
-
-	cd "${S}/lib/"
-	use test && java-pkg_jar-from --build-only junit junit.jar
-
-	cd "${S}/src/lib/"
-	rm *.jar *.zip
-	java-pkg_jar-from concurrent-util
-	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_doc javadocs)
-}
-
-src_install() {
-	cd "${S}/output/lib"
-	rm mini*.jar
-	java-pkg_dojar *.jar
-
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar 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
-
-	dodoc ChangeLog
-
-	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
-}