6 files changed, 22 insertions, 16 deletions
diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 9fb2a8d2d346..6e050ba90e2d 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.12 2006/12/10 20:15:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.13 2007/01/05 00:35:58 wltjr Exp $
+
+  27 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  jdbc-jaybird-1.5.6.ebuild, jdbc-jaybird-2.0.1.ebuild,
+  jdbc-jaybird-2.0.1-r1.ebuild, jdbc-jaybird-2.1.0.ebuild,
+  jdbc-jaybird-2.1.0-r1.ebuild:
+  Removed * from 1.5 virtuals
 
 *jdbc-jaybird-2.1.0-r1 (10 Dec 2006)
 *jdbc-jaybird-2.0.1-r1 (10 Dec 2006)
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
index 54e774663139..06aa967229f1 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1 2006/12/10 20:15:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild,v 1.2 2007/01/05 00:35:58 wltjr Exp $
 
 inherit java-pkg-2
 
@@ -12,9 +12,9 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
 	app-arch/unzip"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )"
 S=${WORKDIR}
 
 src_install() {
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
index 4c03a45ca7e7..3afc377f61ed 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/12/10 20:15:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild,v 1.2 2007/01/05 00:35:58 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples jni source test"
 
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
 		dev-java/log4j"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
 		app-arch/unzip
 		dev-java/log4j
 		jni? ( dev-java/cpptasks )
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
index bdc2bba594a8..856e5c7526bc 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.9 2006/11/05 19:23:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.10 2007/01/05 00:35:58 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -14,9 +14,9 @@ KEYWORDS="amd64 x86"
 IUSE="doc examples source test"
 
 COMMON_DEPEND="dev-java/log4j"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
 		${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
 		app-arch/unzip
 		dev-java/cpptasks
 		test? (
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
index c41f9604f955..17ca37485d67 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1 2006/12/10 20:15:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.2 2007/01/05 00:35:58 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples jni source test"
 
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
 		dev-java/log4j"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
 		app-arch/unzip
 		dev-java/log4j
 		jni? ( dev-java/cpptasks )
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
index c11bae702a66..1240a9e076af 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.7 2006/11/08 07:55:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.8 2007/01/05 00:35:58 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 x86"
 IUSE="doc examples source test"
 
 COMMON_DEPEND="dev-java/log4j"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
 		${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
 		app-arch/unzip
 		dev-java/cpptasks
 		test? (