Merge branch 'master' of vparabola:abslibre

30 files changed, 121 insertions, 304 deletions

diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index cc3749800..9d771b952 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,8 +7,7 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=2.11.4
-_build=
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -19,7 +18,7 @@ makedepends=('opencl-headers')
 provides=(${pkgname%-$_pkgflag}=$pkgver)
 conflicts=${pkgname%-$_pkgflag}
 replaces=${pkgname%-$_pkgflag}
-source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2"
+source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz
         "${pkgname%-$_pkgflag}.conf.d"
         "${pkgname%-$_pkgflag}.service")
 backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
@@ -27,22 +26,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
 build() {
-  cd "$srcdir"
-  cd ${pkgname%-$_pkgflag}-$pkgver${_build}
+  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
 
   # Use in-tree jansson since it is not compatible with jansson 2.0
   #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
 
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
-
-  ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl
+  
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-scrypt --disable-adl
   
   make
 }
 
 package() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build}
+  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
@@ -52,6 +51,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('535ca85b504bd408d1eeddf4962ed685'
+md5sums=('63551fdb16086d57bfa4d39cd40d74cd'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
deleted file mode 100644
index 24b667a67..000000000
--- a/libre/django-countries/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=django-countries
-pkgver=1.5
-pkgdesc="Provides a country field for Django models"
-license=('custom:MIT')
-url="http://bitbucket.org/smileychris/django-countries/"
-
-pkgrel=1
-arch=(any)
-depends=('django')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=(6c65fcc3aa7de065a54cdb619397626d)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
-  # fix python->python2, and a typo!
-  sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-}
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 8d58da41c..61840c4df 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.5.9
+pkgver=2.6.6
 pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('ea50b76dd18c1f714359a095b2f00d6a')
+md5sums=('a018efb1fe0f722ff307382791bf3c98')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 330402ed2..999131a86 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.5.9
+pkgver=2.6.6
 pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('ea50b76dd18c1f714359a095b2f00d6a')
+md5sums=('a018efb1fe0f722ff307382791bf3c98')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 441852591..ec3bc1365 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
 pkgver=4.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -49,7 +49,7 @@ build() {
 		-DKDE4_BUILD_TESTS=OFF \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_QNtrack=OFF
+		-DWITH_QNtrack=OFF -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
 	make
 }
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index d8d648b3b..86d209821 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181384 2013-04-04 03:32:27Z svenstaro $
+# $Id: PKGBUILD 183303 2013-04-21 09:43:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.10.2
-pkgrel=1
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index d6dc1c328..6c04db17b 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.8.7
+_kernver=3.8.8
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=13
+pkgrel=14
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 1963f2536..d7902119f 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.73
+_kernver=3.0.74
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=11
+pkgrel=12
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index df302a20d..f4341cb83 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182731 2013-04-13 15:31:06Z tpowa $
+# $Id: PKGBUILD 183082 2013-04-17 12:40:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=73
+_sublevel=74
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.72 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.73 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -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'
-         '846a503d4bacfaca417fbea67aceabc2'
+         'a0984b44eba8de48e20357c9c146baf6'
          'fe0e9b4415b82f306fc1b63eb9a742a4'
          '69a689019ea0b6ed46b387907f14bc8a'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '5d433e634f9744824a5a3122d734e6f6')
+         '624eacedd2a576161512ffefc1797bc1')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index c3aff92ae..b8118b60d 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.73-1-LIBRE-LTS
+KERNEL_VERSION=3.0.74-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 f0ca4a325..9d1e52de9 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182718 2013-04-13 10:58:55Z tpowa $
+# $Id: PKGBUILD 183078 2013-04-17 12:08:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-_sublevel=7
+_sublevel=8
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'f83582104813c022e6739e12664dbb0c'
+         'cc93810441658cdf40a4bc051f8f4774'
          '9b425f069f920cdd6798b3adab79d3af'
          '9316ebdb21ea9948ae5c83795a3dcf61'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '5629a56818c1875bcc77a51c69347d98')
