version bump

3 files changed, 27 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a007196ecb53..6a49e9443329 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,50 +1,24 @@
 pkgbase = ruby-gollum-lib
-	pkgdesc = A simple, Git-powered wiki, external library dependencies.
-	pkgver = 4.2.10
+	pkgdesc = A simple, Git-powered wiki.
+	pkgver = 5.0.6
 	pkgrel = 1
 	url = http://github.com/gollum/gollum-lib
 	arch = any
 	license = MIT
+	makedepends = ruby-rdoc
 	depends = ruby
-	depends = ruby-gollum-grit_adapter
+	depends = ruby-gollum-rugged_adapter
 	depends = ruby-rouge
 	depends = ruby-nokogiri
-	depends = ruby-stringex
-	depends = ruby-sanitize
+	depends = ruby-loofah
 	depends = ruby-github-markup
 	depends = ruby-gemojione
-	provides = ruby-gollum-grit_adapter=1.0.1
-	provides = ruby-mini_portile2=2.1.0
-	provides = ruby-sanitize=2.1.0
-	provides = ruby-github-markup=1.6.1
-	provides = ruby-kramdown=1.9.0
-	provides = ruby-rack=1.6.8
-	provides = ruby-mustache=0.99.8
-	noextract = gollum-lib-4.2.10.gem
-	noextract = gollum-grit_adapter-1.0.1.gem
-	noextract = mini_portile2-2.1.0.gem
-	noextract = sanitize-2.1.0.gem
-	noextract = github-markup-1.6.1.gem
-	noextract = kramdown-1.9.0.gem
-	noextract = rack-1.6.8.gem
-	noextract = mustache-0.99.8.gem
+	depends = ruby-octicons<9
+	depends = ruby-twitter-text<2
+	noextract = gollum-lib-5.0.6.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/gollum-lib-4.2.10.gem
-	source = https://rubygems.org/downloads/gollum-grit_adapter-1.0.1.gem
-	source = https://rubygems.org/downloads/mini_portile2-2.1.0.gem
-	source = https://rubygems.org/downloads/sanitize-2.1.0.gem
-	source = https://rubygems.org/downloads/github-markup-1.6.1.gem
-	source = https://rubygems.org/downloads/kramdown-1.9.0.gem
-	source = https://rubygems.org/downloads/rack-1.6.8.gem
-	source = https://rubygems.org/downloads/mustache-0.99.8.gem
-	sha256sums = 6eb75173fbd6ed18621e650f747e0581b53f6c070f8fc995474a389363e42999
-	sha256sums = 8b644bac7bd10f38b7944c324263b3f6d4506a0571e6221d604e853d4c5d9139
-	sha256sums = 0b0e83fe0fc190640a93c48cef0c8e1f1f40f77840d82c160fefc1b07a5345f8
-	sha256sums = c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77
-	sha256sums = 38828ee5b49a2f645919d08fc4b6bdd888500117251f6b50c4e52726264bcbdb
-	sha256sums = e00ef90f083f845118577dd6a040b4a4aa475bd7a2a645b2ad6944da0555598b
-	sha256sums = eae37ccb7686b2c672f64bc6be366cfda4d828ea58e1086cb82766b17a54a7a6
-	sha256sums = 826a96db895819c13fffa4fa3c20b85e80b60aaec1f28f79e7db80092abdb0bc
+	source = https://rubygems.org/downloads/gollum-lib-5.0.6.gem
+	sha1sums = a9e4f966a7c621a79372bebed87c8efd2e7c6fa2
 
 pkgname = ruby-gollum-lib
 
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8e89e1ea6018..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-src/
-pkg/
-*.tar.gz
-*.tar.xz
-*.gem
diff --git a/PKGBUILD b/PKGBUILD
index 24e90d67c7ca..15a3d0571609 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,33 @@
 # Generated by gem2arch (https://github.com/anatol/gem2arch)
+# Maintainer: Anatoly Bashmakov <anatoly at posteo dot net>
 # Maintainer: Grey Christoforo <first name at last name dot net>
 
 _gemname=gollum-lib
 pkgname=ruby-$_gemname
-pkgver=4.2.10
+pkgver=5.0.6
 pkgrel=1
-pkgdesc='A simple, Git-powered wiki, external library dependencies.'
+pkgdesc='A simple, Git-powered wiki.'
 arch=(any)
 url='http://github.com/gollum/gollum-lib'
 license=(MIT)
-depends=(ruby ruby-gollum-grit_adapter ruby-rouge ruby-nokogiri ruby-stringex ruby-sanitize ruby-github-markup ruby-gemojione)
+depends=(ruby
+         ruby-gollum-rugged_adapter
+         ruby-rouge
+         ruby-nokogiri
+         ruby-loofah
+         ruby-github-markup
+         ruby-gemojione
+         'ruby-octicons<9'
+         'ruby-twitter-text<2')
+makedepends=(ruby-rdoc)
 options=(!emptydirs)
 source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-provides=()
-
-# The following section contains a hack to add quite a few packages without repeating myself too often.
-# This should be removed once dependency hell is fixed.
-
-_packagefixes=(
-'gollum-grit_adapter=1.0.1'
-'mini_portile2=2.1.0'
-'sanitize=2.1.0'
-'github-markup=1.6.1'
-'kramdown=1.9.0'
-'rack=1.6.8'
-'mustache=0.99.8'
-)
-
-for _buggeddep in ${_packagefixes[@]}; do
-	_buggedgem=$(echo $_buggeddep | cut -d '=' -f 1)
-	_buggedver=$(echo $_buggeddep | cut -d '=' -f 2)
-
-	source+=("https://rubygems.org/downloads/$_buggedgem-$_buggedver.gem")
-	noextract+=("$_buggedgem-$_buggedver.gem")
-	provides+=("ruby-$_buggeddep")
-done
+sha1sums=('a9e4f966a7c621a79372bebed87c8efd2e7c6fa2')
 
 package() {
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" ${noextract[@]}
-
-  # Remove cache, since we are a pacman package.
-  rm -rf "$pkgdir/$_gemdir/cache"
-
-  # Remove binaries, as they are not needed.
-  rm -rf "$pkgdir/usr/bin"
-
+  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"
 }
-
-sha256sums=('6eb75173fbd6ed18621e650f747e0581b53f6c070f8fc995474a389363e42999'
-            '8b644bac7bd10f38b7944c324263b3f6d4506a0571e6221d604e853d4c5d9139'
-            '0b0e83fe0fc190640a93c48cef0c8e1f1f40f77840d82c160fefc1b07a5345f8'
-            'c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77'
-            '38828ee5b49a2f645919d08fc4b6bdd888500117251f6b50c4e52726264bcbdb'
-            'e00ef90f083f845118577dd6a040b4a4aa475bd7a2a645b2ad6944da0555598b'
-            'eae37ccb7686b2c672f64bc6be366cfda4d828ea58e1086cb82766b17a54a7a6'
-            '826a96db895819c13fffa4fa3c20b85e80b60aaec1f28f79e7db80092abdb0bc')