gentoo auto-resync : 30:04:2023 - 11:17:09

4 files changed, 6 insertions, 103 deletions

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 296720cb3440..db4c167eed36 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
-DIST nokogiri-1.13.10-git.tgz 6236674 BLAKE2B 043a08ab969aac1f1fada730b8df11c295b28c9b9c41bd311cedc1d20064c61b2838489c67b8513c98736377defe33cd171b9ff3846f56af450caee4327e7727 SHA512 c9a4b14cb92c4920872048991c958036d5f09b8e231a6f6408e5d3c5df78b70e206cc12b8ed8aaae012e51f6f87adcbe46273cd1feca082ec17f42114f5a1172
 DIST nokogiri-1.14.2-git.tgz 10446957 BLAKE2B 0c72c520642bfa3e69a38f5dba8783a4f749d6ab97cf7531432fcd1f5dfba0aeebd2bf49dfa07aed601093f8ad88bc3dfb57c1a901c7e140aa8265749f4ad724 SHA512 18f16e5609e251c6e08787616aa3f444dac1f5f9d9e3bf8f21ce3b95870ce133187d0df02d03ee854fc87a3da04f886600667cec6832c8e8cfe87c6114672916
 DIST nokogiri-1.14.3-git.tgz 10446988 BLAKE2B e93caad3b807e74b79204d3272c52d1a33ce2189b65de8d126b0b7476edc1b4b0c4fcd1142c38e40beeab56bcaa605ba7d30f9777542979d60e2e5dda3877eb7 SHA512 93ebc7118e364eaa97030a10cd6dc5b4312483a432f267d65b6a091b22dd355d0c1a490b336981f1b284059ba3420c73d31254a91531f295a60583db26a0d331
-EBUILD nokogiri-1.13.10.ebuild 2672 BLAKE2B cbefa7feed0f6318e060996f30613866c8832b004a8ee7abfd811dcc98c5c2ee05d1a5337076d2a60c93c0171d3f70c53b085d4b31f38f3a50ca2f52dc0ded5f SHA512 2bf4ee868314eccdc43a78f3506991e7cf876604ecc507607204d80d77328e40effc845c56cb943f5a156cea1a399dd282dc9a454e687e007aed63fc544ead01
-EBUILD nokogiri-1.14.2-r1.ebuild 2692 BLAKE2B 48420f2e3bffb85455be580c67479ef20690d0733e810a9bbd1b00a2ec971e6ee91a0f01ddf13de071d6f23de6f3d20ace730a88cb6f7eaa731757428cd48fc2 SHA512 b9c8824dbc1ed1cdc53c39fe4fb9ebb3e4e140f125c1c4800cee8656c92075614af05cd7397d7d072bef23759df61561996f9d80fff416e9cdceab6b1b4e4940
-EBUILD nokogiri-1.14.3.ebuild 2699 BLAKE2B d6f54b23fb9aac1feb2e2ce5f4d3e12b97464bfb90ef5cf4686db021cb73dd4107cc6b32077fafbdbec0edcb07eaf03c04688260bbf5b70b57ff6db32e7b92b3 SHA512 d934b4b3928fb889062a61e443d2feea92d839f1b2494757664b8e32778a382bc87b1a66d2ce197907c15953fd32e9671834cc6189734b7d73c390946c2f3f26
+EBUILD nokogiri-1.14.2-r1.ebuild 2740 BLAKE2B 4a6c0e5c63be5e12f7843d42a566d657b4fdbf157caf75a9d54df728cd37b45781aa1872bac7fb07652b3a236eccb246e1c147e69b8e04ff15b1a29c368e1f87 SHA512 1c8c996ef2a6dca3b1db6b47195b3ff0b9b385cc3a674e1d5d7176b247e41266baf1395cf5637919151366435b484d1152b05d455092d34df82df7478ddbda66
+EBUILD nokogiri-1.14.3.ebuild 2747 BLAKE2B e890005b1d00f743ef4a52b750df2172bb81e4128a9168fa48f0ea20f2d6fa990a5e2f009de2f94d22a8c5dd95cfd9cc74cea9cfc7275e73b3dee00af86baacb SHA512 aa11ee6b723d73e994f349f9cc3820395f7ea1a8243f7aa82a0eee338831a0344a88e293810a2d9de59432531e63c98eefeca69d2891aa484fca54905f80cad7
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.10.ebuild
deleted file mode 100644
index 1d25771a5076..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.10.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-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 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.10.3:=
-	>=dev-libs/libxslt-1.1.37
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.10.3
-	>=dev-libs/libxslt-1.1.37
-	>=sys-libs/zlib-1.2.13
-	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 )"
-
-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.14.2-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
index f11567283f61..a64e527cfdbc 100644
--- a/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.14.2-r1.ebuild
@@ -23,12 +23,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.10.3:=
+	>=dev-libs/libxml2-2.10.3:= =dev-libs/libxml2-2.10*
 	>=dev-libs/libxslt-1.1.37
 	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.10.3
+	>=dev-libs/libxml2-2.10.3 =dev-libs/libxml2-2.10*
 	>=dev-libs/libxslt-1.1.37
 	>=sys-libs/zlib-1.2.13
 	virtual/libiconv"
diff --git a/dev-ruby/nokogiri/nokogiri-1.14.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.14.3.ebuild
index b190e6e12ed9..93cc6858ddc9 100644
--- a/dev-ruby/nokogiri/nokogiri-1.14.3.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.14.3.ebuild
@@ -23,12 +23,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.10.4:=
+	>=dev-libs/libxml2-2.10.4:= =dev-libs/libxml2-2.10*
 	>=dev-libs/libxslt-1.1.37
 	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.10.4
+	>=dev-libs/libxml2-2.10.4 =dev-libs/libxml2-2.10*
 	>=dev-libs/libxslt-1.1.37
 	>=sys-libs/zlib-1.2.13
 	virtual/libiconv"