gentoo resync : 22.05.2021

4 files changed, 15 insertions, 112 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 223dee521313..b2f1102e0246 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,8 +1,7 @@
 DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
-DIST nokogiri-1.11.2-git.tgz 5838718 BLAKE2B 2310ce25699e1afa507e4428fc2d698018cc2e07590f85a9f97954c583b02122f2356e87537b3b5d11459373582fb3dc367a4d7969dc871e86065b739becc80f SHA512 9d155647fd400ad34c05c0b0e7c3d459eea07c68cbe829b5021e5040c034d7032c0e8878121d54d3b3d1233dbe8a1c0c195d6189a84aac30e68657b82b4f1eaa
-DIST nokogiri-1.11.3-git.tgz 5868894 BLAKE2B 3140c875535f3ceb7e13b27c4905c7caeae09acc8319a8649066469936fccba311a25a4923fdd5042d8af69144d606fd58f8b22a6d1fe3030ca30f4316d91448 SHA512 7a0d2197f1dcc67adcae7219891cc59cfdb3234e5a7b843686b1dd7d02bbcc57a2b7589ea880f856ee630a0335053bada02b99ac2d994d785baba266f994e20c
+DIST nokogiri-1.11.4-git.tgz 5867481 BLAKE2B d9b0df4d6301a510824f8f31bd51e0f3beaf3cf7d3685a703782ae5fab0667b6276c0ccea20032252efc6c2dd6515577fcb21942f5d27a65815bc48f8af91137 SHA512 ca4bf385b06416f5a5b7f8fd742739181cccf93b42590c7d2d4f666846fd3a25d45c16717ae50bacd85e25644efe8584e195df7174450b8a59f2c6ef47624354
+DIST nokogiri-1.11.5-git.tgz 5869095 BLAKE2B b5ab85a22adf1a5e6f7f3f57b433c723a34eb17cbfd5d667f56fd439700ff72068212b3a831d5798ed627ebd115d2a0297bd83b54977473ac9f217af04c46296 SHA512 d82f620875416a77727dea600dd17bf0a3c126fdc6f9b9a2cc7cf3f182a8eb14302e167bc397d04dcadcfffbc400369d5aa66f0fee7f5e285414e454059b95ba
 EBUILD nokogiri-1.11.1-r1.ebuild 2883 BLAKE2B f57e4f27c25dce68560d50bdaad3fbe31833088bc0b4d486e3fc1036e2ebcfa5c2e449babd9a6cb79bf70dfb3eedda2011dbedb1ddf354b6abd8921b4a4be437 SHA512 22bee11c3b28a0be289c884f92a6ddab91afb45e40b6044bf0275e16698a2afbeb9c9a28775d788a8bfccba38028615e86ea32834ccf249c58b2dc8e3113bf57
-EBUILD nokogiri-1.11.1-r2.ebuild 2948 BLAKE2B c1af732e42d94ab8251464ecbd9a9612115f1d3e02e46c14ce8b1c0e8612be61718994ab65f0538c6aae1dfe68f7a4ad50d4935ba6ce26edcecfeaa017a91721 SHA512 7fa73f106b6c82eb43eaa223ca6a653b7fa4d2535bf46b10c38451a7d04ace31e3bd5ba2a249ba37fd556a22ec25bfa76108826802d5548139417a77b3bfaef8
-EBUILD nokogiri-1.11.2.ebuild 2938 BLAKE2B cc021ee4875686e30f06a142e8966ce28a85c17c81f7f1c60cfdf03af3ffd75ee3a5bd1fedfb13a41b97c4631323ace4e0beb772f9b78927f04dc641f574a2e1 SHA512 9c508357a027fbea0ec4d26820cc8b2049790741d88ccd6e55b802949d96191fdffedeb1ab0c040e2f78485aec9e4deee802cd9708270e7be37fe943697c27de
-EBUILD nokogiri-1.11.3.ebuild 2938 BLAKE2B cc021ee4875686e30f06a142e8966ce28a85c17c81f7f1c60cfdf03af3ffd75ee3a5bd1fedfb13a41b97c4631323ace4e0beb772f9b78927f04dc641f574a2e1 SHA512 9c508357a027fbea0ec4d26820cc8b2049790741d88ccd6e55b802949d96191fdffedeb1ab0c040e2f78485aec9e4deee802cd9708270e7be37fe943697c27de
+EBUILD nokogiri-1.11.4.ebuild 3110 BLAKE2B 18db2d2b23e97bc8aaecdf83e59868f18541a18328418078a65e56daabf870cf1e8ec5416f71dfbd6ad95e1debcfc15a880939a1598c93333581c4d19bd8f77d SHA512 783a90acfc6d6c3f831320b595fc7af338697b99e1acedec4a6ebe891da09a3a5e8f84cc8a21d76b4c565c7949f8e971cc0c9021468522312fb08e80c63bd7cc
+EBUILD nokogiri-1.11.5.ebuild 3117 BLAKE2B 2904a64ee1a6fb65b9c37f906ce146479e48e5347a03e9939fbc22618a9569a75c49ffb96f5667b95a58b004d4cd0a1d7d61d60d4642cbb11eb98e30c414fa14 SHA512 d0a1e864dea2713ff0b6bf86e59a3e31c795b291cdd95940bebd99681cbb71b9e95a427004399caa2a59d2b0e4c68c236588c2e3a026481ebb93cb5393bb3a4a
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r2.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r2.ebuild
deleted file mode 100644
index 5929953673f6..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-inherit ruby-fakegem 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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.10:=
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.10
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.7
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	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
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || 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() {
-	each_fakegem_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
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
index 66e091dead9d..6968b0b8646c 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.3.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
@@ -20,16 +20,16 @@ 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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.10:=
+	>=dev-libs/libxml2-2.9.12:=
 	>=dev-libs/libxslt-1.1.34
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.10
+	>=dev-libs/libxml2-2.9.12
 	>=dev-libs/libxslt-1.1.34
 	virtual/libiconv"
 
@@ -57,6 +57,9 @@ all_ruby_prepare() {
 		-i test/helper.rb || die
 
 	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Account for fix making it upstream into our libxml2 system version
+	sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.5.ebuild
index 66e091dead9d..a12fe2fd24d7 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.2.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.5.ebuild
@@ -25,11 +25,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.10:=
+	>=dev-libs/libxml2-2.9.12:=
 	>=dev-libs/libxslt-1.1.34
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.10
+	>=dev-libs/libxml2-2.9.12
 	>=dev-libs/libxslt-1.1.34
 	virtual/libiconv"
 
@@ -57,6 +57,9 @@ all_ruby_prepare() {
 		-i test/helper.rb || die
 
 	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Account for fix making it upstream into our libxml2 system version
+	sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die
 }
 
 each_ruby_configure() {