From f0ff630e081027d3ccfe0ba1563c2d458a7082ce Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <shengyu.zhang@chaitin.com>
Date: Mon, 20 Nov 2017 13:55:03 +0800
Subject: [PATCH 01/28] addpkg: jekyll

---
 .SRCINFO | 39 +++++++++++++++++++++++++++++++++++++++
 PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 .SRCINFO
 create mode 100644 PKGBUILD

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..0aeef41
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,39 @@
+# Generated by mksrcinfo v8
+# Mon Nov 20 05:53:20 UTC 2017
+pkgbase = jekyll
+	pkgdesc = A simple, blog aware, static site generator.
+	pkgver = 3.6.2
+	pkgrel = 1
+	url = https://github.com/jekyll/jekyll
+	arch = any
+	license = MIT
+	depends = ruby>=2.1.0
+	depends = ruby-addressable>=2.4
+	depends = ruby-addressable<3.0
+	depends = ruby-colorator>=1.0
+	depends = ruby-colorator<=2.0
+	depends = ruby-jekyll-sass-converter>=1.0
+	depends = ruby-jekyll-sass-converter<2.0
+	depends = ruby-jekyll-watch>=1.1
+	depends = ruby-jekyll-watch<2.0
+	depends = ruby-kramdown>=1.14
+	depends = ruby-kramdown<2.0
+	depends = ruby-liquid>=4.0
+	depends = ruby-liquid<5.0
+	depends = ruby-mercenary>=0.3.3
+	depends = ruby-mercenary<0.4
+	depends = ruby-pathutil>=0.9
+	depends = ruby-pathutil<1.0
+	depends = ruby-rouge>1.7
+	depends = ruby-rouge<3
+	depends = ruby-safe_yaml>=1.0
+	depends = ruby-safe_yaml<2.0
+	provides = jekyll=3.6.2
+	conflicts = ruby-jekyll
+	noextract = jekyll-3.6.2.gem
+	options = !emptydirs
+	source = https://rubygems.org/downloads/jekyll-3.6.2.gem
+	sha512sums = 2c212347648cb8f4fe08b06cd248545f9669b25b98ff2784e4e4a79f6e1966ddd538bfc89e2beec68f5a1e2237281bb65a3de511192a22cb18bf78c9843e4f41
+
+pkgname = jekyll
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 0000000..7dda791
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Shengyu Zhang <la@archlinuxcn.org>
+# Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
+
+_gemname=jekyll
+pkgname=$_gemname
+pkgver=3.6.2
+pkgrel=1
+pkgdesc='A simple, blog aware, static site generator.'
+arch=(any)
+url='https://github.com/jekyll/jekyll'
+license=(MIT)
+depends=('ruby>=2.1.0'
+    'ruby-addressable>=2.4' 'ruby-addressable<3.0'
+    'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
+    'ruby-jekyll-sass-converter>=1.0' 'ruby-jekyll-sass-converter<2.0'
+    'ruby-jekyll-watch>=1.1' 'ruby-jekyll-watch<2.0'
+    'ruby-kramdown>=1.14' 'ruby-kramdown<2.0'
+    'ruby-liquid>=4.0' 'ruby-liquid<5.0'
+    'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
+    'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
+    'ruby-rouge>1.7' 'ruby-rouge<3'
+    'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
+    )
+provides=("$pkgname=$pkgver")
+conflicts=('ruby-jekyll')
+replace=('ruby-jekyll')
+options=(!emptydirs)
+source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+sha512sums=('2c212347648cb8f4fe08b06cd248545f9669b25b98ff2784e4e4a79f6e1966ddd538bfc89e2beec68f5a1e2237281bb65a3de511192a22cb18bf78c9843e4f41')
+
+package() {
+  local _gemdir="$(ruby -e'puts Gem.default_dir')"
+  gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem
+  rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
+  install -D -m644 "$pkgdir/$_gemdir/gems/$_gemname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

From 8d67ca7993457d1580141dd28db0fe9ce9661e2e Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <shengyu.zhang@chaitin.com>
Date: Thu, 23 Nov 2017 13:17:14 +0800
Subject: [PATCH 02/28] jekyll: hard link to ruby-rouge-1, add optdepends,
 provide old pkgname

---
 .SRCINFO | 13 ++++++++-----
 PKGBUILD | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 0aeef41..5ad142d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Nov 20 05:53:20 UTC 2017
+# Thu Nov 23 05:17:00 UTC 2017
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -24,11 +24,14 @@ pkgbase = jekyll
 	depends = ruby-mercenary<0.4
 	depends = ruby-pathutil>=0.9
 	depends = ruby-pathutil<1.0
-	depends = ruby-rouge>1.7
-	depends = ruby-rouge<3
+	depends = ruby-rouge-1
 	depends = ruby-safe_yaml>=1.0
 	depends = ruby-safe_yaml<2.0
-	provides = jekyll=3.6.2
+	optdepends = ruby-jekyll-paginate
+	optdepends = ruby-jekyll-gist
+	optdepends = ruby-jekyll-feed
+	provides = jekyll=3.6.2,
+	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	noextract = jekyll-3.6.2.gem
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 7dda791..774e0ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
-arch=(any)
+arch=('any')
 url='https://github.com/jekyll/jekyll'
-license=(MIT)
+license=('MIT')
 depends=('ruby>=2.1.0'
     'ruby-addressable>=2.4' 'ruby-addressable<3.0'
     'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
@@ -18,10 +18,15 @@ depends=('ruby>=2.1.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'
     'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
-    'ruby-rouge>1.7' 'ruby-rouge<3'
+    'ruby-rouge-1'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
     )
-provides=("$pkgname=$pkgver")
+    # 'ruby-rouge>1.7' 'ruby-rouge<3.0'
+optdepends=('ruby-jekyll-paginate'
+    'ruby-jekyll-gist'
+    'ruby-jekyll-feed'
+    )
+provides=("$pkgname=$pkgver", "ruby-jekyll")
 conflicts=('ruby-jekyll')
 replace=('ruby-jekyll')
 options=(!emptydirs)

From ac6034481841924b49bb99e76b0f7ad40deec00e Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <i@srain.im>
Date: Fri, 24 Nov 2017 23:31:26 +0800
Subject: [PATCH 03/28] jekyll: fix replaces

---
 .SRCINFO | 5 +++--
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5ad142d..eefaa1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Nov 23 05:17:00 UTC 2017
+# Fri Nov 24 15:31:18 UTC 2017
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.6.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -33,6 +33,7 @@ pkgbase = jekyll
 	provides = jekyll=3.6.2,
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
+	replaces = ruby-jekyll
 	noextract = jekyll-3.6.2.gem
 	options = !emptydirs
 	source = https://rubygems.org/downloads/jekyll-3.6.2.gem
diff --git a/PKGBUILD b/PKGBUILD
index 774e0ef..152f585 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -28,7 +28,7 @@ optdepends=('ruby-jekyll-paginate'
     )
 provides=("$pkgname=$pkgver", "ruby-jekyll")
 conflicts=('ruby-jekyll')
-replace=('ruby-jekyll')
+replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)

From 4e75b21540ab1ec097f9136543396bd57989e491 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <i@srain.im>
Date: Sun, 7 Jan 2018 23:36:57 +0800
Subject: [PATCH 04/28] jekyll: ruby 2.5 rebuild

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index eefaa1e..72bd875 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Nov 24 15:31:18 UTC 2017
+# Sun Jan  7 15:36:25 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.6.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -30,7 +30,7 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.6.2,
+	provides = jekyll=3.6.2
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
diff --git a/PKGBUILD b/PKGBUILD
index 152f585..51e2668 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -26,7 +26,7 @@ optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'
     'ruby-jekyll-feed'
     )
