gentoo resync : 19.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
commit: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree: ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /dev-ruby
parent: dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)
60 files changed, 608 insertions, 559 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e1993aa33cbf..b07ff17b67cd 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index eb4d07d7e0f1..39bffafb7355 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -4,10 +4,12 @@ DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555
 DIST capybara-3.23.0.gem 349184 BLAKE2B 233b83fb88f106de8e25a1aa34d1082664824571eca2a79ad3de3b164e639b68173804bf2e871c3fde7fe2af54d64ee6ade90c4149807e04e844cbf5d61f24dc SHA512 53e0c6223e574960e136e7620d7d00a0e1479f9eb0fb70c7150bc60e20ed009d163dc29f7cee84acad43168cca230465490c9ca64b640fdebe9223ec62b6e4db
 DIST capybara-3.24.0.gem 349696 BLAKE2B 54447fc17169d953c43f31505a9267bebe6d093052cb553efa8eb65bf6e39fbb13fe02cb3b7252c4fe1f0554370266265eb759ad7f4dc5bab9299410e4f07e81 SHA512 32a19471d3f8d13871c40c28671125039b432065ab6ac1b31f38551f9e5c7d52c041ef9a56db853aeddd14d9411dec4e647336f6b78feb45c90a676ccdc606fe
 DIST capybara-3.25.0.gem 351744 BLAKE2B 12e8f483bca814fa826707895a6fc72a3d54df2e03c1175eb4be8e2f83afeda2466d70eab03c7700665d3f94bc7b3b8f85b2d2d6cf8242cad285d9350428cadc SHA512 1be454984862c314f0571ca68ed3858d241dc5f0709d155b1b7accd7fd81a1ab0bf0a5c6537c871989c9abc758d0e7fa5109c8b04be8b620137e129a5da13a68
+DIST capybara-3.26.0.gem 352256 BLAKE2B b6b71e163adfa2125d4e4a28fdaaf9feb725e874eab7180c0ece1166b2411ee0930244c79cac22f17e7c3ea8c1cb42b043d5bbd7321a3aa6460fbbfa775035b3 SHA512 31dabbb6ea77ed185d53b72e5f4ea89546f33b5c682d68692e4115bdec29c15d1f5f8bcab4f5256b76f6fbfadd5c638f8bf1d7b974dd3153d57521eb8c04a778
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
 EBUILD capybara-3.18.0.ebuild 1804 BLAKE2B 678dba02ba98f19bf4ef17086d3bab0f8216ba6e89d85ca0377a53a03c3b952443a29bd00d8cb0b85849516663958a315386c059fd4d0e119f4417b9550a9558 SHA512 8a1ab2c59dec10beafb8362ad7a58f5389d385ce98975e427f40cc8b464d095ffda7baeb44fc66a5b7ecdca86f181571d16af0000b74a8fc99b1d99118f22a30
 EBUILD capybara-3.2.1.ebuild 1552 BLAKE2B 02cb90fc41a6c642bcb8c3efad2428e9d49cd5fe06a43217a4e67b2b9ec957e5038377cd8bfe957605d3f9bbf85765eb42f07a75b8b8534fc142bb6a71af4a03 SHA512 7ad2cdc611be697732243100756b0be1d66da2654c5f65102a9f258298d1220e21683f1eeeb82ac3f2bae0edcc844d94de2a23eae12e9e4235128df8d2df8d56
 EBUILD capybara-3.23.0.ebuild 1809 BLAKE2B f0a9ba37b66a1d4c26c4c9a42c0f9bf3cac9e11e6d1233749695d61e28a93b349079d7ba10f792b788e4f6d3628a7905ee46e291f51e601f51a4a31e35dd52de SHA512 059cf4bb8b3efa8a9fbfa2671fa7c7f01e1d2aac54a3130db45d27aa46a669c20c4593e1b0db9116dddb98049f6afcc448c7473b2d96608dfb619994a1075723
 EBUILD capybara-3.24.0.ebuild 1810 BLAKE2B 76b7c0221fb17244acec192dae6d061ff8b4f77f41847cf9f97cd9f82b19726193230ea9ca36c5b88a870e3de10899274214542573a36dd6c3c4c3411cb634cb SHA512 11eb703b46cc0d42678414716856b732e9a5a455deeb124219e45d415dffef379db2a668de5520e80ab934c453628228cff3a28458cd4f305142f1bd57dcd611
 EBUILD capybara-3.25.0.ebuild 1816 BLAKE2B b871088425490133c4d5a0cb370be3436ac9309303ac75265b5d91d86468c581d9d39b8886014111a5583348ea88c619662fabe854ddac1b3aa5e0d8f18d4011 SHA512 a86389cd5de999ac8668cb7e977d26612b7933b331e46a1b0fa5550f52f56b8c6908145abc0c4aa6046e8e1279130a2c285736a4ead82fb50e5eb70505209fbc
+EBUILD capybara-3.26.0.ebuild 1816 BLAKE2B b871088425490133c4d5a0cb370be3436ac9309303ac75265b5d91d86468c581d9d39b8886014111a5583348ea88c619662fabe854ddac1b3aa5e0d8f18d4011 SHA512 a86389cd5de999ac8668cb7e977d26612b7933b331e46a1b0fa5550f52f56b8c6908145abc0c4aa6046e8e1279130a2c285736a4ead82fb50e5eb70505209fbc
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.26.0.ebuild b/dev-ruby/capybara/capybara-3.26.0.ebuild
new file mode 100644
index 000000000000..c4deaaa1b6c7
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.26.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.5:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 5d02f53e0885..5ed8c48aeefb 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,9 +1,13 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
 DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3
+DIST facter-3.13.3.tar.gz 393406 BLAKE2B 2a428fc43a46024233f2924a759a52bcbf55655cc430add9cbe4958ae36c581c2bbd05069279e129fea2f29afd8cf3a3a6a522b728d14214192253e0010b05c3 SHA512 26b1788aae0ffbc7ad9365f03486be5a3a6c27c4b06542aad68eceb34de90de53128d2abcb47fa6cbaeee082b1c1b86739d70619c7263b8797e49a0ed7f6c652
 DIST facter-3.14.1.tar.gz 393548 BLAKE2B a3f61df9a7a302948fa8579c451b5cdb973a3e8b92109582b1a6046c68e5212b675f9310012409194f933574d004a7a3fbed1dc0e20576a2ee759feadeac54ee SHA512 b3f4cbaffb2c70423fd9d5eca7afdee35f92f3a3445fb78996258471a3dc3881b1797bed5ee90aa66b62b0e9d1b979dbc05b6e169499d4f1a9e61f002118476d
+DIST facter-3.14.2.tar.gz 393499 BLAKE2B 41e8c81668580f215eb597a2130b0d9830bed4067c76d6429f54d7389767f79ef7f059b8d14d8fdf5baeeb1abdce1fa7c0ae69fee4eb221facb1cc66b9a5049b SHA512 83520da9b9739eb7f1fa72bea6765d02d92d09f20143b7c605b032cd5e720b239035c4ae9991711a0e1b9699ee074710506aa4de5f630c28c3d5c9c1a0682fb2
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-3.13.2-r1.ebuild 2484 BLAKE2B 6d17be9d833f372fcc9621af84a0159ef8aa339e2065a24d6922622777532c6380d7b56c6b37ea8816bf41bd445f8a68b4a2937ff570f372862ec301a5fc11fb SHA512 f83756fa4e53069ed531611d227ae9aeb324d9e43dca3508103a32f1458d715cc88694abd303794418b52bd6f5a6bb9d0725b1c2223645177f22d8c3dfcf682a
+EBUILD facter-3.13.3.ebuild 2486 BLAKE2B 70edcf1f460e85536973e3e54822f8034d7119e9f53d7ae4c9c9a0788d6462a97f530c4078a46e219c2ecf88246e3787f20b7ed2b0c2a16f11c05c3f859c195c SHA512 732c677383c4dc5b693ad55c594b682d7e19239144f53b1c2cb6ae148fd6f62141d8d0f8b7dca5f858ac0225ea85da257a1bc607051bd5ec7adb4eb202cebd17
 EBUILD facter-3.14.1.ebuild 2486 BLAKE2B 70edcf1f460e85536973e3e54822f8034d7119e9f53d7ae4c9c9a0788d6462a97f530c4078a46e219c2ecf88246e3787f20b7ed2b0c2a16f11c05c3f859c195c SHA512 732c677383c4dc5b693ad55c594b682d7e19239144f53b1c2cb6ae148fd6f62141d8d0f8b7dca5f858ac0225ea85da257a1bc607051bd5ec7adb4eb202cebd17
