Put rack 1.2 in a separate slot, and make sure that only rack 1.2 installs rackup so the older version can co-exist. Fixed bug 341941.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 56 insertions, 10 deletions

diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 98cda6561544..47c7453e599d 100644
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.35 2010/10/22 13:25:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.36 2010/12/28 12:25:46 graaff Exp $
+
+*rack-1.1.0-r1 (28 Dec 2010)
+
+  28 Dec 2010; Hans de Graaff <graaff@gentoo.org> +rack-1.1.0-r1.ebuild,
+  rack-1.2.1.ebuild:
+  Put rack 1.2 in a separate slot, and make sure that only rack 1.2 installs
+  rackup so the older version can co-exist. Fixed bug 341941.
 
   22 Oct 2010; Hans de Graaff <graaff@gentoo.org> -rack-1.0.0.ebuild:
   Remove old version.
diff --git a/dev-ruby/rack/rack-1.1.0-r1.ebuild b/dev-ruby/rack/rack-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..620d0ae0020a
--- /dev/null
+++ b/dev-ruby/rack/rack-1.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.1.0-r1.ebuild,v 1.1 2010/12/28 12:25:46 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="http://rubyforge.org/projects/rack"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# 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.
+ruby_add_bdepend test dev-ruby/test-spec
+
+USE_RUBY=ruby19 \
+	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+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 specrb -Ilib:test -w -a \
+		-t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)' \
+		|| die "test failed for ${RUBY}"
+}
diff --git a/dev-ruby/rack/rack-1.2.1.ebuild b/dev-ruby/rack/rack-1.2.1.ebuild
index 023984794f85..6524dc506696 100644
--- a/dev-ruby/rack/rack-1.2.1.ebuild
+++ b/dev-ruby/rack/rack-1.2.1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.1.ebuild,v 1.2 2010/10/03 10:55:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.1.ebuild,v 1.3 2010/12/28 12:25:46 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 
-inherit ruby-fakegem eutils
+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="0"
+SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~ia64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
@@ -24,6 +24,9 @@ IUSE=""
 # 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.
+ruby_add_rdepend "!<dev-ruby/rack-1.1.0-r1"
+
 #USE_RUBY=ruby19 \
 #	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
 
@@ -39,9 +42,3 @@ each_ruby_test() {
 		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)' \
 		|| die "test failed for ${RUBY}"
 }
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rackup
-}