-provides=("$pkgname=$pkgver", "ruby-jekyll")
+provides=("$pkgname=$pkgver" "ruby-jekyll")
 conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)

From 115b81c2c9c53ab05ae8fd54c4aba922178a8ab7 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <shengyu.zhang@chaitin.com>
Date: Tue, 16 Jan 2018 11:57:57 +0800
Subject: [PATCH 05/28] upgpkg: jekyll 3.7.0

---
 .SRCINFO | 25 +++++++++++++++----------
 PKGBUILD | 13 +++++++------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 72bd875..39e119b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jan  7 15:36:25 UTC 2018
+# Tue Jan 16 03:59:50 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.6.2
-	pkgrel = 4
+	pkgver = 3.7.0
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -14,8 +14,8 @@ pkgbase = jekyll
 	depends = ruby-colorator<=2.0
 	depends = ruby-jekyll-sass-converter>=1.0
 	depends = ruby-jekyll-sass-converter<2.0
-	depends = ruby-jekyll-watch>=1.1
-	depends = ruby-jekyll-watch<2.0
+	depends = ruby-jekyll-watch>=2.0
+	depends = ruby-jekyll-watch<3.0
 	depends = ruby-kramdown>=1.14
 	depends = ruby-kramdown<2.0
 	depends = ruby-liquid>=4.0
@@ -24,20 +24,25 @@ pkgbase = jekyll
 	depends = ruby-mercenary<0.4
 	depends = ruby-pathutil>=0.9
 	depends = ruby-pathutil<1.0
-	depends = ruby-rouge-1
+	depends = ruby-rouge>1.7
+	depends = ruby-rouge<4.0
 	depends = ruby-safe_yaml>=1.0
 	depends = ruby-safe_yaml<2.0
+	depends = ruby-i18n>=0.7
+	depends = ruby-i18n<1.0
+	depends = ruby-concurrent-ruby>=1.0
+	depends = ruby-concurrent-ruby<2.0
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.6.2
+	provides = jekyll=3.7.0
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.6.2.gem
+	noextract = jekyll-3.7.0.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.6.2.gem
-	sha512sums = 2c212347648cb8f4fe08b06cd248545f9669b25b98ff2784e4e4a79f6e1966ddd538bfc89e2beec68f5a1e2237281bb65a3de511192a22cb18bf78c9843e4f41
+	source = https://rubygems.org/downloads/jekyll-3.7.0.gem
+	sha512sums = 24d19d48c2d577a0a7349389533aedaf3e7953ae47281901d1fbf22fa1eeaa86d10347054ce20bfd08b997847920feeea606c47bf78e13ed0da593714adc04a1
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 51e2668..d69c6f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.6.2
-pkgrel=4
+pkgver=3.7.0
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -13,15 +13,16 @@ depends=('ruby>=2.1.0'
     'ruby-addressable>=2.4' 'ruby-addressable<3.0'
     'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
     'ruby-jekyll-sass-converter>=1.0' 'ruby-jekyll-sass-converter<2.0'
-    'ruby-jekyll-watch>=1.1' 'ruby-jekyll-watch<2.0'
+    'ruby-jekyll-watch>=2.0' 'ruby-jekyll-watch<3.0'
     'ruby-kramdown>=1.14' 'ruby-kramdown<2.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'
     'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
-    'ruby-rouge-1'
+    'ruby-rouge>1.7' 'ruby-rouge<4.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
+    'ruby-i18n>=0.7' 'ruby-i18n<1.0'
+    'ruby-concurrent-ruby>=1.0' 'ruby-concurrent-ruby<2.0' # missing dependency for ruby-i18n
     )
-    # 'ruby-rouge>1.7' 'ruby-rouge<3.0'
 optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'
     'ruby-jekyll-feed'
@@ -32,7 +33,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('2c212347648cb8f4fe08b06cd248545f9669b25b98ff2784e4e4a79f6e1966ddd538bfc89e2beec68f5a1e2237281bb65a3de511192a22cb18bf78c9843e4f41')
+sha512sums=('24d19d48c2d577a0a7349389533aedaf3e7953ae47281901d1fbf22fa1eeaa86d10347054ce20bfd08b997847920feeea606c47bf78e13ed0da593714adc04a1')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From c6ae2d488da2bbe1d0f47931ee418e4aede8dee1 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <shengyu.zhang@chaitin.com>
Date: Tue, 16 Jan 2018 12:33:11 +0800
Subject: [PATCH 06/28] jekyll: add missing dependency ruby-em-websocket

---
 .SRCINFO | 6 ++++--
 PKGBUILD | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 39e119b..b1b0cbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jan 16 03:59:50 UTC 2018
+# Tue Jan 16 04:32:53 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -32,6 +32,8 @@ pkgbase = jekyll
 	depends = ruby-i18n<1.0
 	depends = ruby-concurrent-ruby>=1.0
 	depends = ruby-concurrent-ruby<2.0
+	depends = ruby-em-websocket>=0.5
+	depends = ruby-em-websocket<1.0
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
diff --git a/PKGBUILD b/PKGBUILD
index d69c6f1..69801dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -22,6 +22,7 @@ depends=('ruby>=2.1.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
     'ruby-i18n>=0.7' 'ruby-i18n<1.0'
     'ruby-concurrent-ruby>=1.0' 'ruby-concurrent-ruby<2.0' # missing dependency for ruby-i18n
+    'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
     )
 optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'

From f3723523391a1dccb919483deb89f49dfd2b029d Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <shengyu.zhang@chaitin.com>
Date: Fri, 19 Jan 2018 12:58:02 +0800
Subject: [PATCH 07/28] jekyll: add dependency ruby-ruby_dep due to ruby-listen
 missing it

