Add patch by Grigory Dorokhov fixing test failure and adding support for

more than two nested try blocks. Bug #165558.
Package-Manager: portage-2.1.4

4 files changed, 45 insertions, 15 deletions

diff --git a/dev-libs/xxl/ChangeLog b/dev-libs/xxl/ChangeLog
index ce971f556fce..2eedf47e2cc1 100644
--- a/dev-libs/xxl/ChangeLog
+++ b/dev-libs/xxl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xxl
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xxl/ChangeLog,v 1.7 2007/03/19 00:56:19 kloeri Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xxl/ChangeLog,v 1.8 2008/01/17 19:33:12 dirtyepic Exp $
+
+  17 Jan 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/xxl-1.0.1-nested-exception.patch, xxl-1.0.1.ebuild:
+  Add patch by Grigory Dorokhov fixing test failure and adding support for
+  more than two nested try blocks. Bug #165558.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/dev-libs/xxl/Manifest b/dev-libs/xxl/Manifest
index 861e38f4966d..94ded205f009 100644
--- a/dev-libs/xxl/Manifest
+++ b/dev-libs/xxl/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xxl-1.0.1-nested-exception.patch 483 RMD160 df376c440f185e4771bc92ea2a72fcebee063c63 SHA1 fd370fa433819f428ffade8ef2787c8e336e16a8 SHA256 d1d3df1f423b2c89ed3360c3fcd9545b26167e2059af945d30c5f36306699f18
+MD5 73bc92bbfd5ac7b9566c3474e5db2682 files/xxl-1.0.1-nested-exception.patch 483
+RMD160 df376c440f185e4771bc92ea2a72fcebee063c63 files/xxl-1.0.1-nested-exception.patch 483
+SHA256 d1d3df1f423b2c89ed3360c3fcd9545b26167e2059af945d30c5f36306699f18 files/xxl-1.0.1-nested-exception.patch 483
 DIST xxl-1.0.0.tar.gz 407019 RMD160 5130196ef34c6efb860c7b42a1b6053cf7250cf8 SHA1 af7ff8166e8b0d633785429c606fb0be63d3d7a4 SHA256 1d68aab1c5beb9623b49ce50fc986976aa4a25115084524469255a8b024f232d
 DIST xxl-1.0.1.tar.gz 456048 RMD160 4f9ab345acc37f7fe6d5145511b0edbf427c2e90 SHA1 febdb23a20c7fbf4966cd2b5264ad95a04cd2521 SHA256 7decbada52dabb0f7298b36982371c7ba4d817b281797498d0515ec2440b20f9
 EBUILD xxl-1.0.0.ebuild 565 RMD160 432fbf80e4a1e608f7567cdca0bf826ddb54719f SHA1 6987cde7021e25be905f0a5b1c86608f77c4cf00 SHA256 1736213166dd2dbfa2f52c8c2ded88c0cb1a0f17933745bd30a3d2e248557eb4
 MD5 7dbf8ec0471f48d7713de191a2a9cf52 xxl-1.0.0.ebuild 565
 RMD160 432fbf80e4a1e608f7567cdca0bf826ddb54719f xxl-1.0.0.ebuild 565
 SHA256 1736213166dd2dbfa2f52c8c2ded88c0cb1a0f17933745bd30a3d2e248557eb4 xxl-1.0.0.ebuild 565
