Don't restrict dependency to 1.5 jdk for tests, since they are disabled anyway.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-java/icu4j/ChangeLog b/dev-java/icu4j/ChangeLog
index 1b4c1feeaa78e66a2234745f4d70a839c1a8c5dc..6ef249207d0fede695932ecf5d968dd34878ba88 100644 (file)
--- a/dev-java/icu4j/ChangeLog
+++ b/dev-java/icu4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icu4j
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.35 2010/03/20 13:49:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/ChangeLog,v 1.36 2010/04/05 23:50:45 caster Exp $
+
+  05 Apr 2010; Vlastimil Babka <caster@gentoo.org> icu4j-3.8.1-r1.ebuild:
+  Don't restrict dependency to 1.5 jdk for tests, since they are disabled
+  anyway.
 
   20 Mar 2010; Pacho Ramos <pacho@gentoo.org> icu4j-4.0.1.1.ebuild:
   amd64 stable, bug 310181

diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 9391a130fda25c4c6a41c801254b337049fc73b7..69eb6bb2b9e74c15a5b4129662d09e8e20184f5b 100644 (file)
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icu4j-3.8.1-manifest 781 RMD160 a7ed98a6cd2977a8dfbcf4231dc06b5fb0b0dcf9 SHA1 57d00b01e51fe5c196ea51bfa841326b6ab6ea63 SHA256 1a1db870dac202bf316d4a13b92551d4223a49b7ed8182a17fd053ed03953826
 AUX icu4j-4.0-manifest 785 RMD160 4d6026d51c29b39a26ba09203fdc82b1ac6df88f SHA1 0a14e30093a8ee1f224895ec0ae054f4431c4426 SHA256 d2b1599ac0826cab97290a4ac3f54b01330d54a046d0ed28c5f26ef558addc41
 DIST icu4j-3_8_1-docs.jar 1470606 RMD160 8131fc868505050ded8563618f3a287e0a57d8eb SHA1 261ba7e69c97e1ea98f08c878280f9cc313184af SHA256 e3acbb4523ebf90288bde1ff4ebe16241ff8d5a3e53ce9e29636f569a42f0b46
@@ -9,15 +6,8 @@ DIST icu4j-4_0_1_1-docs.jar 1553089 RMD160 e8304c27dc363ae99d2ddb6a0624e869c7c3a
 DIST icu4j-4_0_1_1-src.jar 15138020 RMD160 d6cd5163ebbf7bcb2bdfd8f65f83e9ec390c290d SHA1 daa3467983e6ecd735cd67e5920170702375bc7d SHA256 9d5484ccb3ad6849b6d3986ee2cf146984cbbb8adb2349dc79f6a4e006bc417e
 DIST icu4j-4_2-docs.jar 1635014 RMD160 1849be04b1bd26bf3cd3ae6cfff20a2e531b16ed SHA1 63bff833fc3818da74d035e66542b8cb2eacfb6d SHA256 11640200bfb4e9c7dd012ee8a02f32b83262ad1a497926d1dc31124b9a3b1a0e
 DIST icu4j-4_2-src.jar 15994443 RMD160 3a32e25032845568f2a08958042f5b9177e1b575 SHA1 43521cf6e9fb4a457e54bf82a1375aa4e96e57e1 SHA256 0d025dd566ef0eb7135980cc406a69536d7219bed6b7ae385f84f0713a83aba1
-EBUILD icu4j-3.8.1-r1.ebuild 2571 RMD160 463b4fb0023598cfd72e0b8862b5b82281e43e37 SHA1 574c8196e639fc342702373e65be2b6fc1506617 SHA256 7ff619c9d7f566659529148dfdafcc1d6997f44f27dcacc37f1cbd4bda133f41
+EBUILD icu4j-3.8.1-r1.ebuild 2686 RMD160 4c70cde175a7e5125d28f6eb69d6cac8c5f2e67c SHA1 a224038c20d1661ee2269f487ddb7f896d402813 SHA256 89d6aa5745b802217e9afcb4ff26d5b263b6c0e61c7992b6c05ab34f3fcf0212
 EBUILD icu4j-4.0.1.1.ebuild 2328 RMD160 fd3430cfb50bb2a8c7cefcb6061b34453dde547b SHA1 3c24c9b0b47db3e07a6aca13fceca025e298cfb9 SHA256 87f6d19ac01cfe80f75616b638bcb216a7c96f86316ab2e97b04e9dc8dbb1895
 EBUILD icu4j-4.2.ebuild 2135 RMD160 ca8b32af6cde432dfe357a18fe01573d882c5256 SHA1 a57a8a6f4df2c67312f326f521e05715bff923b8 SHA256 822a7bc1f75147d77311025beea5db83b2ad99557060b93206c2656acbfa3bf8
