Add patch to fix SAXParser ClassNotFoundException #431754

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 54 insertions, 4 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 67300eb06eeb..2a68a28bf96a 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.79 2012/08/26 13:43:40 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.80 2012/08/26 16:16:22 thev00d00 Exp $
+
+*jython-2.5.2-r2 (26 Aug 2012)
+
+  26 Aug 2012; Ian Whyman <thev00d00@gentoo.org> -jython-2.5.2-r1.ebuild,
+  +jython-2.5.2-r2.ebuild,
+  +files/jython-2.5.2-sax-parser-class-not-found.patch:
+  Add patch to fix SAXParser ClassNotFoundException #431754
 
 *jython-2.5.3-r1 (26 Aug 2012)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 23f07c159cca..3cf2696d05e8 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -9,6 +9,7 @@ AUX jython-2.5.2-build.xml.patch 1079 SHA256 52de2b89ff7a6e9e6f8df13a855c5791f50
 AUX jython-2.5.2-distutils_byte_compilation.patch 2954 SHA256 f2f2cbc01a138eccdcb38e07fdf4b45ee97393a740d778a69e6900a1e8567c04 SHA512 8706425ae61852c02ed5aa35d0e22f81e8768472f4096d42a4d15238a7d828c8a66764125270e37634999805135d0dff1a18a62c7036f16f0d39c9daa116f6c6 WHIRLPOOL 5a0aa0447ddd1689325b225e29645bbd87d0249f526f076626ab0615132a085a5a20f4ec0c141bbea54d20c9849b145e36da2ebefaafc2ff97f222516ac395fb
 AUX jython-2.5.2-distutils_scripts_location.patch 346 SHA256 240cc2c51aa23738f559a874cc65d9c7de4a4c1d786edece3e865d7922fd6f90 SHA512 e3c96d614f16ab4d0fd3b8c6ce7f1ec7478fc36069f4b4d78f5bc4fe586e6dfd41c2afaf1092abd74bf0a61c352ce6e5328dee1c308493bd8d38fa6452705808 WHIRLPOOL 0c6cdf265094ce4a13d59edd5b5e2d74c91d08cc69514fcf7915b6e11ca8c85188c1d29440a3103348303dce9afb55d9531544b546554666b0e7725d2b25613a
 AUX jython-2.5.2-respect_PYTHONPATH.patch 547 SHA256 23d5008763e4abb6bd3b491b74a7428ae29f629b4c87f1a65659a3c46d51620c SHA512 516943ee4f5a2774695e5eb49d1cebbacb1a55ff0ba3e59a36033f1612f6c73f1ce1e45895fbda1deaec756efcfed9a4de5bc3cadf57ceeffa8990de0a58a0f5 WHIRLPOOL 54e38f603bf2e628bd56aaef8629ed2e6320b9d25519663e1991defc733c4326c08fde576287061183c1bc2f6b225821cdefe3e2b111b17ab5f940ca04a4e398
+AUX jython-2.5.2-sax-parser-class-not-found.patch 1431 SHA256 a6d63dd169dd40376cebce4d61d9b31c0cc4b8d4330d19e465b8b0f310763bd7 SHA512 d541e900cc878f394fc9c3bdbdd949950110be09ef6b00834895f567f6369e02af87eb683e1e96b4c962e03e2ae0255d415feaf09114f391381b7557a513c911 WHIRLPOOL 9befabddc53119655e2b211df59d2856ff3785f308c9079a1002dcd5d1c59d51e2d509740bf70f3fa3d312cc8f3a53313f67fdb9383d4bb9a6e0282b19ffed9f
 AUX jython-2.5.2-sax-parser-fix.patch 3865 SHA256 ad7ceca1bc974432220c7ec699e768657ca39da2f3a4aad0fcff25da454bc0f4 SHA512 b56a539c4b63aca1305aca07aa5ebcabcd479687a5a991cf19a26574c06ef6664d0390c0b82e1c1aadaec23c0b7c44913ca8a816af7a8358ab6b4071c668f092 WHIRLPOOL e771ffcac7f9d59f87b97ae699a0b8cd91c0ec26a877131649c8dfdf920d1a3f08b84256b785605075e833c4aeb1bc7a498a8f00d298fc0344df902913904f12
 AUX python-2.5.5-distutils_byte_compilation.patch 1208 SHA256 b520641c4b4117a231b4798c82a60ac458081cca71c56e9838dd8a9c51116fc8 SHA512 5e82e7d1c683a035105403282d61dab9af0f4fe4400fbdecaee5e676924e77ea57cd2b4d589c6e91b16a20fafcd4988b4d0127c3b2c3238228c706198001a306 WHIRLPOOL 13d1c5d88f12dbfd1b4574e38658062df2320e6a4c9ef233b234522c8cc45208009d9311ad54a58a20de643ddbcd799da69ef06fd408d64f81bf1cfb44b126f5
 DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
