Tue Apr 23 01:16:16 PDT 2013

3 files changed, 33 insertions, 37 deletions

diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 72c2608b0..d47b9bff3 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,38 +1,36 @@
-# $Id: PKGBUILD 166517 2012-09-09 15:40:36Z heftig $
+# $Id: PKGBUILD 183443 2013-04-21 22:11:41Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.6.0.0
-pkgrel=1
+pkgver=0.7.990
+pkgrel=3
 pkgdesc="Mobile broadband modem management service"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-license=('GPL2')
-depends=('dbus-glib' 'udev' 'ppp')
-makedepends=('intltool')
+license=(GPL2)
+depends=(udev ppp libqmi polkit hicolor-icon-theme)
+makedepends=(intltool git gtk-doc)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
-        modem-manager.service)
-sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
-            '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
+install=modemmanager.install
+#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz)
+source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=95274bf")
+sha256sums=('SKIP')
 
 build() {
-  cd "$_realname-$pkgver"
-   ./configure --prefix=/usr \
-   	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--with-udev-base-dir=/usr/lib/udev \
-	--disable-static
+  cd $_realname
+   ./autogen.sh --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-udev-base-dir=/usr/lib/udev \
+        --disable-static \
+        --with-polkit
   make
 }
 
 package() {
-  cd "$_realname-$pkgver"
+  cd $_realname
   make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/modem-manager.service" \
-    "$pkgdir/usr/lib/systemd/system/modem-manager.service"
-  echo "SystemdService=modem-manager.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service"
 }
diff --git a/extra/modemmanager/modem-manager.service b/extra/modemmanager/modem-manager.service
deleted file mode 100644
index bad666be8..000000000
--- a/extra/modemmanager/modem-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Modem Manager
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
-# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
-# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
-# results in logging each message twice.
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install
new file mode 100644
index 000000000..be187f2b4
--- /dev/null
+++ b/extra/modemmanager/modemmanager.install
@@ -0,0 +1,12 @@
+post_install() {
+  type -P gtk-update-icon-cache &>/dev/null &&
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}