+EBUILD facter-3.14.2.ebuild 2486 BLAKE2B 70edcf1f460e85536973e3e54822f8034d7119e9f53d7ae4c9c9a0788d6462a97f530c4078a46e219c2ecf88246e3787f20b7ed2b0c2a16f11c05c3f859c195c SHA512 732c677383c4dc5b693ad55c594b682d7e19239144f53b1c2cb6ae148fd6f62141d8d0f8b7dca5f858ac0225ea85da257a1bc607051bd5ec7adb4eb202cebd17
 EBUILD facter-3.9.2-r1.ebuild 2129 BLAKE2B ace1032be069c17e69c0fed40327848241f31d50b8e165bd01bec7edc08a4d8aeed614bf449e1d878a74b686c2fb18df4c9873338641a6f8ad33248c9c746714 SHA512 c3cd67ac050a0ee35bacf2c7907022c2b46c6b208a3d20e684916dd2361fbe5e5040a2ce7d94779e5283b1af4b1fa60ce4eef48cb28816ffe404c47f98d7f422
 EBUILD facter-9999.ebuild 2418 BLAKE2B 4bf8b77b1b66039da3d4bfa50e8bdf829f5443c7f578043b044f21c716d4103e10f22ccf1c83014f3c4bc7674232ae1df14a7de4eba5e99f5eb9b5da96a39041 SHA512 2709eeaa36352957bc4c958ee4441e6b6004a6d849653f2765b2989a7cb6d4f4e8a8ac904d76d6746954d3ab2b4e8b98e93fcab3fa14600c0e2f7bf26bf093b0
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.13.3.ebuild b/dev-ruby/facter/facter-3.13.3.ebuild
new file mode 100644
index 000000000000..4c7110c0cf6d
--- /dev/null
+++ b/dev-ruby/facter/facter-3.13.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+COMMON_DEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	<dev-libs/boost-1.70.0
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${BDEPEND}
+	${COMMON_DEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# be explicit about the version of rspec we test with
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/facter/facter-3.14.2.ebuild b/dev-ruby/facter/facter-3.14.2.ebuild
new file mode 100644
index 000000000000..4c7110c0cf6d
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+COMMON_DEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	<dev-libs/boost-1.70.0
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${BDEPEND}
+	${COMMON_DEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# be explicit about the version of rspec we test with
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index e2876c60c5cc..861b911dd897 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-gpgme-2.0.12.tar.gz 2414972 BLAKE2B 8890e01ffeda828468d4fd520a102a9bd9415a1503faa57b0b01f6f9f96b8f7d459ebf615f402e3b62583530bef71fc1c07ed859e9b2201657af4a487b70b794 SHA512 7c98defc69fbcee37af654d7f13110ca10663da15f40b2b558c32c1695caaa6b4ec2c65c9c6dcb1a60b9dc955d11226776d4ec7db978847b74638cda3274644e
 DIST ruby-gpgme-2.0.18.tar.gz 2799633 BLAKE2B c50336a8f5ae75fc56a29c043a19e84083f122534bf5639124c991dfb55c03b9ddcfe9a07431e0b826adce2c4fa715576387ea51361df68bb3f86019e049a018 SHA512 9be9112572ee2bf92c54c763f3588d0348c62af1d053b3a9d97d89ccfb5f17507be41d89aacbf75a746682dc176d04599d8fb9cfe6d5ac071fc8435eb31513af
-EBUILD gpgme-2.0.12-r1.ebuild 1432 BLAKE2B c7c7a499a550d6a6a4a9865f7a2c598834b2a5e49f4b51c4c10440d8f4b0bf75c82907847320dd2a9ebdb58bf718a2c80f710f9ad7ded52e60101d0095b1d70e SHA512 eb791978ee0bf94622528ca5e08226e427e4b8a949d9730704eb484c035175bd9947dfc10e716d5630d10287cfe2ee5936f16bda7296e184d1b40f2cd0178d12
 EBUILD gpgme-2.0.18.ebuild 1759 BLAKE2B 6acb4f2612d0c323a3f17d6fbf6ba665c05738144de4ec77ed2ebe26276b98bc7b6050d93b87b390279d918a4bbb2b2b1c6acaaf6da6e120a70e6ffa1c65d32c SHA512 5ff67135e24316a43e61bd3f176de216b749bf404b682e686d7b6d989a40f507e3bbecb8c20f1f86864c264bd8dcab1619eac3e279fb792e0cfbe5a0c4d97dae
 MISC metadata.xml 467 BLAKE2B 43fb75477602eef095d6c69fcb8c54d00c41bbe84b8ab313dd0d7b0f5c2cb0164f61d9fe66da75c3b0e0c9dd2f01621bb65c9243242432e0ebe00d1980ac59b4 SHA512 ef3183e3a7feebe61f96efe8398b19502d57fc8595f6bbd7c0382c4c060003116648605f8ccdb193103f0433b321e98dda3f720da993a7840e7645f8911c0a79
diff --git a/dev-ruby/gpgme/gpgme-2.0.12-r1.ebuild b/dev-ruby/gpgme/gpgme-2.0.12-r1.ebuild
deleted file mode 100644
index 4ca047dc74c8..000000000000
--- a/dev-ruby/gpgme/gpgme-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-ng ruby-fakegem flag-o-matic
-
-DESCRIPTION="Ruby language binding for GnuPG Made Easy"
-HOMEPAGE="https://github.com/ueno/ruby-gpgme"
-SRC_URI="https://github.com/ueno/ruby-gpgme/archive/${PV}.tar.gz -> ruby-${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=">=app-crypt/gpgme-1.1.3"
-RDEPEND+=">=app-crypt/gpgme-1.1.3"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
-		-e '3igem "mocha", "~> 0.14"' \
-		test/test_helper.rb || die
-
-	# Remove failing tests for now. This package was added without
-	# running any tests :-(
-	rm -f test/{ctx,crypto}_test.rb || die
-
-	sed -i -e '/portile/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	append-flags -fPIC
-	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
-	${RUBY} -C ext "${S}/ext/gpgme/extconf.rb" || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext archflag="${LDFLAGS}" || die "emake failed"
-	cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 46e7373b34c2..aba359dcaf26 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -2,8 +2,6 @@ DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f46430
 DIST haml-5.0.4.tar.gz 124580 BLAKE2B c22e464be26f65bd94b202b21604bb9fe3d740865832c9299d93606293794316a5262504e15583fdc2628a3015ea58f9924a9b3aab2f46340b305ad5af7968ac SHA512 125ae514f800b2dd58f7f339ef3bf8c15114c5738813d911985182d4e4b1e8551c92a89149427aa8bf3326f45c8f71f4f13f37ecb7e2bee5cb75163538f6a3a8
 DIST haml-5.1.0.tar.gz 125693 BLAKE2B 0a2e9044e7468a93b5fa62adc77131a67e79fe3701f86ba9dc341a5e33a52701bad09115137c7decfac92bd7e1aa92bbe6bd0a063ef5917c9c6cf4d072a9278a SHA512 97ed4eef3f1b0748c8d7c717dffc466db9da92c862bc90f9db05043facdbe58e605f83193a0d94b8bbcf2863ca0ab95de0a31ec266ee2907aacb94346fddd875
 DIST haml-5.1.1.tar.gz 125902 BLAKE2B b8564dca6a381038dae1b737b6f4a51089b96f618d684f43db6947bc738e06b073aa17241b406ed06fea48fda9c7ec759149829a5727f8da3df21da3cce22318 SHA512 fdc01762280cbece243d1ac1a3c8b6b484e3b01fcb2ff80df591d172ec6aed7240736095aa5a09149049ebb54cf24af32706772a6090c3171c84ccb069d12826
-EBUILD haml-4.0.7-r1.ebuild 1246 BLAKE2B a1879eb558ab35464526fafa41d70172a035c9c0a62642eb06f255160b33f311fd656a9b656b734c489006640845b1622c83e09f5d0af4bfc5e241264d033d54 SHA512 3c0a7b865749cb14df8f4a5e074b17a229287d76da4536211f2795c7fb61ad5a027cfa88309b80c9db7f2726896c7ffcd877b7b136fdcef3f2aa9d964f02c934
-EBUILD haml-4.0.7-r2.ebuild 1276 BLAKE2B 3445708f362dbd6d8d6f63a5552fd30fe933b0111554764f5116d050d090809954901bd2fb83aada132b3ff6d4862226b3a53ca6dd4138855ecaa033b217350b SHA512 6877bef9aa2741465aaedc9feb531aca9f12e986de40fbf200661980c262e6c27fa691980bc8b0c40aca1175da747f4fa0ef7d489a5572f6523b6bcce3a04650
 EBUILD haml-4.0.7-r3.ebuild 1119 BLAKE2B f532a7e3ea234d450ccd1637fa65041d1dc3ec26cd595d1f6eadfbee955083633d89b6ff6c99a0049b455d79e95bc947c755017f1ce243ab3ab4ff44121a71cf SHA512 b42eb97edf5dd9d3d06f06f11d90243635bf69acd3fa1f5927b2bbb2553e0127ab3d5202911a051608eca5b2be7ad6a92b6a3a47da0593717981b1bd1f6ffb46
 EBUILD haml-5.0.4.ebuild 1613 BLAKE2B 917d8a40a68f551bf7e7c20aa317810c86e81788f8cbc15fe478b6af058c9c536d98c7744a32210bd88c1e249d1550269fafdb11c65fae0c129eb2519ce3dc65 SHA512 439c4eea3f128b9c2282b6c41e0af0426bf3853feebf126f09b752189db722e7a07d2b81b1a57bf8993960e5d833907164725b4f0462dc013aba746bef100764
 EBUILD haml-5.1.0.ebuild 1606 BLAKE2B 8f6e72bd9ce8cfe462a532968bed9c3e75c140700614be4c05173cffff13fbd034f0cd5acb37406a4d110b517c35bc62bb0b3c5dda605a5dd55da5f4b94056f3 SHA512 7d89ca2ff45bb0a9245e9f280a75573221dc7138dfe2b065cf60d5a54030cf14d6a8b91b6f43b679a730b492d4469276bd6838a700c8583a5b287e0f9b14ad85
diff --git a/dev-ruby/haml/haml-4.0.7-r1.ebuild b/dev-ruby/haml/haml-4.0.7-r1.ebuild
deleted file mode 100644
index b32071050bd2..000000000000
--- a/dev-ruby/haml/haml-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
-
-ruby_add_rdepend "dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/rails:4.2
-		dev-ruby/bundler
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
-		test/filters_test.rb || die
-	# Avoid tests that are fragile for whitespace
-	sed -i -e '/test_\(text_area\|partials_should_not_cause_textareas\)/,/^  end/ s:^:#:' test/helper_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-4.0.7-r2.ebuild b/dev-ruby/haml/haml-4.0.7-r2.ebuild
deleted file mode 100644
index cfa4d810051a..000000000000
--- a/dev-ruby/haml/haml-4.0.7-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="http://haml-lang.com/"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
-
-ruby_add_rdepend "dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/rails:4.2
-		dev-ruby/bundler
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
-		test/filters_test.rb || die
-	# Avoid tests that are fragile for whitespace
-	sed -i -e '/test_\(text_area\|partials_should_not_cause_textareas\)/,/^  end/ s:^:#:' test/helper_test.rb || die
-}
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index da6030ae09a3..f697de27ccab 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,7 +1,9 @@
 DIST hashdiff-0.3.8.gem 18944 BLAKE2B e248384076cf73db84095060578fcf3f458eaccfee8bdf4645c98c9fe51c67fe1fe1b9affeb485880433acb52d41f5c23f8a9d1bfb4397a820dfad01dd7f9092 SHA512 d58b9a07db1044e9b9b61cf1eb9515ff5a8426f0d59484c132c2c498591c9dd73cebda8a98b180d05228fe8e1e610d0dddb3a63ea38981f6609ecdf239339a83
 DIST hashdiff-0.3.9.gem 18944 BLAKE2B b24c557b0ca14758706b3de6a34034725af4f2c1d6f6a92d03353ab100ae2c82672d5854a17b382f2b5ef7a9bd296f03fd1877d4d36b7c626e3828e2d1cc6055 SHA512 0cfff7d94405391a5d810b6323b820ad73d4543a33bfe34dd6a4159bbf4190eaeb33e8a617bbe84662b14d54ec3d95e838cde5b38c29a029393b6b41f62ed45d
 DIST hashdiff-0.4.0.gem 19968 BLAKE2B 8e9a70ef34a2099a2f3b1748e952132af00bdcd70ce16a8c05ef1dc941489b8b8880933bf97bb084c84f3f75753335f5831f968165dacbbc8c3133fd539e4bfa SHA512 4556479daa42486d12d181c6e231a788c5ddab1b193d1452644ae501a795233e6bf23556bdd0a162a9e386ad2ebebca4398724533d52eff3b36134f8ffa5615f
+DIST hashdiff-1.0.0.gem 19968 BLAKE2B c27da71ad9bfba1e967e3c67804c591b880eb8af905d736d5e25c7f732256ab980855fbede619bb935ff29e99d9247b50f4c1790f415bb232b127de7177a9e23 SHA512 39aa1513f6a03ed79ee3f6c26491b914df2527d5dede6b15362e02550751a13fbddc341c0b39ed8c55afb8cf0e7927d528c22f309e54422bfe4dc64229ad9a6f
 EBUILD hashdiff-0.3.8.ebuild 662 BLAKE2B ed2d660123e34a57c8ca56e1ec01502f3cf8ac2708256588be03e2b207dfc03855df3c3b9d367f81b5a7d61d34d959434ff8059ae397b3040a8e5d947097f980 SHA512 9dcc3808948f7a5320a2beac3aa69da16b9211633572b7e19d169d00d45df49d94a1c02d3465c34b339fe85a4b5468fdef83badceae13e9d748dc28270d44e10
-EBUILD hashdiff-0.3.9.ebuild 656 BLAKE2B 77260f5c02647334fb37abeeb078ef23e4c1ae6aed2fd96c852d148ca8b79348f6c1b6c60c8c76cd524256c89868e88a7855973703f599880cb9b31564d7dc68 SHA512 af7624b954bd5f149312dde53c256539eb4a2dbb468fd2240eb7b3a5a2dc9afb3b560bcc66c26abafacdb4c92ed93043977ba1fe3d0c36d3564d8a1899d12a14
+EBUILD hashdiff-0.3.9.ebuild 655 BLAKE2B 9dc41106378d5a1a09f8bc08a256d50b94d25e7fd82d5d8d51aa259b99ba9fb991f8bc0ba369caee60754a02eb11eb38a4f93dcf48f3abc968b24e0418a4c984 SHA512 128c92add870f55c74bb7c3f72411cd6bdf2a124b131211a509f0dc039be58ce4f0a84d44d68939d76345fb531a4c634021f19206d8c661e9d9babd7585dfcad
 EBUILD hashdiff-0.4.0.ebuild 656 BLAKE2B 77260f5c02647334fb37abeeb078ef23e4c1ae6aed2fd96c852d148ca8b79348f6c1b6c60c8c76cd524256c89868e88a7855973703f599880cb9b31564d7dc68 SHA512 af7624b954bd5f149312dde53c256539eb4a2dbb468fd2240eb7b3a5a2dc9afb3b560bcc66c26abafacdb4c92ed93043977ba1fe3d0c36d3564d8a1899d12a14
+EBUILD hashdiff-1.0.0.ebuild 656 BLAKE2B 77260f5c02647334fb37abeeb078ef23e4c1ae6aed2fd96c852d148ca8b79348f6c1b6c60c8c76cd524256c89868e88a7855973703f599880cb9b31564d7dc68 SHA512 af7624b954bd5f149312dde53c256539eb4a2dbb468fd2240eb7b3a5a2dc9afb3b560bcc66c26abafacdb4c92ed93043977ba1fe3d0c36d3564d8a1899d12a14
 MISC metadata.xml 345 BLAKE2B 32c55c352e09a4cee12f02ca321e7581b56faf759bd3cf95afc684633c7324bd10c19fb832a1d7cb3e96787721eae0f0bd85428fccead003ba72fca53882ba65 SHA512 f241e4bd08fb29d4a2538d5b548597c5869c0bdf332e3453e55c625093bde7c52b35e7a7bcd691b9f5b2bf2cd1c90ef244d23e343cf7800f9fda4de73f6a4cbd
diff --git a/dev-ruby/hashdiff/hashdiff-0.3.9.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.9.ebuild
index 7782fdb1b28c..f1e3153f2c4f 100644
--- a/dev-ruby/hashdiff/hashdiff-0.3.9.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-0.3.9.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild
new file mode 100644
index 000000000000..7782fdb1b28c
--- /dev/null
+++ b/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
+HOMEPAGE="https://github.com/liufengyun/hashdiff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/json_schema/Manifest b/dev-ruby/json_schema/Manifest
index c2e6bfc6c9b1..df0494f8640c 100644
--- a/dev-ruby/json_schema/Manifest
+++ b/dev-ruby/json_schema/Manifest
@@ -1,9 +1,5 @@
-DIST json_schema-0.20.3.tar.gz 35400 BLAKE2B 3d61fab9aa47dc39e74ace68be005a7816c444737b7205eeb5b0b0f408da84e08f53ae22aee6fe8f5101231a33a5914dd57abdc556a1d2cf9ba4f5b30627d7fb SHA512 570afa5bc15899a6797bafaa50b11256442b377abfabd713c1a7c57188b394f86987a104e282540f09ee3e02c13df11a8a88df625834566233e00fa5553af80d
-DIST json_schema-0.20.4.tar.gz 35695 BLAKE2B 07e3f834992dd0f8405f53171a6351d6df755695741d675a2fe34410a40a69299330f2be769dc9a113e4169f6b7698e785061a71e73f0252d6652feca50b8046 SHA512 8b924908bd8e8fe484c85b275b941c3aeb14da1c90aa78f541b8c71471d296f1e935cf0a1944819d96969b687425c3dbd930f626e5627dc6a99a67f26743d545
-DIST json_schema-0.20.5.tar.gz 36099 BLAKE2B 74cafca0d4e369bd7d5ac9a502ed4933aaa37682d67cb2c73cdf338373621b14805a91a365355052c6c4afed917101475ba80ed00f8bc0d01642d1d113d56888 SHA512 9a61d4709fd06aa5b7806cc9f313daa2bf6d632e9c231e2761cda324f0339b5d3a9bde1e96afc02f93ef81414bec93e8fab94df5221ef7809f29a4c0f3f79f54
 DIST json_schema-0.20.6.tar.gz 36231 BLAKE2B 79874e4e7af3c856783ad5eb4c3085ea087195d46ebcf41e12302025dd899e70c81808889ad8e417d3aba1384444beafbd747cddaa4740fd6be9fdd7a4aa2907 SHA512 09fc6f5574da27e69cc13e5b081e27a78425c41606d89e794d77b15f56a17f709ee6a0267b247535da1ee9e71f2b4da9e2e278052a5d53c7d6f9ebbe3e314936
-EBUILD json_schema-0.20.3.ebuild 636 BLAKE2B 243729de2633be8dd7c81bc1633e1ef2527de390941bc6e5b6648c8ef3e3fc89ebc9617dccbf420056fa4c1da1208cc4d85188467c18f62bb0c20157ffbf8c70 SHA512 33cfc58b33b561084dad948cc376003ec52f3365695ff6f819e665aad0042264c6b99e964f192cf77bdd31f004236c9e617678a28e9ebfcc07f57f04e44a31e3
-EBUILD json_schema-0.20.4.ebuild 636 BLAKE2B 243729de2633be8dd7c81bc1633e1ef2527de390941bc6e5b6648c8ef3e3fc89ebc9617dccbf420056fa4c1da1208cc4d85188467c18f62bb0c20157ffbf8c70 SHA512 33cfc58b33b561084dad948cc376003ec52f3365695ff6f819e665aad0042264c6b99e964f192cf77bdd31f004236c9e617678a28e9ebfcc07f57f04e44a31e3
-EBUILD json_schema-0.20.5.ebuild 629 BLAKE2B 6ccda166cfc98bdf79c5b6d28c42bb122178c6afe57f649ddd90b75f724927b1fce3eca8147ad3bd65ace4a3ed1e77c25629b8822425794a33599c2c42aec21a SHA512 d3966ecb60bfe668330b452a8c828e95dca6e7ec3ee0afe4d34e4e29b558e4ef863a9eb7e268dbd22d88bb909f20faa9eb8f309b40290930e4234fd181589685
+DIST json_schema-0.20.7.tar.gz 36421 BLAKE2B 4110d9781da9a95d0480fa88dfc8d94868574dec0e0a36ad11efedf3c50c98557dc8f561d1df8189ec4bd4453e86acbe5f76a8e2274fadcfae659d0fcc85943e SHA512 e35d3d580078051f3484eddd910744d1be5d1dc77a63b20db418a075a75e71961bd1d7459759ee8b40b1784640e69c626f76c73de02b3a07e37b4233ddb4e661
 EBUILD json_schema-0.20.6.ebuild 629 BLAKE2B 6ccda166cfc98bdf79c5b6d28c42bb122178c6afe57f649ddd90b75f724927b1fce3eca8147ad3bd65ace4a3ed1e77c25629b8822425794a33599c2c42aec21a SHA512 d3966ecb60bfe668330b452a8c828e95dca6e7ec3ee0afe4d34e4e29b558e4ef863a9eb7e268dbd22d88bb909f20faa9eb8f309b40290930e4234fd181589685
+EBUILD json_schema-0.20.7.ebuild 629 BLAKE2B 6ccda166cfc98bdf79c5b6d28c42bb122178c6afe57f649ddd90b75f724927b1fce3eca8147ad3bd65ace4a3ed1e77c25629b8822425794a33599c2c42aec21a SHA512 d3966ecb60bfe668330b452a8c828e95dca6e7ec3ee0afe4d34e4e29b558e4ef863a9eb7e268dbd22d88bb909f20faa9eb8f309b40290930e4234fd181589685
 MISC metadata.xml 329 BLAKE2B 336543b59af2964b8644691469c9ebdb21eac3b524a7602e656ab8a2bb184341ba9de381ae8220cc24dd0dbc8fd7ac70e9e6206a1cfb1a143d5273d305411a05 SHA512 4908f24aa2bd471d2a8257b32e8a320b3040e4bb2e6a516666544184890d57c1151b029935dc1ba6df774a1d2bc963a5601749a569c270812374e744ff55617f
diff --git a/dev-ruby/json_schema/json_schema-0.20.3.ebuild b/dev-ruby/json_schema/json_schema-0.20.3.ebuild
deleted file mode 100644
index ac2d6dac495c..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/json_schema-0.20.4.ebuild b/dev-ruby/json_schema/json_schema-0.20.4.ebuild
deleted file mode 100644
index ac2d6dac495c..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/json_schema-0.20.5.ebuild b/dev-ruby/json_schema/json_schema-0.20.7.ebuild
index 735e6565181b..735e6565181b 100644
--- a/dev-ruby/json_schema/json_schema-0.20.5.ebuild
+++ b/dev-ruby/json_schema/json_schema-0.20.7.ebuild
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index ea306f9c9e9c..53bc67293ef6 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -4,6 +4,5 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f25e8b1273961d9bff64830d619e9e97c184e353b69a78fe38be01a2fd2f0453cf94d3ca9fff66e40d18f59d SHA512 132266485d70002da5bd1e680530331db6b74e8ea12011d60a6ba7df0ec045459b5b3a6305bb2ea6a80ff6a4a1244ef935a4143f6c8709df7a176d6db69da08a
 EBUILD listen-0.7.3-r2.ebuild 900 BLAKE2B 11e9754c6f746da9168889e7b982055c6d06b271cf3724ebc4dbc8df776df02c743ece26620b2be54ef68db32f6c1638c92da0c0ef5eae5090a0d274b3e558dd SHA512 f61ee299ed7fbd237c9dcc4ef3174a80bc86a2c19065d2df3abf93393649a792bf0a103a11fbe12cac16bc655ba31b977aa269feaa86b5b905652fdfc4b9abcc
 EBUILD listen-1.3.1-r4.ebuild 976 BLAKE2B afda93382659828446a14b6536e66d4d52e962ead6007d60eae34a7b67958fd94d755b59347183685ee9d93221092fb5063ce1d3bd2e8cd36a7f5db2f61044c8 SHA512 c6ccce9405650484e343cbbf8306a36486ecdb09ef1b4519861968d6b34b5bdb53c0a5a8cd02803fc551db622b4c038694f554995addd1e3c7adb467c2b5b3f6
-EBUILD listen-3.1.5-r1.ebuild 1239 BLAKE2B 7b99f34669fbd30d271f16269f888cf50db70099b88739cf90256ac14b4daa3b3c9c510f491f17c08d6e09bf2114172c25372554060c4d9bbb6c5ed76fb39208 SHA512 b0e53cc835926b8a7dd3d78301193abbe653d1494e999e072fc56e8857f2a5f5c7971e6ff61aceeec1849f4e77b249792c7df761161d0580bcedccc2b3704144
 EBUILD listen-3.1.5-r3.ebuild 1265 BLAKE2B 4fc485140539b9d30947adb238e805b56a923928b13d0c6d64d2a51d90f8d02771522683580365788e321e278be7aabce811e67c9bd268a1948acfad9fb60137 SHA512 187b23b7947f7aaed7120902cbf5aecb777641969b9f6241a122af1118a6762d9f8d7254e6ee535a1db46cdac12c1f68768bd27f8cdedad97dd6971e78734f4e
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.1.5-r1.ebuild b/dev-ruby/listen/listen-3.1.5-r1.ebuild
deleted file mode 100644
index eb1da42ebcaa..000000000000
--- a/dev-ruby/listen/listen-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7 >=dev-ruby/ruby_dep-1.2:1"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index 72dcc93a0673..92155bcd43c2 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,5 +1,7 @@
 DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
 DIST logue-git-1.0.16.tgz 13364 BLAKE2B 1eaedcd8cd2a45713a39fd2bfc59fa8234903e01495072d905d461c799fb210be828a5d9685e285c44858c2a10e6016b0053686c3a7c31df64d829ed1c216df9 SHA512 bb8168b69f614f8b2e85bac982dbc85a4a0705cb8cf2d13bf1c361c120c1f66155782bccefbc9069bd9cb4595d6ae8e090c882677d52245ca3478892ce226c56
+DIST logue-git-1.0.18.tgz 13310 BLAKE2B 42669cae48b5efe5785470410b694c7330dad5273d3a788612729d0e2efb9aabb8b3024727efddb4efedc1addd377242bc5a3ad5e9ede602f0f606be4db84608 SHA512 654681b2d1735790a08d8c53f9097ca28b64c37e902ff1260c8f2fa669067d404103944f0c78c5382a10b9491d8b0a10495516d3529d68be97c62027c2812c9b
 EBUILD logue-1.0.13-r1.ebuild 788 BLAKE2B 2a5f0d59febdb8581c7765390e2a0888962a0015b0f4e3046f004d62aaf22c1d365fe39c2aaf07d9313d06c2689c6845dbc103088d03eedb56433574f66bb1a3 SHA512 a28b8ce7122eca66b8d56f77a5e70c8738aec546ddf41a1ba291307c17a9f32b00e13566a3ba4278ae0933147af5df64098e5e328ce0f9b7e375e70da4b4af93
 EBUILD logue-1.0.16.ebuild 797 BLAKE2B f0847f99df4494d16ab74589ad3d92e06c01bb3997f872ca55230374ca6435363d829c2a392a9c5550b42d15f4d8c8edc78fc1d6e5b58612f317de94d6e15764 SHA512 7a0b1be12cf593d5586b21ba04eec1575957bfe57826185da7d046451dd65d46b7ab5960fdfdf33ff88981cc4ab2e3e1aaffa4fed88acdb819834466180804e7
+EBUILD logue-1.0.18.ebuild 790 BLAKE2B 1742abdd3a67bd1f1ba16381b7dfec984336185c9ca60aae06e90bf2714d3a4382dcbb613faf9728ebc361ece8e856715e88e668552f9aa5407400c204c03b40 SHA512 64204f737cb559c841cf004e5de3aa7cf197e1e4b8a5aca38b8e1a72f0628671b02b48aa10592222e30344af8e4a0ff9533158183a9459af222a9c3b3134b028
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.18.ebuild b/dev-ruby/logue/logue-1.0.18.ebuild
new file mode 100644
index 000000000000..dcef55f32fec
--- /dev/null
+++ b/dev-ruby/logue/logue-1.0.18.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module that adds logging/trace functionality"
+HOMEPAGE="https://github.com/jpace/logue"
+
+SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rainbow:3"
+
+ruby_add_bdepend "test? ( dev-ruby/paramesan )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Fix path to match installed gem path
+	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 2cfd2dd3fd2e..023c6f9fde43 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,5 @@
 DIST mini_magick-4.9.3.tar.gz 1187910 BLAKE2B d0eaa19da0d7310316ed6c11befa2e48ba75f441021f3ecd6533b0e04d9a44cc6da18c867cec87198abd3e433d63643ab61e21bd3c8b059a757634445f718207 SHA512 4a8cd953a8281229c36cb2482115a8fd127099729fbffd4be7db8967da90916e07c062c96ee066d9740d7261c07f263db8f020eabae59cf10fa6043e4be590c8
+DIST mini_magick-4.9.4.tar.gz 1188193 BLAKE2B bd3ae9eb2f5796c42093d9162cd7b1437eccd7ffc2fccd257e2f18b7d34709fa723e413d36045f50bdc13aff1ba5220a4d277d95e419cd37c5b22d304628403d SHA512 9d1bcd7925a26332ff35daba67d78dab88690ea403e70042485d3c1499a41080365b73c03116f26cf11f9cc05c75cf7a8c40f660764f45ece5fdb9ca8a521757
 EBUILD mini_magick-4.9.3.ebuild 2105 BLAKE2B d2b8ed34b54c73fc62ae4b48e064f3120a33f0543ba36614372c6272be85439d7439831e87ed4dcd55fb2b08d033a0baa8d327e48b3e009f8a1c4651980d5994 SHA512 db02126d3153e387d9b63e481d99ba864eeb0e50dfb89facc22f8fbe1cba583acdaeb101dcb3ae3069b2aa1a85ed3bf2d69b58997415d65a75c4bbd88d6d900e
+EBUILD mini_magick-4.9.4.ebuild 2098 BLAKE2B 45f3efc413dc295df0b52f6b41fd3e6a262221b9b32670c912aef0a712490cd9fbdd8c499bca85e3cdeead9c73f2a768643d62a3827704d3e382ab0ccc469d37 SHA512 5098a7173dca084b2299ace9073cb2294483bcbc113e8430084f36c06c8e3a2e31b9d275558f259709d67e95d830629e5e8d64a8b6c443400403e8534c0301a1
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.9.4.ebuild b/dev-ruby/mini_magick/mini_magick-4.9.4.ebuild
new file mode 100644
index 000000000000..b8093b12ed23
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.9.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid failing spec that also fails in upstream Travis
+	sed -i -e '/returns a hash of verbose information/,/^        end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Make spec more lenient to imagemagick quoting
+	sed -i -e "/unable to open image/ s/'foo'/.foo./" spec/lib/mini_magick/shell_spec.rb || die
+
+	# Avoid graphicsmagick tests because installing both in parallel for
+	# tests is hard.
+	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
+	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
+	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index b80ab46c2469..e372d67076cf 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,9 +1,7 @@
 DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc266312a3426f9de3c40165d68bf07d5ed162ce51e31b1bb8502dc844fe61d9e93733108501f156c3096af23 SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
 DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
-DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
 EBUILD minitest-4.7.5-r2.ebuild 954 BLAKE2B b8fc49a4dda9157f9e5df7e78c9024dd5b6e81499576d2a952d9c426e0b1a2b6d364a12917d2b0f49869c523ce961a5dde64a8210bca96de0a730e002bfca9f1 SHA512 6f2430d24e27da50eccb5b1a0adb401b0d5ad5779415c54c90d0d04cd6c0a960c048427acc5a4fec967890b9c8bf7100aa6cc279529a926c02185c7e528ed6ee
 EBUILD minitest-5.10.3.ebuild 793 BLAKE2B 711eb5c2dad734877c502f315301063ee166f7e5a1e6ff2a8c69019bfa7c007e05f4bf0696b395366ce33e1501fb0792bc58fe6ca4b6389b1b5c91bf849fee25 SHA512 88b8d031915cc635d56b204ae17c91a250ab4e348987d32b915bf366d7d6d9273a9157d4da0e77c4031c90c2511d14788ca81da30a7350b023e57f9e26a9f74d
 EBUILD minitest-5.11.3.ebuild 802 BLAKE2B ce7bd09ba4031ce94be4ee5f44bb6792e0d7e3241fb84351477b5fad01e42b69c68d530610e554a4e215af4d7360584df6bb38805702186c0d69a55c9d234188 SHA512 b5b5de59dfec0c07951b48025b18029692072f804414621bf06a3697b907b4a144994706225ee83a04b35334efbb1655f8714aa8a19b0954e1a68027e6841990
-EBUILD minitest-5.3.3-r1.ebuild 821 BLAKE2B 6907956309106893345f9a0f79978fbe230c42f33378a27801cf302338c1756f1a828942420c4e0521537568faffa135edebb61304fc55d89bf1a5ba83073fee SHA512 6f2ea1a2f061305e22fd42e11813a1265f392c4653e27ff3abf7ab7fd3a22cb2fce68f3b0bfcc5331f9d90d54edb86a68165c53622b4f76a9e51a43865ef9ccd
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.3.3-r1.ebuild b/dev-ruby/minitest/minitest-5.3.3-r1.ebuild
deleted file mode 100644
index 06c17a8747a6..000000000000
--- a/dev-ruby/minitest/minitest-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	for f in test/minitest/test_*.rb; do
-		${RUBY} -Ilib:test ${f} || die "${f} tests failed"
-	done
-}
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index be645f038e5b..e2742152e97b 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1,3 +1,5 @@
 DIST mixlib-shellout-2.4.4.tar.gz 38305 BLAKE2B 19e4211dee056e03f007971d4d77685a2d2d6a111439903bd33e0ed8dee62090b54b6f15e0bc6db168591491c2462869645174a909609b7499bdce251a6ceeef SHA512 e42217a6ced0fb8335cb2df60947168c629d637d280b36fe3d77f47593dc73eda72578b0e9ddf48498e27460cb878764c5dff1b5648a0c7d244c16558d57eef4
