5 files changed, 9 insertions, 104 deletions
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 60a9497e5f51..86e877d5b555 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,9 +1,7 @@
 DIST nokogiri-1.8.1-git.tgz 5747155 BLAKE2B 40eaa7506f646e47caced25e87c125f2650d69e7194491061f734de9d4b58ee3efcab202e528c8d416683bf1642b0f1e7cbeb7268e1fa32549ae2a427d55227d SHA512 fbd5e9c3edb0f7099ed7923ccb8922e778859ee1fb226c756f515f69c5f16cc4103644d4a569e16aa05374c6e94c691572255ea82af0002f95879ed396ccdc4a
-DIST nokogiri-1.8.2-git.tgz 5749541 BLAKE2B bb3baa299fd27caf43890a752f93cfc1aafd5897f19783cbc6732ce2924bf9c86639ccabad9f26506cf228f5c179afae4cde57150769780c30d9dfc3403359b0 SHA512 5f34f8a055844cd034682b11e4408fb12b60640e52ea64886a13cb5504d94904eace2a85d5047b21f946f1a296ee562ab3677791d53093123ac136062167294d
 DIST nokogiri-1.8.4-git.tgz 5754921 BLAKE2B 189dc8ffe4df67b04fa8436799bd6d64e4f8c1f93206b619bda8e153afffb3091fdfab9a3a4da28fcaa2650711aad6e37232e4e948a74c217f7fdc8b061dd4cd SHA512 ed409daeb4e13f93e13bc6901ee27bf5d1155e24fb306b5b9e8ba462517d26d4514413b9728d4a8f2514015c54436b9689a11449030c7bb5826d2ca7bf7eb97a
 DIST nokogiri-1.9.1-git.tgz 5784212 BLAKE2B 9055a954a52deb10e2a937267d7b382dd235885a44afe126c2770b415d4f6c26b851396a2f03898c335987eba7baf8b5aa1f5fb8ae1063b64c0a620b9ce7969e SHA512 8d0dc667c68b612ba481692a02cf32860f9cb180a831942789c56568e3b4c1bc89a21ac284cd4d406b183600c6aaf56cf7a3a104594bdbba22fa53f9af6525da
-EBUILD nokogiri-1.8.1.ebuild 2723 BLAKE2B fcbf50d99b8f9d291f06a54c81769f204ae40c0ddc12ffbd2fae56492ccbbc6e9d418cab04d397b37192f981bd3668ba72cc5a99e62ad486b1db7916c3db7794 SHA512 0b9afd7dfc9accefc1d426b14776ba56675d8272e1ece8ca4acb63866672a5a5613630f488e1d87a9ef04e73fa418ea30865202a5f27c1e124f83baa3a98191a
-EBUILD nokogiri-1.8.2.ebuild 2732 BLAKE2B c9daa660aca193ad32773a78dfe58bf43c40d04f64fb79909d58e81515eb50e2f2a8cb85040204512e6a5f85f6f101cb8cf9e3a30d3041c1354e30a1bdbb81ba SHA512 c95f2468c3ebf8d07dcc8daf485a070b8179312926bee6ed6a6b47494b1125228f96a9359b5707d979752a3f463cf713d63f119f0716209717279da5e971d843
-EBUILD nokogiri-1.8.4.ebuild 2725 BLAKE2B 76369d03a97c7bcf4d040a4f61ef731da24915ea37cf8c74975cb2088e761e4686f64f2dbf8a6ef38bf977acc4de4cea6e36071561887dae295b60b761f6427f SHA512 09316e636a3420aebe2d00fef7289ac04bf4e6f2d77aeb1a24a1b814f6f8de922c89c9cda110aaec9ba850a3d12e50a8831e58db2594f2b6738078645671849c
-EBUILD nokogiri-1.9.1.ebuild 2715 BLAKE2B e19bf8793e2dd24d6344ac2dba39cf62503a0c5602c55bc54b1ef51663b38b9bd0f2b06fe138561e65b4cf5ff6a34b2250e0e6d443136905bfbe20e1a7909730 SHA512 87e25d5e7d5b0d5a8843fcb6d1b890dcd03806b1c10b334f11149985618475de8f03e9292382a8cd16c3a8f5847bf71102a7f2ca305426e0c5984c5ef69290ca
+EBUILD nokogiri-1.8.1.ebuild 2725 BLAKE2B 40613f6afb0be7efe92e8ed3383f28eaab21e8a55ae01599a4e184338c89d027685e80a14a0f4e9dfe9552f7fbf5f6456768981257cc290f96bfe875112877f6 SHA512 73253964aef2742c73f83dfc3d0c35c1f1a223283e7ce60c6588ec67a2d1b9e31cc314bdda364337f60b887867fc14d194b45e6a7249d6bb1c075f846a512e91
+EBUILD nokogiri-1.8.4.ebuild 2725 BLAKE2B fc4323577459b70bdf18205ceee75b712a500cb059c4d56b33db74c919a10870a94a2097f62b226a813247927f437c82c4da6b51c5ce0784ad45ad0be2cd4517 SHA512 c10aa5ee54028076d39be2a98d3060b7b85864f407cc4c6f5727f55bb4017e5bde0ea7649945cc1b39a5682368323b00900bebb39fdc50fff3ac3cb2d308a172
+EBUILD nokogiri-1.9.1.ebuild 2721 BLAKE2B 48f3fcbe5698d765f2b6c8c62a82b494e1fe4e41026d3976a4fb37e4211894e152b318fb9415e366909a4ae3615abe76e4229f0606f17d567b3a16e1bf993e88 SHA512 a88f95b1a413f2c2e66304cd82d731bd201d014aa3bd0a9c066352c759e76f43fc7bb34c55eae7782897501597f8a24bdff8b7a95014b25e5dc5910ee7e4f36a
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
index 9b8b65cf490b..815029d28e4c 100644
--- a/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.8.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.8.2.ebuild
deleted file mode 100644
index 0f7deeca3c9c..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.8.2.ebuild
+++ /dev/null
@@ -1,93 +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 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.7:=
-	>=dev-libs/libxslt-1.1.30
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.7
-	>=dev-libs/libxslt-1.1.30
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	dev-ruby/hoe
-	>=dev-ruby/pkg-config-1.1.7
-	dev-ruby/rexical
-	dev-ruby/rdoc
-	dev-ruby/racc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
index 469b051ba010..92e808d009ea 100644
--- a/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
index c94e4fe91596..4e24138c5374 100644
--- a/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""