Remove unused file and prepare a revision with Ruby 1.9 so a new one can be stabilized.

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

5 files changed, 53 insertions, 25 deletions

diff --git a/dev-ruby/uuidtools/ChangeLog b/dev-ruby/uuidtools/ChangeLog
index e3ab96b60073..8978d07ff087 100644
--- a/dev-ruby/uuidtools/ChangeLog
+++ b/dev-ruby/uuidtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/uuidtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/ChangeLog,v 1.17 2010/08/16 12:21:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/ChangeLog,v 1.18 2010/08/21 21:01:10 flameeyes Exp $
+
+*uuidtools-2.1.1-r2 (21 Aug 2010)
+
+  21 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/uuidtools-1.0.7+ruby-1.8.7.patch, uuidtools-2.1.1-r1.ebuild,
+  +uuidtools-2.1.1-r2.ebuild:
+  Remove unused file and prepare a revision with Ruby 1.9 so a new one can
+  be stabilized.
 
   16 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   uuidtools-2.1.1-r1.ebuild:
diff --git a/dev-ruby/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index e75a706bb6ee..24c239c8ce98 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,17 +1,17 @@
 -----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
 DIST uuidtools-2.1.1.tgz 15139 RMD160 00639a1ac749814ba4b32c9daf0fd7011f8e460f SHA1 f4fb06a0b4999148c98273f3223b78bd59c4ea4d SHA256 1ff5ef65cf3d2125e8ae0875fde1121ddb8a96ee1925fbd8aeef9dcb1b65b2de
 EBUILD uuidtools-1.0.7.ebuild 993 RMD160 e6c4cd57f7afaa4171d66ad953233a1606712e0b SHA1 a20ff9acfbafcdcd2a95c4ab72dbc2ff4ac1f3e8 SHA256 951fedf6db8baed4ee8ac8d3de2e4ccb17a621a5217eeaba585e9844ed75874b
-EBUILD uuidtools-2.1.1-r1.ebuild 933 RMD160 dcaafa9b5004cdffc427bf61ddc0d57f5389b131 SHA1 f32d79c429797f72e5316e87c6fa1e7b387c55de SHA256 8be06b8933616868ce1c3b823330a83d983a93d43f98300d18bfc8d112dff0eb
-MISC ChangeLog 2829 RMD160 8211b768acb856065b076cdf7f58ab0c1534aa0c SHA1 7ff91acd556445f375cb29d6105f8d1bed5c2850 SHA256 ab91492c7faa6d831f1f98f97ec40df22f1537232ab1e3206ffb0d459aeff027
+EBUILD uuidtools-2.1.1-r1.ebuild 926 RMD160 7e5ef352aaad3f87bd132b206e3ffa8704056abb SHA1 d43ae9cc8ef6b4313e07a0c08fe24550cd3b107a SHA256 7e734537280d543f7ab5a8a48e667fe3b7b9afa181e13d115edbe0abd5a19348
+EBUILD uuidtools-2.1.1-r2.ebuild 933 RMD160 23e734acffe3cac66ecabee26c275bfe98f07825 SHA1 21457d46070e01861bd133c2055cdf64a996662d SHA256 4c3c28ab92219b1988716f5f85d4849001580d0ee871433b05285a0c18c58f0e
+MISC ChangeLog 3113 RMD160 fc4beab6a8ce9e446828c1019def8e0c546281b1 SHA1 245461382c4a11ec4dbb81a9a6a11e929a40063c SHA256 1623c263e1c7110aa667e0ed7c7cff95bf1d21314573c466230d02362444150a
 MISC metadata.xml 359 RMD160 2a68a91eed726357114282e80e9900b48786a993 SHA1 f02e1e4d9766bb929cf7964c3e53a1c46e7cd971 SHA256 839494b250e210b4e59b4880338e741a9f9def69979df47cf658e5d04a93726c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxpLRQACgkQAiZjviIA2XiiTwCfc7U8TTSQ4JjVcJ7+t6Voi4/C
-wVcAoOtOrz3XgdybNnzilNJ9+K1ffOSg
-=o0Ml
+iEYEARECAAYFAkxwPqsACgkQAiZjviIA2Xj8kgCdGWk+eUDXpZmO8cFtJuYQNWkC
+MnsAn3A2ZGKmqfkPgHF7uljA+ETs0Omv
+=6vkd
 -----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
deleted file mode 100644
index 4eb15348456a..000000000000
--- a/dev-ruby/uuidtools/files/uuidtools-1.0.7+ruby-1.8.7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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-2.1.1-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.1-r1.ebuild
index 0eaa7756bc40..46baf1781527 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.1-r1.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.1-r1.ebuild,v 1.3 2010/08/16 12:21:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.1-r1.ebuild,v 1.4 2010/08/21 21:01:10 flameeyes Exp $
 
 EAPI=2
 
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_TASK_TEST="spec:normal"
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.1-r2.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..ec0424a528c1
--- /dev/null
+++ b/dev-ruby/uuidtools/uuidtools-2.1.1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.1-r2.ebuild,v 1.1 2010/08/21 21:01:11 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_TASK_TEST="spec:normal"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
+
+inherit ruby-fakegem
+
+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=""
+
+# Rakefile does not work without rspec (and is quite difficult to work
+# it around).
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/rspec-1.0.8 )
+	test? ( >=dev-ruby/rspec-1.0.8 )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '1d; 2i require File.expand_path("../../spec_helper.rb", __FILE__)' \
+		"${S}"/spec/uuidtools/*.rb || die
+}