-MISC ChangeLog 5023 RMD160 d5ac32b6d9197d010cfef544d72044d185eeb927 SHA1 f85c638cde5c57483932f4a301fd8db8719253d1 SHA256 f6a57c089cda3f4e7ad18ed48d383a375bf65fc4a73c7e0084e85bdcc3939b02
+MISC ChangeLog 5183 RMD160 c402b60d5e42ece09f666a92f308944204954541 SHA1 4c462604d9b228f4fa4fab89419ac70bf9a69d45 SHA256 2b4dffe382caa7d0dbc3670a8fab8408a43b267f40c8226292e6e74050f0f0bd
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuk0oMACgkQCaWpQKGI+9SSZQCfaNRent2W4kuneUCHKyuA1XeX
-OegAn2PpZU4hq3eOmSmxOZ2ZaU+91JvV
-=3uiW
------END PGP SIGNATURE-----

diff --git a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
index 5299405fdffaf39c788b71ea437f991fad64ff75..7bb66f808d342a5598a2426a5e77b3424c14fb77 100644 (file)
--- a/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
+++ b/dev-java/icu4j/icu4j-3.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.8.1-r1.ebuild,v 1.5 2010/01/03 20:45:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.8.1-r1.ebuild,v 1.6 2010/04/05 23:50:45 caster Exp $
 
 # We currently download the Javadoc documentation.
 # It could optionally be built using the Ant build file.
@@ -27,12 +27,17 @@ RDEPEND=">=virtual/jre-1.4"
 
 # build.xml does file version detection that fails for 1.7
 # http://bugs.gentoo.org/show_bug.cgi?id=213555
-DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
-       !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
        app-arch/unzip"
 
+# test curently disabled
+#DEPEND="test? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+#      !test? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
+
 IUSE="doc test"
 
+RESTRICT="test"
+
 S="${WORKDIR}"
 
 src_unpack() {

diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index a4fb04eee9b938b04a13b7aa6d8b7945621d42b2..fa60c7749e20522187790ef0b186ce184c41269b 100644 (file)
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,18 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xmlunit-1.0-gentoo.patch 993 RMD160 b5361f2cfe6d7455020d8b176abe3ad0358a634a SHA1 a58417b2a6b434029af924432365b389294bde73 SHA256 e4ee42289943b390869d53313161b0820f5864994a3750d740c80e870058fbde
-AUX xmlunit-1.0-r2-build.xml.patch 980 RMD160 92acd3a877c09592f6e77d9bd00bf932f58255f3 SHA1 57bbe252beb41d98861d5c832de3691391b17997 SHA256 d144de102440d906b58f51bd2cb62a3c6b47530e4177490e0614827e11e98b59
 DIST xmlunit-1.3-src.zip 836670 RMD160 7f9c4d1467c9701a6d93cfab24cbe2a2be6d7573 SHA1 b0d05b7a67ca2343668f61c0ba0ca2eecda86746 SHA256 fe5ff18925a4b07a70d939a1211fed2c021496ac6bedaacff884c29c8d01b42f
-DIST xmlunit1.0.zip 421131 RMD160 1cac117a5fb857f052d90731e110ce56f2bf78a1 SHA1 7fc03613f0534ca993c7395f3b964e3099992d5e SHA256 da85e544011fa0499b74ae9363a5130cc34c27a92349521bc4b6f25832ddee81
-EBUILD xmlunit-1.0-r2.ebuild 1669 RMD160 5fbb776f78f6ed166dff37fdd3335e05b52f5557 SHA1 9a81c195f217f4a7761240324b2431d508c1dd68 SHA256 db951aca0692e6fc1577196e0dac3c8002fe347fd5289b9f9de66a8389aa5a38
 EBUILD xmlunit-1.3.ebuild 1440 RMD160 a0cab44e0aba08924731eaded4ccf55beee30555 SHA1 dcf7e4153478198ca9a2d558921e849e3e59b071 SHA256 222768c7a87140539af642e50f63fdaaaade98a2ce49b6b9a4495772e2266c5a
-MISC ChangeLog 2700 RMD160 c4324aeb093012a069e571d510ef37369797835a SHA1 23348992f7f445788bb134811a1a6691e4dccbc7 SHA256 9ce9dbfdb9d8ffad33d304dce2bf765effa63ef6c10132671f88f2b724229601
+MISC ChangeLog 2864 RMD160 d14f2b44e1c6dc11b0ef7d858686551439afb3d4 SHA1 8dc089a975b57049d6dac507b4f4d287ccb5c6c8 SHA256 a6823f7b8329d1d65973bd89566cda63a6127cb2c1beac054fea2cf45a0fa8a9
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks4cFoACgkQcsIHjyDViGQmwgCgpYORFSzl3lKf+ABs/GVdKv8z
-IC8AoKyPKatAhIUo0dS/q14DXCJ8l46G
-=HN5t
------END PGP SIGNATURE-----