I don't understand gcc/PKGBUILD.mips64el

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/addresses/PKGBUILD
	community/chmsee/PKGBUILD
	community/coin/PKGBUILD
	community/critterding/PKGBUILD
	community/distcc/PKGBUILD
	community/djview4/PKGBUILD
	community/freedroid/PKGBUILD
	community/gnumail/PKGBUILD
	community/gyachi/PKGBUILD
	community/java-oracle/PKGBUILD
	community/liboop/PKGBUILD
	community/ltris/PKGBUILD
	community/nepim/PKGBUILD
	community/pantomime/PKGBUILD
	community/pyxattr/PKGBUILD
	community/soqt/PKGBUILD
	community/tilda/PKGBUILD
	community/unrealircd/PKGBUILD
	community/uqm/PKGBUILD
	core/dnsutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	core/vpnc/PKGBUILD
	extra/apache/PKGBUILD
	extra/bind/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/ccache/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/cups/PKGBUILD
	extra/doxygen/PKGBUILD
	extra/fam/PKGBUILD
	extra/fcitx/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoip/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libfwbuilder/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt/PKGBUILD
	extra/samba/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib-testing/lib32-keyutils/PKGBUILD
	multilib-testing/lib32-udev/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dash/PKGBUILD
	testing/libssh2/PKGBUILD

3 files changed, 7 insertions, 41 deletions

diff --git a/extra/udisks/01-mkfs-tempdir.patch b/extra/udisks/01-mkfs-tempdir.patch
deleted file mode 100644
index 976108264..000000000
--- a/extra/udisks/01-mkfs-tempdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail.
-# Just create the directory in /tmp, this is what /tmp is for, after all.
-# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265
-
-Index: udisks/src/helpers/job-mkfs.c
-===================================================================
---- udisks.orig/src/helpers/job-mkfs.c	2010-12-05 23:08:54.587881164 +0100
-+++ udisks/src/helpers/job-mkfs.c	2010-12-05 23:09:12.399889312 +0100
-@@ -546,7 +546,7 @@
-   /* take ownership of the device if requested */
-   if (take_ownership_uid != 0 || take_ownership_gid != 0)
-     {
--      char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX";
-+      char dir[256] = "/tmp/job-mkfs-XXXXXX";
- 
-       if (mkdtemp (dir) == NULL)
-         {
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 0c1529d9e..6e68c52ef 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,24 +1,21 @@
-# $Id: PKGBUILD 133589 2011-07-29 19:10:42Z giovanni $
+# $Id: PKGBUILD 136339 2011-08-26 17:03:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=udisks
-pkgver=1.0.3
-pkgrel=6
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
+depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        01-mkfs-tempdir.patch)
-sha256sums=('d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
   #fix location for bash_completion helper
@@ -30,6 +27,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/var/run"
 }
diff --git a/extra/udisks/fix_well_known_filesystems.patch b/extra/udisks/fix_well_known_filesystems.patch
deleted file mode 100644
index 77eee26ba..000000000
--- a/extra/udisks/fix_well_known_filesystems.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c
---- udisks-1.0.3.orig/src/device.c	2011-04-05 13:16:00.000000000 -0700
-+++ udisks-1.0.3/src/device.c	2011-05-03 13:27:39.064679418 -0700
-@@ -5902,7 +5902,7 @@
-   "msdos",
-   "umsdos",
-   "vfat",
--  "exfat"
-+  "exfat",
-   "ntfs",
-   NULL,
- };