gentoo resync : 16.04.2022

4 files changed, 9 insertions, 217 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 559fb1dd9c66..e8a9f387dbfb 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,11 +1,7 @@
-DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
 DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b
-DIST nokogiri-1.13.0-git.tgz 6188433 BLAKE2B ec603e4202b03cc74ce73c540cfccab51f0910b24a3cde0ecbc6267a83c0c4898bc40614261727f7c7e52561d0dec679e00d97a9a0066ac436037a1681a4125b SHA512 f11169ab0dfec9b16e9fc32c066910dcc71325795283fac1372a67383535ddfd09bf342e2a82b129b71c058153f338cba30000ef16f85225f24b6d0c769c98cf
-DIST nokogiri-1.13.1-git.tgz 6190499 BLAKE2B daea484ee0e5bff581ae67528f1688002f1e2f550eb55e3164b631f9e87b188ec4152347aaa0ae6253feafbdae9182c54c92cb709c223ce04120ddd1b340cd17 SHA512 febb7b8a701c9be4f7b60a8b43bc24d17a37d39a8557ea4fc76d1490e7f9973d2a4516560f3335ba5d2405ae487e040e47fe24387a25e6c170e34719e9dd230c
 DIST nokogiri-1.13.3-git.tgz 6187128 BLAKE2B 7ab47b7e5d87a83eeaf9c5e10684199f67be1af80a5fa5d616cb4a3ffe91a9598be0576dc23d8f0cc6d143f8ce601a868e44af6411615f377cd43773659b25b8 SHA512 69666c1f62124a20fcfe3fa58091a463ed64d5a9c98355572c5822944ba6992fe1e150b694fa883d23605999f14065c5c59d7a34e2273041d9de416e42d75fb6
-EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B 020c0670608a63e9126d98e30a423aad9937e698fe3b3d55ccbade79d7cce323253a528db4eee0b3bcd86ec746e8be38b71e0316548f948e60f3d9b8ec0b7efc SHA512 017ce68216111061f5056dae14eff11c27a3665bf20e8f104f388a694fe1971d6548650d31d354fb99b0e6b8a5d45d20657e2b2d4bb88241aba059cdf8d50f4c
+DIST nokogiri-1.13.4-git.tgz 6249271 BLAKE2B bc8569a0c80e4efcedd6c5bb8a46c8504cc33ec3d2acdcefe2718047ffabef9404c76003cd279ac55e5a5fb17243af12c335b7d9e300b90d8a97e84015cf92bc SHA512 cca3e8558f8739cca2424e461a5e048a3675a23bcb6549f1c71ecfea0729859cda84ef3bf09a81d2b419e1a7b8ff2616a8dd84ac12f6e1f32b9626a0bd3e1bc4
 EBUILD nokogiri-1.12.5.ebuild 2685 BLAKE2B 4f8d05be10250cd7cd02a2a7af8de9674eabf71478fd52e36100dce1a73466d1ea2f19b2464808aff85c6d73bd2c9b65fc365a17e965a32c0d63b0aedae4d8c7 SHA512 dcea02c471e20c91a0d0d0ce6ed254c720ab7e60bbdb21f783e67625a890ddf4a53179cc11397270ad49d10e6829438b31e7ab7ee9d5061cafa06b346cf14121
-EBUILD nokogiri-1.13.0.ebuild 2692 BLAKE2B 196593084ea5c8bfb263319f21d4a04392e9619a09c67a8791d7c4c815a507a43fec72b75d0ee5c868248d6af96702db9a8222125d7afd067ff4c7b4019d7f4d SHA512 038b4ebf8871e1f6fdeb5b9ff4474ba29857d426fa0aba9fe7ee3be8795c8c4b127717fec3b3ccdf993d740764445a228f0530bd6c11dcc9dad484162af78fc7
-EBUILD nokogiri-1.13.1.ebuild 2692 BLAKE2B 196593084ea5c8bfb263319f21d4a04392e9619a09c67a8791d7c4c815a507a43fec72b75d0ee5c868248d6af96702db9a8222125d7afd067ff4c7b4019d7f4d SHA512 038b4ebf8871e1f6fdeb5b9ff4474ba29857d426fa0aba9fe7ee3be8795c8c4b127717fec3b3ccdf993d740764445a228f0530bd6c11dcc9dad484162af78fc7
 EBUILD nokogiri-1.13.3.ebuild 2670 BLAKE2B be891cc660a096b6840ec0493d728d1063177d40f4e28f21d32b638ba68014efb0290292e32e1a003a19075c0fda692af20b6072273a98dbd87eb24c2e3aa655 SHA512 95e0c59d03c5b7b3b8cee7987db2ceae63b51a8db74fdc669f6407449befd2a7568f04fc1e0839cdc41aa20b546f3560db74142e109b096feb8bec287c5c4a2f
+EBUILD nokogiri-1.13.4.ebuild 2663 BLAKE2B a8e536bdf3aa49df93a9ddc334cf31ed1615199399aee82a7c638c27793532f728501ab3e64428a0fcc99ba16a0ce412a9a49a6f6186d7cb39aa5ac2363e4bec SHA512 5dd6996572e55396fb73f942331ab7632d1b54b5c61cbba2c8f500aa98b0e9693be19cd79ebd5a8934280ea6b51e7b82627875774b553a070a7454db096f6376
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
deleted file mode 100644
index 4dac40ee475b..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
+++ /dev/null
@@ -1,107 +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 SECURITY.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 ~riscv ~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.12:=
-	>=dev-libs/libxslt-1.1.34
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.12
-	>=dev-libs/libxslt-1.1.34
-	sys-libs/zlib
-	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
-
-	# 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() {
-	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.13.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.1.ebuild
deleted file mode 100644
index 84744c5cfcbb..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-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 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.12:=
-	>=dev-libs/libxslt-1.1.34
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.12
-	>=dev-libs/libxslt-1.1.34
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.7
-	>=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
-
-	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
-	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
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.0.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
index 84744c5cfcbb..c125f5d9de48 100644
--- a/dev-ruby/nokogiri/nokogiri-1.13.0.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
 
@@ -18,26 +18,25 @@ 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 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.12:=
-	>=dev-libs/libxslt-1.1.34
+	>=dev-libs/libxml2-2.9.13:=
+	>=dev-libs/libxslt-1.1.35
 	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.12
-	>=dev-libs/libxslt-1.1.34
+	>=dev-libs/libxml2-2.9.13
+	>=dev-libs/libxslt-1.1.35
 	sys-libs/zlib
 	virtual/libiconv"
 
 ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
 
 ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.7
-	>=dev-ruby/pkg-config-1.1.7
+	dev-ruby/mini_portile2:2.8
 	>=dev-ruby/rexical-1.0.7
 	dev-ruby/rdoc
 	test? ( dev-ruby/minitest )"