commit: 93a0ca1d70c27ba565874b3fa8fd51f7d8cd50c1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 12 01:53:49 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 12 02:27:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a0ca1d
dev-ruby/thor: add 1.2.2 Patch is easier than sed here (with how the file is now laid out in >=1.2.2). Signed-off-by: Sam James <sam <AT> gentoo.org> dev-ruby/thor/Manifest | 1 + dev-ruby/thor/files/thor-1.2.2-no-coverage.patch | 29 +++++++++ dev-ruby/thor/thor-1.2.2.ebuild | 78 ++++++++++++++++++++++++ 3 files changed, 108 insertions(+) diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest index a89e5dfe47d4..38005b2f9056 100644 --- a/dev-ruby/thor/Manifest +++ b/dev-ruby/thor/Manifest @@ -1 +1,2 @@ DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9 +DIST thor-git-1.2.2.tgz 98213 BLAKE2B e71ee51eb5c982c585cf9bd9dffda8933975c9d0df8096015d125eefd0597a653887db1acfc132ce1f5a2e8ce4ab71c790a6c0bf39edd7c5e4c85a75de963944 SHA512 2c8af5d59f33691af63e813ba8dfe3392c279593f3e3ccf0ab2d6eb2ccce4220d93b7cb3413ad853e4bba14f4e2182c54caaf4944627cbcbefa31cdc0fabefc7 diff --git a/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch b/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch new file mode 100644 index 000000000000..f57cbfeb63f5 --- /dev/null +++ b/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch @@ -0,0 +1,29 @@ +--- a/spec/helper.rb ++++ b/spec/helper.rb +@@ -1,17 +1,5 @@ + $TESTING = true + +-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0") +- require "simplecov" +- require "coveralls" +- +- SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter] +- +- SimpleCov.start do +- add_filter "/spec" +- minimum_coverage(90) +- end +-end +- + $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib")) + require "thor" + require "thor/group" +@@ -22,8 +10,6 @@ require "rspec" + require "diff/lcs" # You need diff/lcs installed to run specs (but not to run Thor). + require "webmock/rspec" + +-WebMock.disable_net_connect!(:allow => "coveralls.io") +- + # Set shell to basic + ENV["THOR_COLUMNS"] = "10000" + $0 = "thor" diff --git a/dev-ruby/thor/thor-1.2.2.ebuild b/dev-ruby/thor/thor-1.2.2.ebuild new file mode 100644 index 000000000000..86f805fb7395 --- /dev/null +++ b/dev-ruby/thor/thor-1.2.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 2000-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby30 ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_DOCDIR="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.md" +RUBY_FAKEGEM_BINWRAP="thor" + +RUBY_FAKEGEM_GEMSPEC="thor.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities" +HOMEPAGE="http://whatisthor.com/" +SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz" + +LICENSE="MIT" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux" +IUSE="doc" + +# For initial target porting (new rubies), we can make these test deps +# conditional with: +# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ... +# 2. skip logic in each_ruby_test +USE_RUBY="ruby30 ruby31 ruby32" ruby_add_bdepend " + test? ( + dev-ruby/childlabor + dev-ruby/webmock + )" + +RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0" + +PATCHES=( + "${FILESDIR}"/thor-1.2.2-no-coverage.patch +) + +all_ruby_prepare() { + # Remove rspec default options (as we might not have the last + # rspec). + rm .rspec || die + + # Remove Bundler + #rm Gemfile || die + sed -i -e '/[Bb]undler/d' Thorfile || die + + # Remove mandatory coverage collection using simplecov which is not + # packaged. + #sed -i -e '/require "simplecov"/,/^end/ s:^:#:' spec/helper.rb || die + + # Avoid a spec that requires UTF-8 support, so LANG=C still works, + # bug 430402 + #sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die + + # Avoid specs depending on git, bug 724058 + rm -f spec/quality_spec.rb || die + + # Avoid currently broken readline specs (already fixed upstream) + rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die + + # Avoid spec failing on whitespace difference in error message + sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die +} + +each_ruby_test() { + case ${RUBY} in + *ruby33) + einfo "Skipping tests due to circular dependencies" + ;; + *) + RSPEC_VERSION=3 ruby-ng_rspec spec || die + ;; + esac +}