From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sat, 28 Apr 2007 19:39:26 +0000 (+0000)
Subject: Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb4cac53c028f50f2ab2227738f07feb553341c1;p=gentoo.git

Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
Package-Manager: portage-2.1.2.5
---

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index f74d48456cb5..d0054623dab8 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.14 2007/01/26 16:19:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.15 2007/04/28 19:39:26 betelgeuse Exp $
+
+  28 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jdbc-jaybird-2.1.0-r1.ebuild:
+  Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
 
   26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   jdbc-jaybird-1.5.6.ebuild, jdbc-jaybird-2.0.1.ebuild,
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index d8736614a907..dfc74c44391d 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -33,18 +36,18 @@ EBUILD jdbc-jaybird-2.0.1.ebuild 2890 RMD160 2a4d1d5a49cccf07c1bcff4e8b1eb22869d
 MD5 fe65a0801a54d06dd7e795dda4f1c75c jdbc-jaybird-2.0.1.ebuild 2890
 RMD160 2a4d1d5a49cccf07c1bcff4e8b1eb22869d83c88 jdbc-jaybird-2.0.1.ebuild 2890
 SHA256 92b860cc1d207632299fd92d95430dd1e0e1c3e31b7aa43758d85c4ff6e830b2 jdbc-jaybird-2.0.1.ebuild 2890
-EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2721 RMD160 c41c21f56bc820a81f57b24779f710ddb483f9a4 SHA1 e71e18aab66c4620509e609ae5141b646ae00eb4 SHA256 c80fa419b34ff0db84bc625446d5840abfb0638094648c4f7e285f0c8bf2888f
-MD5 749e6068dc48f56d28887937d33d3a04 jdbc-jaybird-2.1.0-r1.ebuild 2721
-RMD160 c41c21f56bc820a81f57b24779f710ddb483f9a4 jdbc-jaybird-2.1.0-r1.ebuild 2721
-SHA256 c80fa419b34ff0db84bc625446d5840abfb0638094648c4f7e285f0c8bf2888f jdbc-jaybird-2.1.0-r1.ebuild 2721
+EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2662 RMD160 58de966f87fc4939398153439e343495c7746ffe SHA1 03a2cf3e4ac50b0e3f2fc52252640010c7a635a7 SHA256 c8781c2ec649ab7eab88e2ea0995c4ccd1d587c7329535229848a4ef4311aff4
+MD5 3939019eb222bb7be49af87ec645aeb2 jdbc-jaybird-2.1.0-r1.ebuild 2662
+RMD160 58de966f87fc4939398153439e343495c7746ffe jdbc-jaybird-2.1.0-r1.ebuild 2662
+SHA256 c8781c2ec649ab7eab88e2ea0995c4ccd1d587c7329535229848a4ef4311aff4 jdbc-jaybird-2.1.0-r1.ebuild 2662
 EBUILD jdbc-jaybird-2.1.0.ebuild 2684 RMD160 6ade0aef3215b195ae709b5cb89eed99edb2973a SHA1 0854958376958e2c7b728049f1f33a97a50bc843 SHA256 447ef0cf40d98ec1eebd719433cf6ce7b944b59d2a1a4f962822a825601118a2
 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 3196 RMD160 46979a0d8015f1caa32e35333196e9fb47dd706b SHA1 7f762f47f7991dbf6292ed57e6bc9e73973d6c72 SHA256 136ca2f1ac8d3d489219061ccf0eded0413d637d15ca920e28c67e5adabdca4a
-MD5 b2f45c5418344894bd7b868639528811 ChangeLog 3196
-RMD160 46979a0d8015f1caa32e35333196e9fb47dd706b ChangeLog 3196
-SHA256 136ca2f1ac8d3d489219061ccf0eded0413d637d15ca920e28c67e5adabdca4a ChangeLog 3196
+MISC ChangeLog 3334 RMD160 a07bf06d2447aa4e56e1bc9340c143e1566b0eb5 SHA1 ffc2446f1999e2825140f065bf4b53e6afc49ca0 SHA256 4dcde442ac07958377ca1c0f2b2b8028d7667dfc2599a54bcb05ff750e9b192e
+MD5 281615196b447245d3c5a558196c5166 ChangeLog 3334
+RMD160 a07bf06d2447aa4e56e1bc9340c143e1566b0eb5 ChangeLog 3334
+SHA256 4dcde442ac07958377ca1c0f2b2b8028d7667dfc2599a54bcb05ff750e9b192e ChangeLog 3334
 MISC metadata.xml 428 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 SHA1 76b3cd6dba37cfabeb1ef69314b1e05b8cd7bd12 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091
 MD5 37d8cbe784ce232ec1b6bd1e8cf5cde4 metadata.xml 428
 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 metadata.xml 428
@@ -64,3 +67,10 @@ 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/jdbc-jaybird-2.1.0-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
index a6023e4c37b6..ecbde3b3fd4e 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,8 @@
 # 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-2.1.0-r1.ebuild,v 1.3 2007/01/26 16:19:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.4 2007/04/28 19:39:26 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source examples test"
 
 inherit eutils java-pkg-2
 
@@ -11,20 +13,18 @@ SRC_URI="mirror://sourceforge/firebird/${At}.zip"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples jni source test"
+IUSE="jni"
 
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
+RDEPEND=">=virtual/jre-1.4
 		dev-java/log4j"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
 		app-arch/unzip
 		dev-java/log4j
 		jni? ( dev-java/cpptasks )
 		test? (
 			dev-java/junit
 			dev-java/ant
-		)
-		!test? ( dev-java/ant-core )
-		source? ( app-arch/zip )"
+		)"
 
 S="${WORKDIR}/client-java"