Add a fix for uuidtools with Ruby 1.8.7's securerandom and make it install for Ruby 1.9 too.

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

4 files changed, 83 insertions, 6 deletions

diff --git a/dev-ruby/uuidtools/ChangeLog b/dev-ruby/uuidtools/ChangeLog
index 1ebd59e2be64..c4c054540a35 100644
--- a/dev-ruby/uuidtools/ChangeLog
+++ b/dev-ruby/uuidtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/uuidtools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/ChangeLog,v 1.10 2009/04/19 14:55:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/ChangeLog,v 1.11 2009/04/27 12:48:03 flameeyes Exp $
+
+*uuidtools-1.0.7-r1 (27 Apr 2009)
+
+  27 Apr 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/uuidtools-1.0.7+ruby-1.8.7.patch, +uuidtools-1.0.7-r1.ebuild:
+  Add a fix for uuidtools with Ruby 1.8.7's securerandom and make it install
+  for Ruby 1.9 too.
 
   19 Apr 2009; Markus Meier <maekke@gentoo.org> uuidtools-1.0.7:
   amd64/x86 stable, bug #266508
diff --git a/dev-ruby/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index f47092e2fef3..5828687a560a 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX uuidtools-1.0.7+ruby-1.8.7.patch 564 RMD160 b53e0e611cc504f5bc25eef89d6d1069a1c4a310 SHA1 0ad020bbf03d93704b4e8076c425ccc8efc570dc SHA256 5468aea96adf291b74b4bf81496c642a1fc327cf94dbd5917810e60150c171cf
 DIST uuidtools-1.0.7.tgz 15580 RMD160 6c68d83aead3ab879df962e5ec701431f78671cf SHA1 ebdf6ac56b0945ae637d0691796893bc365a4808 SHA256 1a58cfbdef2d7017033844803922b72ebb49680a1d6b123f763c180b26e44fed
+EBUILD uuidtools-1.0.7-r1.ebuild 1139 RMD160 4735bde785898c173cae302d3f05ce16e7c22796 SHA1 df8d520b2968eea51c2d4a28174af481c3c9e874 SHA256 bcd67b97a9cd96d330065705cf2580289ebade9717331757b1818b42dcbbd0b5
 EBUILD uuidtools-1.0.7.ebuild 993 RMD160 e6c4cd57f7afaa4171d66ad953233a1606712e0b SHA1 a20ff9acfbafcdcd2a95c4ab72dbc2ff4ac1f3e8 SHA256 951fedf6db8baed4ee8ac8d3de2e4ccb17a621a5217eeaba585e9844ed75874b
-MISC ChangeLog 1689 RMD160 47d2aae1d19792da8f8eb0e5def409951026271d SHA1 474ec6df750e34803fbcd122d62233398453676a SHA256 97e21733df7ab109aec52bbdcb6f9098a4a50ae151635a63b79505060342071b
+MISC ChangeLog 1952 RMD160 9fcd698010b9ccbe921bea5729e1a63c40b2f65b SHA1 0903c27816086523b423b9a84ba4e96ffe37e11a SHA256 e98fde12244d2d66fd1716973a99448a7db04394bdc2b22145ce1e07bda1801c
 MISC metadata.xml 359 RMD160 2a68a91eed726357114282e80e9900b48786a993 SHA1 f02e1e4d9766bb929cf7964c3e53a1c46e7cd971 SHA256 839494b250e210b4e59b4880338e741a9f9def69979df47cf658e5d04a93726c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknrO5IACgkQkKaRLQcq0GIBKQCfUBm/D+mQ0+l9mmfPwI5CB0t/
-XwgAn1rleM5jPovbK7cQFN7dGECTgxmO
-=kqfX
+iEYEARECAAYFAkn1qYkACgkQAiZjviIA2XjcUwCgq7/lO6LAko3mjjqWHJ3WLb9o
+QHkAnRmYqLmsr8aIp7pUsTTRNDUVrZx2
+=uIoU
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/uuidtools/files/uuidtools-1.0.7+ruby-1.8.7.patch b/dev-ruby/uuidtools/files/uuidtools-1.0.7+ruby-1.8.7.patch
new file mode 100644
index 000000000000..4eb15348456a
--- /dev/null
+++ b/dev-ruby/uuidtools/files/uuidtools-1.0.7+ruby-1.8.7.patch
@@ -0,0 +1,16 @@
+Index: uuidtools-1.0.7/lib/uuidtools.rb
+===================================================================
+--- uuidtools-1.0.7.orig/lib/uuidtools.rb
++++ uuidtools-1.0.7/lib/uuidtools.rb
+@@ -191,10 +191,7 @@ class UUID
+           octet.to_i(16)
+         end
+       else
+-        nodes = SecureRandom.random_bytes(6).split("").map do |chr|
+-          # Ruby 1.9 / Ruby 1.8
+-          chr.respond_to?(:ord) ? chr.ord : chr.sum(8)
+-        end
++        nodes = SecureRandom.random_bytes(6).unpack("C*")
+         nodes[0] |= 0b00000001
+       end
+       for i in 0..5
diff --git a/dev-ruby/uuidtools/uuidtools-1.0.7-r1.ebuild b/dev-ruby/uuidtools/uuidtools-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..57a44a22f454
--- /dev/null
+++ b/dev-ruby/uuidtools/uuidtools-1.0.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-1.0.7-r1.ebuild,v 1.1 2009/04/27 12:48:03 flameeyes Exp $
+
+inherit ruby eutils
+
+DESCRIPTION="Simple library to generate UUIDs"
+HOMEPAGE="http://uuidtools.rubyforge.org/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test doc"
+
+DEPEND="doc? ( dev-ruby/rake )
+	test? ( dev-ruby/rake )
+	test? ( >=dev-ruby/rspec-1.0.8 )"
+RDEPEND=""
+
+USE_RUBY="ruby18 ruby19"
+
+src_unpack() {
+	unpack ${A}
+
+	find . -name '._*.rb' -delete || die "unable to remove mac files"
+
+	epatch "${FILESDIR}"/${P}+ruby-1.8.7.patch
+}
+
+src_compile() {
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+src_test() {
+	for ruby in $USE_RUBY; do
+		[[ -n `type -p $ruby` ]] && $ruby $(type -p rake) spec:normal || die "testsuite failed"
+	done
+}
+
+src_install() {
+	cd "${S}"/lib
+	doruby -r * || die "doruby failed"
+
+	if use doc; then
+		dohtml -r "${S}"/doc/* || die "dohtml failed"
+	fi
+
+	dodoc "${S}"/CHANGELOG "${S}"/README || die "dodoc failed"
+}