---
 .SRCINFO | 5 +++--
 PKGBUILD | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b1b0cbf..95fc7a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jan 16 04:32:53 UTC 2018
+# Fri Jan 19 04:57:58 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.7.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -34,6 +34,7 @@ pkgbase = jekyll
 	depends = ruby-concurrent-ruby<2.0
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
+	depends = ruby-ruby_dep
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
diff --git a/PKGBUILD b/PKGBUILD
index 69801dc..638a402 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -23,6 +23,7 @@ depends=('ruby>=2.1.0'
     'ruby-i18n>=0.7' 'ruby-i18n<1.0'
     'ruby-concurrent-ruby>=1.0' 'ruby-concurrent-ruby<2.0' # missing dependency for ruby-i18n
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
+    'ruby-ruby_dep' # missing dependency for ruby-listen
     )
 optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'

From 2e3acc2301b1fad26e54349d729e475d9082266f Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <i@silverrainz.me>
Date: Fri, 20 Apr 2018 02:26:15 +0800
Subject: [PATCH 08/28] upgpkg: jekyll 3.8.0-1

---
 .SRCINFO | 14 +++++++-------
 PKGBUILD |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 95fc7a2..a4a3fa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jan 19 04:57:58 UTC 2018
+# Thu Apr 19 18:24:38 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.7.0
-	pkgrel = 3
+	pkgver = 3.8.0
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -38,14 +38,14 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.7.0
+	provides = jekyll=3.8.0
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.7.0.gem
+	noextract = jekyll-3.8.0.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.7.0.gem
-	sha512sums = 24d19d48c2d577a0a7349389533aedaf3e7953ae47281901d1fbf22fa1eeaa86d10347054ce20bfd08b997847920feeea606c47bf78e13ed0da593714adc04a1
+	source = https://rubygems.org/downloads/jekyll-3.8.0.gem
+	sha512sums = 225aefe8105f8cc29f07eac7feb4c515a0f4f79977482435756e202e66e18a966797d7dc35b67d243760008c9269d6486247394525ff0d468118c1c0211e44ac
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 638a402..694a855 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.7.0
-pkgrel=3
+pkgver=3.8.0
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -35,7 +35,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('24d19d48c2d577a0a7349389533aedaf3e7953ae47281901d1fbf22fa1eeaa86d10347054ce20bfd08b997847920feeea606c47bf78e13ed0da593714adc04a1')
+sha512sums=('225aefe8105f8cc29f07eac7feb4c515a0f4f79977482435756e202e66e18a966797d7dc35b67d243760008c9269d6486247394525ff0d468118c1c0211e44ac')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From b63e165ff5a4f637b24a700c557de57b99275103 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <i@silverrainz.me>
Date: Sun, 24 Jun 2018 17:03:20 +0800
Subject: [PATCH 09/28] upgpkg: jekyll 3.8.3-1

---
 .SRCINFO | 12 ++++++------
 PKGBUILD |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a4a3fa7..e7c906e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Apr 19 18:24:38 UTC 2018
+# Sun Jun 24 09:03:02 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.8.0
+	pkgver = 3.8.3
 	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
@@ -38,14 +38,14 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.8.0
+	provides = jekyll=3.8.3
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.8.0.gem
+	noextract = jekyll-3.8.3.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.8.0.gem
-	sha512sums = 225aefe8105f8cc29f07eac7feb4c515a0f4f79977482435756e202e66e18a966797d7dc35b67d243760008c9269d6486247394525ff0d468118c1c0211e44ac
+	source = https://rubygems.org/downloads/jekyll-3.8.3.gem
+	sha512sums = 3b1b486dcae67a92751f410c4984b25355abf6a04b445b8c6e17f102b9a8ee47a7ef143ea2f54afa3a537a92b7a28ec75383581eb018dd73bcd055aafec58ecf
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 694a855..1dc1dec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.8.0
+pkgver=3.8.3
 pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
@@ -35,7 +35,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('225aefe8105f8cc29f07eac7feb4c515a0f4f79977482435756e202e66e18a966797d7dc35b67d243760008c9269d6486247394525ff0d468118c1c0211e44ac')
+sha512sums=('3b1b486dcae67a92751f410c4984b25355abf6a04b445b8c6e17f102b9a8ee47a7ef143ea2f54afa3a537a92b7a28ec75383581eb018dd73bcd055aafec58ecf')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From de7c6ab755c3909a2fb7db22f42f47894bcbe6e9 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <i@silverrainz.me>
Date: Tue, 2 Oct 2018 18:05:17 +0800
Subject: [PATCH 10/28] upgpkg: jekyll 3.8.4-1

---
 .SRCINFO | 15 ++++++---------
 PKGBUILD |  6 ++----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e7c906e..952f8e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jun 24 09:03:02 UTC 2018
+# Tue Oct  2 10:05:13 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.8.3
+	pkgver = 3.8.4
 	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
@@ -30,22 +30,19 @@ pkgbase = jekyll
 	depends = ruby-safe_yaml<2.0
 	depends = ruby-i18n>=0.7
 	depends = ruby-i18n<1.0
-	depends = ruby-concurrent-ruby>=1.0
-	depends = ruby-concurrent-ruby<2.0
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
-	depends = ruby-ruby_dep
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.8.3
+	provides = jekyll=3.8.4
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.8.3.gem
+	noextract = jekyll-3.8.4.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.8.3.gem
-	sha512sums = 3b1b486dcae67a92751f410c4984b25355abf6a04b445b8c6e17f102b9a8ee47a7ef143ea2f54afa3a537a92b7a28ec75383581eb018dd73bcd055aafec58ecf
+	source = https://rubygems.org/downloads/jekyll-3.8.4.gem
+	sha512sums = 139c235941951ad25888aa8b3fe3039d2de55d9e1056ad313828269f36fd8ae554c2f8e664411ade8f7a094d0135b8d7d382b92e66857251d8b20a806bce9d24
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 1dc1dec..5b2a7db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
@@ -21,9 +21,7 @@ depends=('ruby>=2.1.0'
     'ruby-rouge>1.7' 'ruby-rouge<4.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
     'ruby-i18n>=0.7' 'ruby-i18n<1.0'
-    'ruby-concurrent-ruby>=1.0' 'ruby-concurrent-ruby<2.0' # missing dependency for ruby-i18n
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
-    'ruby-ruby_dep' # missing dependency for ruby-listen
     )
 optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'
