gentoo resync : 11.02.2018

3 files changed, 10 insertions, 46 deletions

diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index ccd1cd5fa208..57c5486efa68 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,7 +1,5 @@
 DIST nokogumbo-1.4.13.gem 228352 BLAKE2B 60e85f1cadc2c8b98d067c9bf0f651057e709f204d7ffa7759ec68090b816e8b17a0d12dce4a5d6f6efd372c931f75ef54c439a5496d0fe696edd8795488cd8f SHA512 369743cab4a4bd3ffa5eee4f46074099afd253b66ef5ef9303b79d5e5ce1375f33b73916f1712e256044a00335bdb6595f2ce028e02169607252f32dd9dff9b0
-DIST nokogumbo-1.4.7.gem 227328 BLAKE2B a5b9ee7b99ec6a3fc5ce0cd0bfd9732a2aa2d28d4aff80f5bd1e4406abd0a173e3782ea712f8faf144d1ada783c72dbf159fc296997ae87eb569cb5a57b4b48b SHA512 c4ac9c148430a3fe975849ee7e409d934f832433ba519468e3434153149178a34d03cd2381fe4b816aedbd26e086d96c4b1d397dee220a602ab70a54b973359a
-DIST nokogumbo-1.4.9.gem 228352 BLAKE2B ecb75cea1134f1d3a75c9cb18eab7d2abfd0b24fb90d80a400bb4254426a065f23658f70b82efa9bc9c33b751506c8bc198281226c1c07091ece6359db9c9c4e SHA512 c23d28b63141266122834d0067aa49ad3575ae20baf0b10a915eba4d28de244d2c71e101f3c470bc384f6b7833f76097025fcf0273a13e8bd17e750a5bdc6e3b
+DIST nokogumbo-1.5.0.gem 228352 BLAKE2B 66740dfb9bd9edea13c6bc872e1cadf855116ee7247c7691210d3eaa81ad4c7b972fe8edd02a6f7ade6c172c870923c9af3fc24b10c5594cd0255b2fa0c2cd82 SHA512 a89ec7ae4d42cce5431070e790f0f10734655654f6f680c0b949fab7527b6a811953f1c3c13d633427b40980f9e9bd434a9afe1a9d1f1e504af05246d96be77e
 EBUILD nokogumbo-1.4.13.ebuild 1054 BLAKE2B 73131a9d95d413af0cfd94c2f06490291cf03bdd0762f4362fa6278c4f706c563964d95755180921967930524b4538e6132c7d3fc5b10557a89e6a4e10eb4715 SHA512 fa1347ba5cee32b12c7b7b7bb8b9e9a128d34aa4682f74ec3af3b1de6a503db238493d17cabd4316ad801c24ce80cf2c80a97dd8f02ae7419865c5c1aa9650df
-EBUILD nokogumbo-1.4.7.ebuild 918 BLAKE2B 85064e85e53aecc619a9bdef007ada0996fe7fb36d5ff63ccf822461a0fd3b91cc801002ce050561c0dd880b68cba30c213f0ca7bb18d5dc24f242364bb3bcad SHA512 5fa5123305d29bb5ed461acb998b3452c5a399759c176dc348729227d03d0a66668a28a38ad40aeaa2af9aaaea0d0c9b8dd2ead1ff96ea0504b707e22b2d247f
-EBUILD nokogumbo-1.4.9.ebuild 918 BLAKE2B 85064e85e53aecc619a9bdef007ada0996fe7fb36d5ff63ccf822461a0fd3b91cc801002ce050561c0dd880b68cba30c213f0ca7bb18d5dc24f242364bb3bcad SHA512 5fa5123305d29bb5ed461acb998b3452c5a399759c176dc348729227d03d0a66668a28a38ad40aeaa2af9aaaea0d0c9b8dd2ead1ff96ea0504b707e22b2d247f
+EBUILD nokogumbo-1.5.0.ebuild 1054 BLAKE2B 675fff0c77d75489a7199994ca1d00385c7add728582da386da32c960f523c535053b2d665504da657b37ea58a1c727affe1be69a0ac6535eede4ed3ef251959 SHA512 219f455755b8c1477347dd74c57f6c4bb75551bb6c4b2054f32257cb0985c1d7eefdb80b84793e21481b51e32827c77ef89e5939b169c7ee0a0f9b6ca66836cc
 MISC metadata.xml 341 BLAKE2B 56d3bff8ec2e7b01a76edaba7633edf4388b00976deab109ef3e34112f35878bfa81de9a32a2aacfdef5f3919fb0210a6c824c4d1242686eccaa7237f783b176 SHA512 652bff94a0b5050f6d8dffbc1dd2b0008202c9f6fd19aa44a148a53c7ed9cc78b8ed64ca4c548f60643b58954f1e344bea0a5b9fc28cd381daf2987ccbf6c149
diff --git a/dev-ruby/nokogumbo/nokogumbo-1.4.9.ebuild b/dev-ruby/nokogumbo/nokogumbo-1.4.9.ebuild
deleted file mode 100644
index 9783dd4da1b8..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-1.4.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=">=dev-libs/gumbo-0.10"
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.5-r1"
-
-each_ruby_configure() {
-	${RUBY} -Cext/nokogumboc extconf.rb || die
-	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumboc/Makefile || die
-}
-
-each_ruby_compile() {
-	emake -Cext/nokogumboc V=1
-	cp ext/nokogumboc/nokogumboc.so lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test-nokogumbo.rb || die
-}
diff --git a/dev-ruby/nokogumbo/nokogumbo-1.4.7.ebuild b/dev-ruby/nokogumbo/nokogumbo-1.5.0.ebuild
index 9783dd4da1b8..7ad6e455e8be 100644
--- a/dev-ruby/nokogumbo/nokogumbo-1.4.7.ebuild
+++ b/dev-ruby/nokogumbo/nokogumbo-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -24,6 +24,11 @@ RDEPEND+=">=dev-libs/gumbo-0.10"
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.5-r1"
 
+all_ruby_prepare() {
+	# Define rakehome in scope
+	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumboc/extconf.rb || die
+}
+
 each_ruby_configure() {
 	${RUBY} -Cext/nokogumboc extconf.rb || die
 	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumboc/Makefile || die