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

3 files changed, 18 insertions, 17 deletions

diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 8de5e3fc8..6fb18992c 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185866 2013-05-19 16:28:55Z giovanni $
+# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.16.1
-pkgrel=3
+pkgrel=5
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
@@ -26,9 +26,11 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'mtools: utilities to access MS-DOS disks')
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'org.archlinux.pkexec.gparted.policy')
+        'org.archlinux.pkexec.gparted.policy'
+        'gparted_polkit')
 md5sums=('3f399bff031b5ce14d11a8c346f4b89c'
-         '122ed3120c846376bead22b25f6a3b19')
+         '122ed3120c846376bead22b25f6a3b19'
+         '0b68a4e2bc6bc15440730ebe2d7bf9f6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -45,14 +47,10 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # Install policy file
-  install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
+  install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" \
+                 "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
 
   # Install launcher script
-  echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted_polkit
-  echo 'if [ $(which pkexec) ]; then' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo '  pkexec --disable-internal-agent "/usr/bin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo 'else' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo '  /usr/bin/gparted "$@"' >> ${pkgdir}/usr/bin/gparted_polkit
-  echo 'fi' >> ${pkgdir}/usr/bin/gparted_polkit
-  chmod 755 ${pkgdir}/usr/bin/gparted_polkit
+  install -m755 "${srcdir}/gparted_polkit" \
+                "${pkgdir}/usr/bin/gparted_polkit"
 }
diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install
index e8f6bed8f..1a05f573e 100644
--- a/extra/gparted/gparted.install
+++ b/extra/gparted/gparted.install
@@ -1,14 +1,11 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo 'If you use a lightweight windowmanager, remember to run'
-  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
-  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
diff --git a/extra/gparted/gparted_polkit b/extra/gparted/gparted_polkit
new file mode 100644
index 000000000..d9f94d1bd
--- /dev/null
+++ b/extra/gparted/gparted_polkit
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ $(which pkexec) ]; then
+	pkexec --disable-internal-agent "/usr/bin/gparted" "$@"
+else
+	/usr/bin/gparted "$@"
+fi