+DIST mixlib-shellout-3.0.4.tar.gz 42533 BLAKE2B 4d71cfb2d41120be04613749fd5c0e73d6939fe64410e46285a6f81ec61107b1e658ecc011c032621b433eb15e9ffd42b4f589419ffd8f68b7c5977691e011d1 SHA512 2ed866333874c8c40109de9bb4a1e5a3afea4f4c4cf537b11a1ccd670d374b9ce132717e87d43bb41065a9361e45de13bb1fa2db3e1f2d9f4af18253548f5811
 EBUILD mixlib-shellout-2.4.4.ebuild 888 BLAKE2B f10ff7cb63a9c135dadfe842a1fa0e63d8429440579735a0e01386d7e385e83e05a74ed9373fd49be555cc23dbb79bad477537b5c3fb5a9619863b375d6f0498 SHA512 e025185540ccc8afab4c8f549b21fed49e945a79805d3557e52bea855046837eeb95a73f8fe8cb094b30c25a7fe1802f45effb4c3b289f505070c0e8613822f3
+EBUILD mixlib-shellout-3.0.4.ebuild 881 BLAKE2B e53249d636ad6d21d58efe0302cc5795ebd6a08e75df4837717ea2ab1efd144fd19ea71488c4ace3b8d1584e7dfc94300bcc9d106c3f5558e9d006caea16523d SHA512 013042d75f94c5601384d0d7ae7e49de27539668487e5fba3755dcb9c4661caea8d78350979d3a016b4323c202ebb806ba843b65d04913a2e45a695855d54e33
 MISC metadata.xml 349 BLAKE2B bbf03da0b10552936f124a0d5ef0fc3513b2a381f2101a4f6088cdaf1a1287a6580bbac4247729c725562cfb2181bc4d1e744b1e07a6d8871b334e85d5f55269 SHA512 895846614036d27c1ca678c47d46302985645d1079c16910dfccb1a4077554422c6f08555d3fe3275c6463734d869f160ac1265dc06854db512001e8b05b32c7
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.4.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.4.ebuild
new file mode 100644
index 000000000000..95d017b5ca3e
--- /dev/null
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/opscode/mixlib-shellout"
+SRC_URI="https://github.com/opscode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+each_ruby_prepare() {
+	# Make sure we actually use the right interpreter for testing
+	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+
+	# Avoid spec that requires an interactive terminal
+	sed -i -e '/with subprocess writing lots of data to both stdout and stderr/,/^      end/ s:^:#:' spec/mixlib/shellout_spec.rb || die
+}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index a96ab6a74f8f..6754e16b5d52 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,5 +1,3 @@
-DIST octokit-4.13.0.tar.gz 3053006 BLAKE2B 7028cd8c14865a1b061a5ad95f103944b20827797e5f75dbbc8237ed91cb7c9fc79e9a9319dddd9dcee58d32071156e02c04f7d39c4073bad789cbc65887c2df SHA512 48716876e8c5d807e5ebfbd2236bc4b1558d0d1dfd5d3c4cd42b345e3c8164ea36176c23a23e2bb84078e5a6fdeba2b55c3ae8ec0a6451258fe683d84b007013
 DIST octokit-4.14.0.tar.gz 3068165 BLAKE2B e50efa246273422daf5aed8e619465886962d361d129a310974c21bbc683c7444ee99e3dc01c184497683d07a48d852c006ab56c6cd4bea8660f16e7ec5eee98 SHA512 2aff18492c0207b8c7ced23adf0e76260d2976331563e22f7a130445b19b816a00281a86b4161d6709025d058c848ef3f7d1a5c64323954f8c03a59be6f6b132
