Version bump for NetworkManager. New version does _not_

include modemmanager support. It will be re-added when
0.7.1 final is relased. If you want modemmanager support
please use stable 0.7.0-r2 or dev 9999 version.

Updated NetworkManager live ebuild (9999) to use new
git location.

WARNING: Neither 0.7.1_rc1 nor 9999 compiles with
--as-needed. NM maintainer is already aware.


svn path=/overlay/; revision=80

3 files changed, 196 insertions, 48 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index b84d8af..fde49ae 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,8 +1,10 @@
 AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
+DIST NetworkManager-0.7.0.97.tar.bz2 1199342 RMD160 698dac23298cff2cf2be89aa0e96122c57bfc9c1 SHA1 973ce6d3fe119035602e7e0e7a40ee9b2879d23a SHA256 c950fede4f0ac4840e11d038f68b30a8713ecf56dc7719ab1c6f069984d09042
 DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc7292e990e SHA1 c661e95867c0cb231d3ef3e911b285ebb1e02310 SHA256 281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
 DIST modem-manager-patches.tar.bz2 38126 RMD160 cad4501e43404890079018243fadeb86885a21f3 SHA1 13ee77388d0f510a069f9b68100d328d8e93cc0b SHA256 7d80d18a140ec2927559464bedba3c4e7a5da84a2bfc47dd9472cd15f82b4ca8
 DIST networkmanager-patches1.tar.bz2 22756 RMD160 419b330ba9011040254043bb4f66a6b67823ab58 SHA1 168d62bfc0d59f54fae102f71f3bf48f49724ea3 SHA256 598fdf48716f147669f2ff7e30e8a9d8b382abaa0cefc006f0c9d83074ed9f01
 EBUILD networkmanager-0.7.0-r2.ebuild 3999 RMD160 f1c74923dc71c2b187e8dedea8f376c7bd3bb704 SHA1 8b111230af016d2e0f6aeabaf9783cb041271f31 SHA256 69f2aed55416eb91aedd38a19f96c895f7bba8f35d3b954aa81e8d9a39c0840b
-EBUILD networkmanager-9999.ebuild 3738 RMD160 e572302105ee0468a58a6ebefe7f66a857f583e2 SHA1 d0865a15b6acdafef63852a722fc774b57b08c50 SHA256 8cdc1bbd524e6f0f493d2d0698fee1928ab50536742ba83407cd78ddede61c53
+EBUILD networkmanager-0.7.1_rc1.ebuild 3929 RMD160 a88165f405742e73b87ff6823fac564da7cc8bfc SHA1 b10cac2cd6043913cbf4b48aa2236b5e053c91cc SHA256 04e448a61eb53e7ecd30abe47634ce6f2e3eb32c53af25b4315b6cf2d68d36a7
+EBUILD networkmanager-9999.ebuild 3811 RMD160 e5f4c6a0c55fce91c0d8f53548413048c23e0153 SHA1 cf8efdef173979c07df1ea48b61aa8bb668384ea SHA256 d3d4f45a9fc6c6988868052a3ba4a5d4f67c97234adc747771b94190e0146247
 MISC metadata.xml 942 RMD160 d7fbb33279cb272b0e362a910b44398a893f6025 SHA1 e94ee026e4fe5701573f12afd0df09d3287c013f SHA256 7d34a1d393ce3d1a52f506abe55c226e5d5d25174198e0c04e2a3e20ce130c07
