gentoo resync : 15.12.2019

3 files changed, 3 insertions, 98 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index b0128cd03a23..54f239744bc1 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,3 @@
 DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
-DIST nokogiri-1.8.4-git.tgz 5754921 BLAKE2B 189dc8ffe4df67b04fa8436799bd6d64e4f8c1f93206b619bda8e153afffb3091fdfab9a3a4da28fcaa2650711aad6e37232e4e948a74c217f7fdc8b061dd4cd SHA512 ed409daeb4e13f93e13bc6901ee27bf5d1155e24fb306b5b9e8ba462517d26d4514413b9728d4a8f2514015c54436b9689a11449030c7bb5826d2ca7bf7eb97a
-EBUILD nokogiri-1.10.4.ebuild 2734 BLAKE2B 43c0635b63a384d4c075c599e8e19f5843277dcf8705fdad3c7f4442120061f5f6b83ccc1a768e72c7f76f995355d2350a03cecff412ecf1215c9aca58d5cd1c SHA512 ee6cee391d7e469d0b1f9d22f74303f02bccd4f3de80610daf2864f1516f39ab74ac0721fa5a7862c320d4becc0e602503ddc7eaa65ae3f2f7ae9cb4898a23d9
-EBUILD nokogiri-1.8.4.ebuild 2708 BLAKE2B 3a401d9aadb785b859c1e0e3bf8b3f881bf0d1c4cf7ea774e14a3e1a167b660e9af14b3227fdfc497aa6e7efdbf24a858e646f90c19d12d8991fd786568373f2 SHA512 bdaf3a9d581258635eeca61a37dc460f8f62eb45dfe0599596a07b5aa2ae7195d1a9e220986165d820f300d195707ad747f3577c6b1ede0523883dfa9a478f13
+EBUILD nokogiri-1.10.4.ebuild 2702 BLAKE2B 9c7c2294f03993f100a1f53e88b576feba760417fff9f19de9a803c815b4c7045717669242851a112696c0daabad4a40f8a30d93b1d725b48924cab7a7238849 SHA512 75d3ea4780533b3e9b81db82a53dd83268ba263ad8b446fca2c8a0574ef887bab509ecc2957715578eac56a4afe5b7d83604415a951a47ed80d41c8ba464380b
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
index ca9a935f953d..47633abb936c 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
@@ -16,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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
@@ -76,7 +76,7 @@ each_ruby_compile() {
 	emake -Cext/${PN} \
 		V=1 \
 		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
+		archflag="${LDFLAGS}"
 	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
 }
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
deleted file mode 100644
index 20c882ff2f74..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.8.4.ebuild
+++ /dev/null
@@ -1,93 +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"
-
-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 ~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/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
-}