Prefer virtual/jdk-1.5 over virtual/jdk-1.4

Package-Manager: portage-2.1.2.3

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index 814f9af93e2285b9df270bcbff3cf194c0e2f6e5..03deba6c9c7f4cdf9e89cb363a8a122d1f89ea31 100644 (file)
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/jxtray
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.20 2007/03/03 07:06:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.21 2007/04/02 21:05:22 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jxtray-0.5-r3.ebuild:
+  Prefer virtual/jdk-1.5 over virtual/jdk-1.4
 
   03 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org> -jxtray-0.5.ebuild:
   Removing older version that deps on soon to be removed jdbc-firebirdsql

diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index b10875280bf2970ff0ca9ec3af9be4e552142a3f..96d3553be4d0ab2c1de9fe60efe6a0624b62432a 100644 (file)
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 1599 RMD160 b63f18fc103695edb7e97a6065121cfa106ea9e2 SHA1 91d54eda8eca0064bbf62da066a65c61449af087 SHA256 4a134433577e5bca6f66851878f2359b01e5d0692d34143b4834d9cec09730cc
 MD5 97bb388f459c454b06a8276c62609259 files/build.xml 1599
 RMD160 b63f18fc103695edb7e97a6065121cfa106ea9e2 files/build.xml 1599
@@ -15,14 +18,14 @@ EBUILD jxtray-0.5-r2.ebuild 1967 RMD160 5ef8d28e4adf3251434dfe7606b95dcdc45a35b5
 MD5 609d763f28736c7bcf04947d3cf5b670 jxtray-0.5-r2.ebuild 1967
 RMD160 5ef8d28e4adf3251434dfe7606b95dcdc45a35b5 jxtray-0.5-r2.ebuild 1967
 SHA256 0b3900b84b9b7fd7ec74a04922ea98a65b99c9e43a2be12595c00c4d69f94ff2 jxtray-0.5-r2.ebuild 1967
-EBUILD jxtray-0.5-r3.ebuild 1957 RMD160 402e0edd15129381600cc0fb9dd1135a4ab09be1 SHA1 b574298c7d127fbd1a7d817c53a4c8f4836fee81 SHA256 e2ead544e373d0966b2f89e0871b41fd6e34575ef314cb3371906c5a781eac96
-MD5 68327318124727a06969817664e86ab1 jxtray-0.5-r3.ebuild 1957
-RMD160 402e0edd15129381600cc0fb9dd1135a4ab09be1 jxtray-0.5-r3.ebuild 1957
-SHA256 e2ead544e373d0966b2f89e0871b41fd6e34575ef314cb3371906c5a781eac96 jxtray-0.5-r3.ebuild 1957
-MISC ChangeLog 3144 RMD160 859656ece3d115e151f100ce467e54c165c74245 SHA1 bac68ee0a87309802a95bf211cb80be98ce051ea SHA256 e4d955248bc77272f6be8bbdc71132fed33709dd2d1f4b459e7ad7681d1809ee
-MD5 bd08b2a09a8c740d32cba2863fa32841 ChangeLog 3144
-RMD160 859656ece3d115e151f100ce467e54c165c74245 ChangeLog 3144
-SHA256 e4d955248bc77272f6be8bbdc71132fed33709dd2d1f4b459e7ad7681d1809ee ChangeLog 3144
+EBUILD jxtray-0.5-r3.ebuild 1949 RMD160 5fe5c9c729603ea71bf66b4daca8bfa1a0decc2e SHA1 cb4b576f6263d2ed880aa9fc6cc1a65cd559819e SHA256 b1b1dc78df448e0f3a4bca97a0b146b1c0884bd6005e3c85a9c7eb8f92a5a1e4
+MD5 94b6f282f7bc5c56a12e2b828859cc5f jxtray-0.5-r3.ebuild 1949
+RMD160 5fe5c9c729603ea71bf66b4daca8bfa1a0decc2e jxtray-0.5-r3.ebuild 1949
+SHA256 b1b1dc78df448e0f3a4bca97a0b146b1c0884bd6005e3c85a9c7eb8f92a5a1e4 jxtray-0.5-r3.ebuild 1949
+MISC ChangeLog 3271 RMD160 84089afdf346a80cd162ae4002f0c0af45744e21 SHA1 086339cda56bb1f6a1b9dd348a4543c1bc919fa9 SHA256 9e98ef18c178c7e80ed0306af68e5351238757b49d919599030316c2d035fabe
+MD5 25350f5d78e4fd46b7439093c92d4eb8 ChangeLog 3271
+RMD160 84089afdf346a80cd162ae4002f0c0af45744e21 ChangeLog 3271
+SHA256 9e98ef18c178c7e80ed0306af68e5351238757b49d919599030316c2d035fabe ChangeLog 3271
 MISC metadata.xml 586 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 SHA1 d4a26605f4ccfbdc0a582cccec0bf6c7dcc5829d SHA256 4be3c32bfe30ef7b3d9c516caf50be3c23508dac87bf643edfcd0835f68a4aaf
 MD5 594c956745248197dd33c47c01686464 metadata.xml 586
 RMD160 774dae3c502ca2fdb4e906211cdfb5b7ecf3e9a7 metadata.xml 586
@@ -36,3 +39,10 @@ SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/di
 MD5 7af89aae3e508d01ce8dfab9af1d81be files/digest-jxtray-0.5-r3 238
 RMD160 195074f5a992ba75b3228faf6ef28ac00b168a6e files/digest-jxtray-0.5-r3 238
 SHA256 ce525836d421d7614397a7dc09f5c1f74f6431fb4e650a1e68cc6c98b15e72f4 files/digest-jxtray-0.5-r3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGEXAVcxLzpIGCsLQRAmeqAJoDziROiHK08AXsDAJJh3NEX9aH2QCfR/ms
+TbDNq1fPNHEo3WbanUUEob8=
+=xxi9
+-----END PGP SIGNATURE-----

diff --git a/dev-db/jxtray/jxtray-0.5-r3.ebuild b/dev-db/jxtray/jxtray-0.5-r3.ebuild
index a6c814434d0219d68171ab6f72ccefdacd306738..df0516385d10634c0c93dbd6540705dfc4bed5a1 100644 (file)
--- a/dev-db/jxtray/jxtray-0.5-r3.ebuild
+++ b/dev-db/jxtray/jxtray-0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r3.ebuild,v 1.1 2007/01/30 10:52:41 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5-r3.ebuild,v 1.2 2007/04/02 21:05:22 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc firebird mssql mysql postgres"
 
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+COMMON_DEP="
        >=dev-java/jdom-1.0
        >=dev-java/kunststoff-2.0.2
        dev-java/poi
@@ -24,9 +24,10 @@ RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
        mysql? ( dev-java/jdbc-mysql )
        postgres? ( dev-java/jdbc-postgresql )
        !firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
-       ${RDEPEND}
-       dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.4
+       ${COMMON_DEP}"
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+       ${COMMON_DEP}"
 
 S="${WORKDIR}/${PN}-src-${PV}"