upgpkg: ruby-oj

Use CARCH instead of uname -m.

.gitmodules

@@ -292,9 +292,6 @@
 [submodule "ruby-guard"]
 	path = ruby-guard
 	url = ssh://aur@aur.archlinux.org/ruby-guard.git
-[submodule "ruby-guard-compat"]
-	path = ruby-guard-compat
-	url = ssh://aur@aur.archlinux.org/ruby-guard-compat.git
 [submodule "ruby-guard-nanoc"]
 	path = ruby-guard-nanoc
 	url = ssh://aur@aur.archlinux.org/ruby-guard-nanoc.git

elfcat

@@ -1 +1 @@
-Subproject commit 46b1be79c6485d2a144efd76ab744cb8529421d7
+Subproject commit 6e806bb71d81a0f842c8fef1cb31e02157fa9253

ruby-guard-compat

@@ -1 +0,0 @@
-Subproject commit f9f4718a53dc333e529bcac29bcaccdf3d96ae87

ruby-guard-compat/PKGBUILD

@@ -0,0 +1,46 @@
+# Maintainer: George Rawlinson <grawlinson@archlinux.org>
+# Contributor: Mario Finelli <mario at finel dot li>
+
+_gemname=guard-compat
+pkgname=ruby-${_gemname}
+pkgver=1.2.1
+pkgrel=2
+pkgdesc="Test helper for testing Guard plugins"
+arch=('any')
+url="https://github.com/guard/guard-compat"
+license=('MIT')
+depends=('ruby')
+makedepends=('ruby-rdoc')
+options=('!emptydirs')
+source=("https://rubygems.org/downloads/$_gemname-$pkgver.gem")
+noextract=("$_gemname-$pkgver.gem")
+b2sums=('988365132a2594deff90623dd2d590b14f12b4d119e0d486c865dc0c3c53e67fe9c831173eeb009c4a37fa6061bf07c59f8759b5a63a86fbfd1010576ac18663')
+
+package() {
+  local _gemdir="$(ruby -e'puts Gem.default_dir')"
+
+  gem install \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "$pkgdir/$_gemdir" \
+    --bindir "$pkgdir/usr/bin" \
+    "$_gemname-$pkgver.gem"
+
+  # delete cache
+  cd "$pkgdir/$_gemdir"
+  rm -vrf cache
+
+  # delete unnecessary files & folders
+  cd "gems/$_gemname-$pkgver"
+  find . -type f -name ".*" -delete
+  rm -vrf spec Gemfile Rakefile "$_gemname.gemspec"
+
+  # move documentation
+  install -vd "$pkgdir/usr/share/doc/$pkgname"
+  mv -vt "$pkgdir/usr/share/doc/$pkgname" README.md
+
+  # move license
+  install -vd "$pkgdir/usr/share/licenses/$pkgname"
+  mv -vt "$pkgdir/usr/share/licenses/$pkgname" LICENSE.txt
+}

ruby-oj/PKGBUILD

@@ -32,7 +32,7 @@ package() {
 
   # delete unnecessary files & folders
   # TODO: investigate gem.build_complete (gem_build_complete_path)
-  rm -vrf "extensions/$(uname -m)-linux/$(basename $(ruby -e'puts Gem.default_dir'))/$_gemname-$pkgver/gem_make.out"
+  rm -vrf "extensions/$CARCH-linux/$(basename $(ruby -e'puts Gem.default_dir'))/$_gemname-$pkgver/gem_make.out"
   cd "gems/$_gemname-$pkgver"
   rm -vrf test ext