diff options
author | Hans de Graaff <graaff@gentoo.org> | 2020-01-29 08:15:14 +0100 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2020-01-29 08:16:00 +0100 |
commit | 78ffdf3aadd4a15063fdde99ff25d4301831b332 (patch) | |
tree | a82b40ee5fac53b97779ba0374b466f07d24671d /dev-ruby/rack | |
parent | dev-ruby/rack: cleanup (diff) | |
download | gentoo-78ffdf3aadd4a15063fdde99ff25d4301831b332.tar.gz gentoo-78ffdf3aadd4a15063fdde99ff25d4301831b332.tar.bz2 gentoo-78ffdf3aadd4a15063fdde99ff25d4301831b332.zip |
dev-ruby/rack: fix slot file collision
Add 2.0 slot without binaries and make the 2.1 slot block on 2.0
versions with the binaries.
Closes: https://bugs.gentoo.org/706410
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'dev-ruby/rack')
-rw-r--r-- | dev-ruby/rack/rack-2.0.8-r1.ebuild | 44 | ||||
-rw-r--r-- | dev-ruby/rack/rack-2.1.1.ebuild | 2 |
2 files changed, 45 insertions, 1 deletions
diff --git a/dev-ruby/rack/rack-2.0.8-r1.ebuild b/dev-ruby/rack/rack-2.0.8-r1.ebuild new file mode 100644 index 000000000000..6ccbc9c8b581 --- /dev/null +++ b/dev-ruby/rack/rack-2.0.8-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC" + +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +DESCRIPTION="A modular Ruby webserver interface" +HOMEPAGE="https://rack.github.com/" + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_rdepend "virtual/ruby-ssl" + +ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )" + +# 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. + +# Block against versions in older slots that also try to install a binary. +RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6" + +all_ruby_prepare() { + # The build system tries to generate the ChangeLog from git. Create + # an empty file to avoid a needless dependency on git. + touch ChangeLog || die + + # Avoid development dependency + sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die +} + +each_ruby_test() { + ${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die +} diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.1.1.ebuild index 620d39032e9f..c133d3f60d2a 100644 --- a/dev-ruby/rack/rack-2.1.1.ebuild +++ b/dev-ruby/rack/rack-2.1.1.ebuild @@ -33,7 +33,7 @@ ruby_add_bdepend "test? ( # make them dependencies at all. # Block against versions in older slots that also try to install a binary. -RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6" +RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0" all_ruby_prepare() { # The build system tries to generate the ChangeLog from git. Create |