Add systemd eclass support (bug #366113)

Make mobile broadband optional (bug #374727)

(Portage version: 2.1.10.6/cvs/Linux x86_64)

3 files changed, 17 insertions, 7 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 9d52b7a2fa08..ff37b3503376 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.106 2011/06/09 01:41:03 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.107 2011/07/21 08:05:28 dagger Exp $
+
+*networkmanager-0.8.4.0-r2 (21 Jul 2011)
+
+  21 Jul 2011; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.8.4.0-r1.ebuild, +networkmanager-0.8.4.0-r2.ebuild,
+  metadata.xml:
+  Add systemd eclass support (bug #366113)
+  Make mobile broadband optional (bug #374727)
 
   09 Jun 2011; Sebastian Pipping <sping@gentoo.org>
   networkmanager-0.8-r1.ebuild, networkmanager-0.8.1-r6.ebuild,
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 727197659ca0..36784db1dd53 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</flag>
+                <flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg>.</flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information</flag>
 		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and <pkg>net-firewall/iptables</pkg> for connection sharing </flag>
 	</use>
diff --git a/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
index b8ae56fe5375..5239538079db 100644
--- a/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r1.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild,v 1.1 2011/07/21 08:05:28 dagger Exp $
 
 EAPI="2"
 
-inherit autotools eutils gnome.org linux-info
+inherit autotools eutils gnome.org linux-info systemd
 
 # NetworkManager likes itself with capital letters
 MY_PN=${PN/networkmanager/NetworkManager}
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux +ppp resolvconf connection-sharing"
 
 RDEPEND=">=sys-apps/dbus-1.2
 	>=dev-libs/dbus-glib-0.75
@@ -26,7 +26,8 @@ RDEPEND=">=sys-apps/dbus-1.2
 	>=dev-libs/glib-2.18
 	>=sys-auth/polkit-0.92
 	>=dev-libs/libnl-1.1
-	>=net-misc/modemmanager-0.4
+	ppp? ( >=net-misc/modemmanager-0.4
+		>=net-dialup/ppp-2.4.5 )
 	>=net-wireless/wpa_supplicant-0.5.10[dbus]
 	bluetooth? ( net-wireless/bluez )
 	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
@@ -48,7 +49,6 @@ RDEPEND=">=sys-apps/dbus-1.2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
-	>=net-dialup/ppp-2.4.5
 	doc? ( >=dev-util/gtk-doc-1.8 )"
 
 S=${WORKDIR}/${MY_P}
@@ -96,7 +96,8 @@ src_configure() {
 		--with-iptables=/sbin/iptables
 		$(use_enable doc gtk-doc)
 		$(use_with doc docs)
-		$(use_with resolvconf)"
+		$(use_with resolvconf)
+		$(systemd_with_unitdir)"
 
 	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
 	if use dhclient ; then