diff options
Diffstat (limited to 'www-apps/jekyll')
| -rw-r--r-- | www-apps/jekyll/Manifest | 4 | ||||
| -rw-r--r-- | www-apps/jekyll/jekyll-4.3.2.ebuild (renamed from www-apps/jekyll/jekyll-4.2.2.ebuild) | 25 |
2 files changed, 20 insertions, 9 deletions
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest index e12438a243bf..bbf70f323910 100644 --- a/www-apps/jekyll/Manifest +++ b/www-apps/jekyll/Manifest @@ -1,4 +1,4 @@ AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0 -DIST jekyll-4.2.2.tar.gz 1413485 BLAKE2B 08f4b8b72aecc19d5c8d7bd29897d88edb66ce82b172306ee4fe356a5d2598362f3946354eaa3701f14df0f97e7fc95361b5cc59ec8820703c879bcf05e6331a SHA512 3c72a24a2193493c9e417a05a113fa85889abd8df4d4c114fdc082e40de81d24824e3c4e41ecb3633ef780d4e3f3b0ab091c5f4234326a83b1a8a3da543275ff -EBUILD jekyll-4.2.2.ebuild 2555 BLAKE2B f1e9c75954dbcb44206da685fff391b4354aee04447c5d4a900a8314a3bc55d98f6ac770e54368407b89a99f87e9455250c7c00c174dca230e7bfaed99da032a SHA512 35deb5e1c8ee963a635e5cc4c1841fb7011da5117ec5a2455aa4611065f1f0701166814d68e3649f5f7d758d7a8982093914040e0e977437248a5f8a67f42ab2 +DIST jekyll-4.3.2.tar.gz 1447970 BLAKE2B 8f722c363483d937198f5ac1abbca3aa59f754f66106d4355c59da541cce218704ee3976af2842e6b2f58d367eb80caa376612f73c84032ac5a2aa3076f6d007 SHA512 865bffe97683a4765a16b6eb9ec1bbbb5d2567699ad343360e101d3cae81187ea0f218b67d13a1121213fc49269475935fe0322d8b0f052c868536d5aaa0f7ab +EBUILD jekyll-4.3.2.ebuild 3065 BLAKE2B 689c5129933cb35a8713e358ba4fb77e7f845d8360cce574304867e9b98a3d808abccef6a0222dfc23b8babcb408ef5a285c7a9aa73e367df6ab9b483eb9c56a SHA512 b978add621395c5f3283164a73fec1ba28d4633fe11223516074e3973c244192ecb0c3abecc70a0c22901cd58828577684cd5b97e655b928cb249392b2960232 MISC metadata.xml 246 BLAKE2B a1eee8b457925c68b280d73349fa5bfff1639a1b7c1763bb38f9c43680a0cedfaf583b776820211cf3992ea83e983c237e00be9340b4d64a72775f0c4014ff54 SHA512 7ccb92985f1a956a36f408671063aac1ef02e2e8284cba45ae636dd23dd085087f452b9a96c3bbbcff5d809e4559fc8ba653b3198eb995baf1f217f20e893303 diff --git a/www-apps/jekyll/jekyll-4.2.2.ebuild b/www-apps/jekyll/jekyll-4.3.2.ebuild index f7a34488c3e2..db9b3c7015a0 100644 --- a/www-apps/jekyll/jekyll-4.2.2.ebuild +++ b/www-apps/jekyll/jekyll-4.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby27 ruby30" inherit ruby-fakegem @@ -33,16 +33,15 @@ ruby_add_rdepend " dev-ruby/liquid:4 >=dev-ruby/mercenary-0.4.0 >=dev-ruby/pathutil-0.9 - =dev-ruby/rouge-3* + || ( dev-ruby/rouge:4 dev-ruby/rouge:2 ) >=dev-ruby/safe_yaml-1.0 - dev-ruby/terminal-table: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/classifier-reborn-2.1.0 dev-ruby/httpclient dev-ruby/kramdown-syntax-coderay dev-ruby/launchy @@ -58,11 +57,15 @@ ruby_add_bdepend " all_ruby_prepare() { eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch + eapply -R "${FILESDIR}/${P}-sass.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 ": "./:' \ @@ -70,8 +73,8 @@ all_ruby_prepare() { # FIXMEs: # fails to find fixtures because this requires bundler - rm test/test_theme.rb || die - rm test/test_theme_assets_reader.rb || die + 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 @@ -84,6 +87,14 @@ all_ruby_prepare() { # 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 } src_test() { |