From 7591e97858845f2ab8c61611ebddf168b1a9a9e5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 20 Dec 2014 08:57:58 +0100
Subject: [PATCH] NetworkManager: update to 1.0.0.

---
 common/shlibs                   |  1 +
 srcpkgs/NetworkManager/template | 27 ++++++++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8e4709ffaf8..f747c9a3bb9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -549,6 +549,7 @@ libipq.so.0 iptables-1.4.7_1
 libnm-util.so.2 libnm-0.9.1.90_1
 libnm-glib.so.4 libnm-0.9.1.90_1
 libnm-glib-vpn.so.1 libnm-0.9.1.90_1
+libnm.so.0 libnm-1.0.0_1
 libpanel-applet-4.so.0 gnome-panel-3.3.92_1
 libboost_context.so.1.54.0 boost-1.54<1.55_1
 libboost_prg_exec_monitor.so.1.54.0 boost-1.54<1.55_1
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 8689dd8c584..f850a595de6 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,15 +1,16 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=0.9.10.0
-revision=5
+version=1.0.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
  --with-crypto=gnutls --disable-static --enable-ppp --enable-concheck
- --with-udev-dir=/usr/lib/udev
+ --with-udev-dir=/usr/lib/udev $(vopt_enable gir introspection)
  --with-kernel-firmware-dir=/usr/lib/firmware --disable-wimax
  --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 --enable-modify-system
  --with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf
+ --enable-polkit-agent --enable-tests=no
  ac_cv_file__etc_redhat_release=no ac_cv_file__etc_gentoo_release=no
  ac_cv_file__etc_fedora_release=no ac_cv_file__etc_mandriva_release=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_debian_version=no"
@@ -17,12 +18,13 @@ short_desc="Network Management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
-checksum=66a88346bb04d4f402540281181340313b2ec433e75aa9d9ea13f31697f9487e
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
+checksum=3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947
 
 hostmakedepends="
  automake libtool pkg-config intltool gnutls-devel glib-devel dbus-glib-devel
- gettext-devel gtk-doc dbus iproute2 dhcpcd wpa_supplicant bluez iptables"
+ gettext-devel gtk-doc dbus iproute2 dhcpcd wpa_supplicant bluez iptables
+ $(vopt_if gir gobject-introspection)"
 makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel>=2.4.7 iptables-devel libsoup-devel
  ModemManager-devel mobile-broadband-provider-info readline-devel libndp-devel"
@@ -30,7 +32,10 @@ makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
 lib32disabled=yes
 depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
-replaces="runit-void<20141013_2"
+make_dirs="
+ /etc/NetworkManager/dispatcher.d/pre-up.d 0750 root root
+ /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
+"
 
 # Package build options
 build_options="gir systemd"
@@ -39,13 +44,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	hostmakedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --with-session-tracking=systemd --with-suspend-resume=systemd"
 	configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
@@ -73,7 +71,6 @@ post_install() {
 }
 
 libnm_package() {
-	replaces="NetworkManager<0.9.1.90_1"
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"