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

1 files changed, 9 insertions, 11 deletions

diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD
index 65a819282..2f37e901d 100644
--- a/extra/perl-guard/PKGBUILD
+++ b/extra/perl-guard/PKGBUILD
@@ -1,19 +1,17 @@
 # Packager: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 180339 2013-03-20 16:34:29Z eric $
+# $Id: PKGBUILD 186406 2013-05-26 09:25:16Z bluewind $
 
 pkgname=perl-guard
 pkgver=1.022
-pkgrel=2
+pkgrel=3
 pkgdesc="safe cleanup blocks"
 arch=(i686 x86_64 'mips64el')
-license=(custom:unknown)
-options=(!emptydirs)
+url="https://metacpan.org/release/Guard"
+license=('GPL' 'PerlArtistic')
 depends=('perl')
-url=https://metacpan.org/release/Guard
+options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz")
-md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c)
-sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e)
-_distdir="${srcdir}/Guard-${pkgver}"
+md5sums=('8d1d8b942fd5d0240f47906a6d6fac8c')
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -22,7 +20,7 @@ build() {
       PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "${srcdir}/Guard-${pkgver}"
     /usr/bin/perl Makefile.PL
     make
   )
@@ -30,13 +28,13 @@ build() {
 
 check() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
+    cd "${srcdir}/Guard-${pkgver}"
     make test
   )
 }
 
 package() {
-    cd "$_distdir"
+    cd "${srcdir}/Guard-${pkgver}"
     make DESTDIR="$pkgdir" install
 }