Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: www-servers/thin/
Date: Sun, 11 Jul 2021 22:28:58
Message-Id: 1626042477.38100aaf444c2945f19b8537444088861dc85157.Alessandro-Barbieri@gentoo
1 commit: 38100aaf444c2945f19b8537444088861dc85157
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sun Jul 11 22:27:57 2021 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sun Jul 11 22:27:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=38100aaf
7
8 www-servers/thin: remove ruby25
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 www-servers/thin/thin-1.8.0.ebuild | 16 ++++++++--------
14 1 file changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/www-servers/thin/thin-1.8.0.ebuild b/www-servers/thin/thin-1.8.0.ebuild
17 index 9f43ab603..d1d45d546 100644
18 --- a/www-servers/thin/thin-1.8.0.ebuild
19 +++ b/www-servers/thin/thin-1.8.0.ebuild
20 @@ -1,13 +1,11 @@
21 -# Copyright 2020 Gentoo Authors
22 +# Copyright 2020-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26
27 -USE_RUBY="ruby24 ruby25 ruby26"
28 -
29 -RUBY_FAKEGEM_RECIPE_TEST="rspec3"
30 -
31 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
32 +RUBY_FAKEGEM_RECIPE_TEST="rspec3"
33 +USE_RUBY="ruby26"
34
35 inherit ruby-fakegem
36
37 @@ -56,7 +54,9 @@ all_ruby_prepare() {
38
39 sed -i -e "s/Spec::Runner/Rspec/" spec/spec_helper.rb || die
40 # nasty but too complex to fix up for now :(
41 - use doc || rm tasks/rdoc.rake
42 + if ! use doc; then
43 + rm tasks/rdoc.rake || die
44 + fi
45 }
46
47 each_ruby_configure() {
48 @@ -76,8 +76,8 @@ all_ruby_install() {
49 all_fakegem_install
50
51 keepdir /etc/thin
52 - newinitd "${FILESDIR}"/${PN}.initd-r4 ${PN}
53 - newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
54 + newinitd "${FILESDIR}/${PN}.initd-r4" "${PN}"
55 + newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
56
57 einfo
58 elog "Thin is now shipped with init scripts."