gentoo resync : 27.10.2021

4 files changed, 10 insertions, 83 deletions

diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index f16afb9e96e8..fe4acae5363d 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,7 +1,4 @@
-DIST cool.io-1.6.0.gem 112128 BLAKE2B 829a2ce47342b4611fb76457836935e26902e5849dd7c43aae297f1d4b220c30020478d3176d15c179489be2ceb504da218b123d04cd6639a7b99e8a185f51eb SHA512 d6ef51ef15b804158b5d84a6a774368513e787d0bec12743d3ebf0c634d40b1fbfe213b5b7c484a1f3de0aaf894e5edb3072e39452d53886b00317a368570e76
-DIST cool.io-1.7.0.gem 112128 BLAKE2B 6c3db3fb6ac001321884de8cb1ffb4b1b8d7ef10afdd92cdbbae97672de43b75b79316cdd56f3a2075c7521742e1fd6874afdd9c218c68f532560d0fa77c0745 SHA512 e443fdd71a6bd0dd8409b7285a4fcea880aae2a43fc5687f664caa936ff4304b522bc07e148bdd51c91f8847ed2f482c5bbcee435dfab5282cf1114a47686d95
 DIST cool.io-1.7.1.gem 112640 BLAKE2B 107d7541180de46c78542eab4b131220c4ae4a10210c7ff870f54eb24178b364fcac1abc4b93f8d0eccea197fb746cede95416aea8f3d5cc458626b1fa9a02f4 SHA512 9ab3e6ddd1689b2825f9bd82714b4ef5ac921dc4b2f84786971c3ec448577613cee73084c99090382878b0da43c9228cb2fd3a8627dc8f62ceeeff274dbdc929
-EBUILD coolio-1.6.0.ebuild 1446 BLAKE2B b02a2812141f06849746a78cc80d80f976d551b757ccccd6fb538166b05eb4092e513cf78fc5309d392aec224ec31c7456c54a9ed84608403838df0248d15a60 SHA512 ccbdf45fb33cc23061d8b59f61db20e43a4218bc11f3cab834c890b72e49c785f3d1bdc1d31033fb65b97124f54335a9cec0d4fe8a17bac31d7673da5100fe50
-EBUILD coolio-1.7.0.ebuild 1439 BLAKE2B ccbb6b6695432b9b36f68cd426ae9a346375b53d0597cfd6a2aca5dd749f6d27f42ee1d321683ecd76b86bf04a9b5b7c2b16760ea4e0f61c46edf346a6866f83 SHA512 6e91969a45e80c178fbe04360a66aaba2423db1fd162a90f9bb70d310f27e45bea3c6d0fa9678eeceb3b87aca67c419f14fe33a8c97b8b01c5801863573af943
-EBUILD coolio-1.7.1.ebuild 1267 BLAKE2B 508953a5ad20b8a3909087ca7762aa036e476a5d72b5229854c5b7d97c0bdfbb038f7d2343030c97c239b18a51ef90534383748ff07b84adaf2d1011930ee2d7 SHA512 3bb6467eb2d464456e9cb798561aefd8f0ce65e279b669f3282d08aa05b22b302fbf32c6180eefd6f2e3e640bb89c63c191323e453a76568c8a7706aae0e89cb
+EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 9ef7b959127bac1a709fd33d857824909bdfdb4a2c861060c03670818939f8d465676693b789732d239ecf0a5af7bb5e8240c2a9cd845655661e19606a045ba0 SHA512 47e72aec678cf545817d216a57b47ecc2ae97fc2aff3ac07fd79a2c9065311f12f230c63d4b882ed959a16082ed202e19582074248b1f217751a2edc34217bc6
+EBUILD coolio-1.7.1.ebuild 1266 BLAKE2B 04a961e5772a29fa992ee8fd6db64d89879806fa2cb09c3278900d3a42015060dffdca3362fc7611a844c857a1146e3b7c94d9c3b5383cc99b4f5d541cc4aaa2 SHA512 fb810cccab72486602522f9f106cc96be049600dc77926c3c99a0aefc403e674b805b5e3f1e9049a0f4164020e7328da4b753db3f6031851575aa72828f36623
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/coolio/coolio-1.6.0.ebuild b/dev-ruby/coolio/coolio-1.6.0.ebuild
deleted file mode 100644
index cb36a9e516af..000000000000
--- a/dev-ruby/coolio/coolio-1.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_NAME="cool.io"
-
-RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
-
-ruby_add_rdepend ">=dev-ruby/iobuffer-1"
-
-all_ruby_prepare() {
-	rm -r Gemfile* lib/.gitignore || die
-
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove specs that require network connectivity
-	rm -f spec/dns_spec.rb || die
-
-	# Use one address consistently
-	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
-}
-
-each_ruby_configure() {
-	pushd ext/cool.io || die
-	${RUBY} extconf.rb || die
-	popd || die
-}
-
-each_ruby_compile() {
-	pushd ext/cool.io || die
-	emake V=1
-	popd || die
-	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/coolio/coolio-1.7.0.ebuild b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
index 30cbd1fc5c95..b7f9b1eec0bd 100644
--- a/dev-ruby/coolio/coolio-1.7.0.ebuild
+++ b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
@@ -11,10 +11,12 @@ RUBY_FAKEGEM_NAME="cool.io"
 
 RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
 
-inherit multilib ruby-fakegem
+RUBY_FAKEGEM_EXTENSIONS=(ext/cool.io/extconf.rb ext/iobuffer/extconf.rb)
+
+inherit ruby-fakegem
 
 DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.com/"
+HOMEPAGE="https://coolio.github.io/"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,8 +25,6 @@ IUSE=""
 
 # cool.io includes a bundled version of libev that is patched to work correctly with ruby.
 
-ruby_add_rdepend ">=dev-ruby/iobuffer-1"
-
 all_ruby_prepare() {
 	rm -r Gemfile* lib/.gitignore || die
 
@@ -42,16 +42,3 @@ all_ruby_prepare() {
 	# Use one address consistently
 	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
 }
-
-each_ruby_configure() {
-	pushd ext/cool.io || die
-	${RUBY} extconf.rb || die
-	popd || die
-}
-
-each_ruby_compile() {
-	pushd ext/cool.io || die
-	emake V=1
-	popd || die
-	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/coolio/coolio-1.7.1.ebuild b/dev-ruby/coolio/coolio-1.7.1.ebuild
index 82cb3c7c0068..18be3f40240f 100644
--- a/dev-ruby/coolio/coolio-1.7.1.ebuild
+++ b/dev-ruby/coolio/coolio-1.7.1.ebuild
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_EXTENSIONS=(ext/cool.io/extconf.rb)
 inherit multilib ruby-fakegem
 
 DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.com/"
+HOMEPAGE="https://coolio.github.io/"
 
 LICENSE="MIT"
 SLOT="0"