@@ -21,7 +22,7 @@ DIST jython_installer-2.5.2.jar 18435770 SHA256 1b7168b961e31ddd89012a36cde611c3
 EBUILD jython-2.1-r11.ebuild 2934 SHA256 9ce1e028309ecc0d8f804fad81ce80f9ed81ef9f089aa01c26c17a47b79baf3f SHA512 73056839842a49593083e5d22babe1fd4aaa2ed64305208129e5b7c981f3f6a5782627ac7ab819fa1305250b3bd23e7da3fb7c3bac262bb3dd8e5692b5c24a62 WHIRLPOOL 11e1f46dbbbb80058ae1a059782c5e0fa9cef25d39b5320742c5eff220e209b11b818d7429a7af8a83f8726e58e83c17cc85518cf9e949b930d09cffbb37e102
 EBUILD jython-2.2.1-r1.ebuild 3769 SHA256 936d381297b273398a608fc879331f147f555ea19174ff12722003c4ec90cd9f SHA512 61d10d83cc2e56818d069ba3d0e0262cb21082b96fdb89e5704912fee4457048c8e390a6eaba55664bf15fe581321da517e7fe70260143cf62e3129a40eacf7f WHIRLPOOL 49705b431243688cac0558fcf87b7b492ceb4d90100d7ff80608b4faeb4d53801a8055bacb6b62f4ddfb5b82279eb9e1973d6ae1d9c21bb716d389add06688bd
 EBUILD jython-2.5.1-r2.ebuild 5606 SHA256 a6c0b84a70d266616ffe73062986615502e60ed39426d517f6089640fdc689ec SHA512 5eaa7bb9c03e947945be8248c1db5e1024654c1d11e61471a1b7686845719da21544369d40cabf31240f6beecab6e9eae169f29c05dcf9846ecec51b8f269356 WHIRLPOOL 55d0bceda9d789ceba4ab54b63bc976e319e8a30307f53e0754b4d6b8bae93845368012bb8b06033ea1ebdfc4ce6831ad0552457c8d6d535ef5e10c7b74823ad
-EBUILD jython-2.5.2-r1.ebuild 4158 SHA256 01e4cc57e54c78e52f149bcfc591bc4c903b9d2bc4d4472427063173cd46a0ae SHA512 59a31a88f31becf078106f0b494e657098e546323e80cc2b94990d6b3648191b81e36e269472feac5cf58adb421d6ff2c13f7cbb01089b338f2875daf5616b3a WHIRLPOOL c2c4700231f3222972e256f85ecf6bdcf6bbbd5607b4a4800b73c7e6fd50b5a8221ee092f056c421334e842978629190a3818d2770e2ab5752f98e55d12c3ece
+EBUILD jython-2.5.2-r2.ebuild 4232 SHA256 5e84cee35324d5d1740b2afd5f7d2dfbbe1c77da97373c6eb9a66a89088a419d SHA512 00cd44609a84ee5bcabba6b9d34bb9ce40424ea0874be5a42ac911ecaa0c5786b5807158eded99ad1c9996992429fa04023571b7038135c5de01151a2d643203 WHIRLPOOL 890c00fb89a4e5dca81c06dd2c7d2ff71b428ac74902cbc7e7537126a8a3d23bff96cda151ff7cf7f8ceebe1f7650177e73e96ec50c8335e6d95532caa180fe4
 EBUILD jython-2.5.3-r1.ebuild 4166 SHA256 41495f88447e8b292d51407b2692208330bb3958684538cac3bc501bfc340d9f SHA512 f558c5098cde10e5149e82398949d9e98a183549657d55b6f52ed509b7fa9172cb4621233f515860b08a67bf8ad437ba82b86d4e7a3bcc42c0bf18c1b8012f9f WHIRLPOOL 616e4112494145ab5fafa9418578fef5f45f785c5fd80a6bd0c193e2e8f4bdd1b5245f7345531f6a890b538e15bdcf0f08718b05d855dd368c97f6980148405b
