Remove old versions of NetworkManager, add a bump that works with libnl 1.1

(Portage version: 2.1.4.1)

9 files changed, 48 insertions, 284 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index bedd92b9240a..1414dcc2abab 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/networkmanager
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.23 2007/12/25 14:30:07 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.24 2008/02/02 07:09:34 steev Exp $
+
+*networkmanager-0.6.5_p20080130 (02 Feb 2008)
+
+  02 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  -files/networkmanager-0.6.4-Gentoo-checklo.patch,
+  -files/networkmanager-0.6.4-confchanges.patch,
+  -files/networkmanager-0.6.4-dbus-1.patch,
+  -files/networkmanager-0.6.4-gentooinitscript.patch,
+  -networkmanager-0.6.4_pre20061028.ebuild,
+  -networkmanager-0.6.4_pre20061028-r1.ebuild, -networkmanager-0.6.5.ebuild,
+  networkmanager-0.6.5_p20070823.ebuild,
+  +networkmanager-0.6.5_p20080130.ebuild:
+  Remove old versions of NetworkManager and add a bump that works with libnl 1.1
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing metalgod from metadata.xml as per #99350.
diff --git a/net-misc/networkmanager/files/networkmanager-0.6.4-Gentoo-checklo.patch b/net-misc/networkmanager/files/networkmanager-0.6.4-Gentoo-checklo.patch
deleted file mode 100644
index ac15423c9c6c..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.6.4-Gentoo-checklo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN NetworkManager.cvs/src/backends/NetworkManagerGentoo.c NetworkManager/src/backends/NetworkManagerGentoo.c
---- NetworkManager.cvs/src/backends/NetworkManagerGentoo.c	2005-08-06 22:26:40.000000000 -0500
-+++ NetworkManager/src/backends/NetworkManagerGentoo.c	2005-08-07 02:28:15.000000000 -0500
-@@ -168,7 +168,9 @@
-  */
- void nm_system_enable_loopback (void)
- {
--	nm_spawn_process("/etc/init.d/net.lo start");
-+  /* No need to run net.lo if it is already running */
-+	if (nm_spawn_process ("/etc/init.d/net.lo status") != 0)
-+		nm_spawn_process("/etc/init.d/net.lo start");
- }
- 
diff --git a/net-misc/networkmanager/files/networkmanager-0.6.4-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.6.4-confchanges.patch
deleted file mode 100644
index ab703a5d4424..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.6.4-confchanges.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/NetworkManager.conf.orig	2006-10-28 04:43:50.426682976 +0100
-+++ src/NetworkManager.conf	2006-10-28 04:44:36.883620448 +0100
-@@ -8,14 +8,14 @@
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
--        <policy at_console="true">
-+        <policy group="plugdev">
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
-         <policy context="default">
--                <deny own="org.freedesktop.NetworkManager"/>
--                <deny send_destination="org.freedesktop.NetworkManager"/>
--                <deny send_interface="org.freedesktop.NetworkManager"/>
-+                <allow own="org.freedesktop.NetworkManager"/>
-+                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
- </busconfig>
- 
---- gnome/applet/nm-applet.conf.orig	2006-10-28 04:45:30.707437984 +0100
-+++ gnome/applet/nm-applet.conf	2006-10-28 04:46:34.810692808 +0100
-@@ -8,17 +8,17 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
- 	</policy>
--	<policy at_console="true">
-+	<policy group="plugdev">
- 		<allow own="org.freedesktop.NetworkManagerInfo"/>
- 
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
- 	</policy>
- 	<policy context="default">
--		<deny own="org.freedesktop.NetworkManagerInfo"/>
-+		<allow own="org.freedesktop.NetworkManagerInfo"/>
- 
--		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
--		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
-+		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-+		<allow send_interface="org.freedesktop.NetworkManagerInfo"/>
- 	</policy>
- </busconfig>
- 
diff --git a/net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch b/net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch
deleted file mode 100644
index e4e57530f5a3..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/NetworkManagerDbus.c.orig	2006-11-15 23:43:00.000000000 +0200
-+++ src/NetworkManagerDbus.c	2006-11-15 23:44:35.000000000 +0200
-@@ -831,10 +831,10 @@
- 	}
- 
- 	dbus_error_init (&error);
--#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
--	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
--#else
-+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
- 	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
-+#else
-+	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
- #endif
- 	ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);
- 	if (dbus_error_is_set (&error))
diff --git a/net-misc/networkmanager/files/networkmanager-0.6.4-gentooinitscript.patch b/net-misc/networkmanager/files/networkmanager-0.6.4-gentooinitscript.patch
deleted file mode 100644
index 097cc00d831b..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.6.4-gentooinitscript.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- initscript/Gentoo/NetworkManager.in.orig	2006-10-28 22:12:57.915210160 +0100
-+++ initscript/Gentoo/NetworkManager.in	2006-10-28 22:14:34.879469352 +0100
-@@ -30,7 +30,7 @@
- pidfile=/var/run/NetworkManager.pid
- 
- depend() {
--	need hald
-+	need dhcdbd hald
- }
- 
- start()
diff --git a/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild b/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild
deleted file mode 100644
index f24ad5733e16..000000000000
--- a/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.4_pre20061028-r1.ebuild,v 1.6 2007/01/26 14:40:07 leio Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop env independent"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="http://dev.gentoo.org/~metalgod/files/NetworkManager-0.6.4_pre20061028.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="crypt debug doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5
-	sys-apps/iproute2
-	>=dev-libs/libnl-1.0_pre6
-	net-misc/dhcdbd
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	>=dev-libs/glib-2.8
-	>=x11-libs/libnotify-0.3.2
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	crypt? ( dev-libs/libgcrypt )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/NetworkManager
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	$(use_with crypt gcrypt) \
-	$(use_with gnome ) \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-distro=gentoo \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/networkmanager-updatedbackend.patch
-	epatch ${FILESDIR}/networkmanager-use-kernel-headers.patch
-	epatch ${FILESDIR}/networkmanager-resolvconf-perms.patch
-	epatch ${FILESDIR}/networkmanager-0.6.4-gentooinitscript.patch
-	epatch ${FILESDIR}/networkmanager-0.6.4-confchanges.patch
-	epatch ${FILESDIR}/networkmanager-0.6.4-dbus-1.patch
-}
-
-src_install() {
-	gnome2_src_install
-	keepdir /var/run/NetworkManager
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	einfo
-	einfo "NetworkManager doesn't work with all wifi devices"
-	einfo "to see if your card is supported please visit"
-	einfo "http://live.gnome.org/NetworkManagerHardware"
-	einfo
-	einfo "You can use NetworkManager instead of baselayout"
-	einfo "to manage your networks but you are advised to use"
-	einfo "baselayout because NetworkManager is beta software"
-	einfo "and don't work fully as expected."
-	einfo
-	einfo "If it's the first time you run NetworkManager please"
-	einfo "restart dbus doing /etc/init.d/dbus restart"
-	einfo
-	einfo "To use NetworkManager disable all entries on runlevels"
-	einfo "net.***X and run /etc/init.d/NetworkManager"
-	einfo "you can add to runlevels writing on your terminal"
-	einfo "rc-update add NetworkManager default"
-	einfo
-	ebeep
-}
diff --git a/net-misc/networkmanager/networkmanager-0.6.4_pre20061028.ebuild b/net-misc/networkmanager/networkmanager-0.6.4_pre20061028.ebuild
deleted file mode 100644
index e2836baed5ce..000000000000
--- a/net-misc/networkmanager/networkmanager-0.6.4_pre20061028.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.4_pre20061028.ebuild,v 1.5 2007/01/26 14:40:07 leio Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop env independent"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="http://dev.gentoo.org/~metalgod/files/NetworkManager-0.6.4_pre20061028.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt debug doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5
-	sys-apps/iproute2
-	>=dev-libs/libnl-1.0_pre6
-	net-misc/dhcdbd
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	>=dev-libs/glib-2.8
-	>=x11-libs/libnotify-0.3.2
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	crypt? ( dev-libs/libgcrypt )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/NetworkManager
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	$(use_with crypt gcrypt) \
-	$(use_with gnome ) \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-distro=gentoo \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/networkmanager-0.6.4-Gentoo-checklo.patch
-	epatch ${FILESDIR}/networkmanager-use-kernel-headers.patch
-	epatch ${FILESDIR}/networkmanager-resolvconf-perms.patch
-	epatch ${FILESDIR}/networkmanager-0.6.4-gentooinitscript.patch
-	epatch ${FILESDIR}/networkmanager-0.6.4-confchanges.patch
-}
-
-src_install() {
-	gnome2_src_install
-	keepdir /var/run/NetworkManager
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	einfo
-	einfo "NetworkManager doesn't work with all wifi devices"
-	einfo "to see if your card is supported please visit"
-	einfo "http://live.gnome.org/NetworkManagerHardware"
-	einfo
-	einfo "You can use NetworkManager instead of baselayout"
-	einfo "to manage your networks but you are advised to use"
-	einfo "baselayout because NetworkManager is beta software"
-	einfo "and don't work fully as expected."
-	einfo
-	einfo "If it's the first time you run NetworkManager please"
-	einfo "restart dbus doing /etc/init.d/dbus restart"
-	einfo
-	einfo "To use NetworkManager disable all entries on runlevels"
-	einfo "net.***X and run /etc/init.d/NetworkManager"
-	einfo "you can add to runlevels writing on your terminal"
-	einfo "rc-update add NetworkManager default"
-	einfo
-	ebeep
-}
diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
index d96bb9e2e6d9..a53cc8117623 100644
--- a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.5 2007/09/16 09:16:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.6 2008/02/02 07:09:34 steev Exp $
 
 inherit gnome2 eutils
 
@@ -21,7 +21,7 @@ IUSE="crypt doc gnome"
 RDEPEND=">=sys-apps/dbus-0.60
 	>=sys-apps/hal-0.5
 	sys-apps/iproute2
-	>=dev-libs/libnl-1.0_pre6
+	=dev-libs/libnl-1.0_pre6
 	>=net-misc/dhcdbd-1.4
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.4.8
diff --git a/net-misc/networkmanager/networkmanager-0.6.5.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild
index 2258768a346c..7faef2748141 100644
--- a/net-misc/networkmanager/networkmanager-0.6.5.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5.ebuild,v 1.7 2007/08/28 14:40:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild,v 1.1 2008/02/02 07:09:34 steev Exp $
 
 inherit gnome2 eutils
 
-MY_PN=NetworkManager
+# NetworkManager likes itself with capital letters
+MY_P=${P/networkmanager/NetworkManager}
 
-DESCRIPTION="Network configuration and management in an easy way. Desktop env independent"
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-#http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.6/
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.6/${MY_PN}-${PV}.tar.gz"
+# Snapshot from SVN, hosted by steev
+SRC_URI="http://steev.net/files/distfiles/${MY_P}.tar.gz
+	mirror://gentoo/${PN}-0.6.5_p20070823-updatedbackend.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="crypt doc gnome"
 
+# Yes, I know that configure will accept libnl 1.0-pre8, however we only have
+# 1.1 in the tree, therefore dep on it.
 RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5
+	>=sys-apps/hal-0.5.10
 	sys-apps/iproute2
-	>=dev-libs/libnl-1.0_pre6
+	>=dev-libs/libnl-1.1
 	>=net-misc/dhcdbd-1.4
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.4.8
@@ -37,7 +41,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.6.5 )"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 USE_DESTDIR="1"
 
 G2CONF="${G2CONF} \
@@ -46,23 +50,29 @@ G2CONF="${G2CONF} \
 	--disable-more-warnings \
 	--localstatedir=/var \
 	--with-distro=gentoo \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
+	--with-dbus-sys=/etc/dbus-1/system.d"
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S=${WORKDIR}/NetworkManager-0.6.5
 
-src_unpack () {
+pkg_setup() {
+	if built_with_use sys-apps/iproute2 minimal ; then
+		eerror "Please rebuild sys-apps/iproute2 without the minimal useflag."
+		die "Fix iproute2 first."
+	fi
+}
 
+src_unpack () {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
 	# Update to use our backend
-	epatch ${FILESDIR}/${PN}-updatedbackend.patch
+	epatch "${WORKDIR}/${PN}-0.6.5_p20070823-updatedbackend.patch"
 	# Use the kernel headers
-	epatch ${FILESDIR}/${PN}-use-kernel-headers.patch
+	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
 	# Fix the resolv.conf permissions
-	epatch ${FILESDIR}/${PN}-resolvconf-perms.patch
+	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
 	# Fix up the dbus conf file to use plugdev group
-	epatch ${FILESDIR}/${PN}-0.6.5-confchanges.patch
+	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
 }
 
 src_install() {
@@ -70,6 +80,7 @@ src_install() {
 	# Need to keep the /var/run/NetworkManager directory
 	keepdir /var/run/NetworkManager
 }
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 	elog "You need to be in the plugdev group in order to use NetworkManager"