-EBUILD octokit-4.13.0.ebuild 857 BLAKE2B 0b624e3b35dac39426790927ed1d0d61d46427032ac44d9f5b093c5d57647751437c6b4e60930cbbdc30d635ce54b9cd34558e5ab327f1429aaf11d98b14d49f SHA512 5efbb8254de4e3699c51684dfbeb4e4d12b0545f72b51828ec56f733f5ee402dd56acf78c4541283bda36a3640dcdc3846ce9a40e1320acf745b7635715bc391
 EBUILD octokit-4.14.0.ebuild 871 BLAKE2B 680ffc68ed44702d91aa03fa167b90ed724887e9e6115fa6623509c5ea7f166f08db2489ed12134f303a12efb965bdc293e2344dcaa648cd5f447311992d8a6d SHA512 4352d8e8421f01448fc585c039ea9973028ff3151e3949bb2ba628577d723f7f7b72e7629abc5156ec1eb9c04128c61e09c15ead8a9f435fe71701c71832d883
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.13.0.ebuild b/dev-ruby/octokit/octokit-4.13.0.ebuild
deleted file mode 100644
index 98a02d018321..000000000000
--- a/dev-ruby/octokit/octokit-4.13.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend ">=dev-ruby/sawyer-0.8.0"
-ruby_add_bdepend "test? ( dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
-}
diff --git a/dev-ruby/plist/Manifest b/dev-ruby/plist/Manifest
index fa1cd815fed7..36496da42f19 100644
--- a/dev-ruby/plist/Manifest
+++ b/dev-ruby/plist/Manifest
@@ -1,3 +1,5 @@
 DIST plist-3.4.0.tar.gz 36637 BLAKE2B 8ea6b11c9adca311d91cf22f7ca11cdcb3acbbb97e18a813de754acc4474183fdd7cdb569b8fe64da06170219ef2fdcabec1d2349399006254c7f399365d1f97 SHA512 01dc47b183b7dce1f20fad8d68d1bebbb6d509c62b77f41855305bf5aafd1abf7960d74f1cb9d2467648a166fbb1747bbdd57f228f10ac091d16ab1a7189525b
