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

Package-Manager: portage-2.1.2.4

3 files changed, 22 insertions, 17 deletions

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index ddcb7290aa83..83b7adab542e 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-jxpath
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.15 2007/01/22 21:24:55 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.16 2007/04/25 18:01:47 betelgeuse Exp $
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-jxpath-1.2-r2.ebuild:
+  Prefer virtual/jdk-1.5 over virtual/jdk-1.4.
 
   21 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   commons-jxpath-1.2-r2.ebuild:
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index e8712058f720..3110395a11da 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -15,14 +15,14 @@ EBUILD commons-jxpath-1.1-r2.ebuild 1295 RMD160 b8609cfe5fc63b2bf6f8b1eaf773127d
 MD5 f650ffcc29ab7bd7a9296c52233c4a8e commons-jxpath-1.1-r2.ebuild 1295
 RMD160 b8609cfe5fc63b2bf6f8b1eaf773127d10668eb5 commons-jxpath-1.1-r2.ebuild 1295
 SHA256 2d1ee566b95f14eefe3c6477d0ad82e8daaf478f3f1bf454ffddbbb0c8a42c03 commons-jxpath-1.1-r2.ebuild 1295
-EBUILD commons-jxpath-1.2-r2.ebuild 1542 RMD160 4e1aaec38e36d72c07a73bdf21c67849c4663c35 SHA1 342d849a4150103f1ad0a11e6d330f82513e6ff9 SHA256 4a7ad7a88397a0df23df566bf108e6d3b4fcc7df2e6973b42dc0b7d186c6edb5
-MD5 12ee69121b3e795d9075837d49a5a475 commons-jxpath-1.2-r2.ebuild 1542
-RMD160 4e1aaec38e36d72c07a73bdf21c67849c4663c35 commons-jxpath-1.2-r2.ebuild 1542
-SHA256 4a7ad7a88397a0df23df566bf108e6d3b4fcc7df2e6973b42dc0b7d186c6edb5 commons-jxpath-1.2-r2.ebuild 1542
-MISC ChangeLog 2273 RMD160 4b2e36760b285f504424f10698435e6c5f552eeb SHA1 3042313cec213d6bd9f2e2c495b379c50e5ff2e1 SHA256 f98a1b96da60c3b85bbc0976dfadee156852ff0303597d8b65cbfcb84436f6d6
-MD5 371ee39357351d7b569ec9c8d810ff40 ChangeLog 2273
-RMD160 4b2e36760b285f504424f10698435e6c5f552eeb ChangeLog 2273
-SHA256 f98a1b96da60c3b85bbc0976dfadee156852ff0303597d8b65cbfcb84436f6d6 ChangeLog 2273
+EBUILD commons-jxpath-1.2-r2.ebuild 1531 RMD160 e4c3485108fc66d3388faa03dea1180c06b86fa1 SHA1 56fce4d32b17acad0684855ff911b0fbe2fedf59 SHA256 04a9b510ac72487f7ff1bf758b135532d5a9421191c732ed24f310d32b722a2a
+MD5 41a49b8df41f1ac1fe7ba3c4c6ce401b commons-jxpath-1.2-r2.ebuild 1531
+RMD160 e4c3485108fc66d3388faa03dea1180c06b86fa1 commons-jxpath-1.2-r2.ebuild 1531
+SHA256 04a9b510ac72487f7ff1bf758b135532d5a9421191c732ed24f310d32b722a2a commons-jxpath-1.2-r2.ebuild 1531
+MISC ChangeLog 2412 RMD160 ea7d6dbb1f61e77db0314fd89a3e3d1aba195679 SHA1 da0defe8a53b43312e438a5e150ff780d4778d09 SHA256 94c62b91850d66fe854146e828478e3eaf6544701ab05f685d8099b29954d64b
+MD5 ce9e3ab3eddd6d15e3bc7d8c046f4690 ChangeLog 2412
+RMD160 ea7d6dbb1f61e77db0314fd89a3e3d1aba195679 ChangeLog 2412
+SHA256 94c62b91850d66fe854146e828478e3eaf6544701ab05f685d8099b29954d64b ChangeLog 2412
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -37,9 +37,9 @@ MD5 1c0580380dd9face127c630de498eba8 files/digest-commons-jxpath-1.2-r2 268
 RMD160 934f49297e2eac197117efb3af08fab59813d744 files/digest-commons-jxpath-1.2-r2 268
 SHA256 d02b085df57c226745148456c00f2203455a5cecf31f51aeb422dfc3915b5e72 files/digest-commons-jxpath-1.2-r2 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFtSutV3J2n04EauwRAjClAKCAjrR9ezrA9sWYZMLVSO6nHk0r7QCgxvYn
-K4vSqF/hBtE7qoNuT5CIP0g=
-=6YfE
+iD8DBQFGL5eQcxLzpIGCsLQRAt3IAJ444T5ZSX70jaAk+iIW5+qmuI1xwQCeMOJc
+ULV9Tp8E5d2TfIg1CdtiQ2c=
+=tKP0
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
index 5441e4d49b63..e06da104cd9c 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.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/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.2 2007/01/21 18:02:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.3 2007/04/25 18:01:47 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,7 +13,7 @@ SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc source test"
+IUSE=""
 
 COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
 	=dev-java/servletapi-2.3*
@@ -19,8 +21,7 @@ COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 # Java 1.6's javadoc doesn't like enums
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
-	!test? ( dev-java/ant-core )
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	test? (
 		dev-java/ant
 		dev-java/commons-collections