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

Conflicts:
	community-staging/erlang/PKGBUILD
	community/bird/PKGBUILD
	community/chmsee/PKGBUILD
	extra/avahi/PKGBUILD
	extra/lirc/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/gcc/PKGBUILD

11 files changed, 73 insertions, 39 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index fb4888e63..43bffcf99 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150782 2012-02-22 03:38:27Z bisson $
+# $Id: PKGBUILD 155887 2012-04-08 22:28:42Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=1
+pkgrel=2
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -23,7 +23,6 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-}
 [ "$CARCH" = "mips64el" ] && {
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
@@ -35,7 +34,8 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
             'gobject-introspection' 'gtk3')
 }
-backup=('etc/avahi/avahi-daemon.conf'
+backup=('etc/avahi/hosts'
+        'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
         'etc/avahi/services/sftp-ssh.service')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
@@ -76,7 +76,7 @@ build() {
 		--with-autoipd-user=avahi \
 		--with-autoipd-group=avahi \
         $extra \
-		--with-systemdsystemunitdir=/lib/systemd/system \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
 
 	make
 }
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 4ad7771bf..6cbe89360 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150687 2012-02-20 07:58:47Z bisson $
+# $Id: PKGBUILD 155885 2012-04-08 22:21:02Z bisson $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=bitlbee
 pkgver=3.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -40,7 +40,7 @@ build() {
 		--etcdir=/etc/bitlbee \
 		--pidfile=/var/run/bitlbee/bitlbee.pid \
 		--ipcsocket=/var/run/bitlbee/bitlbee.sock \
-		--systemdsystemunitdir=/lib/systemd/system \
+		--systemdsystemunitdir=/usr/lib/systemd/system \
 		--ssl=openssl \
 		--strip=0 \
 		--otr=plugin
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index dec627639..9275a90fc 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 152257 2012-03-06 04:01:25Z dreisner $
+# $Id: PKGBUILD 155881 2012-04-08 20:56:39Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
 pkgver=2.60
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64' 'mips64el')
@@ -45,7 +45,7 @@ package() {
 
   install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
   install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
-  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service
+  install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service
 }
 
 # vim: ts=2 sw=2 et ft=sh
diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD
index 432c6b015..29087cc23 100644
--- a/extra/kino/PKGBUILD
+++ b/extra/kino/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 141101 2011-10-23 23:38:04Z andrea $
+# $Id: PKGBUILD 155907 2012-04-09 00:36:43Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=kino
 pkgver=1.3.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A non-linear DV editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kinodv.org/"
 license=('GPL')
-depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm')
+depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm' 'desktop-file-utils')
 makedepends=('intltool' 'v4l-utils')
 options=('!libtool')
 install=kino.install
@@ -24,7 +24,7 @@ build() {
   patch -p1 -i "${srcdir}"/videodev-header.patch
 
   ./configure --prefix=/usr \
-              --with-udev-rules-dir=/lib/udev/rules.d
+              --with-udev-rules-dir=/usr/lib/udev/rules.d
   make
 }
 
diff --git a/extra/libtar/PKGBUILD b/extra/libtar/PKGBUILD
index 62bda2066..0c518d5e8 100644
--- a/extra/libtar/PKGBUILD
+++ b/extra/libtar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151100 2012-02-24 21:37:32Z giovanni $
+# $Id: PKGBUILD 155876 2012-04-08 10:03:47Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org> 
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,29 +6,36 @@
 
 pkgname=libtar
 pkgver=1.2.11
-pkgrel=3
+pkgrel=4
 pkgdesc="C library for manipulating POSIX tar files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.feep.net/libtar/"
 license=('BSD')
 depends=('zlib')
-source=("ftp://ftp.feep.net/pub/software/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("ftp://ftp.feep.net/pub/software/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'libtar-1.2.11-tar_header.patch'
         'libtar-1.2.11.patch')
-md5sums=('604238e8734ce6e25347a58c4f1a1d7e' 
+md5sums=('604238e8734ce6e25347a58c4f1a1d7e'
+         '94b03c0fdee20671e1f6d1ecaf187258'   
          'baef7da841c186e1830566296859c35b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   export CFLAGS+=" -fPIC"
+
+  # Fix FS#29322
+  patch -Np1 -i "${srcdir}/libtar-1.2.11-tar_header.patch"
+
   patch -Np1 -i "${srcdir}/libtar-1.2.11.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libtar/libtar-1.2.11-tar_header.patch b/extra/libtar/libtar-1.2.11-tar_header.patch
new file mode 100644
index 000000000..161f7da7b
--- /dev/null
+++ b/extra/libtar/libtar-1.2.11-tar_header.patch
@@ -0,0 +1,15 @@
+diff -Naur libtar-1.2.11/lib/encode.c libtar-1.2.11.tar_header/lib/encode.c
+--- libtar-1.2.11/lib/encode.c	2003-01-07 07:10:59.000000000 +0530
++++ libtar-1.2.11.tar_header/lib/encode.c	2009-11-20 11:13:25.166756167 +0530
+@@ -30,7 +30,10 @@
+ 	int i, sum = 0;
+ 
+ 	if (t->options & TAR_GNU)
+-		strncpy(t->th_buf.magic, "ustar  ", 8);
++	{
++		memcpy(t->th_buf.magic, "ustar ", 6);
++		memcpy(t->th_buf.version, " \0", 2);
++	}
+ 	else
+ 	{
+ 		strncpy(t->th_buf.version, TVERSION, TVERSLEN);
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index d282ae30d..808fd41bf 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 152026 2012-03-04 13:12:52Z tpowa $
+# $Id: PKGBUILD 155878 2012-04-08 11:00:49Z ibiru $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=12
+pkgrel=15
 epoch=1
-_extramodules=extramodules-3.2-LIBRE
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
+_extramodules=extramodules-3.3-ARCH
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
-makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+### NOTICE don't forget to bump version in depends in package_lirc
+makedepends=('help2man' 'linux-headers>=3.3' 'linux-headers<3.4' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -32,6 +32,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
          '69d099e6deedfa3c1ee2b6e82d9b8bfb')
 
 build() {
+  _kernver="$(cat /lib/modules/${_extramodules}/version)"
   cd "${srcdir}/lirc-${pkgver}"
   patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -61,7 +62,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.2' 'linux<3.3')
+  depends=('lirc-utils' 'linux>=3.3' 'linux<3.4')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 9bf905742..4339aaf45 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.2-ARCH
+EXTRAMODULES=extramodules-3.3-ARCH
 
 post_install() {
   # updating module dependencies
diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD
index 423f84915..3c01803a8 100644
--- a/extra/python-pysqlite/PKGBUILD
+++ b/extra/python-pysqlite/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 140136 2011-10-07 20:31:49Z angvp $
+# $Id: PKGBUILD 155872 2012-04-08 07:25:46Z remy $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 pkgname=python-pysqlite
 pkgver=2.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pysqlite/"
-depends=('python2' 'sqlite3')
+depends=('python2' 'sqlite')
 replaces=('pysqlite2')
 source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
         setup.cfg)
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 59ad827e9..3cfb2ac1a 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ruby
 pkgver=1.9.3_p125
-pkgrel=3
+pkgrel=4
 pkgdesc='An object-oriented language for quick and easy programming'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
diff --git a/extra/ruby/ruby.install b/extra/ruby/ruby.install
index f91254084..ce78e96ec 100644
--- a/extra/ruby/ruby.install
+++ b/extra/ruby/ruby.install
@@ -1,11 +1,22 @@
 #!/bin/sh
 
+print_gem_default_target() {
+  echo 'The default location of gem installs is $HOME/.gem/ruby'
+  echo 'Add the following line to your PATH if you plan to install using gem'
+  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+  echo 'If you want to install to the system wide location, you must either:'
+  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1:  the new package version
+post_install() {
+  print_gem_default_target
+}
+
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  if [ "$(vercmp $2 1.9.3_p125)" -lt 0 ]; then
-    echo 'The default location of gem installs has changed to $HOME/.gem/ruby'
-    echo 'If you want to install to the system wide location, you must either:'
-    echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+    print_gem_default_target
   fi
 }