+DIST plist-3.5.0.tar.gz 36650 BLAKE2B 8f93f8ef2fdedd9da50c4bdf9c473d3b199cd828909ea1572b761bc4e8d0508e997a60737ea21c7fa96764787ecefd41aa0b0046f94d3f89de796a746a794e21 SHA512 b1c9ccd66db1e0d1ebef3931f6db0f57ace2a1bb417885da48e9658c66af28997b6675a8050db78fe0083f05afc91e1313cb823d79553288d7c0c4a3a9762920
 EBUILD plist-3.4.0.ebuild 788 BLAKE2B d4a9da87ca572f907d1be569a48ac92dd3a8f6df57ce97b38daa0dec0f2597acb558d89c09e944ea9889c65cc7f4eb0c1c302cac26d167f753067b6b3caec3e6 SHA512 2e7b3777716ce57a152f4da8700ac0d145e8e22d9be7f059b47e6bc7e8633e0ad7d3fe9dbfa4912ebc3c66385187eaa7a831a1654db20f1bb1333bd85784a855
+EBUILD plist-3.5.0.ebuild 781 BLAKE2B d90544c538e9d21ba260e86578cb52235ce8626f67d6decfeff223c8087396c97e37172375bbe0616e3278904473b42c5c6ff83605385cfe2f60126e5268f3ae SHA512 34c9814c7da956ccd95a66bb7b327bb04994acb74e94fff21c3894c0f6e6107e59444369582841593d1e557a52868383cb77c1db6167314e3578e36c0eba576f
 MISC metadata.xml 330 BLAKE2B 0be0bc0db0a0b4ac8ce4b11ef9c0b67b13238e4336280a2bdeee8317f58e4a97a78fa63b75cf1aa01b00d0c69bf3b53950f68c22a04dcac35b63097041ccdb7a SHA512 9b26476dd91dbe33c4ceeac8a49208718f177262c94d272b8c79cb49806892d21a815cfd379ce38182d00c9e542df2ca1131d6bec4523d694f5582a80c52d337
diff --git a/dev-ruby/plist/plist-3.5.0.ebuild b/dev-ruby/plist/plist-3.5.0.ebuild
new file mode 100644
index 000000000000..3208cf05db0b
--- /dev/null
+++ b/dev-ruby/plist/plist-3.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to manipulate Property List files, also known as plists"
+HOMEPAGE="https://github.com/patsplat/plist"
+SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 5e15d772a715..95a0e543ba86 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,11 +1,9 @@
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
-DIST regexp_parser-1.3.0.tar.gz 82564 BLAKE2B 4b35174893fe3af4d4c2f65625c8920ed4fa5b081868ecfdd418af5bd24749e123c27f26201caa7a792cc3abd89bd826ac332ad042731a330fbf3b05052c14fa SHA512 e2947d32bb8f81fab2428c92ca03389a6df963c4bc2104f9cb9bf013616efc5fdbef711e87d6ff15e2d3a5bc667b1a8c9fc643672975fa23b6e700b2a090c536
 DIST regexp_parser-1.4.0.tar.gz 82874 BLAKE2B b758f5c16c163d43fbf856af20ac6146e9fa81b2945fe7bed8ce66bb3f46586ca03d680a98ea3c2a2deab825adf5d7589856c666b763dc9e688e37e555bbeb1f SHA512 0d350df94cce0812e721d9b2d3b3dc2f5fdadf87eda3824e05121cbb6aceea9b99783bba771af74d9b5606e99e64e23af13abfb000f925440095d612b579c8b3
-DIST regexp_parser-1.5.0.tar.gz 83561 BLAKE2B 0bdbdfbeb8b576e078ae60f39260630139e1ce41c41e30750246e6f2f3d01a5f9186ea724fbbe1247f032eba7fa8be18906993155bcea54ab7710cd5d66c1343 SHA512 bb23a4ae04f4db4b4c02df323e2bcb0f4400e0ea6a362abeb7572b502766c7774ad04a04d9e8164c7650e3ac9f6b36b5ce0accc967aaa742aedbd61b55e24893
 DIST regexp_parser-1.5.1.tar.gz 82482 BLAKE2B ff1746e52e786e273923dd222ea8c8276eb1e4ffe9bf899068160dec229784709ba679983c1e43736c128ec094861174bd43e0aceea704ee2d38aff4a53e6775 SHA512 4856fbcac800083b417880c30b5d6a5ea445bb85950bdd7898f368bfa2d44b01b1e2058b279f1640cf1cf4d7b28e225d25bc2d356d2c4a7c1be0a2c621dd3827
+DIST regexp_parser-1.6.0.tar.gz 82909 BLAKE2B bbf36af3686165c7d0d439cc22181519a79e46853d7e185577026e4e200c1dda9d8696fa2d83a3cb90f78cb2f13632ff0ba9996b7f4a029780d840ba8211507c SHA512 96214654e56bd17a5b79cd979e87ca4cbd86bf9070fb0646dcea913d482e731c8190e17eb31668eb5d429b7ee6f9a13ef3111c60d2d9b87adddfb760859241e9
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 643ac4c39b1558bbddd7cd4fce144887fdc6edefd08da694dc1626685831e30cd46da1d1f0a866fb05861ca49a3045583c5016a8586832508de917a0cc306eb7 SHA512 e8e6ff8528e6e7498e0ac559764a0ba260c373734962252777002ccd5bd70665f22e673cbc4857980dc4f0801b4409c37ca90e45b2f05c809d27a6edd0352aab
-EBUILD regexp_parser-1.3.0.ebuild 922 BLAKE2B 5be2d2c572cf88f11d57e426aff58fc7f5daac3d87920f159375c8efdeaab4865dfccd870d292ca9452ecea611dbaadfbd1ca575a496fb409dcca3f410a0f89e SHA512 4253374a0205da63624210a7fbecce3f587364997b02bcc11e526a14d1ee0fedf011da4029b011e830ed759492b0f839a0f18d425b89e5617d2be1f6588fed57
 EBUILD regexp_parser-1.4.0.ebuild 922 BLAKE2B 5be2d2c572cf88f11d57e426aff58fc7f5daac3d87920f159375c8efdeaab4865dfccd870d292ca9452ecea611dbaadfbd1ca575a496fb409dcca3f410a0f89e SHA512 4253374a0205da63624210a7fbecce3f587364997b02bcc11e526a14d1ee0fedf011da4029b011e830ed759492b0f839a0f18d425b89e5617d2be1f6588fed57
