From 05a4146020f8b8d8bf03a544caad919e5255bc54 Mon Sep 17 00:00:00 2001
From: Hans de Graaff <graaff@gentoo.org>
Date: Sun, 4 Dec 2011 19:03:22 +0000
Subject: [PATCH] Add missing require sometimes exposed by tests.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
---
 dev-ruby/rack/ChangeLog            |  8 ++++-
 dev-ruby/rack/Manifest             | 11 ++++---
 dev-ruby/rack/rack-1.2.4-r1.ebuild | 51 ++++++++++++++++++++++++++++++
 dev-ruby/rack/rack-1.2.4.ebuild    |  4 +--
 4 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 dev-ruby/rack/rack-1.2.4-r1.ebuild

diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 2e31f0e921a6..cba5d51525dd 100644
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.59 2011/09/18 07:38:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.60 2011/12/04 19:03:22 graaff Exp $
+
+*rack-1.2.4-r1 (04 Dec 2011)
+
+  04 Dec 2011; Hans de Graaff <graaff@gentoo.org> rack-1.2.4.ebuild,
+  +rack-1.2.4-r1.ebuild:
+  Add missing require sometimes exposed by tests.
 
 *rack-1.2.4 (18 Sep 2011)
 
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 64066c1c6c7b..2816fa471ad2 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -14,13 +14,14 @@ EBUILD rack-1.1.0-r1.ebuild 1343 RMD160 ce8015fec934f9df85f25c25b9584b291db5cafc
 EBUILD rack-1.1.0.ebuild 1282 RMD160 2507782d9e4b2e5c22da84bbdb7d521edcff62c2 SHA1 43a5861afa0903d111be7d493cfe31f5ce915092 SHA256 172f2a9d15660e4cc8b1ebbddb9a38abfc3d7d20a306fe3a3d00a944b234af05
 EBUILD rack-1.1.2.ebuild 1347 RMD160 1ba6f65d964d58574542f3a2e4b7f1aa152857de SHA1 1e8116532091ffa04b808027b1cca5407d57cf4a SHA256 f2eed5f94f75d7dc3d981330e2cca627870056925359d24b244ea41aa8cd3db8
 EBUILD rack-1.2.3.ebuild 1690 RMD160 751f206621da2567bd544b9179d158401d90d68a SHA1 1190349f20f6c29d3fc6a37c1dbfba220bf5bd5e SHA256 84d6c4334ad99929e4e6ec04eeee162a5af6a6e5cb87c78921c6386ac2c57151
-EBUILD rack-1.2.4.ebuild 1689 RMD160 9e4695c406ae9de1e108df225be32798b8c3b3ec SHA1 b28bd410c71ee0075df4feb112c922f959dee647 SHA256 875e3df8036058a42856d09bed947683aa7687de714c6849db10dd0a49376fcc
-MISC ChangeLog 7686 RMD160 f5466cc7b0bd8b2b7e9642ad930d0d09dfaa7f53 SHA1 720f6f7d9a760597f04066942c81f39bfb793d04 SHA256 1c143a9d988857bca8001f60bfb8c8b098626fbc7cd97bed4feeb599ddc447e9
+EBUILD rack-1.2.4-r1.ebuild 1846 RMD160 4f0c30146034427527ac6b1f64eb51a3a52f1a5f SHA1 fab5ff495d2b2dab090b2a5ff1260ebb9bae6c99 SHA256 631c7e7d90f14cdf4a42e567dcb6ca2758df78343ef1fa64d873167ed0a7402d
+EBUILD rack-1.2.4.ebuild 1683 RMD160 3daff284889b0aade46b7a560cdf348bf96b3b58 SHA1 43290d2990f329e01382a61afd561d3a1551d631 SHA256 337f4222b895826d28ace7bc511916a8015e06593a3b9303ec55fa55b2e4c173
+MISC ChangeLog 7861 RMD160 5dbe4d5eb1154ba14bc5a671bb29708b11b942a3 SHA1 3019490328d5e4c38a84e4f4729389475942303c SHA256 56d64fdfd2dfbb8f91baae3df72704699acb28391746b61c0dfed671a456bd4f
 MISC metadata.xml 298 RMD160 346a19f2ad30420333de0e18f6885d39c45199f9 SHA1 aa0efe5a5420481faf50930f7e9934fdce3f15f3 SHA256 4433420c9bacb25a180e376175271d9fa41ab158ac71638fb8cccc460370899b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk51n+4ACgkQiIP6VqMIqNdynAD7B2h+s6G28mwAherKLaJEBHWu
-8sqRK0luY8j62gsPAv4A/3s0vW/hwxuRdcOPfnKAls/ZTYHHsnEBVkKmT9Lie6G0
-=+4aq
+iF4EAREIAAYFAk7bxAAACgkQiIP6VqMIqNfwgwEAlM68E1MN/BHp9j8C9Qsc/PFo
+r+Ig76FR8AKTvWfo8pEA/0MItDhaBhardYuo1AlORCH/YJ3inCCI/BHYkQtOxyDK
+=tfjX
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack/rack-1.2.4-r1.ebuild b/dev-ruby/rack/rack-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..3be3438be115
--- /dev/null
+++ b/dev-ruby/rack/rack-1.2.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4-r1.ebuild,v 1.1 2011/12/04 19:03:22 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README SPEC"
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="http://rubyforge.org/projects/rack"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all. We do add the fcgi dependency because
+# that spec isn't optional.
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.0-r1:0"
+
+#USE_RUBY=ruby19 \
+#	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+
+	# Add missing require for Mutex use. This may show up in the tests
+	# depending on load order.
+	sed -i -e '1 irequire "thread"' lib/rack/lock.rb || die
+}
+
+each_ruby_test() {
+	# Since the Rakefile calls specrb directly rather than loading it, we
+	# cannot use it to launch the tests or only the currently-selected
+	# RUBY interpreter will be tested.
+	${RUBY} -S bacon -Ilib -w -a \
+		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)' \
+		|| die "test failed for ${RUBY}"
+}
diff --git a/dev-ruby/rack/rack-1.2.4.ebuild b/dev-ruby/rack/rack-1.2.4.ebuild
index fa4a6b9a2811..197cf5c6bd1a 100644
--- a/dev-ruby/rack/rack-1.2.4.ebuild
+++ b/dev-ruby/rack/rack-1.2.4.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/rack/rack-1.2.4.ebuild,v 1.1 2011/09/18 07:38:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4.ebuild,v 1.2 2011/12/04 19:03:22 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README SPEC"
 inherit ruby-fakegem eutils versionator
 
 DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="http://rubyforge.org/projects/rack"
+HOMEPAGE="https://github.com/rack/rack"
 SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-- 
2.26.2