diff --git a/net-misc/networkmanager/networkmanager-0.7.1_rc1.ebuild b/net-misc/networkmanager/networkmanager-0.7.1_rc1.ebuild
new file mode 100644
index 0000000..b5b0f59
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.7.1_rc1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV/0.7.1_rc1/0.7.0.97}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2"
+#	http://patches.piasek.co.uk/modem-manager-patchset-0.7.1.tar.bz2"
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+IUSE="doc nss gnutls dhclient dhcpcd resolvconf"
+# modemmanager"
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=sys-apps/hal-0.5.10
+	>=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
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+
+	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 )"
+
+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 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! built_with_use net-wireless/wpa_supplicant dbus ; then
+		eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag."
+		die "Fix wpa_supplicant first."
+	fi
+}
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
+
+#	EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset-0.7.1"
+#	EPATCH_SUFFIX="patch"
+#	use modemmanager && epatch
+
+}
+
+src_compile() {
+	ECONF="--disable-more-warnings \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--with-dbus-sys=/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
+			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+		else
+			ECONF="${ECONF} --with-dhcp-client=dhclient"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnutls"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
+
+	econf ${ECONF}
+	emake || die "emake failed"
+}
+
+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"
+}
+
+pkg_postinst() {
+	elog "You need to be in the plugdev group in order to use NetworkManager"
+	elog "Problems with your hostname getting changed?"
+	elog ""
+	elog "Add the following to /etc/dhcp/dhclient.conf"
+	elog 'send host-name "YOURHOSTNAME";'
+	elog 'supersede host-name "YOURHOSTNAME";'
+	elog ""
+	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/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
index 994da50..27cd950 100644
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ b/net-misc/networkmanager/networkmanager-9999.ebuild
@@ -1,54 +1,51 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools eutils subversion
+inherit autotools eutils git
 
 # NetworkManager likes itself with capital letters
 MY_P=${P/networkmanager/NetworkManager}
 
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-ESVN_REPO_URI="svn://svn.gnome.org/svn/NetworkManager/trunk"
+EGIT_REPO_URI="git://anongit.freedesktop.org/NetworkManager/NetworkManager"
 
-SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc gnome nss gnutls dhclient dhcpcd"
-
-S=${WORKDIR}/${MY_P}
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+IUSE="doc nss gnutls dhclient dhcpcd resolvconf"
 
 RDEPEND=">=sys-apps/dbus-1.2
-        >=dev-libs/dbus-glib-0.75
-        >=sys-apps/hal-0.5.10
-        >=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
-        || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
-
-        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 )"
+	>=dev-libs/dbus-glib-0.75
+	>=sys-apps/hal-0.5.10
+	>=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
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+
+	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 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
 	net-dialup/ppp
-	>=dev-util/gtk-doc-1.8
-	>=dev-util/intltool-0.35"
+	doc? ( >=dev-util/gtk-doc-1.8 )"
 
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )
-	kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )"
+PDEPEND=">=net-misc/modemmanager-0.2"
 
 S=${WORKDIR}/${MY_P}
 
@@ -57,27 +54,28 @@ pkg_setup() {
 		eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag."
 		die "Fix wpa_supplicant first."
 	fi
-
 }
 
 src_unpack () {
-	subversion_src_unpack ${A}
-	cd "${S}"
-
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
-	gtkdocize
-	intltoolize
-	eautoreconf 
+        git_src_unpack ${A}
+        cd "${S}"
+
+        # Fix up the dbus conf file to use plugdev group
+        epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
+        gtkdocize
+        intltoolize
+        eautoreconf
 }
 
 src_compile() {
 	ECONF="--disable-more-warnings \
 		--localstatedir=/var \
 		--with-distro=gentoo \
-		--with-dbus-sys=/etc/dbus-1/system.d
+		--with-tests=no \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
 		$(use_enable doc gtk-doc)
-		$(use_with doc docs)"
+		$(use_with doc docs)
+		$(use_with resolvconf)"
 
 	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
 	if use dhclient ; then
@@ -95,13 +93,13 @@ src_compile() {
 		if use nss ; then
 			ECONF="${ECONF} --with-crypto=nss"
 		else
-			ECONF="${ECONF} --with-crypto=gnults"
+			ECONF="${ECONF} --with-crypto=gnutls"
 		fi
 	else
 		ECONF="${ECONF} --with-crypto=nss"
 	fi
 
-	econf ${ECONF} || die "econf failed"
+	econf ${ECONF}
 	emake || die "emake failed"
 }
 
@@ -111,11 +109,16 @@ src_install() {
 	# Need to keep the /var/run/NetworkManager directory
 	keepdir /var/run/NetworkManager
 
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	# 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
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+		|| die "newins failed"
 }
 
 pkg_postinst() {
@@ -131,5 +134,5 @@ pkg_postinst() {
 	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 "USERNAME"'
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"'
 }