Sun Feb 26 23:15:00 UTC 2012

1 files changed, 39 insertions, 29 deletions

diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index c4786c331..8ceaba4b4 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,46 +1,56 @@
-# $Id: PKGBUILD 146483 2012-01-11 15:22:37Z stephane $
-# Maintainer:
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
-pkgbase=ruby
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p0
-pkgrel=3
-pkgdesc="An object-oriented language for quick and easy programming"
+pkgname=ruby
+pkgver=1.9.3_p125
+pkgrel=1
+pkgdesc='An object-oriented language for quick and easy programming'
 arch=('i686' 'x86_64')
-url="http://www.ruby-lang.org/en/"
+url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+backup=('etc/gemrc')
+provides=('rubygems' 'rake')
+conflicts=('rake')
+depends=('openssl' 'libffi' 'libyaml')
+makedepends=('tk')
+optdepends=('tk: for Ruby/TK'
+            'ruby-docs: Ruby documentation')
 options=('!emptydirs' '!makeflags')
-source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
-sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
+install='ruby.install'
+source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+        'gemrc')
+md5sums=('341b8fc42aa18bd668314199f219db14'
+         '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
-      --enable-shared --enable-pthread --disable-rpath
+  cd ruby-${pkgver//_/-}
+
+  PKG_CONFIG=/usr/bin/pkg-config ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-pthread \
+    --disable-rpath \
+    --disable-install-doc
+
   make
 }
 
-package_ruby() {
-  depends=('openssl' 'libffi' 'libyaml')
-  provides=('rubygems' 'rake')
-  conflicts=('rake')
-  optdepends=('tk: for Ruby/TK')
+check() {
+  cd ruby-${pkgver//_/-}
 
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-nodoc
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
+  make test
 }
 
-package_ruby-docs() {
-  pkgdesc="Documentation files for ruby"
+package() {
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-nodoc
+
+  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
 
-  cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  make DESTDIR="${pkgdir}" install-doc install-capi
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
 }