gentoo auto-resync : 23:02:2025 - 19:24:09

3 files changed, 12 insertions, 106 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index fc1ba05e6e7b..f5b7ab7942c7 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,13 +1,11 @@
-DIST nokogiri-1.16.5-git.tgz 11014565 BLAKE2B 0158c23c1479a4c05074906afbb1f7507814f73702bf6c4f5dbf90d130ad61cbd89e9be2957c59dc3a2f5bf1023d625c7c435220e168d76dbc524d314175cd52 SHA512 822acaf88f838e4b2b1840187e62d9d4424a0e552a850a2349541c114f58f3ca1ca83df2d1d1323275bb6847b79ea4afc87b6282c8ebc56094f1eb8b57dda217
 DIST nokogiri-1.16.6-git.tgz 11014594 BLAKE2B 5a2becbbaf52d753569d778fcf2c84b521a30aa52abeb923970dbc8abea56277b807e70538032edfb883552c9385b7c225885cdbab111462f51a741a0b8d3bd5 SHA512 c90e0dcd9c90980344551a5b660e15cbdf1f42a139c123f936c728952f0d8d07f8ca4810cf6f8dd51070bff66398dca3cb29ed60f8e2242930233dd594efe843
-DIST nokogiri-1.16.7-git.tgz 11014702 BLAKE2B b300ceb73101c822df040ed99edcae3b1556ca8a9060b05b51107a949d562ffdd02349d2f771207ad6cb8aa6d17725b823f22b086acde638ad36e0ac36c75889 SHA512 6f4c28351bcf1d01e1892eaceb75a6af3fb8399c2cb18c9db1c2a2e65d87103d9a7f8ef4bf6396e2ab8ca6c178125999bd7273893cb43e6ce47c9e46cfb17462
 DIST nokogiri-1.16.8-git.tgz 11014909 BLAKE2B 55a580c96bb281bd57136488139f01dd5939b9fa8122104b6a19c92a121038215ba63d585e6e229b01b5779b650485cf6ff3585daa048173fc6f539d3b3c25a7 SHA512 bcfd72cd4b2b425d9615d7df095989b2ce39abb01eee3fa2d24e09b5f9f3e25d58879a95c3e869cebf6f6d3c0e94f7c2114da51218d2569d806223bd2654de86
 DIST nokogiri-1.17.2-git.tgz 11048266 BLAKE2B eb7c1b178d8fbb91e1b398e639a9a68d1b9e62af8de0d41e5b48e681f6359a4501734216431273f4e7d9d3e2aafee9cf9f0237c504e0b0f9cfc848d8cba2ef57 SHA512 9282f38feadd6139e99689706c045c6cc42ef71b7372a6c6d7e684faad6a40249a69553eaa7fbff4f7677e328b4d64b0ab7752415f574f21cca4e2e32ed75852
 DIST nokogiri-1.18.1-git.tgz 11051288 BLAKE2B 544d1cbcfb8e75ca499b93a68928dbeba678ba978e6f2bdd624537d7adb0508e8e0127f2ba4ac2f49be552ba1db932561059d30db65a9940da0ed329b9acf3e9 SHA512 3a099d0c5fec88b3728be150dc5a7a5d52e0b7d2f875e662eccc2fcb7dc4c5c140cf4fca14792d8329f196e3f1fc564af6791c48f693a08816ab977011a157fd
-EBUILD nokogiri-1.16.5.ebuild 2727 BLAKE2B bc5d3495278dad04af906d922471d091adf6bcff87a1d814552b9dbec01d70a0b9830b2ccdc62f44f8f43af46dac919060c6275941cf77c4fb49d88e31cb3509 SHA512 a9965e5ee0c8a0e1f73a68dbbbb0ae50c6d178ca5849dfff3baf019ef1f7953a1eaafec3118859daa6b3c453a6ed231632a48ccc6471fbf08e9d96fd94631c3b
+DIST nokogiri-1.18.3-git.tgz 11051462 BLAKE2B 122bd2d8ddbba09e7aded36a1125d6fa79ed60f7066488baa39cc1295edeb006cbea119e9edf193a635c8c131d1f3829088f30c6ebf49b0090672b8bdedadc60 SHA512 cccfa0caef34326924e21e24a205199503504a817467a65ba038af5f96ec10978e2c72948c5f28e3db0b1ae172c9d1e63de3ba71cab926956cf4596055606b6d
 EBUILD nokogiri-1.16.6.ebuild 2708 BLAKE2B 9fe762ce58838183c8dd1f56d039707da4c36718d29e738fb9f1188096e7bbe1801d21dec08f924cd0a00d7a7f19366777ec4252b70fcafee4f3b6f7d3448792 SHA512 4a8a2f6a6ae21b0e6ed4cc30126b6e9179a126b256dc2336fbaec344643bf657b963c448555f03c36d7ebbc9d6967fa50bf93a339b38ab48269debb844180c61
