3 files changed, 107 insertions, 0 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0a45d0d9a249..b9327c3032ac 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index c0f8583c50d5..bd261290643d 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -3,5 +3,6 @@ AUX jekyll-4.3.2-no-safe_yaml.patch 16966 BLAKE2B 4af96af3bc4c60836639ccdb2ffb58
 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.ebuild 3204 BLAKE2B c92ba4e0dff17272d68074a9c6c073091a9e39a76c54a32e9f45e9362a06aa1afb22354848d027863a7d0e22d19b92c458af72391544b66edca2572401c56e50 SHA512 b11742502fca83f675c0bda7874dfdaf526756e630eb8041888deabcd67994d6a94cbceb1b9438045c5e2faf1329bec8ab388389b7c3aec64421d84cc1531b8c
 MISC metadata.xml 246 BLAKE2B a1eee8b457925c68b280d73349fa5bfff1639a1b7c1763bb38f9c43680a0cedfaf583b776820211cf3992ea83e983c237e00be9340b4d64a72775f0c4014ff54 SHA512 7ccb92985f1a956a36f408671063aac1ef02e2e8284cba45ae636dd23dd085087f452b9a96c3bbbcff5d809e4559fc8ba653b3198eb995baf1f217f20e893303
diff --git a/www-apps/jekyll/jekyll-4.3.2-r2.ebuild b/www-apps/jekyll/jekyll-4.3.2-r2.ebuild
new file mode 100644
index 000000000000..06180b8f59ed
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.3.2-r2.ebuild
@@ -0,0 +1,106 @@
+# 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 )
+	>=dev-ruby/webrick-1.7:0
+	>=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
+}