gentoo resync : 03.07.2021

3 files changed, 2 insertions, 36 deletions

diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index b66fc931b877..874e2ca55537 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,7 +1,6 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
 EBUILD shoulda-2.11.3-r2.ebuild 874 BLAKE2B 2441a2b6a261de6de5fa10a17f92dd22bead3ffaf6b75204b6607821dfdfbff876dee36dcf40c89bffbfe84194ba5525698ef533856d433f0d1c17165b25fc1e SHA512 afe6e330b0e5deb1453e64891fc42243cd9f0285adf300f588d1936b4a991757190d9a03c4b02cb7b5fc5b914495689cf7c3061ffee7dec543b2e7d5670d4426
-EBUILD shoulda-2.11.3-r3.ebuild 841 BLAKE2B c41232118979ff733e191582e086a306a4d3608c44c2835dc44e296cad2e27ff748707618e944d027e998cdc8f8b86a57e610d92d6de4a0399da561b3b3a4ac1 SHA512 9223ba175f0874f868a64177f43005567f7a7616951899aeff02f60a0db8209d88e9a17e0c0ad35a1541d1c73ddef6860afde4518da8a9ded3328510d777cec6
+EBUILD shoulda-2.11.3-r3.ebuild 836 BLAKE2B a16178f1c34220fb8c01bb68468d10229439de2c101a8e9511a227286e4c38e29bffe0262916c74274de12d8dd2ae2e0d90db5ece4cb9b39f01e1ead5fb0da1d SHA512 a2e1fab8c023c84e90cb985e71ceba1f9aba2141f0820344bee7c085075dc130d46eaff25ef6b77dc558022774fe851a0766d053139a45b9b79b3d4cb32d736c
 EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
-EBUILD shoulda-3.6.0.ebuild 931 BLAKE2B 02504a8fbb249eb1899083362eec53048d6b1a994da86cb5cd215480c3c663277db56eb0e37db4b41c74f7729d1037675869c4e4756e4728027734bdcfafd6f2 SHA512 7e6bddcfaa0eb3228022d1025f133fd04f14040286108d6db25447f206fd1376ed713c2a5529550dc7bf785795d9d95a34cc8e47380d2fddd845df6c91198f89
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
index 905694b9e654..b472d2d5c371 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/shoulda/shoulda-3.6.0.ebuild b/dev-ruby/shoulda/shoulda-3.6.0.ebuild
deleted file mode 100644
index b7232eb371d1..000000000000
--- a/dev-ruby/shoulda/shoulda-3.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# This now more or less a meta-gem and it only contains features for
-# integration tests using Appraisals, which we don't currently package.
-RESTRICT=test
-
-ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
-	dev-ruby/shoulda-matchers:3"
-
-all_ruby_prepare() {
-	sed -e '/executables/,/^  end/d ; /test_files/d; s/git ls-files/find . -print/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}