+         'fead20edc727fbb89789194eaebb6daa')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 46f383749..c6fa71c97 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.8.7-1-LIBRE
+KERNEL_VERSION=3.8.8-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/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index bdc8b63c0..0634f6f6c 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182068 2013-04-06 09:25:55Z tpowa $
+# $Id: PKGBUILD 183118 2013-04-17 16:51:39Z 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=41
+pkgrel=42
 epoch=1
 _extramodules=extramodules-3.8-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar
         lirc_atiusb-kfifo.patch
         kernel-2.6.39.patch
         linux-3.8.patch
-        lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+        lirc.logrotate
         lirc.service lircm.service irexec.service
         lirc.tmpfiles)
 
@@ -82,13 +82,10 @@ package_lirc-utils-libre() {
   replaces=('lirc-utils')
   conflicts=('lirc-utils')
   provides=("lirc-utils=$pkgver")
-  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
   install=lirc-utils.install
 
   cd "${srcdir}/lirc-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
   install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
   install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
   install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
@@ -99,12 +96,6 @@ package_lirc-utils-libre() {
   # install the logrotate config
   install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
     
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
   install -d "${pkgdir}/etc/lirc"
   
   # remove built modules
@@ -116,12 +107,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          '1f8b104a2365d9f93404b143f499059b'
          '087a7d102e1c96bf1179f38db2b0b237'
          '9ee196bd03ea44af5a752fb0cc6ca96a'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
          '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb'
          'dab8a73bcc5fd5479d8750493d8d97dc'
          'c2e20fe68b034df752dba2773db16ebe'
          '07131d117fcfe9dcd50c453c3a5e9531'
diff --git a/libre/lirc-libre/irexec.conf b/libre/lirc-libre/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/libre/lirc-libre/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
\ No newline at end of file
diff --git a/libre/lirc-libre/irexecd b/libre/lirc-libre/irexecd
deleted file mode 100644
index a64b033a5..000000000
--- a/libre/lirc-libre/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
-  start)
-    stat_busy "Starting IREXEC Daemon"
-    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon irexecd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IREXEC Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irexecd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/libre/lirc-libre/lircd b/libre/lirc-libre/lircd
deleted file mode 100644
index e9739b36e..000000000
--- a/libre/lirc-libre/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
-  start)
-    stat_busy "Starting LIRC Daemon"
-   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
-    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
-    if [ $? -ne 0 ]; then
-      stat_fail
-      exit 0
-    fi
-    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && 
-      if [ -n "$LIRC_DEVICE" ] ; then
-        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      else
-        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LIRC Daemon"
-    rm -f $LIRCD_SYMLINKFILE
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/libre/lirc-libre/lircd.conf b/libre/lirc-libre/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/libre/lirc-libre/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/libre/lirc-libre/lircmd b/libre/lirc-libre/lircmd
deleted file mode 100644
index 220c47c9c..000000000
--- a/libre/lirc-libre/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
-  start)
-    stat_busy "Starting lircmd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lircmd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lircmd Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/libre/parabola-archiso-git/PKGBUILD b/libre/parabola-archiso-git/PKGBUILD
deleted file mode 100644
index 0b07ddf8d..000000000
--- a/libre/parabola-archiso-git/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-pkgname=parabola-archiso-git
-pkgver=20120506
-pkgrel=1
-pkgdesc="Parabola GNU/Linux-libre livecd/liveusb generation scripts"
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL')
-depends=('libisoburn' 'squashfs-tools' 'rsync')
-optdepends=('qemu: quickly test isos')
-makedepends=('git')
-provides=('archiso')
-conflicts=('archiso')
-source=()
-md5sums=()
-
-_gitroot=git://parabolagnulinux.org/archiso.git
-_gitname=archiso
-
-build() {
-  cd ${srcdir}
-  msg "Connecting to projects.parabolagnulinux.org GIT server..."
-
-  if [ -d ${srcdir}/$_gitname ]; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
- 
-  if [ -d ${srcdir}/$_gitname-build ]; then
-    rm -rf ${srcdir}/$_gitname-build
-  fi
-
-  git clone ${srcdir}/$_gitname ${srcdir}/$_gitname-build || return 1
-  cd ${srcdir}/$_gitname-build/$_gitname || return 1
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
new file mode 100644
index 000000000..a7bd85da1
--- /dev/null
+++ b/libre/python2-django-countries/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=django-countries
+pkgname=python2-$_pkgname
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+url="http://bitbucket.org/smileychris/$_pkgname/"
+license=('custom:MIT')
+
+replaces=($_pkgname)
+conflicts=($_pkgname)
+
+pkgrel=2
+arch=(any)
+depends=('python2-django')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=(6c65fcc3aa7de065a54cdb619397626d)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
+  # fix help message: (python2, typo)
+  # "python regenenerate.py" -> "python2 regenerate.py"
+  sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index 2158c2892..e8a981a3d 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $
+# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
 pkgver=3.11
-pkgrel=2
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)"
+pkgrel=3
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
@@ -19,26 +19,23 @@ provides=("rp-pppoe=$pkgver")
 replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
 install=rp-pppoe.install
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
-        adsl adsl.service kmode.patch $pkgname.patch)
-md5sums=('13b5900c56bd602df6cc526e5e520722'
-         '8fc724aa146dba52ef7b3fbe5b8784c6'
-         'adace1ad441aa88dcb3db52fb7f9c97f'
-         'af234125f956f3a356ab0d0fcaa9e8a2'
-         'd38a903a247d689ff0323d7b6caa1c6b'
-         '3c53d550ac408608abb0b6cd6b76b6c2')
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
+       adsl.service 
+       kmode.patch
+       $pkgname.patch)
 
