gentoo resync : 18.08.2019

3 files changed, 5 insertions, 100 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 8e56ec75f12b..048baec7d896 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
-DIST nokogiri-1.10.3-git.tgz 5792280 BLAKE2B e902a773d925bff9414e2aa5c561b2e315144f9ee56f6186a0585a390af8db52725a960c747acd71e174d896d60d555568bd85a314735de72c75b74f76a40c30 SHA512 88c408cb25cc7e4fff9cf74ec8d3a15aeaeef8754c1172fb2cb4c0cb8b8b7419a47e6a2ec54ff9b1faa2bfdf0b287f05d429d8dfc9d2054125c488ca234b80cc
+DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
 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.10.3.ebuild 2714 BLAKE2B 9868bd84b2bbcad890cb1c8015a2ab0321fc3a28db414dfde9d72e1955c4b7f133177f639e0dcb01b5dabc7c661abd83c0a963dc90a9a3ee4c755f8da7a9955f SHA512 81793807b1f460bb25d512723198f24555590e7cb234cbe91351bcafec711952e475764a3bcf6b1b5cc5c9b6165de3c1c46ff7efe7cd96a7d9f339bb816ef50d
+EBUILD nokogiri-1.10.4.ebuild 2684 BLAKE2B c8874e049bbf647c3dfe269fbe6261cb6289cc0ca3e27b9e15379c8f74c0d5ca132d4bc9e90af44796e33f86054ea0e2130c11024a5f7fcd3b0131fb95cd9478 SHA512 858780bda9beea3c1d42977d29cb466448454a7da24770e5114bf17a3a15e8a6fb3c5e7d6bd68172f2700d740bbf900601ac59f03cf3a5feac1b62dc7e9673e2
 EBUILD nokogiri-1.8.4.ebuild 2718 BLAKE2B a97aef540279f6b0b17684a3b0a9fc22099e4ba7889fa933b5606adbceeb0dabdeb85f53e5139bfa099c529e1a53dc95a52a47e192dcf6bff7bc070ba68413db SHA512 3354d796753f1f05645dd966ea1fd4d0d75c92abd840a76659b0915496bb43ee3ae32218d6276ce9e52e2a4eca5d6b9a0bd3c9e679c87031afc12a8a5d0d57fb
-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.10.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
index 7ae8cea09431..de747099c26c 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.3.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 USE_RUBY="ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
 
 RUBY_FAKEGEM_EXTRAINSTALL="ext"
@@ -17,7 +16,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 ~s390 ~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=""
 
@@ -32,7 +31,7 @@ DEPEND="${DEPEND}
 
 ruby_add_bdepend "
 	>=dev-ruby/pkg-config-1.1.7
-	dev-ruby/rexical
+	>=dev-ruby/rexical-1.0.7
 	dev-ruby/rdoc
 	dev-ruby/racc
 	test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
deleted file mode 100644
index 4e24138c5374..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
+++ /dev/null
@@ -1,92 +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="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 ~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=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.8:=
-	>=dev-libs/libxslt-1.1.30
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.8
-	>=dev-libs/libxslt-1.1.30
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	>=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
-}