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

Conflicts:
	community/drbd/PKGBUILD
	community/dumb/PKGBUILD
	community/echat/PKGBUILD
	community/librcc/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python2-pysqlite-legacy/PKGBUILD
	community/python2-pyxmpp/PKGBUILD
	core/libksba/PKGBUILD
	core/ncurses/PKGBUILD
	extra/libbonobo/PKGBUILD
	extra/libmpeg2/PKGBUILD
	extra/qt/PKGBUILD
	extra/rarian/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD

12 files changed, 56 insertions, 39 deletions

diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 55f88a97f..cf428bfa7 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173107 2012-12-11 04:46:40Z bisson $
+# $Id: PKGBUILD 177005 2013-02-04 00:31:50Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -8,7 +8,7 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.3.3
+pkgver=3.3.4
 pkgrel=1
 pkgdesc='Plugins for Audacious without unfree plugins'
 url='http://audacious-media-player.org/'
@@ -30,7 +30,7 @@ conflicts=("${pkgname%-libre}")
 
 makedepends=("audacious>=${pkgver}"
              'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
+             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
              'libnotify' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss')
@@ -47,7 +47,7 @@ optdepends=('oss: Open Sound System v4 output'
             'ffmpeg: ffaudio input'
             'libmodplug: modplug input'
             'fluidsynth: MIDI FluidSynth backend input'
-            'libcdio: CD Digital Audio input'
+            'libcdio-paranoia: CD Digital Audio input'
             'libsidplay: Commodore 64 audio input'
             'wavpack: WavPack input'
 
@@ -61,7 +61,7 @@ optdepends=('oss: Open Sound System v4 output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e')
+sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607')
 
 build() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 95a121a57..53f26e112 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -17,7 +17,7 @@ else
 fi
 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
 pkgver=2.65a
-pkgrel=1
+pkgrel=2
 pkgaev=6
 arch=(
   i686
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index eb3a148e2..dc05d95ad 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,11 +2,11 @@
 
 _pkgname=ghostscript
 pkgname=gnu-ghostscript
-_pkgver=9.05
-pkgver=9.05.0
-pkgrel=2
+_pkgver=9.06
+pkgver=9.06.0
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
 makedepends=('gtk2' 'gnutls')
@@ -16,14 +16,19 @@ conflicts=${_pkgname}
 provides="${_pkgname}=9.06"
 url="https://www.gnu.org/software/${_pkgname}/"
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
+        ijs-automake.patch
         libtool.patch)
-options=('!libtool' '!makeflags')
-md5sums=('e80423be9abb32fc99cc897ed379a7df'
+options=('!libtool')
+md5sums=('85a5e07a6b91937c157576293b381065'
+         '83bcae456ad4c9fb790be483914dbeba'
          '5bd5d4966007b460deed866a30a0b3c8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # fix build with recent automake
+  patch -p1 -i "$srcdir/ijs-automake.patch"
+
   # fix libtool version
   patch -Np1 -i ${srcdir}/libtool.patch
 
@@ -55,7 +60,7 @@ build() {
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} \
+  make -j1 DESTDIR=${pkgdir} \
 	cups_serverroot=${pkgdir}/etc/cups \
 	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
 
@@ -70,5 +75,5 @@ package() {
 
   # install IJS
   cd ${srcdir}/${pkgname}-${pkgver}/ijs
-  make DESTDIR=${pkgdir} install
+  make -j1 DESTDIR=${pkgdir} install
 }
diff --git a/libre/gnu-ghostscript/ijs-automake.patch b/libre/gnu-ghostscript/ijs-automake.patch
new file mode 100644
index 000000000..7b5f77ca1
--- /dev/null
+++ b/libre/gnu-ghostscript/ijs-automake.patch
@@ -0,0 +1,10 @@
+--- gnu-ghostscript-9.06.0.orig/ijs/configure.ac	2012-12-26 23:11:50.000000000 -0200
++++ gnu-ghostscript-9.06.0/ijs/configure.ac	2013-02-04 13:28:10.656069912 -0200
+@@ -117,7 +117,6 @@
+ dnl Checks for programs
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_ISC_POSIX
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 9621d5097..f82a250bf 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.7.5
+_kernver=3.7.6
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_pkgver=2013-01-25-u
-pkgver=20130125
+_version=v3.8-rc5
+_pkgver=3.8-rc5-1-u
+pkgver=3.8rc5.1
 pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
@@ -16,9 +17,9 @@ install=linux-libre-kmod-alx.install
 replaces=('alx' 'alx-driver' 'dkms-alx')
 provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2013/01/25/compat-drivers-$_pkgver.tar.xz)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('ecad3f4a4917b3c7fa2363383e6b7aa4')
+md5sums=('6ad873fbc6664aa4c15160e3ad7cb4c1')
 
 
 build() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 52197526f..4a4972307 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=61
+_sublevel=62
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.61 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'dd163767eb05f10ff0fc0c14ac2a6f4f'
+         '90b2c4b9a05b108219bd44ac4804db84'
          '99f9c408b64393aceb2482c9a3e329ee'
          'fba95bf1857ce6bf863e13a1ab73f584'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 798e62ec4..dc9b9e2d1 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.61-1-LIBRE-LTS
+KERNEL_VERSION=3.0.62-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5dd8a1974..ed451ff6e 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.7
-_sublevel=5
+_sublevel=6
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'fat-3.6.x.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
-         '9de11fba7c68f3588ce01f03f48ff395'
-         'f4f17ac556ed20dda63804fa359c730c'
-         'dc6058f50e3a64e5fe8e7f4b2d07ba80'
+         '90b2c4b9a05b108219bd44ac4804db84'
+         '53c782740eb3ddf875ad98c31c1bf213'
+         '71a6f703cb0bee098a76ea42d5836d06'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index ce3d7e082..e6ffc0759 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.7.1-1 Kernel Configuration
+# Linux/i386 3.7.6-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -870,6 +870,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
@@ -5144,7 +5145,6 @@ CONFIG_DX_SEP=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
 # CONFIG_ZCACHE is not set
-CONFIG_ZCACHE2=y
 CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
@@ -5224,6 +5224,7 @@ CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 CONFIG_CSR_WIFI=m
+CONFIG_ZCACHE2=y
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
@@ -5322,7 +5323,7 @@ CONFIG_MEMORY=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5442,7 +5443,6 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_RAMSTER=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 80f5fe993..eb2e5d7ef 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.7.1-1 Kernel Configuration
+# Linux/x86_64 3.7.6-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -840,6 +840,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
@@ -4910,8 +4911,7 @@ CONFIG_VT6656=m
 CONFIG_DX_SEP=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-# CONFIG_ZCACHE is not setup
-CONFIG_ZCACHE2=y
+# CONFIG_ZCACHE is not set
 CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
@@ -4991,6 +4991,8 @@ CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 CONFIG_CSR_WIFI=m
+CONFIG_ZCACHE2=y
+CONFIG_RAMSTER=y
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
@@ -5089,7 +5091,7 @@ CONFIG_MEMORY=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5210,7 +5212,6 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_RAMSTER=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 32f947f56..d31ca0b7c 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.7.5-1-LIBRE
+KERNEL_VERSION=3.7.6-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 8292119d8..937332360 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=20121102
+pkgver=20130205
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -15,5 +15,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('63c49a827ef05575514412ae76637c67'
-         '9b887e116a8e115a2ca082f65b3ea65a')
+md5sums=('695ef52f9cdd167f8f406ebfbe08754f'
+         '7f5b50ad7e68f8cf2e3a7f9a4b3b1277')