@@ -35,7 +33,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('3b1b486dcae67a92751f410c4984b25355abf6a04b445b8c6e17f102b9a8ee47a7ef143ea2f54afa3a537a92b7a28ec75383581eb018dd73bcd055aafec58ecf')
+sha512sums=('139c235941951ad25888aa8b3fe3039d2de55d9e1056ad313828269f36fd8ae554c2f8e664411ade8f7a094d0135b8d7d382b92e66857251d8b20a806bce9d24')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From 5d0fc02761f0f1308c86fcfac66fc524859ce949 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <i@silverrainz.me>
Date: Mon, 8 Oct 2018 22:40:34 +0800
Subject: [PATCH 11/28] jekyll: update ruby-i18n dependency

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 952f8e7..8d2c1f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Oct  2 10:05:13 UTC 2018
+# Mon Oct  8 14:40:23 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.8.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -29,7 +29,7 @@ pkgbase = jekyll
 	depends = ruby-safe_yaml>=1.0
 	depends = ruby-safe_yaml<2.0
 	depends = ruby-i18n>=0.7
-	depends = ruby-i18n<1.0
+	depends = ruby-i18n<2.0
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
 	optdepends = ruby-jekyll-paginate
diff --git a/PKGBUILD b/PKGBUILD
index 5b2a7db..a05634c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -20,7 +20,7 @@ depends=('ruby>=2.1.0'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
     'ruby-rouge>1.7' 'ruby-rouge<4.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
-    'ruby-i18n>=0.7' 'ruby-i18n<1.0'
+    'ruby-i18n>=0.7' 'ruby-i18n<2.0'
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
     )
 optdepends=('ruby-jekyll-paginate'

From 3e43fdb59554bd057d57f8f12ab1e86d12088de1 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <shengyu.zhang@chaitin.com>
Date: Thu, 18 Oct 2018 11:13:08 +0800
Subject: [PATCH 12/28] Revert "jekyll: update ruby-i18n dependency"

This reverts commit 5d0fc02761f0f1308c86fcfac66fc524859ce949.
---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 8d2c1f8..7a7969f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Oct  8 14:40:23 UTC 2018
+# Thu Oct 18 03:13:50 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.8.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -29,7 +29,7 @@ pkgbase = jekyll
 	depends = ruby-safe_yaml>=1.0
 	depends = ruby-safe_yaml<2.0
 	depends = ruby-i18n>=0.7
-	depends = ruby-i18n<2.0
+	depends = ruby-i18n<1.0
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
 	optdepends = ruby-jekyll-paginate
diff --git a/PKGBUILD b/PKGBUILD
index a05634c..4cf08ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -20,7 +20,7 @@ depends=('ruby>=2.1.0'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
     'ruby-rouge>1.7' 'ruby-rouge<4.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
-    'ruby-i18n>=0.7' 'ruby-i18n<2.0'
+    'ruby-i18n>=0.7' 'ruby-i18n<1.0'
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
     )
 optdepends=('ruby-jekyll-paginate'

From 36d9d3328819ef655cdafac61414c4fe5bce87db Mon Sep 17 00:00:00 2001
From: Bjoern Franke <bjo@nord-west.org>
Date: Mon, 21 Jan 2019 16:37:28 +0100
Subject: [PATCH 13/28] updated to 3.8.5

---
 .SRCINFO | 16 +++++++---------
 PKGBUILD |  9 +++++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 7a7969f..8ea7d10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Thu Oct 18 03:13:50 UTC 2018
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.8.4
-	pkgrel = 3
+	pkgver = 3.8.5
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -17,7 +15,7 @@ pkgbase = jekyll
 	depends = ruby-jekyll-watch>=2.0
 	depends = ruby-jekyll-watch<3.0
 	depends = ruby-kramdown>=1.14
-	depends = ruby-kramdown<2.0
+	depends = ruby-kramdown<2.1
 	depends = ruby-liquid>=4.0
 	depends = ruby-liquid<5.0
 	depends = ruby-mercenary>=0.3.3
@@ -35,14 +33,14 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.8.4
+	provides = jekyll=3.8.5
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.8.4.gem
+	noextract = jekyll-3.8.5.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.8.4.gem
-	sha512sums = 139c235941951ad25888aa8b3fe3039d2de55d9e1056ad313828269f36fd8ae554c2f8e664411ade8f7a094d0135b8d7d382b92e66857251d8b20a806bce9d24
+	source = https://rubygems.org/downloads/jekyll-3.8.5.gem
+	sha512sums = 1a45814567caa1cb4902d749330c3f6287fb7f0e84a1bc81eb7ce49ce48ed182799733b227671dfe4de9d5229877ffb581fedb927b831c6a68ab699c7d6b763a
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 4cf08ba..945d2e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Shengyu Zhang <la@archlinuxcn.org>
+# Co-Maintainer: Bjoern Franke <bjo@nord-west.org>
 # Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.8.4
-pkgrel=3
+pkgver=3.8.5
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -14,7 +15,7 @@ depends=('ruby>=2.1.0'
     'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
     'ruby-jekyll-sass-converter>=1.0' 'ruby-jekyll-sass-converter<2.0'
     'ruby-jekyll-watch>=2.0' 'ruby-jekyll-watch<3.0'
-    'ruby-kramdown>=1.14' 'ruby-kramdown<2.0'
+    'ruby-kramdown>=1.14' 'ruby-kramdown<2.1'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'
     'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
@@ -33,7 +34,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('139c235941951ad25888aa8b3fe3039d2de55d9e1056ad313828269f36fd8ae554c2f8e664411ade8f7a094d0135b8d7d382b92e66857251d8b20a806bce9d24')
+sha512sums=('1a45814567caa1cb4902d749330c3f6287fb7f0e84a1bc81eb7ce49ce48ed182799733b227671dfe4de9d5229877ffb581fedb927b831c6a68ab699c7d6b763a')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From 31192457851b833d57a88145a6f47228a7ce5c90 Mon Sep 17 00:00:00 2001
From: Bjoern Franke <bjo@nord-west.org>
Date: Mon, 21 Jan 2019 17:03:02 +0100
Subject: [PATCH 14/28] fix kramdown dep

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 8ea7d10..3699ad3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.8.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -14,8 +14,8 @@ pkgbase = jekyll
 	depends = ruby-jekyll-sass-converter<2.0
 	depends = ruby-jekyll-watch>=2.0
 	depends = ruby-jekyll-watch<3.0
-	depends = ruby-kramdown>=1.14
-	depends = ruby-kramdown<2.1
+	depends = ruby-kramdown-1>=1.14
+	depends = ruby-kramdown-1<2.0
 	depends = ruby-liquid>=4.0
 	depends = ruby-liquid<5.0
 	depends = ruby-mercenary>=0.3.3
diff --git a/PKGBUILD b/PKGBUILD
index 945d2e8..601e1a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -15,7 +15,7 @@ depends=('ruby>=2.1.0'
     'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
     'ruby-jekyll-sass-converter>=1.0' 'ruby-jekyll-sass-converter<2.0'
     'ruby-jekyll-watch>=2.0' 'ruby-jekyll-watch<3.0'
-    'ruby-kramdown>=1.14' 'ruby-kramdown<2.1'
+    'ruby-kramdown-1>=1.14' 'ruby-kramdown-1<2.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'
     'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'

From 2db5f5eea7a067051206689375d6a479b28dc13a Mon Sep 17 00:00:00 2001
From: Bjoern Franke <bjo@nord-west.org>
Date: Thu, 4 Jul 2019 12:08:58 +0200
Subject: [PATCH 15/28] 3.8.6

---
 .SRCINFO | 12 ++++++------
 PKGBUILD |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 3699ad3..5bbe44f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.8.5
-	pkgrel = 2
+	pkgver = 3.8.6
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -33,14 +33,14 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.8.5
+	provides = jekyll=3.8.6
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.8.5.gem
+	noextract = jekyll-3.8.6.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.8.5.gem
-	sha512sums = 1a45814567caa1cb4902d749330c3f6287fb7f0e84a1bc81eb7ce49ce48ed182799733b227671dfe4de9d5229877ffb581fedb927b831c6a68ab699c7d6b763a
+	source = https://rubygems.org/downloads/jekyll-3.8.6.gem
+	sha512sums = 9b54f3c06373ff515c3f190645a231538b3045a5d39b568defc4977434a52812a1cfa1f9ec836b0b7376d1d0290ca17a55b69b3039203aa8f99df8e9b66c56e3
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 601e1a6..50f72ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.8.5
-pkgrel=2
+pkgver=3.8.6
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -34,7 +34,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('1a45814567caa1cb4902d749330c3f6287fb7f0e84a1bc81eb7ce49ce48ed182799733b227671dfe4de9d5229877ffb581fedb927b831c6a68ab699c7d6b763a')
+sha512sums=('9b54f3c06373ff515c3f190645a231538b3045a5d39b568defc4977434a52812a1cfa1f9ec836b0b7376d1d0290ca17a55b69b3039203aa8f99df8e9b66c56e3')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From 448d441d5990ba3bb3b8a27fe0a317f046a2f2aa Mon Sep 17 00:00:00 2001
From: Bjoern Franke <bjo@nord-west.org>
Date: Mon, 5 Aug 2019 14:19:37 +0200
Subject: [PATCH 16/28] fix ruby-public_suffix-3 dep

---
 .SRCINFO | 4 +++-
 PKGBUILD | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5bbe44f..10e4aeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.8.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -30,6 +30,8 @@ pkgbase = jekyll
 	depends = ruby-i18n<1.0
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
+	depends = ruby-public_suffix-3>=3.0
+	depends = ruby-public_suffix-3<3.9
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
diff --git a/PKGBUILD b/PKGBUILD
index 50f72ab..c418cee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Shengyu Zhang <la@archlinuxcn.org>
-# Co-Maintainer: Bjoern Franke <bjo@nord-west.org>
+# Co-Maintainer: Bjoern Franke <bjo+aur@schafweide.org>
 # Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
 
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -23,6 +23,8 @@ depends=('ruby>=2.1.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
     'ruby-i18n>=0.7' 'ruby-i18n<1.0'
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
+    'ruby-public_suffix-3>=3.0' 'ruby-public_suffix-3<3.9'
+
     )
 optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'

From 0d45a95608ba5e09593071571b5b6c11d2aaea89 Mon Sep 17 00:00:00 2001
From: Bjoern Franke <bjo@nord-west.org>
Date: Thu, 15 Aug 2019 12:55:10 +0200
Subject: [PATCH 17/28] fix jekyll-sass-converter dep

---
 .SRCINFO | 6 +++---
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 10e4aeb..b9e8148 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.8.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -10,8 +10,8 @@ pkgbase = jekyll
 	depends = ruby-addressable<3.0
 	depends = ruby-colorator>=1.0
 	depends = ruby-colorator<=2.0
-	depends = ruby-jekyll-sass-converter>=1.0
-	depends = ruby-jekyll-sass-converter<2.0
+	depends = ruby-jekyll-sass-converter-1>=1.0
+	depends = ruby-jekyll-sass-converter-1<2.0
 	depends = ruby-jekyll-watch>=2.0
 	depends = ruby-jekyll-watch<3.0
 	depends = ruby-kramdown-1>=1.14
diff --git a/PKGBUILD b/PKGBUILD
index c418cee..8fdbabc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.8.6
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('ruby>=2.1.0'
     'ruby-addressable>=2.4' 'ruby-addressable<3.0'
     'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
-    'ruby-jekyll-sass-converter>=1.0' 'ruby-jekyll-sass-converter<2.0'
+    'ruby-jekyll-sass-converter-1>=1.0' 'ruby-jekyll-sass-converter-1<2.0'
     'ruby-jekyll-watch>=2.0' 'ruby-jekyll-watch<3.0'
     'ruby-kramdown-1>=1.14' 'ruby-kramdown-1<2.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'

From 491bff14e5a7605f29864275111218ce6a7fc24c Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Tue, 20 Aug 2019 10:58:45 +0200
Subject: [PATCH 18/28] Remove packaged ruby-public_suffix dep.

Fixed by https://bugs.archlinux.org/task/63500.
---
 .SRCINFO | 4 +---
 PKGBUILD | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b9e8148..b60abe5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 3.8.6
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -30,8 +30,6 @@ pkgbase = jekyll
 	depends = ruby-i18n<1.0
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
-	depends = ruby-public_suffix-3>=3.0
-	depends = ruby-public_suffix-3<3.9
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
diff --git a/PKGBUILD b/PKGBUILD
index 8fdbabc..0c3ae3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=3.8.6
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -23,8 +23,6 @@ depends=('ruby>=2.1.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
     'ruby-i18n>=0.7' 'ruby-i18n<1.0'
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
-    'ruby-public_suffix-3>=3.0' 'ruby-public_suffix-3<3.9'
-
     )
 optdepends=('ruby-jekyll-paginate'
     'ruby-jekyll-gist'

From 0765662f20871cea9cf5448c83eec3c6703f3048 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Tue, 10 Sep 2019 10:47:26 +0200
Subject: [PATCH 19/28] Update to 4.0.0.

---
 .SRCINFO | 28 +++++++++++++---------------
 PKGBUILD | 26 ++++++++++++++++----------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index b60abe5..396426f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 3.8.6
-	pkgrel = 4
+	pkgver = 4.0.0
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
 	depends = ruby>=2.1.0
 	depends = ruby-addressable>=2.4
-	depends = ruby-addressable<3.0
 	depends = ruby-colorator>=1.0
-	depends = ruby-colorator<=2.0
-	depends = ruby-jekyll-sass-converter-1>=1.0
-	depends = ruby-jekyll-sass-converter-1<2.0
+	depends = ruby-jekyll-sass-converter>=2.0
+	depends = ruby-sassc
 	depends = ruby-jekyll-watch>=2.0
-	depends = ruby-jekyll-watch<3.0
-	depends = ruby-kramdown-1>=1.14
-	depends = ruby-kramdown-1<2.0
+	depends = ruby-kramdown>=2.1.0
 	depends = ruby-liquid>=4.0
 	depends = ruby-liquid<5.0
 	depends = ruby-mercenary>=0.3.3
@@ -26,21 +22,23 @@ pkgbase = jekyll
 	depends = ruby-rouge<4.0
 	depends = ruby-safe_yaml>=1.0
 	depends = ruby-safe_yaml<2.0
-	depends = ruby-i18n>=0.7
-	depends = ruby-i18n<1.0
+	depends = ruby-i18n>=1
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-em-websocket<1.0
+	depends = ruby-kramdown-parser-gfm
+	depends = ruby-terminal-table
+	optdepends = ruby-minima: Default theme for Jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=3.8.6
+	provides = jekyll=4.0.0
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-3.8.6.gem
+	noextract = jekyll-4.0.0.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-3.8.6.gem
-	sha512sums = 9b54f3c06373ff515c3f190645a231538b3045a5d39b568defc4977434a52812a1cfa1f9ec836b0b7376d1d0290ca17a55b69b3039203aa8f99df8e9b66c56e3
+	source = https://rubygems.org/downloads/jekyll-4.0.0.gem
+	sha256sums = 4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c3ae3f..5b042e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,36 @@
 # Maintainer: Shengyu Zhang <la@archlinuxcn.org>
 # Co-Maintainer: Bjoern Franke <bjo+aur@schafweide.org>
+# Co-Maintainer: Bert Peters <bert+aur@bertptrs.nl>
 # Contributor: Carsten Feuls <archlinux@carstenfeuls.de>
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=3.8.6
-pkgrel=4
+pkgver=4.0.0
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
 license=('MIT')
 depends=('ruby>=2.1.0'
-    'ruby-addressable>=2.4' 'ruby-addressable<3.0'
-    'ruby-colorator>=1.0' 'ruby-colorator<=2.0'
-    'ruby-jekyll-sass-converter-1>=1.0' 'ruby-jekyll-sass-converter-1<2.0'
-    'ruby-jekyll-watch>=2.0' 'ruby-jekyll-watch<3.0'
-    'ruby-kramdown-1>=1.14' 'ruby-kramdown-1<2.0'
+    'ruby-addressable>=2.4'
+    'ruby-colorator>=1.0'
+    'ruby-jekyll-sass-converter>=2.0'
+    'ruby-sassc' # actually a missing dependency of ruby-jekyll-sass-converter
+    'ruby-jekyll-watch>=2.0'
+    'ruby-kramdown>=2.1.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'
     'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
     'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
     'ruby-rouge>1.7' 'ruby-rouge<4.0'
     'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
-    'ruby-i18n>=0.7' 'ruby-i18n<1.0'
+    'ruby-i18n>=1'
     'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
+    'ruby-kramdown-parser-gfm'
+    'ruby-terminal-table'
     )
-optdepends=('ruby-jekyll-paginate'
+optdepends=(
+    'ruby-minima: Default theme for Jekyll'
+    'ruby-jekyll-paginate'
     'ruby-jekyll-gist'
     'ruby-jekyll-feed'
     )
@@ -34,7 +40,7 @@ replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-sha512sums=('9b54f3c06373ff515c3f190645a231538b3045a5d39b568defc4977434a52812a1cfa1f9ec836b0b7376d1d0290ca17a55b69b3039203aa8f99df8e9b66c56e3')
+sha256sums=('4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a')
 
 package() {
   local _gemdir="$(ruby -e'puts Gem.default_dir')"

From 23731611e4b5a0c803ad613533568657d60c8c7e Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sat, 11 Jan 2020 22:12:56 +0100
Subject: [PATCH 20/28] Remove unneeded dependency.

---
 .SRCINFO | 3 +--
 PKGBUILD | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 396426f..3f207eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 4.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -9,7 +9,6 @@ pkgbase = jekyll
 	depends = ruby-addressable>=2.4
 	depends = ruby-colorator>=1.0
 	depends = ruby-jekyll-sass-converter>=2.0
-	depends = ruby-sassc
 	depends = ruby-jekyll-watch>=2.0
 	depends = ruby-kramdown>=2.1.0
 	depends = ruby-liquid>=4.0
diff --git a/PKGBUILD b/PKGBUILD
index 5b042e1..3e7af83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -15,7 +15,6 @@ depends=('ruby>=2.1.0'
     'ruby-addressable>=2.4'
     'ruby-colorator>=1.0'
     'ruby-jekyll-sass-converter>=2.0'
-    'ruby-sassc' # actually a missing dependency of ruby-jekyll-sass-converter
     'ruby-jekyll-watch>=2.0'
     'ruby-kramdown>=2.1.0'
     'ruby-liquid>=4.0' 'ruby-liquid<5.0'

From 754a44c40ac0fb1701c7ecc5fa7c51c9406cafb7 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sun, 9 Feb 2020 20:31:24 +0100
Subject: [PATCH 21/28] Use open-ended dependencies.

Ruby has the unfortunate habit of being way too strict in its semantic
versioning. In this case, we think it's better to use open-ended
dependencies for now, as most repository packages do.

In the event that stuff breaks, we can reconsider this. For now it seems
to work just fine.

Unfortunately, this does require us to rebuild the gem file from source.
This is slightly more work, but we believe the experience will be better
for everyone in the end.
---
 .SRCINFO | 13 +++----------
 PKGBUILD | 31 +++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 3f207eb..1e42862 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 4.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -12,18 +12,12 @@ pkgbase = jekyll
 	depends = ruby-jekyll-watch>=2.0
 	depends = ruby-kramdown>=2.1.0
 	depends = ruby-liquid>=4.0
-	depends = ruby-liquid<5.0
 	depends = ruby-mercenary>=0.3.3
-	depends = ruby-mercenary<0.4
 	depends = ruby-pathutil>=0.9
-	depends = ruby-pathutil<1.0
 	depends = ruby-rouge>1.7
-	depends = ruby-rouge<4.0
 	depends = ruby-safe_yaml>=1.0
-	depends = ruby-safe_yaml<2.0
 	depends = ruby-i18n>=1
 	depends = ruby-em-websocket>=0.5
-	depends = ruby-em-websocket<1.0
 	depends = ruby-kramdown-parser-gfm
 	depends = ruby-terminal-table
 	optdepends = ruby-minima: Default theme for Jekyll
@@ -34,10 +28,9 @@ pkgbase = jekyll
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
-	noextract = jekyll-4.0.0.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/jekyll-4.0.0.gem
-	sha256sums = 4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a
+	source = jekyll-4.0.0.tar.gz::https://github.com/jekyll/jekyll/archive/v4.0.0.tar.gz
+	sha256sums = 262547c5c6365b73ef45da79005ecd08600f3f398ac0d071439abf0f11fc35a1
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 3e7af83..7d9bc98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=4.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -17,13 +17,13 @@ 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<5.0'
-    'ruby-mercenary>=0.3.3' 'ruby-mercenary<0.4'
-    'ruby-pathutil>=0.9' 'ruby-pathutil<1.0'
-    'ruby-rouge>1.7' 'ruby-rouge<4.0'
-    'ruby-safe_yaml>=1.0' 'ruby-safe_yaml<2.0'
+    'ruby-liquid>=4.0'
+    'ruby-mercenary>=0.3.3'
+    'ruby-pathutil>=0.9'
+    'ruby-rouge>1.7'
+    'ruby-safe_yaml>=1.0'
     'ruby-i18n>=1'
-    'ruby-em-websocket>=0.5' 'ruby-em-websocket<1.0'
+    'ruby-em-websocket>=0.5'
     'ruby-kramdown-parser-gfm'
     'ruby-terminal-table'
     )
@@ -37,11 +37,22 @@ provides=("$pkgname=$pkgver" "ruby-jekyll")
 conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
-source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
-noextract=($_gemname-$pkgver.gem)
-sha256sums=('4a1dc48895d525bfb98cd562bf03ab6dd2727b5795360877c90e12670b9fec3a')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
+sha256sums=('262547c5c6365b73ef45da79005ecd08600f3f398ac0d071439abf0f11fc35a1')
+
+prepare() {
+  cd ${_gemname}-${pkgver}
+  sed -r 's|~>|>=|g' -i ${_gemname}.gemspec # don't give a fuck about rubys bla bla
+  sed 's|git ls-files -z|find -type f -print0\|sed "s,\\\\./,,g"|' -i ${_gemname}.gemspec
+}
+
+build() {
+  cd ${_gemname}-${pkgver}
+  gem build ${_gemname}.gemspec
+}
 
 package() {
+  cd ${_gemname}-${pkgver}
   local _gemdir="$(ruby -e'puts Gem.default_dir')"
   gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem
   rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"

From a62d7c343998fcf31be40685f46ccf2bf46e354a Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Fri, 8 May 2020 18:13:04 +0200
Subject: [PATCH 22/28] Update to v4.0.1.

---
 .SRCINFO | 10 +++++-----
 PKGBUILD |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 1e42862..f67d889 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 4.0.0
-	pkgrel = 3
+	pkgver = 4.0.1
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -24,13 +24,13 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=4.0.0
+	provides = jekyll=4.0.1
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
 	options = !emptydirs
-	source = jekyll-4.0.0.tar.gz::https://github.com/jekyll/jekyll/archive/v4.0.0.tar.gz
-	sha256sums = 262547c5c6365b73ef45da79005ecd08600f3f398ac0d071439abf0f11fc35a1
+	source = jekyll-4.0.1.tar.gz::https://github.com/jekyll/jekyll/archive/v4.0.1.tar.gz
+	sha256sums = a36dae868e2a60f94ebbf1bb0e1818a9df06544d0a1914156f3b1eeed60962f0
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d9bc98..db72703 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=4.0.0
-pkgrel=3
+pkgver=4.0.1
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -38,7 +38,7 @@ conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
-sha256sums=('262547c5c6365b73ef45da79005ecd08600f3f398ac0d071439abf0f11fc35a1')
+sha256sums=('a36dae868e2a60f94ebbf1bb0e1818a9df06544d0a1914156f3b1eeed60962f0')
 
 prepare() {
   cd ${_gemname}-${pkgver}

From 58145f49f9e66bf7df43c929d07ee2ac4938c165 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 27 May 2020 17:58:45 +0200
Subject: [PATCH 23/28] Update to v4.1.0.

---
 .SRCINFO | 8 ++++----
 PKGBUILD | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f67d889..acd4ebf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 4.0.1
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
@@ -24,13 +24,13 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=4.0.1
+	provides = jekyll=4.1.0
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
 	options = !emptydirs
-	source = jekyll-4.0.1.tar.gz::https://github.com/jekyll/jekyll/archive/v4.0.1.tar.gz
-	sha256sums = a36dae868e2a60f94ebbf1bb0e1818a9df06544d0a1914156f3b1eeed60962f0
+	source = jekyll-4.1.0.tar.gz::https://github.com/jekyll/jekyll/archive/v4.1.0.tar.gz
+	sha256sums = 39198e5099b8fed89cdfce312ec2897a2bd152effde61a9147d8eff8c9f4af44
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index db72703..7236aa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=4.0.1
+pkgver=4.1.0
 pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
@@ -38,7 +38,7 @@ conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
-sha256sums=('a36dae868e2a60f94ebbf1bb0e1818a9df06544d0a1914156f3b1eeed60962f0')
+sha256sums=('39198e5099b8fed89cdfce312ec2897a2bd152effde61a9147d8eff8c9f4af44')
 
 prepare() {
   cd ${_gemname}-${pkgver}

From 0a9459efb05f54856bb1eff6919d488de1f0fd61 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 27 May 2020 18:12:04 +0200
Subject: [PATCH 24/28] Fix upstream packaging change.

---
 .SRCINFO | 2 +-
 PKGBUILD | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index acd4ebf..44e0dad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 4.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 7236aa4..8d3b36b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -43,7 +43,7 @@ sha256sums=('39198e5099b8fed89cdfce312ec2897a2bd152effde61a9147d8eff8c9f4af44')
 prepare() {
   cd ${_gemname}-${pkgver}
   sed -r 's|~>|>=|g' -i ${_gemname}.gemspec # don't give a fuck about rubys bla bla
-  sed 's|git ls-files -z|find -type f -print0\|sed "s,\\\\./,,g"|' -i ${_gemname}.gemspec
+  sed 's|git ls-files|find -type f\|sed "s,\\\\./,,g"|' -i ${_gemname}.gemspec
 }
 
 build() {

From 27c73a7287047479338a1293064b8d85d44a08eb Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Wed, 24 Jun 2020 19:35:37 +0200
Subject: [PATCH 25/28] Update to v4.1.1

---
 .SRCINFO | 10 +++++-----
 PKGBUILD |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 44e0dad..c0b7c12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 4.1.0
-	pkgrel = 2
+	pkgver = 4.1.1
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -24,13 +24,13 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=4.1.0
+	provides = jekyll=4.1.1
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
 	options = !emptydirs
-	source = jekyll-4.1.0.tar.gz::https://github.com/jekyll/jekyll/archive/v4.1.0.tar.gz
-	sha256sums = 39198e5099b8fed89cdfce312ec2897a2bd152effde61a9147d8eff8c9f4af44
+	source = jekyll-4.1.1.tar.gz::https://github.com/jekyll/jekyll/archive/v4.1.1.tar.gz
+	sha256sums = 697a2cb683b2a3e4372cc490912da65f512f162917886e0ee9fe0eae5ec51ec1
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d3b36b..3a49f20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=4.1.0
-pkgrel=2
+pkgver=4.1.1
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -38,7 +38,7 @@ conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
-sha256sums=('39198e5099b8fed89cdfce312ec2897a2bd152effde61a9147d8eff8c9f4af44')
+sha256sums=('697a2cb683b2a3e4372cc490912da65f512f162917886e0ee9fe0eae5ec51ec1')
 
 prepare() {
   cd ${_gemname}-${pkgver}

From 118dc9d3929a31e63b2aefe97b35eabe1e43756c Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Thu, 17 Dec 2020 21:10:35 +0100
Subject: [PATCH 26/28] Update to v4.2.0.

---
 .SRCINFO | 8 ++++----
 PKGBUILD | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index c0b7c12..e3f4dc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 4.1.1
+	pkgver = 4.2.0
 	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
@@ -24,13 +24,13 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=4.1.1
+	provides = jekyll=4.2.0
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
 	options = !emptydirs
-	source = jekyll-4.1.1.tar.gz::https://github.com/jekyll/jekyll/archive/v4.1.1.tar.gz
-	sha256sums = 697a2cb683b2a3e4372cc490912da65f512f162917886e0ee9fe0eae5ec51ec1
+	source = jekyll-4.2.0.tar.gz::https://github.com/jekyll/jekyll/archive/v4.2.0.tar.gz
+	sha256sums = a2d80f6d4f55bfaf6c62cceb0e5f49120ba755c286fbfe409fc10f2086cd9d74
 
 pkgname = jekyll
 
diff --git a/PKGBUILD b/PKGBUILD
index 3a49f20..6391bc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=4.1.1
+pkgver=4.2.0
 pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
@@ -38,7 +38,7 @@ conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
-sha256sums=('697a2cb683b2a3e4372cc490912da65f512f162917886e0ee9fe0eae5ec51ec1')
+sha256sums=('a2d80f6d4f55bfaf6c62cceb0e5f49120ba755c286fbfe409fc10f2086cd9d74')
 
 prepare() {
   cd ${_gemname}-${pkgver}

From b4483a3f9d8a756dcbaadced603f488e8ac45e7f Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 26 Apr 2021 23:13:58 +0200
Subject: [PATCH 27/28] Fix Ruby 3 compatibility

Webrick is no longer bundled with Ruby so we need to install it as a
dependency.
---
 .SRCINFO | 3 ++-
 PKGBUILD | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e3f4dc9..47591e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
 	pkgver = 4.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -20,6 +20,7 @@ pkgbase = jekyll
 	depends = ruby-em-websocket>=0.5
 	depends = ruby-kramdown-parser-gfm
 	depends = ruby-terminal-table
+	depends = ruby-webrick
 	optdepends = ruby-minima: Default theme for Jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
diff --git a/PKGBUILD b/PKGBUILD
index 6391bc1..d325613 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _gemname=jekyll
 pkgname=$_gemname
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -26,6 +26,7 @@ depends=('ruby>=2.1.0'
     'ruby-em-websocket>=0.5'
     'ruby-kramdown-parser-gfm'
     'ruby-terminal-table'
+    'ruby-webrick'
     )
 optdepends=(
     'ruby-minima: Default theme for Jekyll'

From a3a131ab5f33929a91780bac3d5f2bf8e4da20df Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sun, 3 Oct 2021 13:39:25 +0200
Subject: [PATCH 28/28] upgpkg: jekyll 4.2.1-1

upstream release
---
 .SRCINFO | 11 +++++------
 PKGBUILD |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 47591e9..08225bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jekyll
 	pkgdesc = A simple, blog aware, static site generator.
-	pkgver = 4.2.0
-	pkgrel = 2
+	pkgver = 4.2.1
+	pkgrel = 1
 	url = https://github.com/jekyll/jekyll
 	arch = any
 	license = MIT
@@ -25,13 +25,12 @@ pkgbase = jekyll
 	optdepends = ruby-jekyll-paginate
 	optdepends = ruby-jekyll-gist
 	optdepends = ruby-jekyll-feed
-	provides = jekyll=4.2.0
+	provides = jekyll=4.2.1
 	provides = ruby-jekyll
 	conflicts = ruby-jekyll
 	replaces = ruby-jekyll
 	options = !emptydirs
-	source = jekyll-4.2.0.tar.gz::https://github.com/jekyll/jekyll/archive/v4.2.0.tar.gz
-	sha256sums = a2d80f6d4f55bfaf6c62cceb0e5f49120ba755c286fbfe409fc10f2086cd9d74
+	source = jekyll-4.2.1.tar.gz::https://github.com/jekyll/jekyll/archive/v4.2.1.tar.gz
+	sha256sums = 3413623a27709877f5850f7991b6318d0a3d15960c84ac1b2fee4e7d3e72ccd7
 
 pkgname = jekyll
-
diff --git a/PKGBUILD b/PKGBUILD
index d325613..e955832 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 _gemname=jekyll
 pkgname=$_gemname
-pkgver=4.2.0
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
 pkgdesc='A simple, blog aware, static site generator.'
 arch=('any')
 url='https://github.com/jekyll/jekyll'
@@ -39,7 +39,7 @@ conflicts=('ruby-jekyll')
 replaces=('ruby-jekyll')
 options=(!emptydirs)
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/jekyll/jekyll/archive/v${pkgver}.tar.gz)
-sha256sums=('a2d80f6d4f55bfaf6c62cceb0e5f49120ba755c286fbfe409fc10f2086cd9d74')
+sha256sums=('3413623a27709877f5850f7991b6318d0a3d15960c84ac1b2fee4e7d3e72ccd7')
 
 prepare() {
   cd ${_gemname}-${pkgver}