[gentoo-commits] gentoo-x86 commit in dev-ruby/rack: ChangeLog rack-1.4.0.ebuild rack-1.3.6-r1.ebuild

[Hans de Graaff (graaff)]

graaff      12/01/01 10:21:55

  Modified:             ChangeLog rack-1.4.0.ebuild
  Added:                rack-1.3.6-r1.ebuild
  Log:
  Make sure only the latest version installs rackup, fixes bug 396661.
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.70                 dev-ruby/rack/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/ChangeLog?r1=1.69&r2=1.70

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	31 Dec 2011 19:37:40 -0000	1.69
+++ ChangeLog	1 Jan 2012 10:21:55 -0000	1.70
@@ -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@g.o> +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@g.o> rack-1.4.0.ebuild:
   Add Prefix keywords, bug #396547



1.3                  dev-ruby/rack/rack-1.4.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/rack-1.4.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/rack-1.4.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/rack-1.4.0.ebuild?r1=1.2&r2=1.3

Index: rack-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rack-1.4.0.ebuild	31 Dec 2011 19:37:40 -0000	1.2
+++ rack-1.4.0.ebuild	1 Jan 2012 10:21:55 -0000	1.3
@@ -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_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



1.1                  dev-ruby/rack/rack-1.3.6-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/rack-1.3.6-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rack/rack-1.3.6-r1.ebuild?rev=1.1&content-type=text/plain

Index: rack-1.3.6-r1.ebuild
===================================================================
# 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}"
}