gentoo resync : 16.01.2021

3 files changed, 3 insertions, 42 deletions

diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index 423c37044832..4e88c3ee0a5c 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1,4 +1,3 @@
 DIST flexmock-2.3.6.tar.gz 91601 BLAKE2B f2888891820f13f4a9812ffdfe042ccd266b0b5166fa538aba96e2c865ba55d3689d077e73fb9aa238455e90b8ea97aa60f8649c08823a753b6af8c0f550cbed SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc
-EBUILD flexmock-2.3.6-r1.ebuild 1135 BLAKE2B 420f97c3cb50ba757e64d3fa5f3dbe66136315bc3838b4318a72303fa1e1a79397d768effd4d445d6cd7cd0a3b971826214138f6b561455628cd12138e73404d SHA512 c19b0ff62a7b9bae8040236353450bb835156c721f04d3351ced3041e2203c6130e8b9a1cde0e90c18f3d01dd5bd7b3c91422c7f6e93b0b12951b75e5fd682f3
-EBUILD flexmock-2.3.6.ebuild 1027 BLAKE2B f77dae841d04b1f2e914434e7613463d51b2385449301d1d9e40b1c10d7f5076402a9161f6a0b850a308fbce197a81111885e043625434b84d2e40d898a89029 SHA512 aa3b72f472af2ca47f6c03d360c5dbbf9478d80381874f04ea2b71f2f9dfe9a0ff6619d088c427b1a074b8a59720ad0a59f4d175f2274d0ed0cf090365e2fa8a
+EBUILD flexmock-2.3.6-r1.ebuild 1133 BLAKE2B 1e5fb9a6a15a9689b96940a865d1cc20383ed16eab1d4dfb8bb10e1a1c97c60cc8c5bf91cf616475b1e5a7d5cb1078d161913aeea66f841f66a9d700768779ef SHA512 e5c65be24e5ac95185793559d51be62f4e1e82917fe8647fdd1293eefb669d6268fb033aada04449581362cab896d34638ebd260402b313d7a21f0b66f3792f9
 MISC metadata.xml 346 BLAKE2B 80f8ed32e41d3df3b32db9b646a23f2fbe9e037e1b5f058b07d3b270ed002380d17e67903d49d2290ba43b59520d005396575f1fe359c4f41546d1d9bcb6caab SHA512 9d39eaf3912ec47aee2fc5ce85bbb952a71202ef07c5fd6cef1d1645713f46a016d97ea5f8f08f0707fc8bbdf70d49621ad4300d4b14f3fd58de6c022f1f05c3
diff --git a/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild b/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
index d04994270898..eb003c501dc1 100644
--- a/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
+++ b/dev-ruby/flexmock/flexmock-2.3.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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="flexmock"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/flexmock/flexmock-2.3.6.ebuild b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
deleted file mode 100644
index e5a0cab2284e..000000000000
--- a/dev-ruby/flexmock/flexmock-2.3.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mock object library for Ruby unit testing"
-HOMEPAGE="https://github.com/doudou/flexmock"
-SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="flexmock"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/rspec:3
-	)"
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
-	${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
-}