-EBUILD regexp_parser-1.5.0.ebuild 859 BLAKE2B 9f0111aa2452d92e69a43b452e9364677919683596a8022777df280fd12039fc62de41c0f2ad71125ae32debec70e4aa94a1dbbac1825cd6d7fd0ffd07cf0ffd SHA512 053686da238a0fc129e9e61bfe972bdaa50629d4557daff8e4bc053fb3be72c1902b1d397e120c5de7446ef0bb4ffadbcffdcf87bb761f12af2e7324587cc29f
 EBUILD regexp_parser-1.5.1.ebuild 864 BLAKE2B 03c5cb910a8ba8a7a6c8e7fdf087eb549da266d973f034301907867473bfbc8dadf932e331c059c271a226c8d84d1b66b9f9df77243095e6e4f9e45356ae70c5 SHA512 8b4254b91b8f93fe2c74bb7e1f86152102e45dcc8b4ab1fda3780c782b3f3648602223bbef48440d5a8c79c2fb09fd5f7b7b709a602dd1d2b637eddb3ea0713c
+EBUILD regexp_parser-1.6.0.ebuild 865 BLAKE2B e2f7bf30e8d30b3b6d343e488374446abea0ff96c9382af9946ada0c1a2f76a1d0bd5ad4afcb9e7a14af3dfb652c398de36a948d6dde66f97c934ff085651a54 SHA512 5dae8f57683d3c89ea754ba4a23ccab9af36a2e334a42022ee9c98b0df801f761c8c841e9566f2318e656377df7d9cd46eb343f42de2445e11395ba921b10634
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
deleted file mode 100644
index 2167d9769c71..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake test? ( dev-ruby/regexp_property_values )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-	sed -i -e '1irequire "delegate"' test/support/warning_extractor.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib bin/test || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.5.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.6.0.ebuild
index 804b3a4e3a70..5a83d67bbbf5 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.5.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-1.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index 131a7e968841..ce04edfce62d 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,5 +1,7 @@
 DIST regexp_property_values-0.3.4.tar.gz 11273 BLAKE2B a52ab11676b58a752741240912da5fa312661a583dd74a4321f8184fef2864c74e0d5f709cb68e3ce64a3e19e9320305e80bf7614a40142c4855ccec1c40b5a5 SHA512 01ca50f831bf3364e38559e06cb54faef59fdb0b995a6bfa0aaa3943591d98f97939a47911bf8b075b34b3c401b5de51e42a71088400112ee8afd8d39f164465
 DIST regexp_property_values-0.3.5.tar.gz 11410 BLAKE2B adcf7848af9df53707a878ee35443583b03f96f60f9b23fd5f146e81b4b12a4e3ada2c48d6509b15c848b15c668d9430ef93b34f08491ce13249ec458b2be0eb SHA512 5ac91331deb12fd77ee6a5ca8f942c2b2ea0ccb42bc63548444ecfe85c3a60bad385831b408f21c848f0c0ac2db3c68f8391fd68074acb0187ae9de51ca76e47
+DIST regexp_property_values-1.0.0.tar.gz 12884 BLAKE2B 82f63d21a1e1508cef79afc2f1b5cca842c1e5bc96b197efa90ec0d02e7bd213cc67ae99f4f71cae6e632e0804fa2d6e935c7d30f27a940c767f5a83dd9edd21 SHA512 f51946d93c255c3b51bfb8055d2c0548c9656db9f208de74b569df8799fa97712a76b509546e149f71e3176ae0e979f295b225c171cedc687e1871f204c1e0d3
 EBUILD regexp_property_values-0.3.4.ebuild 1254 BLAKE2B d9b901483114466afafc8f82ffbe5485197c7de551b7d277e45a8cde2d8f5e3ceb831ad15a19375b2d891db72a99d3ed91d2972e4e2f87a7d2953582b6047245 SHA512 5fab7ef2092989c213bf7f9c91b7ae06b6c87602b95c08e061c8c7304314a629e7cf4a656766b1c058555f3bb1829fec1a5e1916e5fafc802334b625bda3a2c7
-EBUILD regexp_property_values-0.3.5.ebuild 1261 BLAKE2B 5a21bce48a8e71ebd23e4246930b7a4831f03b5bb8957aa82030ee8dfcf81ff9878f8d6faaa477a604358e3da4748e094509dfe2be82ff95bbe93adf2c947901 SHA512 b3988366fe734236f325a823ceab666cc1f55e4081a93bb3c07bcb1e51b0f89b22f89f5dec105fa68016d7e7e64aba6435d22b4532f179cb4940ad3653f4ad16
+EBUILD regexp_property_values-0.3.5.ebuild 1260 BLAKE2B a50ab51dfaf6c5877c59dd08d019c08fd3a72fa3e9100721161b5bb193f0f61feb071fc80114979f56d20815c3fbbbe9d0eb26e4dd4034c08166a64064fe44bb SHA512 b924dabf8f7275abe71e6049a5a823c1fde0906a77347ab7c39e2d808fb75f75071113574550c7caece493e5fec4c4d40af2994b890143cabd21b773f1383210
+EBUILD regexp_property_values-1.0.0.ebuild 1250 BLAKE2B 33f01e18a00005d415c5002da54e31d57f2dbd6fae2cdc114c55f310da21aa65f7ac43d816a8ea6cdc1cec4c9dd85ac9dcbc36b46f0aece207a2e1ed1c7133c0 SHA512 de3c8445bcd37d644c2946cf53b654af07928fb506ee3c58091307b681b60c4582f759e841b5b1a9f14949a509334d036d4d9fe55c8ad91b0c176de9edb91b50
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
index c71b9d988f2f..5f9cfd2688b1 100644
--- a/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
new file mode 100644
index 000000000000..10afef7a1307
--- /dev/null
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="See which property values are supported by the regular expression engine"
+HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
+SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on character_set which would lead to circular
+	# dependencies.
+	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/value_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/regexp_property_values extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/regexp_property_values V=1
+	cp ext/regexp_property_values/regexp_property_values.so lib/regexp_property_values/ || die
+}
diff --git a/dev-ruby/ruby-elf/Manifest b/dev-ruby/ruby-elf/Manifest
index 96ad3e20ca9e..ea405f716c6b 100644
--- a/dev-ruby/ruby-elf/Manifest
+++ b/dev-ruby/ruby-elf/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-elf-1.0.8.tar.gz 1958368 BLAKE2B c12464d55dc318301e7b999de5057bc6efb306c2393942200e866d7a48c05a179a09991366bddbf10d4a181d9db36c1dbadb0e2ba50ea1021f012a47dce200e7 SHA512 40eb774b9869948812c56193c46548f5c372a1fbd3892b7e6ecd7865607e0edba81ba7e857b6571acb9abb67e066aed312d48a3d0ddd64c8f51f142eb45f8d8f
 EBUILD ruby-elf-1.0.8.ebuild 1207 BLAKE2B a04ad80a71849d3210e6412d891108781935227b31559c3b0fb8fcdb8ad7b142425217b759e149d1f7ccbd26e9638636574c3467ca91f72c83c5cac5d0ab741e SHA512 df785d63c9280dd9f779d0b729210ae5e803c6475f0ded89e1080c5d16d28f37ee81e19f320405257362b8cf4df012ade23a3f83761d7a881603d5c072aaaf88
-MISC metadata.xml 222 BLAKE2B a5de72e26a4305bf1e3ab2714d6759354174ae5d72a37d8426689b10f639f6c01f3df6b2f2440f4bb5efec009113c0399d46d852716421b6bd12413c91f8b0f3 SHA512 76a40459ec8f91419a4f5700ba32715bcb67c69f6b672f2dfff1714ee05e5ccc68e79c90918fea5c3439a1bd95539af371b65afecd60fc25bf1b01bf4d3ce588
+MISC metadata.xml 248 BLAKE2B aa787ab18d2d3ba2f0738fec4f0f3c09c1334fddcc7e223264efbc72a272d587e978359685fd1b26e83bd2a3655895d5a23b30695b7dfeffb6701388200771b5 SHA512 ff561d9540660efe71a9459c0e1223c87c9e0c450f0cabac18643eeb9164fb0c8cbcadb9ab7716c9b263119ad6ffd4a2add416b013d5be904c21422387c04f9b
diff --git a/dev-ruby/ruby-elf/metadata.xml b/dev-ruby/ruby-elf/metadata.xml
index b4ffcd78a756..d45527651beb 100644
--- a/dev-ruby/ruby-elf/metadata.xml
+++ b/dev-ruby/ruby-elf/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">Flameeyes/ruby-elf</remote-id>
 	</upstream>
diff --git a/dev-ruby/sawyer/Manifest b/dev-ruby/sawyer/Manifest
index 324012a12b89..0b9f673c889f 100644
--- a/dev-ruby/sawyer/Manifest
+++ b/dev-ruby/sawyer/Manifest
@@ -1,5 +1,3 @@
-DIST sawyer-0.8.1.gem 15872 BLAKE2B 07f5196d9b34307837112822b2c8ad8f1c7a2c5e7341cfd17674970a4a2ba2a2085f14b9cc81bc3758a6c276561d142645b439de75c21676c78e0f560d94dbcd SHA512 d057c34e1ee1bfc5939cfc002118fcc31579846814caa668e3633d5c04dd2437aa71b417626f669aca3a082481bf493682720260592072367af104c20fd34783
 DIST sawyer-0.8.2.tar.gz 15059 BLAKE2B 11a82158493fba69695b4eee15db223a07ebd81f8e39910553ef197a253a3342cffd00045385706c56c6f5e46bf4e20872cf61028acaf02d6f81fa2f640fc09b SHA512 fdaf88d33d87922bd0d44de919b920938b7072ad437db4b98370c507e22e4229ec0c68c613944fd2e20dde060ae5d34de6c001568eb7d1f38098831ca29b0c13
-EBUILD sawyer-0.8.1.ebuild 670 BLAKE2B 05c3d39357439179c7d0bfa64cad5ecd6de03ab061be02dcb81ae77049f79b79918e81c6835f33fe80990e09c597d16c8101fbbb77c262d39573d2466723557c SHA512 a5e803a870a6773120c1f730cc30ccc7bf4f2ee9706dff6c589d11de1963434c9e2c63167afabac7afa45d7ac0140e97034e1db6cff3d34cb1a0b6716fac2322
 EBUILD sawyer-0.8.2.ebuild 707 BLAKE2B b79f43b5396530aa729510a91fa76882b454d6b2f044c2236041e015b861323b270c7cce2ad81476e8a976cc11ed7d178d8ffad6b95c6d0c588b11d75a873ab3 SHA512 51e3a82e9790f08fbfb950ef31f443a36ad5e3f66ad6fbe916c997b6186e9496de5fec8f8781c0a4f60ab271877dbf48876a2a982ea52d22bd9001c6e2de4d21
 MISC metadata.xml 343 BLAKE2B cc1ee84d088f5dee301ce54b35dc657a5755376424dd112af7a3b1e92044b5f337e63ff1d9429ef5386f4f473a6bb1b8862fd674b8d8214fbcbfd57b1706cb6a SHA512 e8a9c944a7e5e4c4be4baa2dece6b6ec683591551624cd5e97adeb90d8698cbe6a38a173a9c37a856b77830b5aa2ee182b5a0c25d083959837c04b366d835538
