Add net-misc/networkmanager

7 files changed, 154 insertions, 2 deletions

diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index a2934ef..318aec5 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -33,8 +33,8 @@ ELTCONF=${ELTCONF:-}
 # Default module svn path
 MODPATH=${MODPATH:-"${PN}"}
 
-# SVN URI for the project
-EGIT_REPO_URI="git://git.gnome.org/${MODPATH}"
+# GIT URI for the project
+EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${MODPATH}"}"
 
 # Unset SRC_URI auto-set by gnome2.eclass
 SRC_URI=""
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
new file mode 100644
index 0000000..763d3d2
--- /dev/null
+++ b/net-misc/networkmanager/Manifest
@@ -0,0 +1,4 @@
+AUX networkmanager-bad-link.patch 655 RMD160 24a431665b604d111a9b10efa33ff066a4363aad SHA1 9de1073f681623cb156444fed53c19d03e06076d SHA256 92bf60b9a10d804d0c295e73f8525bce67e9d6e36dc7ccf5468243c21183c113
+AUX networkmanager-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437
+AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
+EBUILD networkmanager-9999.ebuild 3438 RMD160 c0e6ba3c7542c5b664263487115cb0eb76a1fa78 SHA1 9854bd6392800fc82d5bb661f0d0ecc428ae6986 SHA256 81b810eb00699740f2005bab8e2d1a9b5d65b560c4e129fc520e20539de539ec
diff --git a/net-misc/networkmanager/files/networkmanager-bad-link.patch b/net-misc/networkmanager/files/networkmanager-bad-link.patch
new file mode 100644
index 0000000..ea074ba
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-bad-link.patch
@@ -0,0 +1,15 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am NetworkManager-0.7.1/src/ppp-manager/Makefile.am
+--- NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am	2009-03-03 11:55:47.000000000 -0500
++++ NetworkManager-0.7.1/src/ppp-manager/Makefile.am	2009-04-24 11:32:58.000000000 -0400
+@@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \
+ nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
+ 
+ nm_pppd_plugin_la_LIBADD = \
++	$(top_builddir)/libnm-util/libnm-util.la \
+ 	$(DBUS_LIBS) \
+-	$(GLIB_LIBS) \
+-	$(top_builddir)/libnm-util/libnm-util.la
++	$(GLIB_LIBS)
+ 
+ BUILT_SOURCES = nm-ppp-manager-glue.h
+ 
diff --git a/net-misc/networkmanager/files/networkmanager-confchanges.patch b/net-misc/networkmanager/files/networkmanager-confchanges.patch
new file mode 100644
index 0000000..ca53328
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-confchanges.patch
@@ -0,0 +1,16 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/NetworkManager.conf NetworkManager-0.7.1/src/NetworkManager.conf
+--- NetworkManager-0.7.1.orig/src/NetworkManager.conf	2009-03-03 11:55:47.000000000 -0500
++++ NetworkManager-0.7.1/src/NetworkManager.conf	2009-05-01 20:04:33.000000000 -0400
+@@ -15,6 +15,12 @@
+                 <deny send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.PPP"/>
+         </policy>
++        <policy group="plugdev">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                      send_interface="org.freedesktop.NetworkManager.PPP"/>
++        </policy>
+         <policy context="default">
+                 <deny own="org.freedesktop.NetworkManager"/>
+                 <deny send_destination="org.freedesktop.NetworkManager"/>
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
new file mode 100644
index 0000000..c37b596
--- /dev/null
+++ b/net-misc/networkmanager/files/nm-system-settings.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
new file mode 100644
index 0000000..d927e7a
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r4.ebuild,v 1.1 2009/06/10 22:03:19 dagger Exp $
+
+EAPI="2"
+
+inherit gnome2 gnome2-live
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/NetworkManager/NetworkManager"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
+# modemmanager"
+
+RDEPEND="sys-fs/udev-extras
+	>=dev-libs/dbus-glib-0.75
+	>=sys-apps/dbus-1.2
+	>=net-wireless/wireless-tools-28_pre9
+	>=dev-libs/glib-2.16
+	>=sys-auth/policykit-0.8
+	>=dev-libs/libnl-1.1
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+	avahi? ( net-dns/avahi[autoipd] )
+	gnutls? (
+		nss? ( >=dev-libs/nss-3.11 )
+		!nss? ( dev-libs/libgcrypt
+			net-libs/gnutls ) )
+	!gnutls? ( >=dev-libs/nss-3.11 )
+	dhclient? (
+		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	net-dialup/ppp
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+#PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 )"
+
+PATCHES="${FILESDIR}/${PN}-confchanges.patch
+	${FILESDIR}/${PN}-bad-link.patch"
+
+pkg_setup() {
+	G2CONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)
+		$(use_with resolvconf)"
+
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			G2CONF="${G2CONF} --with-dhcp-client=dhcpcd"
+		else
+			G2CONF="${G2CONF} --with-dhcp-client=dhclient"
+		fi
+	else
+		G2CONF="${G2CONF} --with-dhcp-client=dhcpcd"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			G2CONF="${G2CONF} --with-crypto=nss"
+		else
+			G2CONF="${G2CONF} --with-crypto=gnutls"
+		fi
+	else
+		G2CONF="${G2CONF} --with-crypto=nss"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+		|| die "newins failed"
+	insinto /etc/udev/rules.d
+	newins callouts/77-nm-probe-modem-capabilities.rules 77-nm-probe-modem-capabilities.rules
+	rm -rf "${D}"/lib/udev/rules.d
+}
+
+pkg_postinst() {
+	elog "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+	elog ""
+	elog "To save system-wide settings as a user, that user needs to have the"
+	elog "right policykit privileges. You can add them by running:"
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"'
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 07e8fb7..4bb97e9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -4,6 +4,7 @@
 # Please append to the top of this list as ebuilds are added
 
 
+=net-misc/networkmanager-9999
 =x11-themes/gtk-engines-murrine-9999
 =dev-python/pygtk-9999
 =dev-python/pygobject-9999