From: Hans de Graaff <graaff@gentoo.org>
Date: Sun, 1 Jan 2012 10:21:55 +0000 (+0000)
Subject: Make sure only the latest version installs rackup, fixes bug 396661.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=000734c7410d507de750c1061f928cda2647ca65;p=gentoo.git

Make sure only the latest version installs rackup, fixes bug 396661.

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

diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 959462360e5a..8ec998bac2e2 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.69 2011/12/31 19:37:40 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.70 2012/01/01 10:21:55 graaff Exp $
+
+*rack-1.3.6-r1 (01 Jan 2012)
+
+  01 Jan 2012; Hans de Graaff <graaff@gentoo.org> +rack-1.3.6-r1.ebuild,
+  rack-1.4.0.ebuild:
+  Make sure only the latest version installs rackup, fixes bug 396661.
 
   31 Dec 2011; Fabian Groffen <grobian@gentoo.org> rack-1.4.0.ebuild:
   Add Prefix keywords, bug #396547
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 9aad3b2f0bc3..e99026ea5a9c 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX rack-1.0.1-gentoo.patch 877 RMD160 a5c7bc9527595e64f6eded1434f92d9e77793b33 SHA1 6ddc5bcc3c2930e7aed22472ec77c5cdc60f4b0d SHA256 2260ce111cf6d07a7b6169f0c5e829d28d00c17d42fcc1dbed82d5953ede04db
 AUX rack-1.1.0-gentoo.patch 1293 RMD160 9b2b240df6c7ce8140f847223546e66e9a130f84 SHA1 161ee6bfe8bcc6aa68b1fd82807055c1461b2887 SHA256 2af3afc6b90d379e63137b798417a1aa6e13c1d6f1bd40d47344b6662bce676a
@@ -26,14 +26,15 @@ EBUILD rack-1.2.4-r2.ebuild 2464 RMD160 a217c76ecfb127fd2aaf7eaa8f162afc2957427d
 EBUILD rack-1.2.4.ebuild 1683 RMD160 3daff284889b0aade46b7a560cdf348bf96b3b58 SHA1 43290d2990f329e01382a61afd561d3a1551d631 SHA256 337f4222b895826d28ace7bc511916a8015e06593a3b9303ec55fa55b2e4c173
 EBUILD rack-1.2.5.ebuild 2768 RMD160 f21c4d8f8b17054c3504700ddd38075eb5e9db94 SHA1 d762283e25753d1757419ef1b9f678ad2eb1ac4a SHA256 3497f8aad6d8ccfcb74d0d2fdeb04c23e44506975d7f2dc4f18104fded18c86e
 EBUILD rack-1.3.5.ebuild 1852 RMD160 84f54f5969575e116a5257517102274e12d30b95 SHA1 e640b9ce2b0d5a98625c9f3c9e34047885c6c0c2 SHA256 d730cd014101e64def8a239a557d0732f9426cd88f380dcb2061edb9f82a638b
+EBUILD rack-1.3.6-r1.ebuild 2172 RMD160 6a280f26e767820c4e6352268d73191001cd1245 SHA1 0fa209c257091cee8f997c183536a2119051ac74 SHA256 4ad6285e0fae3c9b1f27d0dffa9d67aa8497445ef59f50433beded5c90132f58
 EBUILD rack-1.3.6.ebuild 2144 RMD160 1693d9b1e07f30dd715dc73a0f577c635bd0c70e SHA1 d918a56090067cb6273bb4e259c55792eac8a3a1 SHA256 56bc1a95c8923cfb8d46d74ac5ff35da0e514e63ae93a05efd9abf6d5210f26a
-EBUILD rack-1.4.0.ebuild 2198 RMD160 4d980df34612d85a32998e9a474740412f913c70 SHA1 b2d66e7c4ea13b98e99b37187f90620f505ad77e SHA256 c5c5d819da3c15a42347c0e91451b29518f26806c8e5aeaaae1d736bc1503651
-MISC ChangeLog 9327 RMD160 89fd957641799b3c2117da101b3c617c4375e46a SHA1 6f7ecc30fa95dc12102df8fe8640e60f7471094d SHA256 bf6aaaff950c189a3075cbfbcb9e8f2d0b8dcccef38a0019e932a16232938b48
+EBUILD rack-1.4.0.ebuild 2200 RMD160 f67b6b775c7d596d20b0f3d30161944a591f605d SHA1 2553e2923d3efa5721ba2b5bb63d248a363046d8 SHA256 602990b3f4b061d8acb36902befb6814610a7a71b0b26033154a173f2289be54
+MISC ChangeLog 9522 RMD160 b5cba2f69e0d21ce370c87f9ec0acb75ce6fc6f4 SHA1 ae901d61ada45843da3e5acb46bdd996e032ee1d SHA256 ecc34af26c6f62a1918823a1eeea449e204dd48c1a72c861e29c1240365f33e8
 MISC metadata.xml 298 RMD160 346a19f2ad30420333de0e18f6885d39c45199f9 SHA1 aa0efe5a5420481faf50930f7e9934fdce3f15f3 SHA256 4433420c9bacb25a180e376175271d9fa41ab158ac71638fb8cccc460370899b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7/ZIoACgkQX3X2B8XHTon3LgCdGaW/8GYhoNvxJq3s08OihPIK
-koUAnj498wkZrrGPKuF1XexV2JmKV5Th
-=eggM
+iF4EAREIAAYFAk8AM8kACgkQiIP6VqMIqNfQiwD9HnkHS8UprmHU1ZJKvEJchbDR
+LPNCKy2JovTOoUHHpOgA/0A9cvN4gDordFjYYVkgtsTmdv+E0/VR1adioCRp8hC/
+=irmw
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack/rack-1.3.6-r1.ebuild b/dev-ruby/rack/rack-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..f0978b6d84d5
--- /dev/null
+++ b/dev-ruby/rack/rack-1.3.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.3.6-r1.ebuild,v 1.1 2012/01/01 10:21:55 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README.rdoc SPEC"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+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 ~x86-fbsd ~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.3-r1:0 !<dev-ruby/rack-1.2.5:1.2"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+
+	# Avoid tests depending on now randomized hash ordering.
+	sed -i -e '/foobarfoo/ s:^:#:' test/spec_response.rb || die
+	sed -i -e '/build query strings correctly/,/end/ s:^:#:' test/spec_utils.rb || die
+	sed -i -e '/build nested query strings correctly/,/end/ s:^:#:' test/spec_utils.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Avoid two failing tests due to bugs in jruby that should
+			# be solved in 1.6.5 or 1.7.
+			rm test/spec_deflater.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+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|Rack::Server)' \
+		|| die "test failed for ${RUBY}"
+}
diff --git a/dev-ruby/rack/rack-1.4.0.ebuild b/dev-ruby/rack/rack-1.4.0.ebuild
index 31f0ff33916a..32d952e7a14d 100644
--- a/dev-ruby/rack/rack-1.4.0.ebuild
+++ b/dev-ruby/rack/rack-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.0.ebuild,v 1.2 2011/12/31 19:37:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.0.ebuild,v 1.3 2012/01/01 10:21:55 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -28,7 +28,7 @@ ruby_add_rdepend "virtual/ruby-ssl"
 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.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6:1.3"
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3"
 
 all_ruby_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch