From bb68085f2d7fff16d0543583c0010ecd8dcab255 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Mon, 3 Dec 2012 20:05:31 +0000
Subject: [PATCH] first trial to move to new udisks, have 2 fully replace old
 version, xdg-utils update

---
 udisks/PKGBUILD    | 34 +++++++++-------------------------
 xdg-utils/PKGBUILD | 28 ++++++++++++++--------------
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/udisks/PKGBUILD b/udisks/PKGBUILD
index 4d73b0d63..ae82fd29a 100644
--- a/udisks/PKGBUILD
+++ b/udisks/PKGBUILD
@@ -4,49 +4,33 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=udisks
-pkgver=1.0.4
-pkgrel=6
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="Disk Management Service"
 arch=('x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
 depends=('systemd' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper'
          'libatasmart' 'lsof' 'lvm2' 'util-linux')
-makedepends=('intltool' 'docbook-xsl')
+makedepends=('intltool' 'docbook-xsl' 'python2' 'gobject-introspection')
 options=(!libtool)
 replaces=('devicekit-disks')
-source=("http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz"
-	'udisks.service'
-	'drop-pci-db.patch')
-md5sums=('86c63b2b5484f2060499a052b5b6256b'
-         '5d80832b4d4da72beeb45c15b63a1481'
-         '2746c65d0d12fcc6a550b5a8d9085ab2')
+source=("http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2")
+md5sums=('79fb343fbec6ed6b9e76fbe828622d38')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   
-  # fix fail pci-db message, patch thanks to Tom Gundersen <teg@jklm.no>
-  patch -p1 -i ${srcdir}/drop-pci-db.patch
-  
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/udisks --disable-static
-
+      --with-systemdsystemunitdir=/usr/lib/systemd/system --disable-static
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
-  # move udev helpers and rules to /usr/lib
-  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
-  rm -r "${pkgdir}"/lib
+  make DESTDIR="${pkgdir}" install
+     bash_completiondir=/usr/share/bash-completion/completions
   
   #fix ntfs mounts
-  sed -i -e 's|<allow_active>auth_admin_keep</allow_active>|<allow_active>yes</allow_active>|' ${pkgdir}/usr/share/polkit-1/actions/org.freedesktop.udisks.policy
-
-  # install systemd units
-  install -Dm644 "${srcdir}/udisks.service" "${pkgdir}/usr/lib/systemd/system/udisks.service"
-  echo "SystemdService=udisks.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
+  sed -i -e 's|<allow_active>auth_admin_keep</allow_active>|<allow_active>yes</allow_active>|' ${pkgdir}/usr/share/polkit-1/actions/org.freedesktop.udisks2.policy
 }
diff --git a/xdg-utils/PKGBUILD b/xdg-utils/PKGBUILD
index a17200fa4..b6bab785a 100644
--- a/xdg-utils/PKGBUILD
+++ b/xdg-utils/PKGBUILD
@@ -1,34 +1,34 @@
 #
 # Platform Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=xdg-utils
-pkgver=1.1.0rc1
+pkgver=1.1.0.1
+_gitver=050333e34e2fe7430ad2ead37e5a0420ac0c2a3e 
 pkgrel=1
 pkgdesc='Command line tools that assist applications with a variety of desktop integration tasks.'
 arch=('any')
 url='http://portland.freedesktop.org/'
 depends=('sh')
 makedepends=('docbook-xsl' 'lynx' 'xmlto')
-optdepends=('xorg-utils: needed if using Xfce')
-license=('custom')
-source=("http://portland.freedesktop.org/download/${pkgname}-${pkgver/rc1/-rc1}.tar.gz")
-md5sums=('fadf5e7a08e0526fc60dbe3e5b7ef8d6')
+license=('MIT')
+source=("http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/xdg-utils-${_gitver}.tar.gz")
+md5sums=('eb6ddcae050ce3ecd2c8433e90f56247')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver/rc1/-rc1}
+	cd ${srcdir}/${pkgname}-${_gitver}
+	
 	./configure --prefix=/usr --mandir=/usr/share/man
-	make -C scripts
-	make
+	make scripts-clean -C scripts 
+	make man scripts -C scripts 
 }
 
 package() {
-	#cd ${srcdir}/${pkgname}-${pkgver}
-	cd ${srcdir}/${pkgname}-${pkgver/rc1/-rc1}
-	make DESTDIR=${pkgdir} install
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+	cd ${srcdir}/${pkgname}-${_gitver}
+	
+	make DESTDIR="${pkgdir}" install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 _source() {