Wed Nov 28 02:22:26 PST 2012

10 files changed, 97 insertions, 35 deletions

diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 4a8b38052..377e14c69 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149396 2012-02-07 13:30:38Z jgc $
+# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
-pkgver=1.4.1
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('52b31b33fb1aa16e65ddaefc76e41151')
+md5sums=('9c1db8606e520f201c451ec9a0b095f6')
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index c606dfdf9..5d9a31ee1 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171995 2012-11-25 21:24:57Z ronald $
+# $Id: PKGBUILD 172084 2012-11-27 19:02:07Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=enlightenment17
 _pkgname=enlightenment
-pkgver=0.17.0alpha5
-_pkgver=0.17.0-alpha5
+pkgver=0.17.0alpha6
+_pkgver=0.17.0-alpha6
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64')
@@ -13,16 +13,19 @@ url="http://www.enlightenment.org"
 license=('BSD')
 depends=('alsa-lib' 'pm-utils' 'pam' 'shared-mime-info' 'hicolor-icon-theme'
   'desktop-file-utils' 'e_dbus' 'edje' 'eeze' 'efreet'
-  'eio' 'elementary' 'xcb-util-keysyms')
+  'eio' 'elementary' 'xcb-util-keysyms' 'udisks' 'systemd')
+optdepends=('connman: network module')
 provides=('notification-daemon' 'e')
+
 backup=('etc/enlightenment/sysactions.conf')
 options=('!libtool' '!emptydirs')
 install=enlightenment17.install
 source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz
-  'e-applications.menu' 'quickstart.patch')
-sha1sums=('5d9fce8c1daabbadb5f4db8ea187d7a8340a5e31'
+  'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
+sha1sums=('52d44b95a9fd2f4e9033ac65a4fd9ebcac70b9b0'
           'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
-          '3f53931ae86de8fe99e386aeb097521aac0decd8')
+          '3f53931ae86de8fe99e386aeb097521aac0decd8'
+          '86f1c5e36dc274c3101362532378be034e89c593')
 
 build() {
   cd "$srcdir/$_pkgname-$_pkgver"
@@ -33,6 +36,9 @@ build() {
 
   patch -p0 < $srcdir/quickstart.patch
 
+  # default to systemd for sysactions
+  patch -Np0 < $srcdir/sysactions_systemd.patch 
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -78,4 +84,3 @@ package() {
 	$pkgdir/etc/xdg/menus/e-applications.menu
 }
 
-
diff --git a/extra/enlightenment17/enlightenment17.install b/extra/enlightenment17/enlightenment17.install
index 1182e768f..0e3216ffe 100644
--- a/extra/enlightenment17/enlightenment17.install
+++ b/extra/enlightenment17/enlightenment17.install
@@ -1,6 +1,11 @@
 post_install() {
   update-mime-database usr/share/mime > /dev/null
   update-desktop-database -q
+
+cat << EOF
+Enlightenment is configured to use systemd by default for shutdown/sleep purposes. 
+This can be changed in /etc/enlightenment/sysactions.conf.
+EOF
 }
 
 post_upgrade() {
diff --git a/extra/enlightenment17/sysactions_systemd.patch b/extra/enlightenment17/sysactions_systemd.patch
new file mode 100644
index 000000000..5d535dd60
--- /dev/null
+++ b/extra/enlightenment17/sysactions_systemd.patch
@@ -0,0 +1,17 @@
+--- data/etc/sysactions.conf.in	2012-10-31 17:28:49.000000000 +0100
++++ data/etc/sysactions.conf.in.bak	2012-11-27 19:27:15.955334382 +0100
+@@ -43,10 +43,10 @@
+ # user and group name can use glob matches (* == all for example) like the
+ # shell. as can action names allowed or denied. 
+ 
+-action:   halt      /sbin/shutdown -h now
+-action:   reboot    /sbin/shutdown -r now
+-action:   suspend   @SUSPEND@
+-action:   hibernate @HIBERNATE@
++action:   halt      /usr/bin/systemctl poweroff
++action:   reboot    /usr/bin/systemctl reboot
++action:   suspend   /usr/bin/systemctl suspend
++action:   hibernate /usr/bin/systemctl hibernate
+ action:   /bin/mount /bin/mount
+ action:   /bin/umount /bin/umount
+ action:   /usr/bin/eject /usr/bin/eject
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index f69861820..5f054d372 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $
+# $Id: PKGBUILD 172072 2012-11-27 15:23:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.1
-pkgrel=2
+pkgver=2.10.2
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -11,10 +11,10 @@ license=('custom')
 depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
         29-replace-bitmap-fonts.conf)
-md5sums=('c94e380eea42f2f23ca9537035ef1899'
-         'f6b67e8cc79197ed6abd4701911e83da')
+sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
+            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 96b0cb3a1..449a5b84d 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171495 2012-11-18 05:17:05Z eric $
+# $Id: PKGBUILD 172080 2012-11-27 16:33:29Z jgc $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.14.1
-pkgrel=2
+pkgver=3.14.2
+pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8484b62c7a4579ea3e5d98200b397a1baf0b621c0b0c70242ee1dbbe449eae20')
+sha256sums=('d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index a9c5b6d47..318ffc64e 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 171883 2012-11-22 10:46:44Z andrea $
+# $Id: PKGBUILD 172063 2012-11-27 13:49:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://qjson.sourceforge.net"
 depends=('qt')
 makedepends=('cmake')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz")
-md5sums=('e9537e6f596f21f0552978bf064a0415')
+md5sums=('4eef13da988edf8f91c260a3e1baeea9')
 
 build() {
   mkdir build
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index b3b55b369..81b5020df 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 165623 2012-08-27 12:26:06Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 172088 2012-11-27 19:16:47Z dreisner $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=udisks
 pkgver=1.0.4
-pkgrel=5
+pkgrel=6
 pkgdesc="Disk Management Service"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
+depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
 makedepends=('intltool' 'docbook-xsl')
 options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5'
-            '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131')
+source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/udisks --disable-static
+
+  patch -p1 < ../drop-pci-db.patch
+
   make
 }
 
@@ -34,4 +35,10 @@ package() {
   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"
+
+  # install the /media folder
+  install -d -m 755 $pkgdir/media
 }
+md5sums=('86c63b2b5484f2060499a052b5b6256b'
+         '5d80832b4d4da72beeb45c15b63a1481'
+         '773cccd70afd18ace4332037feff67ec')
diff --git a/extra/udisks/drop-pci-db.patch b/extra/udisks/drop-pci-db.patch
new file mode 100644
index 000000000..6de6f5653
--- /dev/null
+++ b/extra/udisks/drop-pci-db.patch
@@ -0,0 +1,28 @@
+commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
+Author: Tom Gundersen <teg@jklm.no>
+Date:   2 days ago
+
+    udev: remove redundant call to deprecated pci-db
+    
+    The binary is no longer shipped with systemd/udev. The functionality
+    is taken over by a builtin, which is ran for all devices, rendering
+    this rule superfluous.
+    
+    Cc: Jan de Groot <jgc@archlinux.org>
+    Signed-off-by: Tom Gundersen <teg@jklm.no>
+
+diff --git a/data/80-udisks.rules b/data/80-udisks.rules
+index d1c8c5d..4bf2b37 100644
+--- a/data/80-udisks.rules
++++ b/data/80-udisks.rules
+@@ -1,10 +1,6 @@
+ # Do not edit this file, it will be overwritten on updates
+ #
+ 
+-# import names for PCI storage controllers
+-#
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+-
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
+ # vid/pid (lower PCI device)
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 62ec3d6c4..476da0f2e 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $
+# $Id: PKGBUILD 172061 2012-11-27 13:18:13Z tomegun $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
@@ -31,5 +31,5 @@ package() {
   mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
   rm -rf "${pkgdir}/lib"
 }
-md5sums=('40fdda3f4055ed818012d7a7b5ef5be5'
-         'cceb1325f35789c95f875b705b3eb373')
+md5sums=('cc4f34a1494275ed70f76f2a806dca6a'
+         'ae8f4ed2ca0c1e006cb8c69b5a2982f7')