commit: 78ffdf3aadd4a15063fdde99ff25d4301831b332 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Wed Jan 29 07:15:14 2020 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Wed Jan 29 07:16:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ffdf3a
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 <AT> gentoo.org> .../rack/{rack-2.1.1.ebuild => rack-2.0.8-r1.ebuild} | 17 ++++++----------- dev-ruby/rack/rack-2.1.1.ebuild | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.0.8-r1.ebuild similarity index 67% copy from dev-ruby/rack/rack-2.1.1.ebuild copy to dev-ruby/rack/rack-2.0.8-r1.ebuild index 620d39032e9..6ccbc9c8b58 100644 --- a/dev-ruby/rack/rack-2.1.1.ebuild +++ b/dev-ruby/rack/rack-2.0.8-r1.ebuild @@ -2,38 +2,33 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby24 ruby25 ruby26" RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC" +RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC" -RUBY_FAKEGEM_GEMSPEC="rack.gemspec" +RUBY_FAKEGEM_BINWRAP="" inherit ruby-fakegem DESCRIPTION="A modular Ruby webserver interface" HOMEPAGE="https://rack.github.com/"; -SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +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/minitest-global_expectations - dev-ruby/concurrent-ruby -)" +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.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.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 diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.1.1.ebuild index 620d39032e9..c133d3f60d2 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
