Fix bug with negative object ids, fixes bug 376177.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 34 insertions, 10 deletions

diff --git a/dev-ruby/tilt/ChangeLog b/dev-ruby/tilt/ChangeLog
index 65c4b2536443..17d185e3224d 100644
--- a/dev-ruby/tilt/ChangeLog
+++ b/dev-ruby/tilt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/tilt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.12 2011/07/24 09:42:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.13 2011/07/25 18:07:28 graaff Exp $
+
+  25 Jul 2011; Hans de Graaff <graaff@gentoo.org> tilt-1.3.2.ebuild,
+  +files/tilt-1.3.2-thread_id.patch:
+  Fix bug with negative object ids, fixes bug 376177.
 
   24 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> tilt-1.3.2.ebuild:
   Marked ~ppc wrt #351835
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index b3ab527d529f..4929309a97b1 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX tilt-1.3.2-thread_id.patch 830 RMD160 8cec792f32ca7352ccb210c2cf96d2a267ff73c3 SHA1 916ea62ec641a97720f7974bceea2f2e5091dd06 SHA256 5cbdf308a81374dd6bacdc959f77149d6f06a3bce38ef5710adaaeeb3e9a895f
 DIST tilt-1.2.2.gem 28672 RMD160 cbb16b94f1aabc6cdc9d2a60cd1af4294d748ddf SHA1 2ed7f6a5ecdf9ec0108e1e8145e67cd26f82ebd3 SHA256 3eb7036985b2a1ee9b27401cbe3b3723e48d092563f212dcd712d4b8e2198eac
 DIST tilt-1.3.1.gem 34304 RMD160 d2034fff22344ee658a6a228f4c375a87fcf20d1 SHA1 822825adad52f03251932857921d26b21efeb5f1 SHA256 9ae86252c1b4942ce01d119e4ed03e38b41e269208b8cabcda494649d7619ffb
 DIST tilt-1.3.2.gem 34304 RMD160 a6fd229332676ced3f9810ee2b9c5b1e4295248b SHA1 afe9478c001f9d193c54fd254d3214bc940bc2cc SHA256 c7e69202794bdfde34395f596023309a3a45725bb292b4c04dba69a5f32f7071
 DIST tilt-1.3.gem 34304 RMD160 6092347909484765b9f73421bc8d2322645723c6 SHA1 34aa628b340c186d9ce6d8d7eee64c028aed65f9 SHA256 66dfd57201144213c2bcfeaacc5e3dba1f3e2d04da66a19d256d1711d0f0a1d1
 EBUILD tilt-1.2.2.ebuild 777 RMD160 aa19b9f39c45d185ee952602bb78c3a570049d9d SHA1 3fe1e1636e926ca4e0d6be1627f1736d692a0d55 SHA256 abaaaf74dd6972c540d56f4a3d5425a8ad3c273055e2cec01e95de5bc7bc9531
 EBUILD tilt-1.3.1.ebuild 807 RMD160 af516dbdfe55e3ba75918a732a2a09877b04011c SHA1 ba46aed61c66fb49e9fe9ffd4c774d436bc47641 SHA256 a557b50cb64454288a6dc99adab4edf4ba671da3880d20c4dec29789af27f0d1
-EBUILD tilt-1.3.2.ebuild 817 RMD160 2378d35f6b0c82f1fbbeb5d31e41d18a79cb813a SHA1 96595fdab289c9309b00f2f0634e8739c911e5e8 SHA256 57357fe25f06993f0bcbe0bcf53e8d23031df17fed89d34270da1b3316d9fa95
+EBUILD tilt-1.3.2.ebuild 854 RMD160 54efdf3b9946f7dc88486a1367d6da5c69924d9a SHA1 d9ea1a7d6983d9f943898e06763655d294886e4c SHA256 b82298b5a10ecd738e566eb80fbceff595785bc7ff70a692127b0176e94600f4
 EBUILD tilt-1.3.ebuild 852 RMD160 4a5a113cb947cc0d3e03c0017ccf4b183f34cbf0 SHA1 38b1dede05b58e0764ae1b772d9b41c3de8f2575 SHA256 76c07ee4658619c5302a75f157f0459f212be06cf834ba01552ff5e9b4a19e5a
-MISC ChangeLog 1632 RMD160 af892a2611beb7b272e3a1bcdbc652b56b8ad2b4 SHA1 e78fe20d6680127d416bdb6c429d869c64473fbc SHA256 c1edef6810869f691e8e706abf68722a959c7019768f510ec9ab96505b949d60
+MISC ChangeLog 1789 RMD160 f545742ce7c3c2d9a3a9a1a62a66849497064395 SHA1 56e1ae8383f0b1914e28ea3eb0e9dcb02021f410 SHA256 0f84aa8d6b85d431f5553df640d8b5a927aaf667a93a3e448e762dac15b7838f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4r6P4ACgkQIiMqcbOVdxT+ugP/df4S5GO5hdey/pCUAenZ9Ju/
-ihqQOPZ/3TX3iZBjZwJykeV3fPW7XDY1sHbYm4fFr+/Aev0qqK3aYMarEmF0qG03
-mKWcS1g51Oo5rRVwbu4PJp4LOQqzF9/brVM/FtuTMTZx986gvQC1EygpaOTVM19b
-m8RGwpT57TWQCduoXpY=
-=pVNx
+iF4EAREIAAYFAk4tsOUACgkQiIP6VqMIqNfUgAD9FSecISZkqCoK4ccPJZeLBUqa
+eTkergLfTJArab6PFZEA/17bbDJgs1zCcq7KVpnxnPlotEaX60bKo/ZePfU4x5lV
+=eUh1
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/tilt/files/tilt-1.3.2-thread_id.patch b/dev-ruby/tilt/files/tilt-1.3.2-thread_id.patch
new file mode 100644
index 000000000000..0391d75c4808
--- /dev/null
+++ b/dev-ruby/tilt/files/tilt-1.3.2-thread_id.patch
@@ -0,0 +1,19 @@
+commit a07077f4737754757e99c2d42267f432289ffd13
+Author: Magnus Holm <judofyr@gmail.com>
+Date:   Fri Jun 24 10:43:55 2011 +0200
+
+    Fix compilesite test for multiple threads (closes #93)
+
+diff --git a/test/tilt_compilesite_test.rb b/test/tilt_compilesite_test.rb
+index 1ba6433..2944c84 100644
+--- a/test/tilt_compilesite_test.rb
++++ b/test/tilt_compilesite_test.rb
+@@ -39,7 +39,7 @@ class CompileSiteTest < Test::Unit::TestCase
+               locals = { "local#{i}" => 'value' }
+               res = template.render(self, locals)
+               thread_id = Thread.current.object_id
+-              res = template.render(self, "local#{thread_id.to_s}" => 'value')
++              res = template.render(self, "local#{thread_id.abs.to_s}" => 'value')
+             rescue => boom
+               main_thread.raise(boom)
+             end
diff --git a/dev-ruby/tilt/tilt-1.3.2.ebuild b/dev-ruby/tilt/tilt-1.3.2.ebuild
index 20ccd3ee567c..cfe172e9731b 100644
--- a/dev-ruby/tilt/tilt-1.3.2.ebuild
+++ b/dev-ruby/tilt/tilt-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.2.ebuild,v 1.2 2011/07/24 09:42:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.2.ebuild,v 1.3 2011/07/25 18:07:28 graaff Exp $
 
 EAPI=2
 
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
+RUBY_PATCHES=( "${P}-thread_id.patch" )
+
 ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
 ruby_add_rdepend ">=dev-ruby/builder-2.0.0"