-EBUILD nokogiri-1.16.7.ebuild 2715 BLAKE2B c18f5e700a76e129a374e5f8552e08497452b080d58d7a28397c6fcc53e44a7b416eff121b23e97e5a2e7489eae6af0568da43bc83acf03ba108e0e0285ba705 SHA512 e0a38397eeb84aa8c9990fd18db894ab1e917142e3e175f7b18d676bfec9c6b88cc6f3b08378e9e01731ef8bc8b0e1fb36b0124b04ab46542b18c6b5329a99e0
 EBUILD nokogiri-1.16.8.ebuild 2710 BLAKE2B e7cb742d590bfa4e038c033eb15e1b24f87a6a67a5c7561549a73d71a88f4654b655da47956dc38d042832a9d547101a3fc5ed1e5a05a67a2abc51aa4a908e10 SHA512 b833efb0feaf85fb53ee402cead1f49e8a7d222912965174b722fb28ea01063d60033898047dc5f84f334c414af5060721f171e8c1f7ccf4fb81f73195627c0f
 EBUILD nokogiri-1.17.2.ebuild 2715 BLAKE2B fb36843b47690dfca0d1d45fd545c352d0109b57be1a449ad8b03b5f9fb65d7fe254458dbec61a80a4f3e842f438ac06ae5139cb6d38ad88047155123b16e009 SHA512 f5c442feb88014bb54994662d041b4ecbf3f2acb6ea8514c100cde3acb91a6b913446f11337622f46df25c900abfd7ff7c6067bbf084b32d812cb14b8f151efb
 EBUILD nokogiri-1.18.1.ebuild 2722 BLAKE2B 830c6690cb299ada4962dc8273faf3d136268e4fe442e6832e677b9c13d6f15a16981f967c373ad7416050506747fa4e3dd147e99406ada707d6acf73fe62ed1 SHA512 122e30d54a43b77dcb7f7a67448990e73ef34019572420bf1b0255cf7eb020ac169a6af81069f66f75f68578be509010c2168de02e8052a79ce81453d5f2339a
+EBUILD nokogiri-1.18.3.ebuild 2843 BLAKE2B 28b203d7fcff859146db3b32c90a347ce12f2fdac4a412ff3cdf8b8506e50c014ff035da71456f4214855e8891b8cd2f087f273b1f4f2bcaf56273ddabf279cb SHA512 26a4e0ba422739f89dd0db8ac750724c9af447fc9ca464f7d6c5062b54a5adab28bf17d1c422e823155a0527144d77765d28e4034deee6b50ac5b20bab2325d8
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild
deleted file mode 100644
index 9399f98f6e02..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-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://nokogiri.org/"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
-IUSE="test"
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.12.7
-	>=dev-libs/libxslt-1.1.39
-	>=sys-libs/zlib-1.3.1
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.12.7
-	>=dev-libs/libxslt-1.1.39
-	>=sys-libs/zlib-1.3.1
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.8
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
-
-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 '/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() {
-	MT_NO_PLUGINS=1 \
-	RUBY_MEMCHECK_RUNNING=true \
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.18.3.ebuild
index ae75d1819732..d2c26da6278d 100644
--- a/dev-ruby/nokogiri/nokogiri-1.16.7.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.18.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
 
@@ -23,13 +23,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390
 IUSE="test"
 
 RDEPEND="
-	>=dev-libs/libxml2-2.12.9
-	>=dev-libs/libxslt-1.1.39
+	>=dev-libs/libxml2-2.13.5
+	>=dev-libs/libxslt-1.1.42
 	>=sys-libs/zlib-1.3.1
 	virtual/libiconv"
 DEPEND="
-	>=dev-libs/libxml2-2.12.9
-	>=dev-libs/libxslt-1.1.39
+	>=dev-libs/libxml2-2.13.5
+	>=dev-libs/libxslt-1.1.42
 	>=sys-libs/zlib-1.3.1
 	virtual/libiconv"
 
@@ -57,6 +57,10 @@ all_ruby_prepare() {
 
 	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
 	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid a failing test already dropped upstream.
+	sed -e '128 s:^:#:' \
+		-i test/xml/test_document_encoding.rb || die
 }
 
 each_ruby_configure() {