gentoo auto-resync : 13:12:2023 - 17:45:55

3 files changed, 4 insertions, 108 deletions

diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index e5efd0f9675e..843a37c1d386 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -2,6 +2,5 @@ AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f4
 AUX jekyll-4.3.2-no-safe_yaml.patch 16966 BLAKE2B 4af96af3bc4c60836639ccdb2ffb58331b807eac04711a899a4b72357e989b6fb06767d9fa605d403ead822ef8363a31a076e825383dc40ab03491f0a4d134e9 SHA512 6333d0cb148ba3c9edb56915bc3b48fbe064bab4d9289289491129d8750f22fbf925730fb9ca9cefc0b7a58550e5b1a8e5b5ba5a5487accc7dc64fc16ea13eba
 AUX jekyll-4.3.2-sass.patch 4212 BLAKE2B 32c9764cf97e0c925eeee64ce10c6e6af8858199f588149dc33010814882b27a0886bb46d53ab9c82ae9639f9dc3cac63711240046723b42d39f0902837d7a90 SHA512 b7444d33cc0e98d1f53c0fd17a33a9a411621122e29793f1efdaf3f41bdcaf188ba8e0308b77d941250bd3183b8306e410f0b1ea959b927be2d214ff9db480b9
 DIST jekyll-4.3.2.tar.gz 1447970 BLAKE2B 8f722c363483d937198f5ac1abbca3aa59f754f66106d4355c59da541cce218704ee3976af2842e6b2f58d367eb80caa376612f73c84032ac5a2aa3076f6d007 SHA512 865bffe97683a4765a16b6eb9ec1bbbb5d2567699ad343360e101d3cae81187ea0f218b67d13a1121213fc49269475935fe0322d8b0f052c868536d5aaa0f7ab
-EBUILD jekyll-4.3.2-r1.ebuild 3234 BLAKE2B 478ecf83bb5c628a90fc4dd960425cdc8b71f6e48c92f4323ce2de5048b67c8ade6bc155366bd58e7f23bab97c9042ab8c74a17300f34ee683daf8a333bec0ca SHA512 1d5a55f940542dda74c77c75bcae5822ff7e7a95d95ae3f55123a3778018423992f5ff53d7877ac020bc241e68931b429f0616f5c8d9414cd4c00df0f33de075
-EBUILD jekyll-4.3.2-r2.ebuild 3260 BLAKE2B 02294f9e676897df0f1cfb57dd85cb0c93c6781577502d1f4b9da697379a071136cd7254055f820a88eea04ae239408848389f05845eaf177481e81e95663ba4 SHA512 c2029c8df383b2389388031e69ecfb4b256c621b4ee5960112461c88ff7853e8881fc1e8cc3d12d38f148fc65fdad4731aead1b4bb18653e38ffe93a2f316d26
+EBUILD jekyll-4.3.2-r2.ebuild 3341 BLAKE2B efb028425c91ebe791f78b6b9d91f898c943621ef65e823fe106a125ea5f3cb1e7a4dd6c4754c8bc1a4b7b95f5ed3c0070e7a56927f6a0808f6cb3d301834cbd SHA512 84504486177bd47db26bff0b863e5fe112fdab242891e3e28597369f8b57070d74a109050bff6a8ed491b04ec3e30c544f842df85dab1bb7e5f6d082cbd964de
 MISC metadata.xml 246 BLAKE2B a1eee8b457925c68b280d73349fa5bfff1639a1b7c1763bb38f9c43680a0cedfaf583b776820211cf3992ea83e983c237e00be9340b4d64a72775f0c4014ff54 SHA512 7ccb92985f1a956a36f408671063aac1ef02e2e8284cba45ae636dd23dd085087f452b9a96c3bbbcff5d809e4559fc8ba653b3198eb995baf1f217f20e893303
