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

Conflicts:
	community/avant-window-navigator/PKGBUILD
	community/awn-extras-applets/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/gnome-menus2/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gpsim/PKGBUILD
	community/kgraphviewer/PKGBUILD
	community/kpovmodeler/PKGBUILD
	community/libdesktop-agnostic/PKGBUILD
	community/python-basemap/PKGBUILD
	community/python-mpi4py/PKGBUILD
	community/python-psutil/PKGBUILD
	community/qgo/PKGBUILD
	community/ude/PKGBUILD
	community/virtkey/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/aterm/PKGBUILD
	extra/cups-pdf/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdeplasma-applets-networkmanagement/PKGBUILD
	extra/libffado/PKGBUILD
	extra/libtar/PKGBUILD
	extra/maxima/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xauth/PKGBUILD

8 files changed, 43 insertions, 27 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index f1eab5401..ce9cfa040 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98047 2013-10-04 15:29:48Z jelle $
+# $Id: PKGBUILD 98485 2013-10-11 18:19:46Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,8 +9,8 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.5
-pkgrel=2
+pkgver=1.6
+pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -27,13 +27,14 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=calibre.install
-source=('http://download.calibre-ebook.com/1.5.0/calibre-1.5.0.tar.xz'
+source=('http://download.calibre-ebook.com/1.6.0/calibre-1.6.0.tar.xz'
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('adb8543044f81f93d6faef372710bcb5'
+md5sums=('d4fc03a2bec211324897cbb916c6eb89'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
+
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 2d081f8e3..52019ab59 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97769 2013-09-29 14:35:16Z fyan $
+# $Id: PKGBUILD 98455 2013-10-11 07:59:42Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 
 _pkgname=cgminer
 pkgname=cgminer-libre
-pkgver=3.5.0
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -54,6 +54,8 @@ build() {
     --enable-modminer \
     --enable-ztex \
     --enable-avalon \
+    --enable-klondike \
+    --enable-bitfury \
     --disable-adl # For license issues
   
   make
@@ -73,6 +75,6 @@ package() {
   install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
 }
 
-sha512sums=('21dbf036012e331676e6dfd85501f04f10e1f0ae7f4fce3bffd3ffe4ccd8c9544b0166f0024cba00177edbe6b70c4d02803ca05af33a2612a5be7bb5a8ec11fc'
+sha512sums=('c8fe532b1086e3f2beb69b7f5e75e8ad9aab137c0db1a920de8e222ea2a4bf62ef608bec4b85cdf0f76162c53e5999677e326bb0b567abe26dd14eca52e28bdf'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index b8e9e825e..20fcf5bf3 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194325 2013-09-13 11:45:16Z andyrtr $
+# $Id: PKGBUILD 196334 2013-10-11 15:48:49Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.38
+pkgver=1.0.40
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
 options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('610da4c62141d294bf456ca8725324dd')
+md5sums=('50936e556a2787a85cb14dd859e8f410')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
@@ -50,4 +50,7 @@ package() {
   # add upstream systemd support file
   install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
   sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  
+  # use lp group from cups pkg FS#36769
+  chgrp -R lp ${pkgdir}/etc/cups
 }
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 1de6c3a1f..8e715be0f 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193917 2013-09-06 04:31:29Z eric $
+# $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.10.2
+pkgver=1.10.3
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('24d533af7dcd985d3cc8b2589fc3443c17b5acd7'
+sha1sums=('70ea247cd84274cd6a144f63772d97af4e6b5ebb'
           '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 374a7662b..8b896d031 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195936 2013-10-05 19:51:37Z tpowa $
+# $Id: PKGBUILD 196212 2013-10-08 14:19:09Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=62
+pkgrel=63
 epoch=1
 _extramodules=extramodules-3.11-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,9 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar
         kernel-2.6.39.patch
         linux-3.8.patch
         lirc.logrotate
-        lirc.service lircm.service irexec.service
+        lirc.service
+        lircm.service
+        irexec.service
         lirc.tmpfiles)
 
 build() {
@@ -34,6 +36,12 @@ build() {
   patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
   patch -Np1 -i "${srcdir}/linux-3.8.patch"
 
+  # use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+  sed -i -e 's|char.*font1_name.*Courier.*$|char		font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
+  # use /dev/lirc0 by default instead of /dev/lirc
+  sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
+
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
       -e 's/@X_LIBS@//g' \
@@ -108,7 +116,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          '087a7d102e1c96bf1179f38db2b0b237'
          '9ee196bd03ea44af5a752fb0cc6ca96a'
          '3deb02604b37811d41816e9b4385fcc3'
-         '1c7ceace42da44f41e5a42b4dd3b3d76'
-         '121283a6de274e52ed86522aecd0f6e5'
+         'a9ab637e7207472e61e55a2fa75dc555'
+         '1847b9997685bc3ad2cf11bea4590a92'
          '07131d117fcfe9dcd50c453c3a5e9531'
          'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
index 2123348fd..a797d1661 100644
--- a/libre/lirc-libre/lirc.service
+++ b/libre/lirc-libre/lirc.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=Linux Infrared Remote Control
+After=network.target
 
 [Service]
-ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid
 Type=forking
 PIDFile=/run/lirc/lircd.pid
+ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
index eedcf5d8f..c0b5e36b7 100644
--- a/libre/lirc-libre/lircm.service
+++ b/libre/lirc-libre/lircm.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=LIRC Mouse
-After=lirc.service
-Wants=lirc.service
+Requires=lirc.service
+After=network.target lirc.service
 
 [Service]
-ExecStart=/usr/bin/lircmd -u
 Type=forking
+ExecStart=/usr/sbin/lircmd 
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 828e2bdb9..bf77c087d 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,8 +4,8 @@ pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
 _pkgflag=libre
-pkgver=9.2.0
-pkgrel=2
+pkgver=9.2.1
+pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library'
 url=http://${pkgbase}3d.sourceforge.net
 license=(MIT Khronos LGPL)
@@ -28,7 +28,7 @@ conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 options=(!libtool)
 source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=26c4b41b7e1d5284b87e2997a14424c1ee0713e11fd9dd65932987832e43b96986ed5e88c06fad4616fc912ffb8e17a2314b282cbf38a2640d76c39724965910
+sha512sums=1dbc59b348618dde85e00b318fa5bbc58c29c3f56f8f77260569f155e5e787e56a2b5efff6b0e8cafedc915ccb465c547a10501f39e3d20a57c4e654968de62e
 
 build() {
   cd $srcdir/${pkgbase^}-$pkgver