diff --git a/dev-ruby/sawyer/sawyer-0.8.1.ebuild b/dev-ruby/sawyer/sawyer-0.8.1.ebuild
deleted file mode 100644
index af38670db928..000000000000
--- a/dev-ruby/sawyer/sawyer-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby25: code not compatible
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Secret User Agent of HTTP"
-HOMEPAGE="https://github.com/lostisland/sawyer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/faraday-1.0
-	>=dev-ruby/addressable-2.3.5 <dev-ruby/addressable-2.6"
-
-all_ruby_prepare() {
-	# Avoid tests that require network acces
-	sed -i -e '/test_blank_response_doesnt_raise/,/^    end/ s:^:#:' test/agent_test.rb || die
-}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 2a8fc4fa4e1c..443f35c35af9 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -2,8 +2,10 @@ DIST shoulda-matchers-2.8.0.gem 153600 BLAKE2B 49ddfe686bbd80665cde74019a046564b
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
 DIST shoulda-matchers-4.0.1.tar.gz 222637 BLAKE2B 70d1aaa08f7670716f9ad385a22cbca709827f2de276d2a82ea8306ea43c44e99f9a2e698813a8c99036568a1f451a7c39d06dc5effd438d2bd31dcab32df8a8 SHA512 c2d8b80d4a0fa8d607b62f56c2718fc9922459f85ffb8a56b0c933c60fc258ce3fe75b7676fee1b178c56d1e35e28356abd855e2e7046b82268f743010c9b273
 DIST shoulda-matchers-4.1.0.tar.gz 231976 BLAKE2B dc77f6c8b31209e6651b8cd277a35afb6db9d32db9ce76cdb4f7b53fcd4dcfd86fe147b2aef1cd387eac602aedd863a6c5bb478a763446c30a88bbd0ed61de73 SHA512 9688712cdb2b5440f0a0a41df1c2956d3bb6f8824a41c0c5418706fc9124296705639286e04cc4d90e083b7b44a96b10f831aab2ae382f7379054ea6adb489d1
+DIST shoulda-matchers-4.1.1.tar.gz 234756 BLAKE2B 19f178b6f80bbc4439053a11772ed449186f507ee1c971a20df1c50931f6ffb3f8e1555d603a111916fb2ab18329aaf97177e2610ad9e5186bc1fcea4c09f48c SHA512 af2df1321e5421211a01fe9b3a94e2786dd7526050ecd38fd256df2c0ed8187d51423df0df8bdfeb1c3eca9eeb9dc0b757605eb6fef5c42e1895deb2fcac257c
 EBUILD shoulda-matchers-2.8.0-r1.ebuild 522 BLAKE2B ef2bbd2854cf8cd5891865b7eb97ed867fe804106b1f6c54dcebb83aae58f3b79803502fdcd042e36c007e36ce9c6d73f9dd3195c802305c42cb02303addd656 SHA512 1e39bd6760a5c9984e64a410d531c387b1990f8014d0bff5c77ac97f442d969f30eb7bedcaa7a4af128003f8fe6ec37c7bb17466e1c4c3f27e4b307cf6225409
 EBUILD shoulda-matchers-3.1.3.ebuild 529 BLAKE2B 8e86c34cb17d6cee8e2a6f139eb4337671ce57f38c0132568874c7f79d0784f4609d30684df3e4a0bed5eba750684f6de31f86be44f9369769c9a9d515cf01ed SHA512 2bac2b7f6d1bbc17aa01a98bb244212af4b90905b7a1516ae5f0e4a3a6b33f67cceb17de2064675e4711565ed6b24e1f7fca5679402723d8f795c72000c58a33
 EBUILD shoulda-matchers-4.0.1.ebuild 766 BLAKE2B 42cab2f7fc8c69fa5ce203c807336f5dcff28ec50754410c11da22d3380d82caba8501c2f9bf6d0aec7e0e4c88fb61a58f8f366d890199ddadcefadecf83036d SHA512 1838812642bfe7541fb2148a132f2122328add69216b1a3743edc8c589ef98039fab042fb1a67379a736b13f43b649a20fb6d21f15bada83095ba8af6285899a
 EBUILD shoulda-matchers-4.1.0.ebuild 836 BLAKE2B 72d83ff66b16195624798a634b2f6f2c5c36439252a8ca52d2980fc593fd35813250bb60bff8a30d497205d15e6565d43cdd975dfd750697f5a56de291e40945 SHA512 0880ce349125ccdff7c1e3dc1f0c9cffe2616ecfe008bbe708b2a1563d0d44f362c3ab467739de4b84f4b5177b2fed7cb11dbd5d5f0da1f2f06205bb39c23593
+EBUILD shoulda-matchers-4.1.1.ebuild 836 BLAKE2B 72d83ff66b16195624798a634b2f6f2c5c36439252a8ca52d2980fc593fd35813250bb60bff8a30d497205d15e6565d43cdd975dfd750697f5a56de291e40945 SHA512 0880ce349125ccdff7c1e3dc1f0c9cffe2616ecfe008bbe708b2a1563d0d44f362c3ab467739de4b84f4b5177b2fed7cb11dbd5d5f0da1f2f06205bb39c23593
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.1.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.1.1.ebuild
new file mode 100644
index 000000000000..2d24aeacace5
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index 81b7d0ba6a4f..20ec714cad37 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,7 +1,5 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
-DIST shoulda-3.5.0.tar.gz 7149 BLAKE2B 2944ac1b586d960dbe3706ca9fe8f3448ab15b23e5b6ed188cac1c4280f47fec1bd9c0f9231fc7003956eb45dbac49920d9195e5f648e6fc127b4c71e2ca79c6 SHA512 41fe41ab1fcd3dd1b2ebde1163cb0712f4cd2615fea9cd2ad6fbd6de46cca8039db94fb91ce1850e84632dbfc299692a728ec91e7c0fbf2d9050fa2c1ee98933
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
 EBUILD shoulda-2.11.3-r2.ebuild 907 BLAKE2B 03cf7c428220966ac68d6a920fc8000d8f82902df15dbba83abaa43d863356e56f06e4a97bc3007b4b17c0067114352cba62af9a8ab7db6cf9bc4b647b169844 SHA512 51e280a48c2872f76569f67f45591d8343d83a7aac1d9ae68f28e92cdfaf092d2053777f32cbda6ca2c34433b301a4ad1d130f297520bb165235185001ce8721
