Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/projectm/PKGBUILD
	community-testing/evas_generic_loaders-svn/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/libextractor/PKGBUILD
	community-testing/pdf2djvu/PKGBUILD
	community-testing/qtcreator/PKGBUILD
	community-testing/qtcreator/qtcreator.desktop
	community/galculator/PKGBUILD
	community/ristretto/PKGBUILD
	core/systemd/PKGBUILD
	extra/llvm/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/python-lxml/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/glew/PKGBUILD
	staging/xine-lib/PKGBUILD
	testing/calligra/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gdm/fix_external_program_directories.patch
	testing/glib2/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/polkit/PKGBUILD
	testing/poppler/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-xdm/PKGBUILD

3 files changed, 0 insertions, 96 deletions

diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
deleted file mode 100644
index 0732107ea..000000000
--- a/testing/ruby/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p286
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.ruby-lang.org/en/'
-license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
-options=('!emptydirs' '!makeflags')
-source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('2278eff4cfed3cbc0653bc73085caa34'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
-
-build() {
-  cd ruby-${pkgver//_/-}
-
-  PKG_CONFIG=/usr/bin/pkg-config ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-pthread \
-    --disable-rpath
-
-  make
-}
-
-check() {
-  cd ruby-${pkgver//_/-}
-
-  make test
-}
-
-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
-
-  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
-
-  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')
diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc
deleted file mode 100644
index 3d11de1ec..000000000
--- a/testing/ruby/gemrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
-
-# --user-install is used to install to $HOME/.gem/ by default since we want to separate
-#                pacman installed gems and gem installed gems
-gem: --user-install
diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install
deleted file mode 100644
index ce78e96ec..000000000
--- a/testing/ruby/ruby.install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-print_gem_default_target() {
-  echo 'The default location of gem installs is $HOME/.gem/ruby'
-  echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
-  echo 'If you want to install to the system wide location, you must either:'
-  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
-}
-
-# arg 1:  the new package version
-post_install() {
-  print_gem_default_target
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
-    print_gem_default_target
-  fi
-}