gentoo resync : 16.01.2021

3 files changed, 3 insertions, 41 deletions

diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index 6ddef0afd8bd..5f2275fc1d38 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1,4 +1,3 @@
 DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
-EBUILD test_declarative-0.0.6-r1.ebuild 1128 BLAKE2B 05b80b4d477bc4f449aeb949301be267164ac82f19e50c98cd12561ae2f8a7f9bb44cc5d82bc8df1eabaaf33855c2da56c70c1efeca95c1f009589f869e3b3c6 SHA512 d00410526c3bb92d6c2694456ac8e12fe057a685658f7c6e48a9cda04a373a51b1bc56b26b3b943575c7c51584c77ea1962f6786e384bbf86c36304913a4d1e0
-EBUILD test_declarative-0.0.6.ebuild 1016 BLAKE2B ca4647e178c383acecf9cdbed06414c737ddab8a9ada93453708c6f247e18e2d6757c801e156ce9c34b024c04fe3e53143cfd51bc31f698224c88a3c8e09b214 SHA512 dc7039c13f230293b523ca7eb0c43dc558bafb3433e799efaeba11af44f53bfcf9dfd05131dea4b02af7647f3a05d6fd87c9339f882fe87676ddb1492a5c2d8b
+EBUILD test_declarative-0.0.6-r1.ebuild 1126 BLAKE2B ac70c439fc272e100b1730451bfb88ae698c5dbd87bfae4572c5a7ea4d3b012e8bccc10fce564cfd0e0cd9e3094ae40f91d6c8af9f517f0674b5eb81c845dd79 SHA512 33733cdd103584e8151f32244725d6628e4684f6aef905534059aeb946723419909fcfade18ae05217aa6cde3f20dfe2e6dc0f9f867049806609ce3cfd91ec43
 MISC metadata.xml 353 BLAKE2B 504efd99cbd9cd70b9241711a5ecb7ac96f10bef5a88e25288dd6293e1c42b2d215ea3042feff270a4c9b9d36c724a6f6450d180dc69a724781d034e5d91e27f SHA512 c6a704277f2ee955f9cfc5898a89285951ee0a9546760bd949bd29e06b4a8037788365b9a95e2530da65907e03fab5d52dbd0d73768ee75cfcf1b00eddea5d85
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
index 3188501ca72e..4f5866174a60 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ RUBY_S="svenfuchs-test_declarative-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
deleted file mode 100644
index 5dcd6d1e34e3..000000000000
--- a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simply adds a declarative test method syntax to test/unit"
-HOMEPAGE="https://github.com/svenfuchs/test_declarative"
-SRC_URI="https://github.com/svenfuchs/test_declarative/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="svenfuchs-test_declarative-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~> 12.0.0/>= 10/ ; /minitest/ s/5.10.1/5.10/' Gemfile || die
-}
-
-each_ruby_test() {
-	# There are other gemfiles but their setup seems broken atm.
-	for gemfile in Gemfile ; do
-		einfo "Running tests with ${gemfile}"
-		BUNDLE_GEMFILE=${gemfile} ${RUBY} -S bundle exec rake test || die
-	done
-}