3 files changed, 51 insertions, 39 deletions
diff --git a/pcr/maruku/PKGBUILD b/pcr/maruku/PKGBUILD
deleted file mode 100644
index a647e5a12..000000000
--- a/pcr/maruku/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
-# Maintainter : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=maruku
-pkgver=0.6.0
-pkgrel=1
-pkgdesc="A Markdown-superset interpreter"
-arch=(any)
-url="http://maruku.rubyforge.org/"
-license=('GPL2')
-depends=(ruby ruby-syntax)
-makedepends=(rubygems)
-source=(http://gems.rubyforge.org/gems/maruku-$pkgver.gem)
-noextract=(maruku-$pkgver.gem)
-md5sums=('6e2575e43b675eb4e15bbcee0fd1fd29')
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" maruku-$pkgver.gem
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('6e2575e43b675eb4e15bbcee0fd1fd29')
diff --git a/pcr/ruby-maruku/PKGBUILD b/pcr/ruby-maruku/PKGBUILD
new file mode 100644
index 000000000..786b03e98
--- /dev/null
+++ b/pcr/ruby-maruku/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainter: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>
+
+_gemname=maruku
+pkgname=ruby-$_gemname
+pkgver=0.6.1
+pkgdesc="A Markdown-superset interpreter"
+url="http://maruku.rubyforge.org/"
+
+license=('GPL') # GPL2+
+
+pkgrel=1
+arch=(any)
+depends=(ruby ruby-syntax)
+makedepends=(rubygems)
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+
+package() {
+  cd "$srcdir"
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+    "$_gemname-$pkgver.gem"
+}
+
+md5sums=('b919c2b706ca83502a8bec0be5c16c6d')
diff --git a/pcr/ruby-syntax/PKGBUILD b/pcr/ruby-syntax/PKGBUILD
index 6845206bb..36d38a725 100644
--- a/pcr/ruby-syntax/PKGBUILD
+++ b/pcr/ruby-syntax/PKGBUILD
@@ -1,23 +1,32 @@
-# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-pkgname=ruby-syntax
+# Maintainter: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>
+
+_gemname=syntax
+pkgname=ruby-$_gemname
 pkgver=1.0.0
-pkgrel=1
-pkgdesc="Syntax - lexical analysis for syntax highlighting"
-arch=(any)
+pkgdesc="A Ruby library for performing simple syntax highlighting"
 url="http://syntax.rubyforge.org/"
-license=('custom:BSD')
+license=('custom:BSD3')
+
+pkgrel=2
+arch=(any)
 depends=(ruby)
 makedepends=(rubygems)
-source=(http://gems.rubyforge.org/gems/syntax-$pkgver.gem)
-noextract=(syntax-$pkgver.gem)
-md5sums=('d9d2eabc03bc937adfa00e35f228f9a8')
+source=("https://rubyforge.org/frs/download.php/4952/$_gemname-$pkgver.tar.bz2" $_gemname.gemspec)
+md5sums=('bcb53b7d0847190c40a993c3fe1f1611'
+         '6e9a615fd9ba73335b16e5cc8762667d')
 
 build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" syntax-$pkgver.gem
+  cd "$srcdir/$_gemname-$pkgver"
+  gem build ../$_gemname.gemspec
 }
 
-# vim:set ts=2 sw=2 et:
-md5sums=('d9d2eabc03bc937adfa00e35f228f9a8')
+package() {
+  cd "$srcdir/$_gemname-$pkgver"
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+    "$_gemname-$pkgver.gem"
+  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \
+                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}