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

Conflicts:
	community/acpid/PKGBUILD
	core/btrfs-progs/PKGBUILD
	extra/calligra/PKGBUILD
	extra/libxcursor/PKGBUILD
	extra/xine-lib/PKGBUILD

13 files changed, 65 insertions, 72 deletions

diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index b77060e57..0b3ff7969 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 90487 2013-05-12 22:11:59Z seblu $
+# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.18
-pkgrel=3
+pkgver=2.0.19
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://tedfelix.com/linux/acpid-netlink.html'
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/acpid2/'
 license=('GPL')
 depends=('bash')
 optdepends=('perl: use perl based examples')
@@ -20,7 +20,7 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta
         'acpid.service'
         'anything'
         'handler.sh')
-md5sums=('7c4ff315ae960c54eea303c71c49f152'
+md5sums=('0b07a982e3e28cf37645f2c6269af72e'
          'd11700eb136e0489835ddaf977a7905b'
          '79cc7a9dceacdeffd51f070c2ba5f023'
          '2d37b98d6e74bab815604b8b48c6cfd4'
diff --git a/community/bind/01-remove-tools.patch b/community/bind/01-remove-tools.patch
deleted file mode 100644
index 29b4c9c5f..000000000
--- a/community/bind/01-remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 55857058c..1d4b89dc4 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $
+# $Id: PKGBUILD 91985 2013-05-30 17:41:01Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.2-P2
+_pkgver=9.9.3
 pkgver=${_pkgver//-/.}
-pkgrel=3
+pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -25,20 +25,19 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.service'
         'named.logrotate'
         'localhost.zone'
-        '127.0.0.zone'
-        '01-remove-tools.patch')
-sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
+        '127.0.0.zone')
+sha1sums=('0d770a68ccdb98db7930951cf380d5c7ed9b5b67'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
           'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
+          '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
 prepare() {
-  patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+  # remove dig to avoid conflict with dnsutils
+  sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in
 }
 
 build() {
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index ab4ef1bfd..1c1df987d 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $
+# $Id: PKGBUILD 91947 2013-05-30 09:41:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.19
+pkgver=0.19.1
 pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('76989337dee4cf7afdcb5cde514423f8')
+md5sums=('df4cfb2b8e3345272e3fc451b76bd630')
 
 build() {
   true
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index ff5b70969..a24c78732 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91858 2013-05-28 17:27:08Z spupykin $
+# $Id: PKGBUILD 91949 2013-05-30 09:42:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=5
+pkgrel=6
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
@@ -43,4 +43,5 @@ package() {
     SYSDATADIR="${pkgdir}"/etc/incron.d install
 
   install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service"
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index d480fae5f..4dc3c6229 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90274 2013-05-10 21:44:25Z thestinger $
+# $Id: PKGBUILD 91966 2013-05-30 13:14:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,25 +8,32 @@
 pkgname=lxc
 pkgver=0.9.0
 epoch=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lxc.sourceforge.net/"
 depends=('bash' 'perl' 'libseccomp')
+makedepends=('docbook2x')
+optdepends=('arch-install-scripts: for archlinux template')
 license=('LGPL')
 source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
 md5sums=('8552a4479090616f4bc04d8473765fc9')
 
+prepare() {
+  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  sed -i "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" configure.ac
+}
+
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
+  ./autogen.sh
   ./configure \
-	--prefix=/usr \
-	--localstatedir=/var \
-	--libexecdir=/usr/bin \
-	--sysconfdir=/etc \
-	--disable-apparmor \
-	--disable-doc \
-        --enable-seccomp
+    --prefix=/usr \
+    --localstatedir=/var \
+    --libexecdir=/usr/bin \
+    --sysconfdir=/etc \
+    --disable-apparmor \
+    --enable-seccomp
   make
 }
 
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 3c6576657..4e959e0fa 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91518 2013-05-23 11:14:52Z spupykin $
+# $Id: PKGBUILD 91951 2013-05-30 09:42:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=20130523
+pkgver=20130530
 pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
@@ -32,7 +32,7 @@ package() {
   cd "${srcdir}/mcelog"
   mkdir -p $pkgdir/usr/share/doc/mcelog
   make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog
-  install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron"
+  install -Dm0755 mcelog.cron "${pkgdir}/usr/bin/mcelog.cron"
   install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate"
   install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README"
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index acf9f36d5..38cddc0e5 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 91522 2013-05-23 11:15:56Z spupykin $
+# $Id: PKGBUILD 91953 2013-05-30 09:43:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
-pkgver=1.2.5
-pkgrel=5
+pkgver=1.2.6
+pkgrel=1
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
@@ -15,7 +15,7 @@ options=('!libtool')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
 	miredo.install
 	miredo.service)
-md5sums=('5114debbf9fcab5d292176e4548f8cd1'
+md5sums=('5bcdbaced54f40b6cb1e9c9a8dbac411'
          'd1b655d7a851cdb46c91c3418ed1962f'
          'fd6d5b355b2356426eeefd6047f6bb7c')
 
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index 00069ada2..717203c27 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91868 2013-05-28 17:43:52Z spupykin $
+# $Id: PKGBUILD 91955 2013-05-30 09:43:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=pound
 pkgver=2.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.apsis.ch/pound/index_html"
@@ -37,4 +37,5 @@ package() {
   install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run
   install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  rmdir $pkgdir/usr/sbin
 }
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 9fbafcc11..5600762f0 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86900 2013-03-24 05:37:37Z foutrelis $
+# $Id: PKGBUILD 91995 2013-05-30 21:12:52Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://01.org/powertop/'
@@ -18,7 +18,7 @@ sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 2a94c6e94..2bee7ef10 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91930 2013-05-29 16:59:39Z spupykin $
+# $Id: PKGBUILD 91963 2013-05-30 10:15:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
@@ -14,28 +14,27 @@ license=('GPL2')
 depends=('qtwebkit')
 makedepends=('glu')
 options=(libtool)
-#source=(https://github.com/qcad/qcad/archive/v${pkgver}.zip
-source=(http://cl.ly/1u1Y3H290M1S/download/qcad-v${pkgver}.zip
+source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip
         QCad.desktop)
-md5sums=('6f52fe016e915850ba942fa760909d4c'
+md5sums=('2c460838235a95a4d969e508a75b8206'
          '8c4288986b78b14a813b005e81b6ba53')
 
 prepare() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
   sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
 }
 
 build() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   qmake-qt4
   make PREFIX=/usr CXX="g++ -fpermissive"
 }
 
 package() {
-  cd ${srcdir}
+  cd ${srcdir}/qcad-$pkgver
 
   # remove project files
   find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete
@@ -61,7 +60,7 @@ package() {
   done
 
   install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png
-  install -Dm644 QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
+  install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
   echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index 3c93a9cbd..4e1d69ae4 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91886 2013-05-28 18:10:20Z spupykin $
+# $Id: PKGBUILD 91957 2013-05-30 09:44:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 
 pkgname=sniffit
 pkgver=0.3.7.beta
-pkgrel=12
+pkgrel=13
 pkgdesc="Very good packet sniffer for unix with ncurses interactive mode"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.ubuntu.com/source/sniffit"
@@ -33,7 +33,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}.${pkgver}"
-  install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}}
-  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit
+  install -d -m0755 -g root -o root ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
+  install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/bin/sniffit
   install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}
 }
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index 4376cea85..ffefbc54e 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91872 2013-05-28 17:44:34Z spupykin $
+# $Id: PKGBUILD 91959 2013-05-30 09:44:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Original TU: Jeff Mickey <j@codemac.net>
@@ -6,7 +6,7 @@
 
 pkgname=squashfs-tools
 pkgver=4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
@@ -17,13 +17,11 @@ md5sums=('1b7a781fb4cf8938842279bd3e8ee852')
 
 build() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
-    sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
-    make
+    make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
 }
 
 package() {
     cd ${srcdir}/squashfs${pkgver}/${pkgname}
-    install -Dm755 mksquashfs ${pkgdir}/bin/mksquashfs
-    install -m755 unsquashfs ${pkgdir}/bin/unsquashfs
+    install -Dm755 mksquashfs ${pkgdir}/usr/bin/mksquashfs
+    install -m755 unsquashfs ${pkgdir}/usr/bin/unsquashfs
 }