Correct testcases so they don't require 1.5 JDK API. Fixes bug #152400.

Package-Manager: portage-2.1.2_pre3-r9

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 450974e53beb47e485e02f00be3c034269e77cb6..bf7ba929f52bcc1cb407e5495e078f0db6e5be0e 100644 (file)
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.29 2006/10/23 07:47:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.30 2006/10/27 00:33:58 caster Exp $
+
+  27 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/jaxen-1.1_beta11-fix-jdk14-tests.patch, jaxen-1.1_beta11.ebuild:
+  Correct testcases so they don't require 1.5 JDK API. Fixes bug #152400.
 
   23 Oct 2006; Vlastimil Babka <caster@gentoo.org> jaxen-1.1_beta11.ebuild:
   Added missing junit dependency.

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 07d7309dceca85b691cd18c9eaa2bec734e7b56f..fe345abe6a681b34ffbfdb2ad590849cb6cf0e67 100644 (file)
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -6,6 +6,10 @@ AUX build.xml.patch 1018 RMD160 f4bcfa42a1faba71d480263531f200b32f9001da SHA1 5a
 MD5 316a481f610ecae9085418b487d1fe1b files/build.xml.patch 1018
 RMD160 f4bcfa42a1faba71d480263531f200b32f9001da files/build.xml.patch 1018
 SHA256 9b77f759eb25ae6e8613c106d1cfb1306f1ea4ea30687d91f3e221e377937208 files/build.xml.patch 1018
+AUX jaxen-1.1_beta11-fix-jdk14-tests.patch 1040 RMD160 d79d68267f42127c8320b769662d331d200183f7 SHA1 c81dcf0e4ed8b87b5d1aa504fbf75a661ca1f119 SHA256 38d7220231487189f0caefe55fba3c9c9f8f0d52f78dec3c252647690ea42c5b
+MD5 5b9c9e4df033849832a6ae52b49e0e42 files/jaxen-1.1_beta11-fix-jdk14-tests.patch 1040
+RMD160 d79d68267f42127c8320b769662d331d200183f7 files/jaxen-1.1_beta11-fix-jdk14-tests.patch 1040
+SHA256 38d7220231487189f0caefe55fba3c9c9f8f0d52f78dec3c252647690ea42c5b files/jaxen-1.1_beta11-fix-jdk14-tests.patch 1040
 AUX jaxen-1.1_beta2-gentoo.diff 1254 RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 SHA1 c9a69a11b49b6800710073fcbe41035f447609b2 SHA256 0c97dd1c0a1605479882f5327f165aa5f939e32fe313d1b6691527b2f1683a25
 MD5 917b383454a8f38fb290d4a69ddb47ca files/jaxen-1.1_beta2-gentoo.diff 1254
 RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 files/jaxen-1.1_beta2-gentoo.diff 1254
@@ -23,10 +27,10 @@ EBUILD jaxen-1.0.ebuild 1393 RMD160 1d272b126f40ef26f035034f47a4c6ee879f2506 SHA
 MD5 9f434389a58fc86ba6560b1d73bc6343 jaxen-1.0.ebuild 1393
 RMD160 1d272b126f40ef26f035034f47a4c6ee879f2506 jaxen-1.0.ebuild 1393
 SHA256 bb778bb6f9f3b62f7f5d32cdaf793296beaa3266b5a9093a0cd9f0b773b7f2ff jaxen-1.0.ebuild 1393
-EBUILD jaxen-1.1_beta11.ebuild 1516 RMD160 88278ee30be9ebe5d0a3e47b5dcb5033fbc449a5 SHA1 67e9e820309913a981bdee14d86c9b9762918a7d SHA256 353403ebf110adfdff9b24c671f4589f0e808cd7f0e0ea1974570fd5abcd6845
-MD5 e06f5e1ac6b95c62766cce55f3a3639a jaxen-1.1_beta11.ebuild 1516
-RMD160 88278ee30be9ebe5d0a3e47b5dcb5033fbc449a5 jaxen-1.1_beta11.ebuild 1516
-SHA256 353403ebf110adfdff9b24c671f4589f0e808cd7f0e0ea1974570fd5abcd6845 jaxen-1.1_beta11.ebuild 1516
+EBUILD jaxen-1.1_beta11.ebuild 1595 RMD160 219fe0969236ae1d730a07b8f1ebbc3ccddc9b7b SHA1 55116fe928259429967b86ba4501b64e172752fc SHA256 54ee9a6b8ffc649201c0c1f41484535ebebb306cad014cce5ebfde26fd88fa8b
+MD5 9a7e480c093fcd3be389146f40c02947 jaxen-1.1_beta11.ebuild 1595
+RMD160 219fe0969236ae1d730a07b8f1ebbc3ccddc9b7b jaxen-1.1_beta11.ebuild 1595
+SHA256 54ee9a6b8ffc649201c0c1f41484535ebebb306cad014cce5ebfde26fd88fa8b jaxen-1.1_beta11.ebuild 1595
 EBUILD jaxen-1.1_beta2-r1.ebuild 1370 RMD160 dba343dc219e9d04b4e300ff9ea9a5e85d31fb7e SHA1 88762cbf857e4de27885ad26a725c0545ee7dbb0 SHA256 4f2e17e259805ba890dc23e78b1d7d150abf5619ca9c151c2331ca98d01ce7fd
 MD5 17801590037e01f8fd3944ec7a621b78 jaxen-1.1_beta2-r1.ebuild 1370
 RMD160 dba343dc219e9d04b4e300ff9ea9a5e85d31fb7e jaxen-1.1_beta2-r1.ebuild 1370
