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

Conflicts:
	community/erlang/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libgdamm/PKGBUILD
	community/luasql/PKGBUILD
	community/myodbc/PKGBUILD
	community/python2-basemap/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/stardict/PKGBUILD
	core/diffutils/PKGBUILD
	core/libsasl/PKGBUILD
	core/systemd/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/calligra/PKGBUILD
	extra/gnokii/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libmtp/PKGBUILD
	extra/lighttpd/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mysql/PKGBUILD
	extra/php/PKGBUILD
	extra/qt3/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/tracker/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/lilo/PKGBUILD
	libre/psi/PKGBUILD

1 files changed, 5 insertions, 22 deletions

diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 928161a0a..2fb54c5b5 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86880 2013-03-23 23:10:43Z td123 $
+# $Id: PKGBUILD 87134 2013-03-27 19:44:03Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -8,29 +8,24 @@
 pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2'
          'ruby-pango')
-pkgver=1.2.2
-pkgrel=2
+pkgver=1.2.5
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2')
-source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz"
-        '0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch')
-sha256sums=('f99ff4888fc69317e1dae61c9ca684bf2f38a20534f1f1b4b3b182c66247910c'
-            '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388')
+source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz")
+sha256sums=('9b956468446361b930bb5b10a518e1c59b4ce2dd2ea04ccc600d0259f1490429')
 
 build() {
   cd "$srcdir/ruby-gtk2-$pkgver"
 
-  #patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch
   LANG="en_US.UTF-8" \
     ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor
   mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux"
   mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux"
   mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux"
   mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux"
-  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
-  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
   make
 }
 
@@ -39,8 +34,6 @@ package_ruby-atk() {
   depends=("ruby-glib2=$pkgver" 'atk')
 
   cd "$srcdir/ruby-gtk2-$pkgver/atk"
-  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
-  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
   make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
@@ -49,8 +42,6 @@ package_ruby-gdkpixbuf2() {
   depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2')
 
   cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2"
-  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
-  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
   make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
@@ -59,8 +50,6 @@ package_ruby-gio2() {
   depends=("ruby-glib2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gio2"
-  #export CXXFLAGS="$CXXFLAGS -lglib-2.0"
-  #export CFLAGS="$CFLAGS -lglib-2.0"
   make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
@@ -69,8 +58,6 @@ package_ruby-glib2() {
   depends=('glib2' 'ruby')
 
   cd "$srcdir/ruby-gtk2-$pkgver/glib2"
-  #export CXXFLAGS="$CXXFLAGS -lglib-2.0"
-  #export CFLAGS="$CFLAGS -lglib-2.0"
   make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
@@ -80,8 +67,6 @@ package_ruby-gtk2() {
            "ruby-gdkpixbuf2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gtk2"
-  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
-  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
   make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
@@ -90,8 +75,6 @@ package_ruby-pango() {
   depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango')
 
   cd "$srcdir/ruby-gtk2-$pkgver/pango"
-  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
-  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
   make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }