Changed default crypo library. In the future NSS will

likely be used for all crypto related things.

Removed old (commented out) patches.

Added elogs for system wide settings. Patch to get it to
work will follow soon.




svn path=/overlay/; revision=36

1 files changed, 10 insertions, 11 deletions

diff --git a/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild
index 6919c6e..698f25a 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0_pre20080817.ebuild
@@ -74,15 +74,15 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-dhcp-client=dhcpcd"
 	fi
 
-	# default is GnuTLS (if none or both are specified), NSS otherwise
-	if use nss ; then
-		if use gnutls ; then
-			G2CONF="${G2CONF} --with-crypto=gnutls"
-		else
+	# 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=gnults"
 		fi
 	else
-		G2CONF="${G2CONF} --with-crypto=gnutls"
+		G2CONF="${G2CONF} --with-crypto=nss"
 	fi
 }
 
@@ -90,10 +90,6 @@ src_unpack () {
 	unpack ${A}
 	cd "${S}"
 
-	# Use the kernel headers
-#	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
-	# Fix the resolv.conf permissions
-# 	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
 	# Fix up the dbus conf file to use plugdev group
 	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
 }
@@ -105,7 +101,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	elog "You need to be in the plugdev group in order to use NetworkManager"
 	elog "Problems with your hostname getting changed?"
 	elog ""
@@ -115,4 +110,8 @@ pkg_postinst() {
 
 	elog "You will need to restart DBUS if this is your first time"
 	elog "installing NetworkManager."
+
+	elog "To save system wide settings, you need to have right policykit"
+	elog "privileges. You can add them by running:"
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify "USERNAME"'
 }