@@ -43,10 +47,10 @@ EBUILD jaxen-1.1_beta7.ebuild 1659 RMD160 6d471421fe596e495174889fb1ef2355adde22
 MD5 d90d457711b37f8bbb6e4c44ee02250b jaxen-1.1_beta7.ebuild 1659
 RMD160 6d471421fe596e495174889fb1ef2355adde2286 jaxen-1.1_beta7.ebuild 1659
 SHA256 88423c996c11879fd443b99f2e40ca3ee1910fd30f793af00b80b34f1e1c0287 jaxen-1.1_beta7.ebuild 1659
-MISC ChangeLog 4228 RMD160 a681042a408fec64913a3272554cea33243e8e84 SHA1 d8660fae286780823a41ad5d9104741ed9b65c5e SHA256 f58e9ec7d13dbe0675376068d7f05f7017eb9c30eff3117e6ae0d6c30f5a530a
-MD5 570b02b82f4b9d9842a2d39a505ce507 ChangeLog 4228
-RMD160 a681042a408fec64913a3272554cea33243e8e84 ChangeLog 4228
-SHA256 f58e9ec7d13dbe0675376068d7f05f7017eb9c30eff3117e6ae0d6c30f5a530a ChangeLog 4228
+MISC ChangeLog 4428 RMD160 b1d12b5452c9466e227b2a69b90e6e764024b49a SHA1 42a769f27c68ed63d4b66bf62a0a527e35c95819 SHA256 2e4c94cc0d9afa81e2d28e48ae3c762e1c5ee9feeb3152db99cea24901fa674d
+MD5 4dbe8adc87f572841a4a7e2ff85658e2 ChangeLog 4428
+RMD160 b1d12b5452c9466e227b2a69b90e6e764024b49a ChangeLog 4428
+SHA256 2e4c94cc0d9afa81e2d28e48ae3c762e1c5ee9feeb3152db99cea24901fa674d ChangeLog 4428
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158

diff --git a/dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch b/dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch
new file mode 100644 (file)
index 0000000..2138da3
--- /dev/null
+++ b/dev-java/jaxen/files/jaxen-1.1_beta11-fix-jdk14-tests.patch
@@ -0,0 +1,20 @@
+--- src/java/test/org/jaxen/test/SimpleVariableContextTest.java        2006-10-27 02:24:14.000000000 +0200
++++ src/java/test/org/jaxen/test/SimpleVariableContextTest.java        2006-10-27 02:22:23.000000000 +0200
+@@ -99,7 +99,7 @@
+         
+         // test the result
+         assertEquals("String Value", copy.getVariableValue("", "", "s"));
+-        assertEquals(Double.valueOf(3.1415292), copy.getVariableValue("", "", "x"));
++        assertEquals(new Double(3.1415292), copy.getVariableValue("", "", "x"));
+         assertEquals(Boolean.TRUE, copy.getVariableValue("", "", "b"));
+         assertEquals("", "");
+         
+@@ -116,7 +116,7 @@
+         
+         // test the result
+         assertEquals("String Value", context.getVariableValue("", "", "s"));
+-        assertEquals(Double.valueOf(3.1415292), context.getVariableValue("", "", "x"));
++        assertEquals(new Double(3.1415292), context.getVariableValue("", "", "x"));
+         assertEquals(Boolean.TRUE, context.getVariableValue("", "", "b"));
+         assertEquals("", "");
+         

diff --git a/dev-java/jaxen/jaxen-1.1_beta11.ebuild b/dev-java/jaxen/jaxen-1.1_beta11.ebuild
index 2372f2e14e3c13591414b571300ff4cf25068073..55d1b82132ce04d94e6f0d20b9011446eb533788 100644 (file)
--- a/dev-java/jaxen/jaxen-1.1_beta11.ebuild
+++ b/dev-java/jaxen/jaxen-1.1_beta11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta11.ebuild,v 1.2 2006/10/23 07:47:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta11.ebuild,v 1.3 2006/10/27 00:33:58 caster Exp $
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -35,6 +35,10 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
        unpack ${A}
 
+       cd ${S}
+       # TODO file upstream
+       epatch ${FILESDIR}/${P}-fix-jdk14-tests.patch
+
        mkdir -p ${S}/target/lib
        cd ${S}/target/lib
        java-pkg_jar-from xerces-2