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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 47 insertions, 19 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/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
+}