Change the order of jdk dependencies.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index aae97c33ce4efba1b28dff1b814dde90de70aba4..bafcae4112f3e3a1a6e2ad5406c9b09eb8a828b2 100644 (file)
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-dbcp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.28 2007/04/02 15:11:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.29 2007/04/02 18:51:10 caster Exp $
+
+  02 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  commons-dbcp-1.2.1-r1.ebuild:
+  Change the order of jdk dependencies.
 
   02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   commons-dbcp-1.2.1-r1.ebuild:

diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index 41eba97ea960ef8b356b043280e8c005d9fe3ae4..89ad179d8115ce50b644cd6a73d56df97228d700 100644 (file)
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST commons-dbcp-1.2.1-src.tar.gz 578573 RMD160 397b1da0c870b6dc460a652c1cd695708f648719 SHA1 82db8bc09ab13b139c3ca3efffb223c8bc9c4a09 SHA256 31a2806955c667460222d2ebf3ec11f88181ccef7d4e10eb683cff55626a0061
-EBUILD commons-dbcp-1.2.1-r1.ebuild 1267 RMD160 187042fac7624499b3ba944f850c44b461ace380 SHA1 f973594f69cae96c502e547799b2eb64f308b22b SHA256 94fb480fcb7698c7c386395179ad20f1a41375c309dd4e574469b7c1c8ebd6fa
-MD5 374618ec1302ab4f155042b45d8a9907 commons-dbcp-1.2.1-r1.ebuild 1267
-RMD160 187042fac7624499b3ba944f850c44b461ace380 commons-dbcp-1.2.1-r1.ebuild 1267
-SHA256 94fb480fcb7698c7c386395179ad20f1a41375c309dd4e574469b7c1c8ebd6fa commons-dbcp-1.2.1-r1.ebuild 1267
+EBUILD commons-dbcp-1.2.1-r1.ebuild 1263 RMD160 aa74c7391134151463992d64ea291a605bb0e182 SHA1 314d2d4d0af66c9c8f08a03ae623be0acd60a637 SHA256 032f43b0e825b70f918dc0e3327c6fc430796eb8cca668e96739e7450c1a396d
+MD5 6afd58f9e7b37b8f6cca9520de5c11fb commons-dbcp-1.2.1-r1.ebuild 1263
+RMD160 aa74c7391134151463992d64ea291a605bb0e182 commons-dbcp-1.2.1-r1.ebuild 1263
+SHA256 032f43b0e825b70f918dc0e3327c6fc430796eb8cca668e96739e7450c1a396d commons-dbcp-1.2.1-r1.ebuild 1263
 EBUILD commons-dbcp-1.2.1.ebuild 1325 RMD160 0ecc3aaed7b0b5c3fbe38bc9b7a3aedb9727b59f SHA1 027d550a7e000264a274a43b20c1119ea0a0959b SHA256 244c34c917327c6ad459fdefe8ec1e82fb85a4be6d42688111323407864d0bd0
 MD5 62ebc18dcfa08f8a8fc349bdffc08a2b commons-dbcp-1.2.1.ebuild 1325
 RMD160 0ecc3aaed7b0b5c3fbe38bc9b7a3aedb9727b59f commons-dbcp-1.2.1.ebuild 1325
 SHA256 244c34c917327c6ad459fdefe8ec1e82fb85a4be6d42688111323407864d0bd0 commons-dbcp-1.2.1.ebuild 1325
-MISC ChangeLog 4199 RMD160 4b633e9134359a8efb8f7b6864cc056248e3c96f SHA1 eee0eb64d18e70b51fa18d672ea512146914f1c9 SHA256 a76f54c7c75e7cfef54629b714d03eff3a99298c8b70db0e92069daa67f5ea87
-MD5 6825312dc62ca0fddd36ed12593f214a ChangeLog 4199
-RMD160 4b633e9134359a8efb8f7b6864cc056248e3c96f ChangeLog 4199
-SHA256 a76f54c7c75e7cfef54629b714d03eff3a99298c8b70db0e92069daa67f5ea87 ChangeLog 4199
+MISC ChangeLog 4319 RMD160 0956f97474f6f829ba5e967f4ba3035959853b5e SHA1 980c72528e3c2424743cfed6840ccf68d7a4c29f SHA256 c8d5f58c5ae053d1e3ea53d84dda44dbfc78d8149ff01a39bcc8a6e9cbfbdc9d
+MD5 66563072f6bb45597c6e02cfdbe5ac5c ChangeLog 4319
+RMD160 0956f97474f6f829ba5e967f4ba3035959853b5e ChangeLog 4319
+SHA256 c8d5f58c5ae053d1e3ea53d84dda44dbfc78d8149ff01a39bcc8a6e9cbfbdc9d ChangeLog 4319
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -24,10 +21,3 @@ SHA256 1093fb58c9691f9fe7aa64e8005f5c104d3982d15df875e73d222ae74f37c960 files/di
 MD5 c653e6286799c9f71c443a22e902cb52 files/digest-commons-dbcp-1.2.1-r1 268
 RMD160 5b91486f3cf464ac76ec38502338122cc5b0061d files/digest-commons-dbcp-1.2.1-r1 268
 SHA256 1093fb58c9691f9fe7aa64e8005f5c104d3982d15df875e73d222ae74f37c960 files/digest-commons-dbcp-1.2.1-r1 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGER0XcxLzpIGCsLQRAnLBAJ40NApU6CPn8rzt7+S4yAp6vkCoKQCglJ7w
-5UJyLCM4XZNZchHyX5Vafow=
-=nQSF
------END PGP SIGNATURE-----

diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
index 6807d594770ceae9874a0165dc21f4ce85ef867c..92c6c397d7400ad8018f140bff2d6b10cbd35879 100644 (file)
--- a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.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-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.6 2007/04/02 15:11:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.7 2007/04/02 18:51:10 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,8 +16,8 @@ RDEPEND=">=virtual/jre-1.4
                ${COMMON_DEP}"
 # FIXME doesn't like API changes with Java 1.6
 DEPEND="|| (
-                       =virtual/jdk-1.4*
                        =virtual/jdk-1.5*
+                       =virtual/jdk-1.4*
                )
                ${COMMON_DEP}"
 LICENSE="Apache-2.0"