-build() {
+prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
   
-  ## Adding patch to remove unfree software recommendation (ServPoET)
+  ## Adding patch to remove nonfree software recommendation (ServPoET)
   patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
 
-  cd ./src
-
-  ## Adding support kernel mode
+  cd "$srcdir/$_pkgname-$pkgver/src"
   patch -Np2 -i ../../kmode.patch
+}
 
+build() {
+  cd "$srcdir/$_pkgname-$pkgver/src"
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
@@ -47,6 +44,11 @@ package() {
   cd "$srcdir/$_pkgname-$pkgver/src"
   make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
-  install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
-  install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
+  #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+  install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         'SKIP'
+         'af234125f956f3a356ab0d0fcaa9e8a2'
+         'd38a903a247d689ff0323d7b6caa1c6b'
+         '3c53d550ac408608abb0b6cd6b76b6c2')
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
index a5a9b9b50..d873da4f7 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -4,9 +4,9 @@
 
 _pkgname=spectrwm
 pkgname=spectrwm-libre
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
-pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way (without unfree profont support)"
+pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.spectrwm.org"
 _watch="https://opensource.conformal.com/snapshots/spectrwm/"
@@ -14,14 +14,14 @@ license=('custom:ISC')
 depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor')
 replaces=('spectrwm' 'scrotwm')
 conflicts=('spectrwm')
-provides=("spectrwm=${pkgver}")
+provides=("spectrwm=$pkgver")
 makedepends=('libxt')
-optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font')
+optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font')
 backup=(etc/spectrwm.conf)
 source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('cd0ca423445bdc5a74528ca23166449b'
+md5sums=('c572727b5fb9fe3674c03a7e51d191c4'
          'a67cfe51079481e5b0eab1ad371379e3'
          '950d663692e1da56e0ac864c6c3ed80e')
 
@@ -32,7 +32,12 @@ build() {
   sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c
   sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c
   sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf
+  # crashes if defaults can't be found, use smaller defaults
   sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf
+  #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf
+
+  # see spectrwm FS#403
+  sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c
 
   cd linux
   make PREFIX="/usr"
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 674e047bf..1f8199a48 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180321 2013-03-20 07:47:12Z remy $
+# $Id: PKGBUILD 183235 2013-04-18 23:55:16Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,8 +6,8 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=8
-pkgdesc="TeX Live binaries, Parabola rebranded"
+pkgrel=10
+pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 1e3d5534b..ca594501d 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=texlive-core-libre
 _pkgname=texlive-core
-pkgver=2012.28273
+pkgver=2012.29661
 _revnr=${pkgver#2012.}
 pkgrel=1
-pkgdesc="TeX Live core distribution"
+pkgdesc="TeX Live core distribution, without nonfree add-on packages"
 license=('GPL')
 arch=(any)
 depends=('texlive-bin-libre')
@@ -30,8 +30,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
 options=(!strip)
 install=texlive.install
 #backup=(etc/texmf/tex/context/config/cont-usr.tex)
-md5sums=('42ce6cf5a7728f2ebb9a1a2bbf9dc4ed'
-         '82c03f7226e1df4440f30c89c05ee653')
+md5sums=('4126fad75c577f5b067e612214039c93'
+         '306ab28bb9b070fc3e40d86d28ea7e8e')
 
 build() {
    cd "$srcdir"
diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps
index 013f15e94..8d86bfad1 100644
--- a/libre/texlive-core-libre/texlive-core.maps
+++ b/libre/texlive-core-libre/texlive-core.maps
@@ -1,5 +1,7 @@
 Map      euler.map
 Map charter.map
+Map cs-charter.map
+Map csfonts.map
 Map fpls.map
 Map l7x-urwvn.map
 Map lm.map
@@ -30,8 +32,6 @@ MixedMap cm-super-x2.map
 MixedMap cm.map
 MixedMap cmextra.map
 MixedMap cmtext-bsr-interpolated.map
-MixedMap csother.map
-MixedMap cstext.map
 MixedMap cyrillic.map
 MixedMap eurosym.map
 MixedMap latxfont.map
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index a445de005..31ff6a3b4 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
-pkgver=2012.28268
+pkgver=2012.29646
 _revnr=${pkgver#2012.}
 pkgrel=1
-pkgdesc="TeX Live - all sorts of extra fonts"
+pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
 license=('GPL')
 arch=(any)
 depends=('texlive-core')
@@ -20,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('2c900d7eaa4506b057e25be64b4ad24b'
-         'd1d90a08bbea59c2f925a4b07c355828')
+md5sums=('25d99fb9897513ceb2ae19f078ad750c'
+         'c57e28ee1d2481b7e14685c70d8e6a51')
 
 build() {
    cd "$srcdir"
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index 771bf3607..e76444d08 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -6,6 +6,7 @@ Map ArtNouvc.map
 Map BulletsADF.map
 Map Carrickc.map
 Map CountriesOfEurope.map
+Map EBGaramond.map
 Map ESSTIX.map
 Map Eichenla.map
 Map Eileen.map
@@ -16,6 +17,7 @@ Map GoudyIn.map
 Map Kinigcap.map
 Map Konanur.map
 Map Kramer.map
+Map LibreBaskerville.map
 Map MnSymbol.map
 Map MorrisIn.map
 Map Nouveaud.map
@@ -41,7 +43,6 @@ Map aurical.map
 Map belleek.map
 Map bera.map
 Map bguq.map
-Map biolinum-type1.map
 Map boondox.map
 Map cabin.map
 Map calligra.map
@@ -80,13 +81,14 @@ Map iwona.map
 Map kpfonts.map
 Map kurier.map
 Map lato.map
-Map libertine-type1.map
+Map libertine.map
 Map linearA.map
 Map mathabx.map
 Map mdbch.map
 Map mdput.map
 Map mdsymbol.map
 Map mdugm.map
+Map newpx.map
 Map newtx.map
 Map ocrb.map
 Map opensans.map
@@ -95,6 +97,7 @@ Map pbsi.map
 Map phaistos.map
 Map prodint.map
 Map pxtx.map
+Map quattrocento.map
 Map recycle.map
 Map rsfso.map
 Map sansmathaccent.map
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 533a0aa6e..b327d2f61 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 171569 2012-11-19 07:37:56Z remy $
+# $Id: PKGBUILD 183221 2013-04-18 23:52:31Z remy $
+# Maintainer: Firmicus <firmicus āt gmx dōt net>
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
-pkgver=2012.28272
+pkgver=2012.29701
 _revnr=${pkgver#2012.}
 pkgrel=1
-pkgdesc="TeX Live - Large collection of add-on packages for LaTeX"
+pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages"
 license=('GPL')
 arch=(any)
 depends=('texlive-core')
@@ -25,7 +26,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('75db29b9e9bea30e9b6c1b77c4fca964'
+md5sums=('1b67842cdc5debc80730fced7ce369ce'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 build() {
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index a9464f1fd..172e318c5 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.12
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index d6d50f425..59816a051 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.12
 _extramodules=extramodules-3.8-LIBRE
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')