gentoo resync : 30.05.2020

4 files changed, 7 insertions, 69 deletions

diff --git a/dev-ruby/rinku/Manifest b/dev-ruby/rinku/Manifest
index afde499cdac6..c8d32285e231 100644
--- a/dev-ruby/rinku/Manifest
+++ b/dev-ruby/rinku/Manifest
@@ -1,7 +1,3 @@
-DIST rinku-2.0.4.gem 21504 BLAKE2B cabb91710eca3f6d4985042045c1ebd37063abc466a2071c9a1c2f16f6efcdb80914eec855cc5c0795b428b285fcd6d760437ab2716cb3358e9a8e96b7916367 SHA512 fab4b47a22153d96f71e8b3c6e91595ba3ce97002233b035ab8ebcd6fb46a8e4ca2f82e49ed6d7a510338bd2ebec1b2e67d9146e589535fc8a072ae69e39d58f
-DIST rinku-2.0.5.gem 22016 BLAKE2B 962b2e369ec91022f61d640ed604939e4a5db561cc594d54199ed83fd166302c2a0b5dba5976af4b7fb048ed6ab78e578a7ba33933005ecd19ac8be3269ed652 SHA512 7a0f3c906ddb190344033fbc19aeace137bc234a164fcbc4311ce31972f98398bc6fc10ad89926a212544a0c67369af333a9f7e1d865bfe1119447de44f6e588
 DIST rinku-2.0.6.gem 22016 BLAKE2B 9ba678996110a219e4a5121879597f5024c5bfe475af187d9557092ac871f16528e473b41d20742847127b9c7ae665b91e5db7b9aab42dddd32e2a51f20815bb SHA512 5acb6de775e050a92c7b1040af52c5399b3fea654f7569d58aa1b5db10e4f17a2e1ae7ecc05f3753be4e18bbdf63ccd8e62d4060c0c6693981c8bab7115b2ff7
-EBUILD rinku-2.0.4.ebuild 622 BLAKE2B 2f2e73bb2d048a87354b5295cdc778915e69d9c46184ce827291c2b11bee6008b97b86472fab70e2f4bad72bad259f2f7be68a051654b95927a24b763da69b94 SHA512 d1ba75824dc605f62d06f944aebb617c624fad0445ab3ed836080e44411036cc7e5956a120923e38f22e7d8f9bb46fb1c248b02ae77cbde8d2cab6b6c100fbe9
-EBUILD rinku-2.0.5.ebuild 622 BLAKE2B 2f2e73bb2d048a87354b5295cdc778915e69d9c46184ce827291c2b11bee6008b97b86472fab70e2f4bad72bad259f2f7be68a051654b95927a24b763da69b94 SHA512 d1ba75824dc605f62d06f944aebb617c624fad0445ab3ed836080e44411036cc7e5956a120923e38f22e7d8f9bb46fb1c248b02ae77cbde8d2cab6b6c100fbe9
-EBUILD rinku-2.0.6.ebuild 634 BLAKE2B 274b754a758fe81f46a51ca9f3449eca29b1067a878b9015a832c259b8b5453cc11607a7bbea1272a41ec93e37d6d051c325a2dff3d6cd85ecdf9b16bc1db5c8 SHA512 18e322cfb4ab93452b07d03fb1edbf0e726c87a75fd9bca238a1279238c8abf94e27e80399221fbb571f7fee7f0bd980eeb14807143b159ada8c19166f00ff01
+EBUILD rinku-2.0.6.ebuild 724 BLAKE2B f6e83ecd30f36718df510b266aeec779dabecab4be7c0c64b04af271bb11d31464dd2d1c8edabf41f5f42aa5fc5ee929a51be5b2db111580b822efd8ca52a3cd SHA512 41e6e1df598af779ae4fd95707988427d8d1263eb6c72790bd5e72b14ec9fc340d28370d051aabf9db6410167680704b40b0f697601476f381f0d3d99138b153
 MISC metadata.xml 335 BLAKE2B ac11d84fdaad5f557902d13fb489bf0bb00686e1f68adc8015255171847f7da151d72f1b6f8e8fca6106ea882cbdfeb8b9cc4834f248a5a0124160f0045739a2 SHA512 84c583662f162f0bdda4962c3a4ca5c12e70d7aa0ebb9a8f8001a997074953843b4c8137e75260ef4c63782a13bd0a53b4f8cd8e518fb0f817ca71faae9b4fa0
diff --git a/dev-ruby/rinku/rinku-2.0.4.ebuild b/dev-ruby/rinku/rinku-2.0.4.ebuild
deleted file mode 100644
index 7731dbfffa0c..000000000000
--- a/dev-ruby/rinku/rinku-2.0.4.ebuild
+++ /dev/null
@@ -1,31 +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="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby library that does autolinking"
-HOMEPAGE="https://github.com/vmg/rinku"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/autolink_test.rb || die
-}
diff --git a/dev-ruby/rinku/rinku-2.0.5.ebuild b/dev-ruby/rinku/rinku-2.0.5.ebuild
deleted file mode 100644
index 7731dbfffa0c..000000000000
--- a/dev-ruby/rinku/rinku-2.0.5.ebuild
+++ /dev/null
@@ -1,31 +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="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby library that does autolinking"
-HOMEPAGE="https://github.com/vmg/rinku"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/autolink_test.rb || die
-}
diff --git a/dev-ruby/rinku/rinku-2.0.6.ebuild b/dev-ruby/rinku/rinku-2.0.6.ebuild
index 22158d3edb46..311aafaed121 100644
--- a/dev-ruby/rinku/rinku-2.0.6.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
@@ -17,6 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' test/autolink_test.rb || die
+}
+
 each_ruby_configure() {
 	${RUBY} -Cext/${PN} extconf.rb || die
 }