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

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

2 files changed, 42 insertions, 5 deletions

diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch
new file mode 100644
index 000000000..580f4cf21
--- /dev/null
+++ b/extra/perl-bit-vector/Bit-Vector-destroy.patch
@@ -0,0 +1,27 @@
+From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001
+From: Gisle Aas <gisle@activestate.com>
+Date: Thu, 28 Mar 2013 00:41:07 -0700
+Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11
+
+---
+ t/02_____destroy.t |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/t/02_____destroy.t b/t/02_____destroy.t
+index 41e3aa3..adcf995 100644
+--- a/t/02_____destroy.t
++++ b/t/02_____destroy.t
+@@ -17,7 +17,9 @@ if (ref($set) eq '')
+ {print "ok $n\n";} else {print "not ok $n\n";}
+ $n++;
+ eval { $set->DESTROY(); };
+-if ($@ =~ /Can't call method "DESTROY" without a package or object reference/)
++if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ ||
++    $@ =~ /Can't locate object method "DESTROY" via package "1"/
++)
+ {print "ok $n\n";} else {print "not ok $n\n";}
+ $n++;
+ eval { Bit::Vector::DESTROY($set); };
+-- 
+1.7.0.5
+
diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD
index 648a65b45..e0852fbc8 100644
--- a/extra/perl-bit-vector/PKGBUILD
+++ b/extra/perl-bit-vector/PKGBUILD
@@ -1,19 +1,29 @@
-# $Id: PKGBUILD 160505 2012-06-02 10:26:56Z bluewind $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
+# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $
+# Maintainer:
+# Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=perl-bit-vector
 _cpanname=Bit-Vector
 pkgver=7.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Efficient bit vector, set of integers and "big int" math library'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_cpanname}/"
 depends=('perl-carp-clan' 'perl')
 options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('bc6ae34738b8f889290bf50099ff8aed')
+source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz
+        Bit-Vector-destroy.patch)
+md5sums=('bc6ae34738b8f889290bf50099ff8aed'
+         'c86a55b84cb05dd04004ee8f56ee2ee3')
+
+prepare() {
+  cd "${srcdir}/${_cpanname}-$pkgver"
+
+  # https://rt.cpan.org/Public/Bug/Display.html?id=84250
+  patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch"
+}
 
 build() {
   cd "${srcdir}/${_cpanname}-$pkgver"