1 |
commit: 78ffdf3aadd4a15063fdde99ff25d4301831b332 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 29 07:15:14 2020 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 29 07:16:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ffdf3a |
7 |
|
8 |
dev-ruby/rack: fix slot file collision |
9 |
|
10 |
Add 2.0 slot without binaries and make the 2.1 slot block on 2.0 |
11 |
versions with the binaries. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/706410 |
14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
15 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
16 |
|
17 |
.../rack/{rack-2.1.1.ebuild => rack-2.0.8-r1.ebuild} | 17 ++++++----------- |
18 |
dev-ruby/rack/rack-2.1.1.ebuild | 2 +- |
19 |
2 files changed, 7 insertions(+), 12 deletions(-) |
20 |
|
21 |
diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.0.8-r1.ebuild |
22 |
similarity index 67% |
23 |
copy from dev-ruby/rack/rack-2.1.1.ebuild |
24 |
copy to dev-ruby/rack/rack-2.0.8-r1.ebuild |
25 |
index 620d39032e9..6ccbc9c8b58 100644 |
26 |
--- a/dev-ruby/rack/rack-2.1.1.ebuild |
27 |
+++ b/dev-ruby/rack/rack-2.0.8-r1.ebuild |
28 |
@@ -2,38 +2,33 @@ |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
EAPI=7 |
32 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
33 |
+USE_RUBY="ruby24 ruby25 ruby26" |
34 |
|
35 |
RUBY_FAKEGEM_DOCDIR="doc" |
36 |
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC" |
37 |
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC" |
38 |
|
39 |
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec" |
40 |
+RUBY_FAKEGEM_BINWRAP="" |
41 |
|
42 |
inherit ruby-fakegem |
43 |
|
44 |
DESCRIPTION="A modular Ruby webserver interface" |
45 |
HOMEPAGE="https://rack.github.com/" |
46 |
-SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 |
|
48 |
LICENSE="MIT" |
49 |
SLOT="$(ver_cut 1-2)" |
50 |
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
51 |
+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" |
52 |
IUSE="" |
53 |
|
54 |
ruby_add_rdepend "virtual/ruby-ssl" |
55 |
|
56 |
-ruby_add_bdepend "test? ( |
57 |
- dev-ruby/minitest:5 |
58 |
- dev-ruby/minitest-global_expectations |
59 |
- dev-ruby/concurrent-ruby |
60 |
-)" |
61 |
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )" |
62 |
|
63 |
# The gem has automagic dependencies over mongrel, ruby-openid, |
64 |
# memcache-client, thin, mongrel and camping; not sure if we should |
65 |
# make them dependencies at all. |
66 |
|
67 |
# Block against versions in older slots that also try to install a binary. |
68 |
-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" |
69 |
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6" |
70 |
|
71 |
all_ruby_prepare() { |
72 |
# The build system tries to generate the ChangeLog from git. Create |
73 |
|
74 |
diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.1.1.ebuild |
75 |
index 620d39032e9..c133d3f60d2 100644 |
76 |
--- a/dev-ruby/rack/rack-2.1.1.ebuild |
77 |
+++ b/dev-ruby/rack/rack-2.1.1.ebuild |
78 |
@@ -33,7 +33,7 @@ ruby_add_bdepend "test? ( |
79 |
# make them dependencies at all. |
80 |
|
81 |
# Block against versions in older slots that also try to install a binary. |
82 |
-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" |
83 |
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0" |
84 |
|
85 |
all_ruby_prepare() { |
86 |
# The build system tries to generate the ChangeLog from git. Create |