-MISC ChangeLog 12747 SHA256 cf09dc79acd3347bdba64efb40fe622cc78ee171569db849da5e0b11f411a666 SHA512 475480eec870cb2162714acd9da6ef1a4a1eee149fca388f3590d267f7de634d4793daec116d3fe42468f3a2f35142830d4f924917aeeacfd0a8ed2cbfa1c787 WHIRLPOOL 542fbbe0896df78678ca188d7eddc4128c0e7dedf3163296b1e0ad450af1f552300c4fc3a55523d21ca06df076ebc319886dbc9a100fc5074fe2601dae98933b
+MISC ChangeLog 12997 SHA256 6b0d4cd9471ae4c38d8d7b941fae368556322d61c0623af4938e1691fc40a526 SHA512 3bbebae1fe9f46c1cdb5719be7b089764f266e0ac81ce845b3e7e6fef5ce0ead33c4294839937fef6748d9d2f6fdfbd26de822d633aac5bc42fc251348c2e8f7 WHIRLPOOL fe6a6442e355628454c768df2ddb35926834ac7ce702b25f3a1d04350d5c477671dff6adaf4135ff59e2caf17fb314024f80a9beb76bd68b706ee030892065ee
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
diff --git a/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch b/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch
new file mode 100644
index 000000000000..7e9273c68cb4
--- /dev/null
+++ b/dev-java/jython/files/jython-2.5.2-sax-parser-class-not-found.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Alan Kennedy <alan@xhaus.com>
+# Date 1333300584 -3600
+# Node ID a972112ac1b155ef41b3f8ce195251bc6cc3ebce
+# Parent  920a60f5d5b5fdf46f4f26c75cab42e2a671be2f
+#1537: Fix for classloading issues with MATLAB/OpenJDK
+
+diff --git a/Lib/xml/parsers/expat.py b/Lib/xml/parsers/expat.py
+--- a/Lib/xml/parsers/expat.py
++++ b/Lib/xml/parsers/expat.py
+@@ -47,12 +47,8 @@ from org.xml.sax.helpers import XMLReade
+ from org.xml.sax.ext import DefaultHandler2
+ 
+ # Xerces
+-try:
+-    # Name mangled by jarjar?
+-    import org.python.apache.xerces.parsers.SAXParser
+-    _xerces_parser = "org.python.apache.xerces.parsers.SAXParser"
+-except ImportError:
+-    _xerces_parser = "org.apache.xerces.parsers.SAXParser"
++_mangled_xerces_parser_name = "org.python.apache.xerces.parsers.SAXParser"
++_xerces_parser_name = "org.apache.xerces.parsers.SAXParser"
+ 
+ 
+ # @expat args registry
+@@ -88,7 +84,11 @@ class XMLParser(object):
+                      "not %s" % type(namespace_separator).__name__)
+             raise TypeError(error)
+ 
+-        self._reader = XMLReaderFactory.createXMLReader(_xerces_parser)
++        # See http://bugs.jython.org/issue1537
++        try:
++            self._reader = XMLReaderFactory.createXMLReader(_mangled_xerces_parser_name)
++        except:
++            self._reader = XMLReaderFactory.createXMLReader(_xerces_parser_name)
+ 
+         if self.namespace_separator is None:
+             try:
+
diff --git a/dev-java/jython/jython-2.5.2-r1.ebuild b/dev-java/jython/jython-2.5.2-r2.ebuild
index 049be7621d38..85c5f21abe5f 100644
--- a/dev-java/jython/jython-2.5.2-r1.ebuild
+++ b/dev-java/jython/jython-2.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.2-r1.ebuild,v 1.2 2012/08/20 02:44:35 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.2-r2.ebuild,v 1.1 2012/08/26 16:16:22 thev00d00 Exp $
 
 EAPI="4"
 
@@ -60,6 +60,9 @@ java_prepare() {
 
 	epatch "${FILESDIR}/${P}-sax-parser-fix.patch"
 
+	# 431754
+	epatch "${FILESDIR}/${P}-sax-parser-class-not-found.patch"
+
 	epatch "${FILESDIR}/${P}-distutils_byte_compilation.patch"
 	epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
 	epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch"