gentoo resync : 29.12.2022

4 files changed, 7 insertions, 194 deletions

diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 3fd2c2b722ff..87dba2befa51 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,7 +1,4 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
-DIST jekyll-4.1.1.tar.gz 1398438 BLAKE2B ac207d58b155e069fda40b4598d441d8fb88f22e85740082829d018dc9cefe51ca636b23a6207c37711c4d26e078f6e4913946599f0200b8e8cb065a9ceff952 SHA512 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
-DIST jekyll-4.2.0.tar.gz 1412419 BLAKE2B 351852b52abc227f8e1eedeeef0871a593d66ffc95f4ed644441f81e841582ab9f393b206f049107daa7e9deaa63d36359ff8d0b47c69b629dda2ea462cd0481 SHA512 aee4d832631a285c3d37576b5f3d80073b56afefcb8c8a19a74435ce431b606b5cedc28a02c8e3930f9bc35ab432c952f96e1878b3bee6b9d33fbd01f0a147ec
-EBUILD jekyll-4.1.1.ebuild 2478 BLAKE2B 7ebfa111013b93c0f930c1ee67a0a7b72b70e9c3084b6781dbb2192742720e3c5d408e7189489e51d3afbfd6f5d6e3df24fc09d979eb15f9a73713675c349ffc SHA512 20d1db68d598c41702f1dafb9c6ced88b93e0f4db63f67349a7e179b35fff6fe75c21caf8a8b566204d6d403c5a2f040d375c62358b5f125b258d1b14577120b
-EBUILD jekyll-4.2.0-r1.ebuild 2561 BLAKE2B a852d27dc158b9834820f5fc016054a09fc4251501608221f20cdc81e15618a094b1b1fa3faf2724335f1943411dff67d546b91cfba3286c062944e769dd0d78 SHA512 1d153c79191ac02f172474ea24a0f1d3a2afc88ae20ef02b4c8400d70f72020b604711460d4da20cee73fbf4ac1a8471200d88d679a8a7962601d25e86bda07e
-EBUILD jekyll-4.2.0.ebuild 2668 BLAKE2B 15d02fc712b298690f2422f274e68c0ac715a79384e03bc48fef0c21774c6f25d6c7e4972e42d95c2d15263c1d6d8f5a9d513f558edcb0e60416e3e5b1e798c0 SHA512 9145422d7e5e498d963618341951cdade141d79fff21c7307a175ef740346f80756906e1d8a4526aa892e8dd3b55d26cc7e6bdb6e33c5da52e4f440097d00b72
+DIST jekyll-4.2.2.tar.gz 1413485 BLAKE2B 08f4b8b72aecc19d5c8d7bd29897d88edb66ce82b172306ee4fe356a5d2598362f3946354eaa3701f14df0f97e7fc95361b5cc59ec8820703c879bcf05e6331a SHA512 3c72a24a2193493c9e417a05a113fa85889abd8df4d4c114fdc082e40de81d24824e3c4e41ecb3633ef780d4e3f3b0ab091c5f4234326a83b1a8a3da543275ff
+EBUILD jekyll-4.2.2.ebuild 2555 BLAKE2B f1e9c75954dbcb44206da685fff391b4354aee04447c5d4a900a8314a3bc55d98f6ac770e54368407b89a99f87e9455250c7c00c174dca230e7bfaed99da032a SHA512 35deb5e1c8ee963a635e5cc4c1841fb7011da5117ec5a2455aa4611065f1f0701166814d68e3649f5f7d758d7a8982093914040e0e977437248a5f8a67f42ab2
 MISC metadata.xml 169 BLAKE2B 4307ce25f2199f9cb772e7740a911318479c0a7c122eb2c91e5c908e1e51bde7c261d0c9681dcb5095d0c8d9dc97c5ae40787c13ca971f705c5b471bbb1ce6b1 SHA512 9d7035f8acb273b0b044a4d8d04b395ddef6d5eb62333af0c232b7bdc112d90d5fd88913a60d4e0e1206d113d5cea77b5ece4defa421af52b2bcf3bf7e35d7f1
diff --git a/www-apps/jekyll/jekyll-4.1.1.ebuild b/www-apps/jekyll/jekyll-4.1.1.ebuild
deleted file mode 100644
index f6aebf2bdafd..000000000000
--- a/www-apps/jekyll/jekyll-4.1.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="A 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.1: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-3*
-	>=dev-ruby/safe_yaml-1.0
-	>=dev-ruby/terminal-table-1.8:0
-	>=www-apps/jekyll-sass-converter-2.0
-	>=www-apps/jekyll-watch-2.0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/classifier-reborn-2.1.0
-		dev-ruby/launchy
-		>=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
-
-	# Drop tests requiring bundler
-	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
-	rm test/test_plugin_manager.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 test/test_theme.rb || die
-	rm test/test_theme_assets_reader.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
-}
-
-src_test() {
-	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
-
-	ruby-ng_src_test
-}
diff --git a/www-apps/jekyll/jekyll-4.2.0.ebuild b/www-apps/jekyll/jekyll-4.2.0.ebuild
deleted file mode 100644
index 8affdcb77943..000000000000
--- a/www-apps/jekyll/jekyll-4.2.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-DESCRIPTION="A 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.1: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-3*
-	>=dev-ruby/safe_yaml-1.0
-	>=dev-ruby/terminal-table-1.8:0
-	>=www-apps/jekyll-sass-converter-2.0
-	>=www-apps/jekyll-watch-2.0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/classifier-reborn-2.1.0
-		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() {
-	# reported upstream https://github.com/jekyll/jekyll/issues/8556
-	eapply "${FILESDIR}"/jekyll-missingdep.patch
-	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
-
-	# Drop tests requiring bundler
-	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
-	rm test/test_plugin_manager.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 test/test_theme.rb || die
-	rm test/test_theme_assets_reader.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
-}
-
-src_test() {
-	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
-
-	ruby-ng_src_test
-}
diff --git a/www-apps/jekyll/jekyll-4.2.0-r1.ebuild b/www-apps/jekyll/jekyll-4.2.2.ebuild
index 40520250a3c6..f7a34488c3e2 100644
--- a/www-apps/jekyll/jekyll-4.2.0-r1.ebuild
+++ b/www-apps/jekyll/jekyll-4.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 
 inherit ruby-fakegem
 
@@ -28,14 +28,14 @@ ruby_add_rdepend "
 	>=dev-ruby/colorator-1.0
 	>=dev-ruby/em-websocket-0.5
 	dev-ruby/i18n:1
-	>=dev-ruby/kramdown-2.1:2
+	>=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-3*
 	>=dev-ruby/safe_yaml-1.0
-	>=dev-ruby/terminal-table-1.8:0
+	dev-ruby/terminal-table:2
 	>=www-apps/jekyll-sass-converter-2.0
 	>=www-apps/jekyll-watch-2.2.1-r1
 "