-EBUILD xxl-1.0.1.ebuild 521 RMD160 4fad75e4b00acd84ec3a20644f78e862b0e4fe97 SHA1 349fa0a7d47e400c8d97733e01b78294152dd2c7 SHA256 e49ce3b6c80688af8c4e3bb88eb4e9e34cac17563ef68fba9c0082ea096d5044
-MD5 b8e9c086d695fa1faeca7bb1d9851ca4 xxl-1.0.1.ebuild 521
-RMD160 4fad75e4b00acd84ec3a20644f78e862b0e4fe97 xxl-1.0.1.ebuild 521
-SHA256 e49ce3b6c80688af8c4e3bb88eb4e9e34cac17563ef68fba9c0082ea096d5044 xxl-1.0.1.ebuild 521
-MISC ChangeLog 885 RMD160 2e678a6b062d23433f185179f18b55db880d7fe1 SHA1 02b004e664fcc999dcf5b0e0726b0f63c3c82cf6 SHA256 a0fb6dd89d7d1ab12ef6d5374c42f169ca3b3e3622bbd3924231dc000b3c5741
-MD5 c81eda06d59f72acb5bddfeaeb3a273e ChangeLog 885
-RMD160 2e678a6b062d23433f185179f18b55db880d7fe1 ChangeLog 885
-SHA256 a0fb6dd89d7d1ab12ef6d5374c42f169ca3b3e3622bbd3924231dc000b3c5741 ChangeLog 885
+EBUILD xxl-1.0.1.ebuild 633 RMD160 9576632429321675fe558f54307daa3e0cc04ae5 SHA1 7cf454451c297f1e72a798febe90e8e94a09e04b SHA256 2cafe81a3c36b0410597473ee1c3b0a38ad6dd92417f305d13a08a7d4bf3f8be
+MD5 d2f63190033ae33910b979bd0fbdbe41 xxl-1.0.1.ebuild 633
+RMD160 9576632429321675fe558f54307daa3e0cc04ae5 xxl-1.0.1.ebuild 633
+SHA256 2cafe81a3c36b0410597473ee1c3b0a38ad6dd92417f305d13a08a7d4bf3f8be xxl-1.0.1.ebuild 633
+MISC ChangeLog 1121 RMD160 7399b778826b29248e1ff3e70fb29aa69a45d81d SHA1 f996477142f2855c9d2672186d8e4d26d464a3d3 SHA256 da0b5bdccc67148328ecec84c9063eb7880dff5e4fed23a37e1eee9b85942b80
+MD5 d093c9a4892c081bb2fb32172dd58e08 ChangeLog 1121
+RMD160 7399b778826b29248e1ff3e70fb29aa69a45d81d ChangeLog 1121
+SHA256 da0b5bdccc67148328ecec84c9063eb7880dff5e4fed23a37e1eee9b85942b80 ChangeLog 1121
 MISC metadata.xml 237 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 SHA1 893e2795205e43c12fbb4b034fb48356f047b449 SHA256 ba5b60fec3f01393f9e5a70f37a0372d8e99b6b15934baefa95566dce16dd3d8
 MD5 4a9bb1a9ddd9cc85f7698fb677bee7d7 metadata.xml 237
 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 metadata.xml 237
@@ -28,7 +32,7 @@ SHA256 8410c33f8859b16d0ea3d191d1e67aad123fdf4e82e936e1733d253a2a88ab9f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHP3Pqp/wUKkr7RBoRAjR/AJ9lXQ8cRPnc7V2ypODsgX9K+NHzDgCgjpY8
-lFvArU9WXEgxVoTzJXf7J10=
-=SZ4K
+iD8DBQFHj619iqiDRvmkBmIRAplpAJ4lmiSGGR4l4BuNQrK1L/+uUdYQhACgt0Tb
+f8zlSfnbVusg3zTbRZXWzhM=
+=DY7O
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xxl/files/xxl-1.0.1-nested-exception.patch b/dev-libs/xxl/files/xxl-1.0.1-nested-exception.patch
new file mode 100644
index 000000000000..c6d52c5a09d4
--- /dev/null
+++ b/dev-libs/xxl/files/xxl-1.0.1-nested-exception.patch
@@ -0,0 +1,12 @@
+diff -Naur xxl-1.0.1-orig/xxl.c xxl-1.0.1/xxl.c
+--- xxl-1.0.1-orig/xxl.c	2004-12-22 03:42:52.000000000 -0600
++++ xxl-1.0.1/xxl.c	2008-01-17 13:25:18.000000000 -0600
+@@ -380,6 +380,8 @@
+             if (!tsd->contexts)
+                 die("XXL: Exception thrown with no handler to catch it!\n");
+             tsd->contexts->exception = *exception;
++			how=XXL_SETJMP_TRY;
++			tsd->contexts->state |= XXL_STATE_THROWN;
+             xxl_leave_handler(how);
+             return;
+     }
diff --git a/dev-libs/xxl/xxl-1.0.1.ebuild b/dev-libs/xxl/xxl-1.0.1.ebuild
index 572733489cd4..e08f71afd6b1 100644
--- a/dev-libs/xxl/xxl-1.0.1.ebuild
+++ b/dev-libs/xxl/xxl-1.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xxl/xxl-1.0.1.ebuild,v 1.3 2007/11/17 23:06:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xxl/xxl-1.0.1.ebuild,v 1.4 2008/01/17 19:33:12 dirtyepic Exp $
+
+inherit eutils
 
 DESCRIPTION="C/C++ library that provides exception handling and asset management"
 HOMEPAGE="http://www.zork.org/xxl/"
@@ -11,6 +13,13 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-nested-exception.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc README