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

Conflicts:
	community/go/PKGBUILD
	core/openssl/PKGBUILD
	extra/libsigsegv/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	staging/boost/PKGBUILD
	staging/kactivities/PKGBUILD
	staging/kdeaccessibility-jovie/PKGBUILD
	staging/kdeaccessibility-kaccessible/PKGBUILD
	staging/kdeaccessibility-kmag/PKGBUILD
	staging/kdeaccessibility-kmousetool/PKGBUILD
	staging/kdeaccessibility-kmouth/PKGBUILD
	staging/kdeadmin/PKGBUILD
	staging/kdeartwork/PKGBUILD
	staging/kdebase-konsole/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase/PKGBUILD
	staging/kdebindings-kimono/PKGBUILD
	staging/kdebindings-korundum/PKGBUILD
	staging/kdebindings-kross/PKGBUILD
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	staging/kdebindings-qtruby/PKGBUILD
	staging/kdebindings-qyoto/PKGBUILD
	staging/kdebindings-smokegen/PKGBUILD
	staging/kdebindings-smokekde/PKGBUILD
	staging/kdebindings-smokeqt/PKGBUILD
	staging/kdeedu-analitza/PKGBUILD
	staging/kdeedu-blinken/PKGBUILD
	staging/kdeedu-cantor/PKGBUILD
	staging/kdeedu-kalgebra/PKGBUILD
	staging/kdeedu-kalzium/PKGBUILD
	staging/kdeedu-kanagram/PKGBUILD
	staging/kdeedu-kbruch/PKGBUILD
	staging/kdeedu-kgeography/PKGBUILD
	staging/kdeedu-khangman/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-kiten/PKGBUILD
	staging/kdeedu-klettres/PKGBUILD
	staging/kdeedu-kmplot/PKGBUILD
	staging/kdeedu-kstars/PKGBUILD
	staging/kdeedu-ktouch/PKGBUILD
	staging/kdeedu-kturtle/PKGBUILD
	staging/kdeedu-kwordquiz/PKGBUILD
	staging/kdeedu-marble/PKGBUILD
	staging/kdeedu-parley/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	staging/kdeedu-step/PKGBUILD
	staging/kdegames/PKGBUILD
	staging/kdegraphics-gwenview/PKGBUILD
	staging/kdegraphics-kamera/PKGBUILD
	staging/kdegraphics-kcolorchooser/PKGBUILD
	staging/kdegraphics-kgamma/PKGBUILD
	staging/kdegraphics-kolourpaint/PKGBUILD
	staging/kdegraphics-kruler/PKGBUILD
	staging/kdegraphics-ksaneplugin/PKGBUILD
	staging/kdegraphics-ksnapshot/PKGBUILD
	staging/kdegraphics-mobipocket/PKGBUILD
	staging/kdegraphics-okular/PKGBUILD
	staging/kdegraphics-strigi-analyzer/PKGBUILD
	staging/kdegraphics-svgpart/PKGBUILD
	staging/kdegraphics-thumbnailers/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdepim-runtime/PKGBUILD
	staging/kdepim/PKGBUILD
	staging/kdepimlibs/PKGBUILD
	staging/kdeplasma-addons/PKGBUILD
	staging/kdesdk-kate/PKGBUILD
	staging/kdesdk/PKGBUILD
	staging/kdetoys/PKGBUILD
	staging/kdeutils-filelight/PKGBUILD
	staging/kdeutils-kcalc/PKGBUILD
	staging/kdeutils-kcharselect/PKGBUILD
	staging/kdeutils-kdf/PKGBUILD
	staging/kdeutils-kfloppy/PKGBUILD
	staging/kdeutils-kgpg/PKGBUILD
	staging/kdeutils-kremotecontrol/PKGBUILD
	staging/kdeutils-ksecrets/PKGBUILD
	staging/kdeutils-ktimer/PKGBUILD
	staging/kdeutils-kwallet/PKGBUILD
	staging/kdeutils-superkaramba/PKGBUILD
	staging/kdeutils-sweeper/PKGBUILD
	staging/kdewebdev/PKGBUILD
	staging/libkdcraw/PKGBUILD
	staging/libkdeedu/PKGBUILD
	staging/libkexiv2/PKGBUILD
	staging/libkipi/PKGBUILD
	staging/libksane/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/ruby/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-server/autoconfig-nvidia.patch
	testing/xorg-server/autoconfig-sis.patch

1 files changed, 5 insertions, 10 deletions

diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 7c07fcc93..b02b50e8a 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151647 2012-02-29 10:28:02Z ronald $
+# $Id: PKGBUILD 154928 2012-03-31 08:57:52Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
-pkgver=4.4.4
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.gnuplot.info" 
@@ -13,17 +13,12 @@ license=('custom')
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
 install=gnuplot.install 
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-	"lua_tikz.patch")
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
-          'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # upstram patch to fix lua/tikz terminal
-  patch -Np0 -i ${srcdir}/lua_tikz.patch  
-
   # fix default source location; use the GDFONTPATH variable to modify at runtime 
   sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c