diff --git a/www-apps/jekyll/jekyll-4.3.2-r1.ebuild b/www-apps/jekyll/jekyll-4.3.2-r1.ebuild
deleted file mode 100644
index 77ab81b36060..000000000000
--- a/www-apps/jekyll/jekyll-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="Simple, blog aware, static site generator"
-HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4
-	>=dev-ruby/colorator-1.0
-	>=dev-ruby/em-websocket-0.5
-	dev-ruby/i18n:1
-	>=dev-ruby/kramdown-2.3:2
-	dev-ruby/kramdown-parser-gfm:1
-	dev-ruby/liquid:4
-	>=dev-ruby/mercenary-0.4.0
-	>=dev-ruby/pathutil-0.9
-	|| ( dev-ruby/rouge:4 dev-ruby/rouge:2 )
-	|| ( dev-ruby/terminal-table:3 dev-ruby/terminal-table:2 )
-	>=www-apps/jekyll-sass-converter-2.0
-	>=www-apps/jekyll-watch-2.2.1-r1
-"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/httpclient
-		dev-ruby/kramdown-syntax-coderay
-		dev-ruby/launchy
-		dev-ruby/nokogiri
-		>=dev-ruby/rdiscount-2.0
-		>=dev-ruby/redcarpet-3.2.3
-		dev-ruby/rspec-mocks
-		>=dev-ruby/shoulda-3
-		dev-ruby/test-unit:2
-		www-apps/jekyll-coffeescript
-	)
-"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
-	eapply -R "${FILESDIR}/${P}-sass.patch"
-	eapply "${FILESDIR}"/jekyll-4.3.2-no-safe_yaml.patch
-
-	# Drop tests requiring bundler
-	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
-	rm test/test_plugin_manager.rb || die
-
-	# Drop tests requiring classifier-reborn (ruby27-only package)
-	rm -f test/test_related_posts.rb || die
-
-	# Replace git command in gemspec
-	sed -e 's/git ls-files/find -not -type d -print/' \
-		-e 's:_relative ": "./:' \
-		-i $RUBY_FAKEGEM_GEMSPEC || die
-
-	# FIXMEs:
-	# fails to find fixtures because this requires bundler
-	rm -f test/test_theme.rb || die
-	rm -f test/test_theme_{assets_reader,data_reader,drop}.rb || die
-	sed -i -e '/^    should.*theme/,/^    end$/d' \
-		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
-	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
-	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
-	# partially requires 'toml'
-	rm test/test_configuration.rb || die
-	# pygments tests fail because of line numbering
-	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
-	#sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
-
-	# Tries to use bundler and install packages.
-	rm -f test/test_new_command.rb || die
-
-	# Fails due to ordering differences in ruby 3.0
-	sed -e '/convert drop to json/askip "hash ordering with ruby 3"' \
-		-i test/test_filters.rb || die
-
-	# Avoid a test failing due to TZ differences
-	sed -e '/contain the proper page data to mimic the post liquid/askip "TZ difference"' \
-		-i test/test_excerpt.rb || die
-
-	# Confused by network-sandbox
-	sed -e "/return true if there's internet/askip \"Confused by network-sandbox\"" \
-		-i test/test_utils.rb || die
-}
-
-src_test() {
-	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
-
-	ruby-ng_src_test
-}
diff --git a/www-apps/jekyll/jekyll-4.3.2-r2.ebuild b/www-apps/jekyll/jekyll-4.3.2-r2.ebuild
index 06180b8f59ed..84ba36456c6e 100644
--- a/www-apps/jekyll/jekyll-4.3.2-r2.ebuild
+++ b/www-apps/jekyll/jekyll-4.3.2-r2.ebuild
@@ -39,7 +39,6 @@ ruby_add_rdepend "
 "
 ruby_add_bdepend "
 	test? (
-		dev-ruby/httpclient
 		dev-ruby/kramdown-syntax-coderay
 		dev-ruby/launchy
 		dev-ruby/nokogiri
@@ -97,6 +96,9 @@ all_ruby_prepare() {
 	# Confused by network-sandbox
 	sed -e "/return true if there's internet/askip \"Confused by network-sandbox\"" \
 		-i test/test_utils.rb || die
+
+	# Avoid tests requiring unmaintained and broken httpclient
+	rm -f test/test_commands_serve.rb || die
 }
 
 src_test() {