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

Conflicts:
	extra/shared-mime-info/PKGBUILD

6 files changed, 50 insertions, 21 deletions

diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD
index 125d0d192..d6a253120 100644
--- a/community/allegro/PKGBUILD
+++ b/community/allegro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80364 2012-11-20 22:04:44Z arodseth $
+# $Id: PKGBUILD 84380 2013-02-17 11:58:40Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
-pkgver=5.0.8
+pkgver=5.0.9
 pkgrel=1
 pkgdesc='Portable library mainly aimed at video game and multimedia programming'
 arch=('x86_64' 'i686' 'mips64el')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse')
 makedepends=('cmake' 'mesa' 'glu')
 source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz")
-sha256sums=('272e77d0ca0cef7586d7207887f87bf271e1d0db5f8f208dc7dd9a5e3bb6140b')
+sha256sums=('ba28ac307023f1c756f1c421086f81d1e19ec5f09412d5848303c64177a20bd5')
 
 build() {
   cd "$srcdir"
diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD
index 813d5bf74..26be1d2ff 100644
--- a/community/galculator/PKGBUILD
+++ b/community/galculator/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81934 2013-01-03 21:00:53Z bpiotrowski $
+# $Id: PKGBUILD 84391 2013-02-17 21:32:04Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=galculator
-pkgver=2.0.1
+pkgver=2.1
 pkgrel=1
 pkgdesc='GTK+ based scientific calculator'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils
 makedepends=('intltool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2)
-md5sums=('c4436478adfef4f3a7d6c42ce8286d34')
+sha256sums=('f3ae03601a123287cddf6f79e79cf37bbe5ce87a98997e0fd623f1cd08e6f6be')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index 913043f8a..bbd4c1c58 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81577 2012-12-24 15:00:46Z spupykin $
+# $Id: PKGBUILD 84387 2013-02-17 20:28:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
 pkgname=gnunet
-pkgver=0.9.5
+pkgver=0.9.5_a
 pkgrel=1
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,26 +15,26 @@ makedepends=('gettext' 'pkgconfig')
 backup=(etc/gnunetd.conf)
 options=('!libtool' '!makeflags')
 install=gnunet.install
-source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz
+source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz
 	gnunet.rc
 	gnunet.service
 	gnunet.conf.d
 	defaults.conf)
-md5sums=('9f617b1d5955283e5487e30bd661d3b5'
+md5sums=('b0e204cf9711f9799baaeb477992e66a'
          '5baf691913b007fb33e365239e3f7217'
          '54cce3d2415d95b2e5bd1bd88db3a0ea'
          'f161b46915736e4017e77ad735521453'
          '0fe23b2ca5b3fc47a0b5645e04406da0')
 
 build() {
-  cd $srcdir/gnunet-$pkgver
+  cd $srcdir/gnunet-${pkgver/_/}
   sed -i 's|contrib doc|doc|' Makefile.*
   [ -f Makefile ] || ./configure --prefix=/usr --without-mysql
   make
 }
 
 package() {
-  cd $srcdir/gnunet-$pkgver
+  cd $srcdir/gnunet-${pkgver/_/}
   make DESTDIR=$pkgdir install
   install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd
   install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd
diff --git a/community/kio-mtp/PKGBUILD b/community/kio-mtp/PKGBUILD
new file mode 100644
index 000000000..ebc1beec7
--- /dev/null
+++ b/community/kio-mtp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 84393 2013-02-17 21:44:19Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
+
+pkgname=kio-mtp
+pkgver=0.70
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="Provides KIO Access to MTP devices using the mtp:/// protocol"
+url='https://projects.kde.org/projects/playground/base/kio-mtp'
+license=('GPL')
+depends=('kdebase-runtime' 'libmtp')
+makedepends=('cmake' 'automoc4')
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}-${pkgver}.tar.xz")
+md5sums=('1b4670e938acedcf565ef23cea66890e')
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 4617b7895..cef23d3fb 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83980 2013-02-07 20:46:58Z bpiotrowski $
+# $Id: PKGBUILD 84385 2013-02-17 18:49:54Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.19
+pkgver=0.8.20
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ depends=('openssl' 'python2')
 checkdepends=('curl') # curl used for check()
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('703207d7b394bd3d4035dc3c94b417ee441fd3ea66aa90cd3d7c9bb28e5f9df4')
+sha256sums=('e4461bfded531f4880839829ab3bce5b824905d6e181876e3d0309a366bf57ee')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 83264628a..1c7fa4700 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83891 2013-02-06 11:40:54Z spupykin $
+# $Id: PKGBUILD 84389 2013-02-17 20:28:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.2.7
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
@@ -18,13 +18,13 @@ backup=('etc/squid/squid.conf'
         'etc/squid/mime.conf'
         'etc/conf.d/squid')
 install=$pkgname.install
-source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
+source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid'
         'squid.conf.d'
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('3e4d21b24c39d5066791017919866a64'
+md5sums=('b13a7009e35ba1d3fc0fff00b32ef6b8'
          'e90895ce22c0b618c89a46a9a181fe6c'
          '2383772ef94efddc7b920628bc7ac5b0'
          '270977cdd9b47ef44c0c427ab9034777'
@@ -90,7 +90,7 @@ package() {
   install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
   install -Dm644 "$srcdir/squid.service" \
     "$pkgdir/usr/lib/systemd/system/squid.service"
-  rm -rf $pkgdir/run $pkgdir/var/run
+  rm -rf "$pkgdir/run" "$pkgdir/var/run"
 }
 
 # vim: ts=2 sw=2 et ft=sh