updating NM and fixing stuff

2 files changed, 7 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8610bad5f6d3..861bc748b726 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = networkmanager-git
 	pkgdesc = Network Management daemon
-	pkgver = 1.29.10.r27639.ga3d686a0e
+	pkgver = 1.31.5.r28376.g0448d3b931
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = networkmanager-git
 	makedepends = iptables
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
-	makedepends = ppp=2.4.8
+	makedepends = ppp=2.4.9
 	makedepends = modemmanager
 	makedepends = iproute2
 	makedepends = nss
@@ -39,18 +39,6 @@ pkgbase = networkmanager-git
 	makedepends = jansson
 	makedepends = bluez-libs
 	makedepends = glib2-docs
-	makedepends = libselinux
-	depends = dbus-glib
-	depends = libmm-glib
-	depends = libndp
-	depends = libnewt
-	depends = libnl
-	depends = libsoup
-	depends = libteam
-	depends = libutil-linux
-	depends = nss
-	depends = polkit
-	depends = wpa_supplicant
 	optdepends = iwd: alternative way to connect to wifi
 	optdepends = dhclient: DHCPv6 support
 	optdepends = dnsmasq: connection sharing
@@ -59,7 +47,6 @@ pkgbase = networkmanager-git
 	optdepends = ppp: dialup connection support
 	optdepends = rp-pppoe: ADSL support
 	optdepends = modemmanager: cellular network support
-	optdepends = libselinux: selinux support
 	options = !libtool
 	options = !emptydirs
 	source = git://github.com/NetworkManager/NetworkManager
@@ -86,6 +73,7 @@ pkgname = networkmanager-git
 	depends = bluez-libs
 	depends = libpsl
 	depends = audit
+	depends = libnm-git
 	optdepends = dnsmasq: connection sharing
 	optdepends = bluez: Bluetooth support
 	optdepends = openresolv: resolvconf support
@@ -99,10 +87,8 @@ pkgname = networkmanager-git
 pkgname = libnm-git
 	pkgdesc = NetworkManager client library
 	depends = glib2
-	depends = libgudev
 	depends = nss
 	depends = libutil-linux
-	depends = jansson
 	depends = systemd-libs
 	provides = libnm
 	conflicts = libnm
diff --git a/PKGBUILD b/PKGBUILD
index 0a0940706643..42a59de6717a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,16 +11,14 @@
 pkgbase=networkmanager-git
 _gitname=NetworkManager
 pkgname=(networkmanager-git libnm-git)
-pkgver=1.31.2.r28078.gaf360238be
+pkgver=1.31.5.r28376.g0448d3b931
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 url=http://www.gnome.org/projects/$_gitname
 license=(GPL2 LGPL2.1)
-depends=(dbus-glib libmm-glib libndp libnewt libnl libsoup libteam libutil-linux
-    nss polkit wpa_supplicant)
 checkdepends=(libx11 python-dbus)
-_pppver=2.4.8
+_pppver=2.4.9
 makedepends=(dnsmasq mobile-broadband-provider-info  meson ninja intltool dhclient openresolv iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
               iproute2 nss polkit wpa_supplicant libsoup systemd libgudev
              libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
@@ -118,7 +116,7 @@ _pick() {
 }
 
 package_networkmanager-git() {
-   depends=(iproute2 mobile-broadband-provider-info polkit wpa_supplicant libsoup openresolv libnewt libndp libteam curl bluez-libs libpsl audit)
+   depends=(iproute2 mobile-broadband-provider-info polkit wpa_supplicant libsoup openresolv libnewt libndp libteam curl bluez-libs libpsl audit libnm-git)
     optdepends=('dnsmasq: connection sharing'
     'bluez: Bluetooth support'
     'openresolv: resolvconf support'
@@ -151,7 +149,7 @@ package_networkmanager-git() {
   pkgdesc="NetworkManager client library"
   provides=(libnm)
   conflicts=(libnm)
-  depends=(glib2 libgudev nss libutil-linux jansson systemd-libs)
+  depends=(glib2 nss libutil-linux systemd-libs)
   mv libnm/* "$pkgdir"
 }