Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/actionpack-xml_parser/
Date: Sun, 15 Dec 2019 07:22:16
Message-Id: 1576394508.2bca3d41eaf9473b00735f08caffee5869b8fd9f.graaff@gentoo
1 commit: 2bca3d41eaf9473b00735f08caffee5869b8fd9f
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 15 07:21:48 2019 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 15 07:21:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bca3d41
7
8 dev-ruby/actionpack-xml_parser: add ruby25, ruby26
9
10 Fix tests to work with Rails 5.2.
11
12 Closes: https://bugs.gentoo.org/702926
13 Package-Manager: Portage-2.3.79, Repoman-2.3.16
14 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
15
16 .../actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild | 11 +++++++----
17 1 file changed, 7 insertions(+), 4 deletions(-)
18
19 diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
20 index 469ece6f256..48e5bf081ed 100644
21 --- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
22 +++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
23 @@ -1,8 +1,8 @@
24 -# Copyright 1999-2018 Gentoo Foundation
25 +# Copyright 1999-2019 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 -USE_RUBY="ruby22 ruby23 ruby24"
30 +USE_RUBY="ruby24 ruby25 ruby26"
31
32 RUBY_FAKEGEM_TASK_DOC=""
33
34 @@ -22,9 +22,12 @@ ruby_add_rdepend "=dev-ruby/actionpack-5*:* =dev-ruby/railties-5*:*"
35
36 all_ruby_prepare() {
37 sed -i -e "/bundler/d" Rakefile test/helper.rb || die
38 - sed -i -e '1igem "actionpack", "~>5.0"' test/helper.rb || die
39 + sed -i -e '1igem "actionpack", "~>5.2"' test/helper.rb || die
40 +
41 + # Skip test that is not compatible with Rails 5.2
42 + sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
43 }
44
45 each_ruby_test() {
46 - ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}"
47 + MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
48 }