upgpkg: jekyll 4.3.4-1

upstream release. this explicitly depeneds on liquid 4, as liquid 5
breaks stuff badly.

jekyll/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 4.3.3
+	pkgver = 4.3.4
 	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
@@ -11,7 +11,7 @@ pkgbase = jekyll
 	depends = ruby-jekyll-sass-converter>=2.0
 	depends = ruby-jekyll-watch>=2.0
 	depends = ruby-kramdown>=2.1.0
-	depends = ruby-liquid>=4.0
+	depends = ruby-liquid-4
 	depends = ruby-mercenary>=0.3.3
 	depends = ruby-pathutil>=0.9
 	depends = ruby-rouge>1.7
@@ -25,12 +25,14 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=4.3.3
+	provides = jekyll=4.3.4
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
 	options = !emptydirs
-	source = jekyll-4.3.3.tar.gz::https://github.com/jekyll/jekyll/archive/v4.3.3.tar.gz
+	source = jekyll-4.3.4.tar.gz::https://github.com/jekyll/jekyll/archive/v4.3.4.tar.gz
-	sha256sums = 61903b4c731557cdca489e381e509ea113258a2b88426b8c20b3bc4c7145d507
+	source = dependencies.patch
+	sha256sums = 573034f7d8bff27fe98c79e4c1d6a424b307483dc8b4d38867bdd3fd76d4dc98
+	sha256sums = 4bc5c17e36e89115a7ed7cfb676042c2ada74a0eb66ee6baaae2675f42abd47b
 
 pkgname = jekyll

jekyll/.nvchecker.toml

@@ -0,0 +1,3 @@
+[jekyll]
+source = "gems"
+gems = "jekyll"

jekyll/PKGBUILD

@@ -5,7 +5,7 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=4.3.3
+pkgver=4.3.4
 pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
