Merged upstream, mesa needs revision

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

1 files changed, 28 insertions, 15 deletions

diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 2a8603f5e..917dbd71d 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -3,22 +3,14 @@
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
-pkgname=ruby
-pkgver=1.9.3_p194
-pkgrel=2
-pkgdesc='An object-oriented language for quick and easy programming'
+pkgname=('ruby' 'ruby-docs')
+pkgver=1.9.3_p286
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
-backup=('etc/gemrc')
-provides=('rubygems' 'rake')
-conflicts=('rake')
-depends=('openssl' 'libffi' 'libyaml')
-makedepends=('tk')
-optdepends=('tk: for Ruby/TK'
-            'ruby-docs: Ruby documentation')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
-install='ruby.install'
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
 md5sums=('2278eff4cfed3cbc0653bc73085caa34'
@@ -32,8 +24,7 @@ build() {
     --sysconfdir=/etc \
     --enable-shared \
     --enable-pthread \
-    --disable-rpath \
-    --disable-install-doc
+    --disable-rpath
 
   make
 }
@@ -44,7 +35,16 @@ check() {
   make test
 }
 
-package() {
+package_ruby() {
+  pkgdesc='An object-oriented language for quick and easy programming'
+  depends=('openssl' 'libffi' 'libyaml')
+  optdepends=('tk: for Ruby/TK'
+              'ruby-docs: Ruby documentation')
+  provides=('rubygems' 'rake')
+  conflicts=('rake')
+  backup=('etc/gemrc')
+  install='ruby.install'
+
   cd ruby-${pkgver//_/-}
 
   make DESTDIR="${pkgdir}" install-nodoc
@@ -54,3 +54,16 @@ package() {
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
 }
+
+package_ruby-docs() {
+  pkgdesc='Documentation files for ruby'
+
+  cd ruby-${pkgver//_/-}
+
+  make DESTDIR="${pkgdir}" install-doc install-capi
+
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
+md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
+         '6fb8e7a09955e0f64be3158fb4a27e7a')