-EBUILD shoulda-3.5.0-r3.ebuild 860 BLAKE2B cb5e00e576336ee6a58c638ac288048664f0be3539e5c15bc5850c3b757b83286f48a3a38d667cf63c86dba6a94ff990732a7a2291f479ca8bdb296a3f35bff2 SHA512 ea79525c92fe43b84265a075e9561a683de3a9a965f1ac839c1d07e6573224edc6271b0ace017f2590994c682c7e23d8cc0e93b65717a83a2d503564163e9771
 EBUILD shoulda-3.6.0.ebuild 919 BLAKE2B de269a52d1ef5453a6d65c4a1b58d140c518449c15bff5483810eea1d0b9115f324cd19d94ca64605f7cec3109d1e1ee0bf2514fbf0e52c9b8ee0fb20f4bd8b0 SHA512 e63c854b5beed5b0f4622d0b0e966e759132b906c30afa2404cc5a05d47792c5f7d9ed2e7aa2817374fa94cafb2002046a61fb51b46d915897442903ef07ee67
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild b/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild
deleted file mode 100644
index 484d765b10f6..000000000000
--- a/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24"
-
-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"
-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-1.4.1:0"
-
-all_ruby_prepare() {
-	sed -e '/git ls-files/d' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 76ac303c9b37..17683958703c 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,5 +1,3 @@
-DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
 DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
-EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
 EBUILD thor-0.20.3.ebuild 1433 BLAKE2B 44073f770cbb4fc0c927d7108829238202879e28cad4a68044d47dc50d9a01d878adc8b8425b4de004e7e07ed1b396e2e4c077ab68c36bad4b1297121dd9456b SHA512 7c564aa7b567c3030efedd3d523605dd25fd3ad043e4b4f54cb2c3b970918cab056d4fced7231e8f7a7ae1d2355903521fdffc645d3604d5cb94b4122a09d0da
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.19.4.ebuild b/dev-ruby/thor/thor-0.19.4.ebuild
deleted file mode 100644
index f548e71b984e..000000000000
--- a/dev-ruby/thor/thor-0.19.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-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
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 117108cd4b79..c76145208daf 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,7 +1,9 @@
 DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f46950ff339834b55cb1eaa36e1cdd47a9795d783671a8ef393f6059578ed684240de377ec8824c2468f5014 SHA512 c6c7694ddadf0cf46176a1fabda8ffc2d6b098ca6ed4d568f30c66100a2f55c25ce83c09e8ba379ee6c49dd68d6f1572f17f70f9666628c1fe5225fcc9d7b788
 DIST tins-1.20.3.gem 305664 BLAKE2B 26c78cf94acba6651c631b274a98cc7e19d3e215a450d255886d201c5bf94c343141edeb03456a178943cf70efbc9b75ea12cc2ccaec5c929fe5b2c08e918d2c SHA512 f5f723402096e869a8e44e64db9dcd0be4620812f0b5cc291df79010fcb87774ad56298de328242c96ce9dca64f7313271b9fec8cff758a6b3b689bec17c965d
 DIST tins-1.21.0.gem 305664 BLAKE2B 843b19b1208c3db8b9c21be6d249ca334bb3e8eb172a54623a7f6c6c1d6c62c2891e08cce5ec9a86fbc55637d7d8e2012925efe57fa23e68976bbd83c7f8cbda SHA512 88de2c493ad4ded353d58fa9647844fc14043233e0baa33180218cc068ab34d6a86e8841f41106ffa67215af26ccf3207ac9ef58f7db80f14c59c96591bd4a85
+DIST tins-1.21.1.gem 305664 BLAKE2B 1a86b55f0334d4e28fe4d4e67c12103ab4ed53056fb00d9d375ffc9b8213419bf277c37d23970e99c6bd7d3a2035cdde661dd63524b81082739d01271370be9c SHA512 25288e3c8e633bc9cef11b988bf778e75a304a52146a4501cd3ebbeee4c845a6be795d4ce7d01b24ff4a9a122fc16afbc20d9d88f7b1559c9b433d8f9282e29d
 EBUILD tins-1.20.2.ebuild 628 BLAKE2B 8130fcde3c9ae7f8103b30cae9b164fe3245e243b053710c5cf59740e9144489cc50e05fbddf1a23a7a0dcba8fd9b6cd6d68b1790f2d63fd0c49bf58eb6c6697 SHA512 de10342ae03324eeb94eff836cc4761d87e533a1ab92642a5ee459e57048a0de3ab10f990ec8a400c4c1cd7b7ca382dc09279991254d89e785b4451cc1541e0f
 EBUILD tins-1.20.3.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
 EBUILD tins-1.21.0.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
+EBUILD tins-1.21.1.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.21.1.ebuild b/dev-ruby/tins/tins-1.21.1.ebuild
new file mode 100644
index 000000000000..19bbb25c440d
--- /dev/null
+++ b/dev-ruby/tins/tins-1.21.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index 4e7c227cf1c2..fd53a836d751 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,3 +1,3 @@
 DIST treetop-1.6.10.gem 92160 BLAKE2B ff3b6f0a92bcd2ad279c186e3a3eea72aa8243a89d4a1382df6322d73a19b79bede6c9f5c443644a5011b755a673bc9592f964cf61ab68fdd9f2da2dfcc0be94 SHA512 adff1cf93d1ea071be948437e3fd2800c2e892d1dac49d4571a89336773e012007abb1b4e15f0a86031077c46a6667f8fca8e22920e5c29186e0c3227b4d82ee
-EBUILD treetop-1.6.10.ebuild 805 BLAKE2B be68cdf69f12931160fb3edef616ad7c1b6b6ec2416a667104db1a1b2b497be886004cae5810d93cc818a8cfe625c9c378b4b1ccc5c5c031d9381011b10babfc SHA512 8d63def4cc4d5da1d7bf0040d79c834996f5310e6dc3ea348a5bbacbc4917292be7e642fe4fbc1a901c00dbfc9ccc868c1e025a8086a14e80416b01ae503bd9f
+EBUILD treetop-1.6.10.ebuild 802 BLAKE2B e5a6087d4d7bb3de132a56dd9fc3d74089e8d538d97d6c5cb5448255a95aa27984432698545116980c251400eb2f1a4dacaf0bb3783ce5d1075e9bb02b6b594f SHA512 c01501a52588565c5995ea037cef72d1bd5c18d3773bdbab36a0d88a9adea7079a3b8b6ce7a5765856521b5779dd2928ff1c0f21b22b243aa69c5699c14bccbd
 MISC metadata.xml 341 BLAKE2B 56ec962d821e9e80edb0a650e3f65f9cdfc8ef0bc866a378cfc285b4bc83b9f705f6cb33e54b53fdb25d0b9e96622c382fb972540fffab4e0a2ac9199212edda SHA512 7bbdf48696d2aa4cdfecc5ab84251ef9225ff2ed0dfa9fb1cd2a827b2da3f74e684642423546b0e9e8f182ff155c0963632e1194de284470854e53dce2a2e45b
diff --git a/dev-ruby/treetop/treetop-1.6.10.ebuild b/dev-ruby/treetop/treetop-1.6.10.ebuild
index 2d20f97ea82f..076b0dc7f933 100644
--- a/dev-ruby/treetop/treetop-1.6.10.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 044e63d1aa0b..bbc7f398f07d 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -4,6 +4,6 @@ DIST webmock-3.5.1.gem 116736 BLAKE2B eb6531dd481588419932a93d091bf2c2802d98a9ab
 DIST webmock-3.6.0.gem 117248 BLAKE2B 251f80c90777deacc24588a947426252522c3b4ec1670e77801391e9ed495cc7790b2f7211abc728ac357b2876fbb16b654fffe410c5aa3e837c46e927f031f7 SHA512 4bb3ed9cf7e67c1560c1835e26275657b28b40e3f95dbe50156ce1960e418519020675b6ed07e80521d85ea0b0e53c22d674b7b17b4c9349ef62c089e6bc7891
 EBUILD webmock-2.3.2.ebuild 2039 BLAKE2B aaa37b9bf42a6e40ef0adf60d223604cacfa7f51d425885c8cb04de5932d9b1ccc295e6a7c5f5eb930136e2c45b0a1703651ccbc2c08b2ced92e174729577d61 SHA512 a49f721d3c4c2e29a007aa82137b345aff64f47ba332c8fad9de652a1220d082351f2a25dd232d42b26671610d4fe1a005c3d163ee71d6d1714667985980a505
 EBUILD webmock-3.4.1.ebuild 2011 BLAKE2B 698d63b3fbb0b709284749f8a64d8f61212369ac9e5bc2c4e5296baf7b4e99d37ba3984f3a0fa4c550ed4e53ca8f7a139af9a4deff10b547c7236b376aec48d2 SHA512 aaee3d9c2e18d934fcf0f76eacf81ab1d14d67020b3296e3407c3b71a9baa735c0dfdd2344878f1de9e99494564e2798001e9f0e60f7e84929b2315317d9f3ba
-EBUILD webmock-3.5.1.ebuild 2074 BLAKE2B 0eed3684a9e542dd1c0803e0bde2825799d35c45442e74a60e8135385b90cc0963480e693ee1017755a8553146f1dce9f17073007de912e0257e8af0b3723618 SHA512 05818d327e247bae81c99ce0abab10a93d934afed82bf2c3a9684a87bdb0008d712d5f3983b738e877ada8bd55231277ad23b54921de66df109c38c833321116
+EBUILD webmock-3.5.1.ebuild 2073 BLAKE2B 42d64131855d8937a8c263e480b1bbce34abf325275726cc561330b2613db4d063ec12ce1b089c58cfeda2fb9ecd45e647f774ad2ab894ae9f68460f85455681 SHA512 eed21d9c9828d469a1bdf5981a760fa3001b0867d2a7113f465146fb8407a2131a339a2eb27e3df2833df3d52f8172cbbee862e5773d612a6d2c5613d2247797
 EBUILD webmock-3.6.0.ebuild 2075 BLAKE2B 61eea02d96a1c15354553c7b173da7f2697c4259464d7258b30ea3ba66c90fa342f13fbbd4a075669ba55ac94b660be4b7bd971882d10b25991b1f1c51f0ba0d SHA512 6f728b7c95195a1990d23bfe6e10597287d55d8a8c948b5163f1a7f478d283f63465a6f3c4fd5343ac476f7fc2d201eab75a7a3c8ade9c587cb133a90fae6c92
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.5.1.ebuild b/dev-ruby/webmock/webmock-3.5.1.ebuild
index f283fd983bff..ae5c4de7fff4 100644
--- a/dev-ruby/webmock/webmock-3.5.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index b56704effd56..6fcb6e7999de 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,5 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
-EBUILD yard-0.9.11.ebuild 1464 BLAKE2B 0e4ee9f923c5a7fdfa905a50fe8a69b2273795c19e4c0665d015807e283b8cfee92ce936dcc1d08ca2d5c3c1001452ccc7d2e4b9fb1b9097e008de723db048d2 SHA512 0eb51531a2c15800b4af27f4174abd3fe161448f7d275e63673ccd4e6787fdbfd18ab50563b454495e7707d68df90281c3e7b97f82be977095c41ac9ec74dbdc
+EBUILD yard-0.9.11.ebuild 1461 BLAKE2B 60b1a66dabb02817f1416eba5e1daf3122d546235eb8801a1417128004f2ef289813f358e964bab2ecbd5ca05b79cd734415fab5d7849832df893db3ebf68753 SHA512 03ea228f90bc06ababe97857ec7742935b989efa29b11bb41e854e46af4e53ecfdc44be3bf37bdbc343e5a04b164b7ee1ea0f2625f6da9857451670e429fe9c1
 EBUILD yard-0.9.20.ebuild 1811 BLAKE2B a704d1006706c785bce9e5b175509e9d99571eeae2929c6ca713194d8f84f06b09ff640c3fedb5246b1c3d30004fb94dbf8c8bead6ec8f1b181a8db2ad15b9ba SHA512 6f0a9326a2c83a16600933f544bcb9ed1b80bac39aa24ef1101daf32e22d81df303195e4af06de074f99a33b85c6859cea4b5766c85d9e898128775b46d4066f
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild
index 20374f2b0f8d..1837bcda0810 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 13ea86c31cde..e9ef6702f0f3 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,11 +1,7 @@
 DIST zeitwerk-1.4.3.tar.gz 84202 BLAKE2B 8e14790f4a5b5122efacbe89a0d1ede5c9933564db40f3b498423b73852e91990e09321b3d2854ada8c57aa914bb596d1381ea697e751bc22d7b9ecf4e5653b8 SHA512 e3ba6dcaf5b85c117278e65f15559e7750062ba204b3cdeba4248eb4f153ad4aa09164db61671f6ea00846a9d89ec218b66338dbcbd2c376f4e7b28364533f55
-DIST zeitwerk-2.1.0.tar.gz 86684 BLAKE2B 88227fc490a5837131472746b998885e6a3ee0d2b0fdd928bbf16f03ec2dc2f17bd5721d828a33050fa8bc9f280af26fa3abb423e818519779126179e27343ed SHA512 78ca4621f1a9a632e529ecf329ed70a177e87440f285d93191cbc58a152ea0b23a74362981e61f8ebe58f76e26161f5923ca304c80aa4ab1ac72495667b85bcc
-DIST zeitwerk-2.1.5.tar.gz 89234 BLAKE2B 2da03d3e92ebc8e5ffe2a3ce742790b205c3f20002b06eb77224d80311cde7634941bfce3fe358925deca9e1fd8b4d61abf7629f1056bb5533efe378c6004281 SHA512 fa724e2893b830e28e3d74bb6df5f45ac45c233ff4c36908b7743ed9ae925e715c0b1b4912ba2a9ef433415d228a721b8c30316e6a1abe36315674bf9484bf6c
-DIST zeitwerk-2.1.6.tar.gz 89939 BLAKE2B f6385800904ff2f5eb74712324997ba73718d88600aafc083c9820441056dbcea1e042a764587aa26b3a115cd8b531b72b65933b2dcc272a25d85e3f9e7b50f9 SHA512 7e38c98c1dd34c5f87ba77bc1e984933f3bd7da44edf5e822ecd3aadf2d87f352bce1f59aec62f7f605f1e334ac5ed3f596b1c5795596f8b7d7431b9e2c0f71e
 DIST zeitwerk-2.1.8.tar.gz 90774 BLAKE2B b42c56937b5f9709ce05125ab9358012f4132a49f23a3a56f464aed0c20ba7582e77e7d6cb65d2607d75eed089140827efcec14a2ffe8dd1adb3ead3c10fc882 SHA512 14db7e467b45536cb796f7dae4ca96e8167be023a562cc723843b1a63586ec6678ed23cb3307c3389ce5dba099c70dbdd257d23f5ce649af676aea795fa36243
+DIST zeitwerk-2.1.9.tar.gz 92046 BLAKE2B e4b48c9de3ee575d6b82427211e129478c9839d5716472896f2d6056ba42b7aaf861e644f92329af5034d92092bf02789f04cf6e5d6390151601eb138d7dfa58 SHA512 15de54c5e5b4042e99109707240627aaf5b76f4bf21a1a94d1230c1973404fdeecdc5f64ab16f75158608f64865ff8cc55f4841091c76e2731cc274b0109f677
 EBUILD zeitwerk-1.4.3.ebuild 830 BLAKE2B 7b8d3fa7f20752b2e0caf92e9e63ed1f50ad4e759092d20da1e9d1f4cb8389fba1160b533e21d0b46773152224e2cf69e54488357918353c1fc4bfad6843ba74 SHA512 98529f550a67c791df72a0126a9aaf10d11f1ea427540b4551fa02ad0b4a4ff11c6de51fc25b3d95037cda90896528fcce2634960d931a22f48d0e0481be5004
-EBUILD zeitwerk-2.1.0.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
-EBUILD zeitwerk-2.1.5.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
-EBUILD zeitwerk-2.1.6.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
 EBUILD zeitwerk-2.1.8.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
+EBUILD zeitwerk-2.1.9.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.5.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.5.ebuild
deleted file mode 100644
index e3f56d54a1b1..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.6.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.6.ebuild
deleted file mode 100644
index e3f56d54a1b1..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.0.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
index e3f56d54a1b1..e3f56d54a1b1 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.1.0.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
commit	121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree	ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /dev-ruby
parent	dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)