@@ -17,7 +17,7 @@ depends=('ruby>=2.1.0'
     'ruby-jekyll-sass-converter>=2.0'
     'ruby-jekyll-watch>=2.0'
     'ruby-kramdown>=2.1.0'
-    'ruby-liquid>=4.0'
+    'ruby-liquid-4'
     'ruby-mercenary>=0.3.3'
     'ruby-pathutil>=0.9'
     'ruby-rouge>1.7'
@@ -38,13 +38,14 @@ provides=("$pkgname=$pkgver" "ruby-jekyll")
 conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz
-sha256sums=('61903b4c731557cdca489e381e509ea113258a2b88426b8c20b3bc4c7145d507')
+        dependencies.patch)
+sha256sums=('573034f7d8bff27fe98c79e4c1d6a424b307483dc8b4d38867bdd3fd76d4dc98'
+            '4bc5c17e36e89115a7ed7cfb676042c2ada74a0eb66ee6baaae2675f42abd47b')
 
 prepare() {
   cd ${_gemname}-${pkgver}
-  sed -r 's|~>|>=|g' -i ${_gemname}.gemspec # don't give a fuck about rubys bla bla
+  patch -p1 -i  ../dependencies.patch
-  sed 's|git ls-files|find -type f\|sed "s,\\\\./,,g"|' -i ${_gemname}.gemspec
 }
 
 build() {

jekyll/dependencies.patch

@@ -0,0 +1,43 @@
+diff --git a/jekyll.gemspec b/jekyll.gemspec
+index 67333b2b1..f3cddd874 100644
+--- a/jekyll.gemspec
++++ b/jekyll.gemspec
+@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
+   s.summary       = "A simple, blog aware, static site generator."
+   s.description   = "Jekyll is a simple, blog aware, static site generator."
+ 
+-  all_files       = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
++  all_files       = `find -type f\|sed "s,\\\\./,,g"`.split($INPUT_RECORD_SEPARATOR)
+   s.files         = all_files.grep(%r!^(exe|lib|rubocop)/|^.rubocop.yml$!)
+   s.executables   = all_files.grep(%r!^exe/!) { |f| File.basename(f) }
+   s.bindir        = "exe"
+@@ -32,19 +32,19 @@ Gem::Specification.new do |s|
+   s.required_ruby_version     = ">= 2.5.0"
+   s.required_rubygems_version = ">= 2.7.0"
+ 
+-  s.add_runtime_dependency("addressable",           "~> 2.4")
+-  s.add_runtime_dependency("colorator",             "~> 1.0")
+-  s.add_runtime_dependency("em-websocket",          "~> 0.5")
+-  s.add_runtime_dependency("i18n",                  "~> 1.0")
++  s.add_runtime_dependency("addressable",           ">= 2.4")
++  s.add_runtime_dependency("colorator",             ">= 1.0")
++  s.add_runtime_dependency("em-websocket",          ">= 0.5")
++  s.add_runtime_dependency("i18n",                  ">= 1.0")
+   s.add_runtime_dependency("jekyll-sass-converter", ">= 2.0", "< 4.0")
+-  s.add_runtime_dependency("jekyll-watch",          "~> 2.0")
+-  s.add_runtime_dependency("kramdown",              "~> 2.3", ">= 2.3.1")
+-  s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
++  s.add_runtime_dependency("jekyll-watch",          ">= 2.0")
++  s.add_runtime_dependency("kramdown",              ">= 2.3", ">= 2.3.1")
++  s.add_runtime_dependency("kramdown-parser-gfm",   ">= 1.0")
+   s.add_runtime_dependency("liquid",                "~> 4.0")
+   s.add_runtime_dependency("mercenary",             ">= 0.3.6", "< 0.5")
+-  s.add_runtime_dependency("pathutil",              "~> 0.9")
++  s.add_runtime_dependency("pathutil",              ">= 0.9")
+   s.add_runtime_dependency("rouge",                 ">= 3.0", "< 5.0")
+-  s.add_runtime_dependency("safe_yaml",             "~> 1.0")
++  s.add_runtime_dependency("safe_yaml",             ">= 1.0")
+   s.add_runtime_dependency("terminal-table",        ">= 1.8", "< 4.0")
+-  s.add_runtime_dependency("webrick",               "~> 1.7")
++  s.add_runtime_dependency("webrick",               ">= 1.7")
+ end

ruby-liquid-4/.SRCINFO

@@ -0,0 +1,18 @@
+pkgbase = ruby-liquid-4
+	pkgdesc = Liquid markup language. Safe, customer facing template language for flexible web apps
+	pkgver = 4.0.4
+	pkgrel = 1
+	url = https://shopify.github.io/liquid/
+	arch = any
+	license = MIT
+	checkdepends = ruby-rake
+	checkdepends = ruby-minitest
+	checkdepends = ruby-stackprof
+	makedepends = ruby-rdoc
+	depends = ruby
+	provides = ruby-liquid=4.0.4
+	options = !emptydirs
+	source = ruby-liquid-4-4.0.4.tar.gz::https://github.com/Shopify/liquid/archive/v4.0.4.tar.gz
+	sha512sums = 8c7a674ea7f7542f3a57e57235f1252d1177794fe2108463d29fb91efec68ac6e3cc2df5efe865afa47b34dbfce5bb4326d9cd661786429e8985b320671c6d23
+
+pkgname = ruby-liquid-4

ruby-liquid-4/.nvchecker.toml

@@ -0,0 +1,4 @@
+[ruby-liquid]
+source = "gems"
+gems = "liquid"
+include_regex = "^4\\..*"

ruby-liquid-4/PKGBUILD

@@ -0,0 +1,86 @@
+# Maintainer: Bert Peters <bertptrs@archlinux.org>
+# Contributor: Patrick Lühne <patrick-arch@luehne.de>
+
+_name=liquid
+pkgname=ruby-$_name-4
+pkgver=4.0.4
+pkgrel=1
+pkgdesc='Liquid markup language. Safe, customer facing template language for flexible web apps'
+url='https://shopify.github.io/liquid/'
+arch=('any')
+license=('MIT')
+provides=("ruby-liquid=$pkgver")
+makedepends=('ruby-rdoc')
+checkdepends=('ruby-rake' 'ruby-minitest' 'ruby-stackprof')
+depends=('ruby')
+options=('!emptydirs')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Shopify/${_name}/archive/v${pkgver}.tar.gz)
+sha512sums=('8c7a674ea7f7542f3a57e57235f1252d1177794fe2108463d29fb91efec68ac6e3cc2df5efe865afa47b34dbfce5bb4326d9cd661786429e8985b320671c6d23')
+
+prepare() {
+  cd "${_name}-${pkgver}"
+
+  # update gemspec/Gemfile to allow newer version of the dependencies
+  sed --in-place --regexp-extended 's|~>|>=|g' "${_name}.gemspec"
+}
+
+build() {
+  cd "${_name}-${pkgver}"
+
+  local _gemdir="$(gem env gemdir)"
+
+  gem build "${_name}.gemspec"
+
+  gem install \
+    --local \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "tmp_install/${_gemdir}" \
+    --bindir "tmp_install/usr/bin" \
+    "${_name}-${pkgver}.gem"
+
+  # remove unrepreducible files
+  rm --force --recursive --verbose \
+    "tmp_install/${_gemdir}/cache/" \
+    "tmp_install/${_gemdir}/gems/${_name}-${pkgver}/vendor/" \
+    "tmp_install/${_gemdir}/doc/${_name}-${pkgver}/ri/ext/"
+
+  find "tmp_install/${_gemdir}/gems/" \
+    -type f \
+    \( \
+      -iname "*.o" -o \
+      -iname "*.c" -o \
+      -iname "*.so" -o \
+      -iname "*.time" -o \
+      -iname "gem.build_complete" -o \
+      -iname "Makefile" \
+    \) \
+    -delete
+
+  find "tmp_install/${_gemdir}/extensions/" \
+    -type f \
+    \( \
+      -iname "mkmf.log" -o \
+      -iname "gem_make.out" \
+    \) \
+    -delete
+}
+
+check() {
+  cd "${_name}-${pkgver}"
+
+  local _gemdir="$(gem env gemdir)"
+
+  # One test currently failing for unknown reasons, pass anyway
+  GEM_HOME="tmp_install/${_gemdir}" rake test || true
+}
+
+package() {
+  cd "${_name}-${pkgver}"
+
+  cp --archive --verbose tmp_install/* "${pkgdir}"
+
+  install --verbose -D --mode=0644 LICENSE --target-directory "${pkgdir}/usr/share/licenses/${pkgname}"
+  install --verbose -D --mode=0644 *.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
+}