gentoo resync : 16.09.2020

3 files changed, 7 insertions, 47 deletions

diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index ad47c34af64a..5684f274c3e3 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,7 +1,5 @@
-DIST nio4r-1.2.1.gem 94208 BLAKE2B 229c1c690004444a6701ad765af26e592b9dbdb3646f155dc2114ea677b40097c0158c615efb25506c2ae59316e4ecdd7ec8747bf4f18a3ec2ca1be6bf028b85 SHA512 3136863955bd6f4d489955bae9baf2fb527447c0e71dade1a05402f3e7c8570bf1dd9b8335d70d7303ec4df0a236b13e4ede74ce9154be00a108afcd7c6b7f40
-DIST nio4r-2.4.0.gem 101888 BLAKE2B 05f0223ccf493d3566d370e3199b26136b4158939fcd7102d5d513ae0988c3691fedb00fe47f9884396bc333ed2b88b605c583048ad6a2ebe70eb7aa4b70a6df SHA512 2cd77c4af934c10cbcc23e926d0111a319bd9be69b0ead9c5c5614911f2cd3127ffa9fb103907d961b59e6f846cc83ac9a97722a85dac390dbf2f2a20976a0c0
 DIST nio4r-2.5.2.gem 110592 BLAKE2B b632322d0706f97a30601e7135daad9ee5a66e57ff7dea1eb0b8365e45f896e7b8a7c228c4eb781d2f44ea047eb028549bc172b68a0540d041ad83bd79d25075 SHA512 3db567c9994e9186749e37c3ebc07f744e7a82c1163d44222475cf491f945745c6c070f4a0a8c77e331921147cc1f5f7bfffd86cb3455d5864280c4e4945b295
-EBUILD nio4r-1.2.1-r1.ebuild 1009 BLAKE2B 1e03d4b0f3fdb2643ef903fb78872a4e050b2ee7a76f21a25ac0070351487b94dd7bb423302c352372098828b7e8015b8852a93fd4fdec55401dd9a4898dd0a1 SHA512 bfac422750ae73a1c5046659b007e22d486165992fdc1ac73f0c68b0c4cd4c219c7a51573beb1fc9cb7440b09074927a581018420cdc18bd13d05c89414f7c22
-EBUILD nio4r-2.4.0.ebuild 1069 BLAKE2B 0ddd3a55a6262a691ccd4bacc3d8fe697a8615dd298427d96de911de45a07ac38d49aea5bc19f546726c21e579a39e92e19341466d0bd3edf8918cf88adf4b79 SHA512 394431e4e8f29d4e93ed133bd7e1249f6cac742191f1e459989f294d1e6738b87592fa3e938274164f4de79828fd4e7b407b9f8e25d4ed8dc41c131b9496bd3a
+DIST nio4r-2.5.3.gem 110592 BLAKE2B 8a22839a2431f3128832733ef1f814e2743939e3128c689c1ccfea7537ac92c497545182525a8305ba9348092b897a22c4d21044cca695f17d95c08dc17b1f77 SHA512 dad68688faacf110f08e3252222fed7696e557944c56dadf47a1fb037c5627ab88fa82e70c2e28f802f81ed6c93e38bf85daf28dc42a51f40e455558609b0b58
 EBUILD nio4r-2.5.2.ebuild 1095 BLAKE2B 39fb353b75619c4497fa355e7faa3bb4d1b4612ac3c90111c235ae7846a0242587e45070292b1a102a99b136f80d9e50ea4a9ca2d36b6ff66c69cb2baf8d3305 SHA512 d81fdf5f2b56bd4e8a28dd4e78fd42fc5f9d4ec2e5fccc01a438ae946c60482bdba2d8f18076f54839bccbf1c472951fcfaf841978b0d3e0de844e922f7aae85
+EBUILD nio4r-2.5.3.ebuild 1113 BLAKE2B 710563c5b3d6985788c0faf7df8aaade5e799a0d1e2ab0b83ff8dd238f747f22d141c0fc7306846187855a83b892eb3b9da40de8a8efd2622cca15f313583c1a SHA512 31350b10dd12d9db510e5c1451a5e8c1744e39e6f71995f8210e50e25d662f12aceaef226aa94b1bbdef0e85160d07dc2b8a7bda6eea2212c43714b63916b0ce
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-1.2.1-r1.ebuild b/dev-ruby/nio4r/nio4r-1.2.1-r1.ebuild
deleted file mode 100644
index 409bbfb67a6a..000000000000
--- a/dev-ruby/nio4r/nio4r-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,38 +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 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance selector API for monitoring IO objects"
-HOMEPAGE="https://github.com/celluloid/nio4r"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note that nio4r bundles a patched copy of libev, and without these
-# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-
-all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die
-	sed -e '/extension/ s:^:#:' -i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/nio4r/nio4r-2.4.0.ebuild b/dev-ruby/nio4r/nio4r-2.5.3.ebuild
index 45c25df06b14..cf30cac81ab1 100644
--- a/dev-ruby/nio4r/nio4r-2.4.0.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.5.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 
 inherit ruby-fakegem
@@ -15,7 +15,7 @@ inherit ruby-fakegem
 DESCRIPTION="A high performance selector API for monitoring IO objects"
 HOMEPAGE="https://github.com/socketry/nio4r"
 
-LICENSE="MIT"
+LICENSE="MIT || ( BSD GPL-2 )"
 SLOT="2"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
@@ -26,7 +26,7 @@ IUSE=""
 ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
 
 all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die
+	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' -e '1irequire "openssl"' spec/spec_helper.rb || die
 	sed -e '/extension/ s:^:#:' -i Rakefile || die
 }