gentoo resync : 16.09.2021

3 files changed, 89 insertions, 2 deletions

diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 171c2979501a..f2e152779e97 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -3,5 +3,6 @@ DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598
 DIST cucumber-7.0.0.tar.gz 406986 BLAKE2B 6d06d40e7b7029f3f5fea782b5060cf8985cd65334c722744132f40048d1d261963dd4baaa80a8fd44b18d66b63b08960350abedfbfd4d95e0a033a22192d010 SHA512 ca083c2de895f11d7cfd955c216e1e2c52ea9e5ed0034aacbec44e5daf1809e6a67a4621a64a5f236c6a0be9d8057beb917fd00a5f03191fe3d9d2c8814fa22b
 EBUILD cucumber-3.2.0.ebuild 2837 BLAKE2B 8d76d4476b2e1c8d7bdd16c4c89f8d45eb04af571d7438a057ffb28f3b818388cc346b30b53606e8e96ce75b65fb59e9333433c343817e9a57c805128267cd24 SHA512 f0a0a344b0190d7751f9de8aebb8c5d2c93dec6ba41f6df288c67b1629649c2a0f510394b65e9d53074c8f9ce27dafaa6a469b97b03b69309fbcf17f0ac2b689
 EBUILD cucumber-6.1.0.ebuild 2527 BLAKE2B 5001b462e33a2b308e8e9fb4e9e00893027ed3421980539dbad0e15cd10cd27913f8024731e6df37f1a50760bbca6e508ea87d864be2857ff90b15afb8b9a07a SHA512 3d541dbf42e8fd458ae6bd9b15aa5bc94aa2f3fdb9d05ac344a81c3cb4b4475d1450966682154fd9532ab7bdea573feb665a96be3bc6758932084d3a4de76828
+EBUILD cucumber-7.0.0-r1.ebuild 2532 BLAKE2B c9ec9fbbad74dc110136d9fa4cea41de5b5016b231838daa65f684f8fd108e8ac05f7a79931e1fec44b0605795c5ea5d304a8d67173ad18f6925d98f4d916d1a SHA512 3e0edd81641d2665f613dc8ebeeaf04214f9e1956bab4717dc92d5e1089371795895de7f98bdbfe49a48f94a1fdeb39606d23e20f4b36b5771c7814f5036837f
 EBUILD cucumber-7.0.0.ebuild 2544 BLAKE2B cc361b5e344ce7b6416e4bac97a231270e708a99211693ffa24c7260f2615e9d49370c96dc969f6d55300dd3f95115767b4a6b18e926e708f1825a2d487ca972 SHA512 c62b6773a40fcbc6acc956a2211de3f1cba13c5817fc6633281cc6359dd2461a2af65daa429f96ccad65447d81513ddcf21a3a4b44ff3f663d4074fa902e8d50
-MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
+MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber/cucumber-7.0.0-r1.ebuild b/dev-util/cucumber/cucumber-7.0.0-r1.ebuild
new file mode 100644
index 000000000000..41a4ffcb1b85
--- /dev/null
+++ b/dev-util/cucumber/cucumber-7.0.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP="cucumber"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		dev-ruby/json
+		>=dev-util/cucumber-3
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-3.2.4:3.2
+	>=dev-util/cucumber-core-10.0.1:10
+	>=dev-util/cucumber-create-meta-6.0.1:6
+	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
+	>=dev-util/cucumber-gherkin-20.0.1:20
+	>=dev-util/cucumber-html-formatter-16.0.1:16
+	>=dev-util/cucumber-messages-17.0.0:17
+	>=dev-util/cucumber-wire-6.0.1:6
+	>=dev-ruby/diff-lcs-1.4.4:0
+	>=dev-ruby/mime-types-3.3.1:3
+	>=dev-ruby/multi_test-0.1.2:0
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
+		-e '/nokogiri/ s/1.8.1/1.8/' \
+		-e "/json/ s/, '~> 1.8.6'//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged packages
+	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
+
+	# Avoid specs failing due to differing deprecation message
+	rm -f spec/cucumber/deprecate_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cucumber/metadata.xml b/dev-util/cucumber/metadata.xml
index 06c13e2d2e33..ecbd8c460ae2 100644
--- a/dev-util/cucumber/metadata.xml
+++ b/dev-util/cucumber/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>graaff@gentoo.org</email>