summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2009-07-19 15:11:34 +0200
committerThomas Sachau <tommy@gentoo.org>2009-07-19 15:11:34 +0200
commitfe06d3b83934141bef3318f5d9674bb955bc793d (patch)
tree5452d2939a37f73e49495b481b64f6602e911b45 /net-misc
parentDrop sys-auth/policykit (diff)
downloadmultilib-portage-fe06d3b83934141bef3318f5d9674bb955bc793d.tar.gz
multilib-portage-fe06d3b83934141bef3318f5d9674bb955bc793d.tar.bz2
multilib-portage-fe06d3b83934141bef3318f5d9674bb955bc793d.zip
Drop net-misc/networkmanager
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/networkmanager/ChangeLog197
-rw-r--r--net-misc/networkmanager/Manifest24
-rw-r--r--net-misc/networkmanager/files/NetworkManagerDispatcher48
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.6.4-Gentoo-checklo.patch13
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.6.4-confchanges.patch45
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.6.4-dbus-1.patch16
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.6.4-gentooinitscript.patch11
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch21
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch13
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch25
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch15
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch16
-rw-r--r--net-misc/networkmanager/files/networkmanager-9999-confchanges.patch11
-rw-r--r--net-misc/networkmanager/files/networkmanager-libnl.patch42
-rw-r--r--net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch19
-rw-r--r--net-misc/networkmanager/files/networkmanager-updatedbackend.patch657
-rw-r--r--net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch12
-rw-r--r--net-misc/networkmanager/files/nm-system-settings.conf2
-rw-r--r--net-misc/networkmanager/metadata.xml13
-rw-r--r--net-misc/networkmanager/networkmanager-0.6.6.ebuild89
-rw-r--r--net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild140
-rw-r--r--net-misc/networkmanager/networkmanager-9999.ebuild84
22 files changed, 0 insertions, 1513 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
deleted file mode 100644
index c9a5ca5b2..000000000
--- a/net-misc/networkmanager/ChangeLog
+++ /dev/null
@@ -1,197 +0,0 @@
-# ChangeLog for net-misc/networkmanager
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.33 2008/08/17 16:16:38 maekke Exp $
-
- 17 Aug 2008; Markus Meier <maekke@gentoo.org> networkmanager-0.6.6.ebuild:
- x86 stable, bug #228837
-
- 28 Jul 2008; Kenneth Prugh <ken69267@gentoo.org>
- networkmanager-0.6.6.ebuild:
- amd64 stable, bug #228837. Removed unused autotools inherit.
-
- 26 Jun 2008; Robert Buchholz <rbu@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild,
- -networkmanager-0.6.5_p20080205.ebuild, networkmanager-0.6.6.ebuild:
- Readd ~ppc which was dropped due to >=hal-0.5.10 dependency, and remove old
- version. Block latest version of libnl (bug #223381).
-
- 07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
- -files/NM-po-linguas.patch, -networkmanager-0.6.5.98.ebuild,
- +networkmanager-0.6.6.ebuild:
- Remove the patches that 0.6.5.98 were using
-
-*networkmanager-0.6.6 (07 Mar 2008)
-
- 07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
- -networkmanager-0.6.5.98.ebuild, +networkmanager-0.6.6.ebuild:
- New upstream release. Unmentioned changes in the release notes include the
- updated backend being committed for Gentoo, as well as new init scripts from
- compnerd.
-
-*networkmanager-0.6.5.98 (14 Feb 2008)
-
- 14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
- +files/NM-po-linguas.patch, +networkmanager-0.6.5.98.ebuild:
- Add 0.6.5.98 (aka 0.6.6rc1) to the tree, include patch from Debian to use
- po/LINGUAS.
-
- 14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild,
- networkmanager-0.6.5_p20080205.ebuild:
- Fix the libnotify dependency, this is unneeded in NetworkManager as the
- graphical bits have been split out.
-
-*networkmanager-0.6.5_p20080205 (10 Feb 2008)
-
- 10 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
- -networkmanager-0.6.5_p20080130.ebuild,
- +networkmanager-0.6.5_p20080205.ebuild:
- Bump NetworkManager snapshot
-
- 04 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild:
- Update the dependency to be 1.0_pre6* not just 1.0_pre6.
-
- 02 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
- +files/NetworkManagerDispatcher, networkmanager-0.6.5_p20080130.ebuild:
- Add NetworkManagerDispatcher init script for the latest snapshot
-
-*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.
-
- 16 Sep 2007; Markus Meier <maekke@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild:
- x86 stable, bug #191302
-
- 08 Sep 2007; Joseph Jezak <josejx@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild:
- Marked ppc stable for bug #191302.
-
- 05 Sep 2007; Robert Buchholz <rbu@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild:
- Add die with iproute minimal build (bug #190046)
-
- 05 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
- networkmanager-0.6.5_p20070823.ebuild:
- Marked stable on amd64 as per bug 191302 to make sure stable systems
- actually work.
-
- 28 Aug 2007; nixnut <nixnut@gentoo.org> networkmanager-0.6.5.ebuild:
- Stable on ppc wrt bug 189781
-
- 26 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
- networkmanager-0.6.5.ebuild:
- Marked stable on amd64 as per bug 189781.
-
- 24 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
- networkmanager-0.6.5.ebuild:
- stable x86, bug 189781
-
-*networkmanager-0.6.5_p20070823 (23 Aug 2007)
-
- 23 Aug 2007; Robert Buchholz <rbu@gentoo.org> metadata.xml,
- +networkmanager-0.6.5_p20070823.ebuild:
- Version bump to a current 0.6 branch state, adding myself to metadata
-
- 15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
- add <herd>no-herd</herd>
-
- 14 May 2007; Steev Klimaszewski <steev@gentoo.org>
- networkmanager-0.6.5.ebuild:
- Fix homepage url, fixes bug #178101. Thanks to Pacho Ramos for reporting
-
- 11 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
- networkmanager-0.6.5.ebuild:
- Keyworded ~ppc
-
- 03 May 2007; Steev Klimaszewski <steev@gentoo.org>
- networkmanager-0.6.5.ebuild:
- Add use_with gnome to G2CONF. Fixes bug #176867, thanks to Ingmar Vanhassel
- <ingmar.vanhassel@gmail.com> for reporting
-
-*networkmanager-0.6.5 (02 May 2007)
-
- 02 May 2007; Steev Klimaszewski <steev@gentoo.org>
- +files/networkmanager-0.6.5-confchanges.patch,
- +networkmanager-0.6.5.ebuild:
- New upstream release of NetworkManager.
-
- 26 Jan 2007; Mart Raudsepp <leio@gentoo.org>
- networkmanager-0.6.4_pre20061028.ebuild,
- networkmanager-0.6.4_pre20061028-r1.ebuild:
- Really fix gnome and gcrypt use on configure
-
- 14 Jan 2007; Markus Rothe <corsair@gentoo.org>
- networkmanager-0.6.4_pre20061028-r1.ebuild:
- Added ~ppc and ~ppc64
-
- 05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
- networkmanager-0.6.4_pre20061028.ebuild,
- networkmanager-0.6.4_pre20061028-r1.ebuild:
- Remove debug.eclass usage.
-
- 06 Dec 2006; Steev Klimaszewski <steev@gentoo.org>
- +files/networkmanager-0.6.4-dbus-1.patch,
- networkmanager-0.6.4_pre20061028-r1.ebuild:
- Add patch from the NetworkManager mailing list to fix compilation against
- D-Bus 1.x. Fixes bug #155279. Thanks to Priit Laes for reporting.
-
- 04 Dec 2006; Luis Medinas <metalgod@gentoo.org>
- networkmanager-0.6.4_pre20061028.ebuild,
- networkmanager-0.6.4_pre20061028-r1.ebuild:
- Fix gnome use on configure. Closes bug #155192.
-
-*networkmanager-0.6.4_pre20061028-r1 (26 Nov 2006)
-
- 26 Nov 2006; Luis Medinas <metalgod@gentoo.org>
- +files/networkmanager-updatedbackend.patch,
- +networkmanager-0.6.4_pre20061028-r1.ebuild:
- Added a patch with Gentoo backend updated done by Nathan Caldwell
- <saintdev@gmail.com>. Please test the backend and report any bug.
-
- 05 Nov 2006; Steev Klimaszewski <steev@gentoo.org>
- networkmanager-0.6.4_pre20061028.ebuild:
- Fix the names of patches since epkgmove apparently renamed the patches as
- well.
-
-*networkmanager-0.6.4_pre20061028 (05 Nov 2006)
-
- 05 Nov 2006; 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-gentooinitscript.patch,
- +files/networkmanager-resolvconf-perms.patch,
- +files/networkmanager-use-kernel-headers.patch, +metadata.xml,
- +networkmanager-0.6.4_pre20061028.ebuild:
- Moved from net-misc/NetworkManager to net-misc/networkmanager.
-
- 04 Nov 2006; Luis Medinas <metalgod@gentoo.org>
- NetworkManager-0.6.4_pre20061028.ebuild:
- Remove pam_console from dependencies since our patch makes it work with
- hal/dbus instead of pam_console.
-
-*NetworkManager-0.6.4_pre20061028 (31 Oct 2006)
-
- 31 Oct 2006; Luis Medinas <metalgod@gentoo.org>
- +files/NetworkManager-0.6.4-Gentoo-checklo.patch,
- +files/NetworkManager-0.6.4-confchanges.patch,
- +files/NetworkManager-0.6.4-gentooinitscript.patch,
- +files/NetworkManager-resolvconf-perms.patch,
- +files/NetworkManager-use-kernel-headers.patch, +metadata.xml,
- +NetworkManager-0.6.4_pre20061028.ebuild:
- Initial import. This ebuild was made by Luis Medinas <metalgod@gentoo.org>
- and Stephen Klimaszewski <steev@gentoo.org>.
-
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
deleted file mode 100644
index af32f46b9..000000000
--- a/net-misc/networkmanager/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
-AUX networkmanager-0.6.4-Gentoo-checklo.patch 586 RMD160 69e8cd3a7e4a9ce355a62ffc367a952208ebcc5e SHA1 c366a2c6bbb7e42624cd7312112defa35fd80e64 SHA256 2ca85439e66f8f283d677e48bf52926ccae55a7d8ac3d783881501ca66cb0d96
-AUX networkmanager-0.6.4-confchanges.patch 2057 RMD160 546d22e915113ea956f7a9d2cef9cca3b495d25d SHA1 01dae1aee7f1154e781bc678d900cc95d3143378 SHA256 daf919f2f17f020b4419e51f8deb1f6c131c1328c03283599320dae4987710dc
-AUX networkmanager-0.6.4-dbus-1.patch 661 RMD160 df2ef0607cadf5ecaf48837f07c98d5e9e1a13bc SHA1 10f25693d1abf89c3133adc3035ecba2ac6612d9 SHA256 4bdf8f0d5db1a5d539e4ad67d024a5bef84ce98f4882bbe6113fc8dae38bec00
-AUX networkmanager-0.6.4-gentooinitscript.patch 271 RMD160 806934a0e78466cc68e1a961ce9e0be26702bed5 SHA1 0113fe5566232b92449c061ec5b9ac403a0ace81 SHA256 bc91ea870f0ce42f8971b0635160845903e289d8ad5c96d5dcb9fe1f589cafc3
-AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f
-AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
-AUX networkmanager-0.7.0-gentoo-dhclient.patch 956 RMD160 7d7cb94256350c92e95d9adcf57cc891a84cc086 SHA1 95663877b428803bdbb540cda6effe5a29dda9c5 SHA256 da9c943969ad22a9ad465efc914644c7a6c600c0c88b8b2a8b8807ff05e5f7ae
-AUX networkmanager-0.7.1-bad-link.patch 655 RMD160 24a431665b604d111a9b10efa33ff066a4363aad SHA1 9de1073f681623cb156444fed53c19d03e06076d SHA256 92bf60b9a10d804d0c295e73f8525bce67e9d6e36dc7ccf5468243c21183c113
-AUX networkmanager-0.7.1-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437
-AUX networkmanager-9999-confchanges.patch 567 RMD160 7c5166491ecf5f7d5507b030e73b3e2714d51a09 SHA1 3115ea5cdc4c531d47d742d9ca91b071815cd295 SHA256 34abd6a1a8c6c18add2ef9c394008e69a091dd7e7b79021dc71d6367a664a333
-AUX networkmanager-libnl.patch 1272 RMD160 5199f7e52f144c81a7716084d18028b08e24e65f SHA1 74e71ef490da8039adccfca70b0910bc0f97d064 SHA256 bf7cda4db7d96a9bd131d2d2823edd36da8ec2140afdfaac1ccad47644c1060d
-AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e
-AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43
-AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402
-AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
-DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
-DIST NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2 36726 SHA1 c2df56df89f652a84287951dcb5c89497fc62b46 SHA256 e4684f0c49c3f1c55f8028a1a2fbe18d726a9aa1592f25e1bd61b9443bfe3060
-DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
-EBUILD networkmanager-0.6.6.ebuild 2726 RMD160 8d7f8f72cc7aa9b69d49fc84f743ce44de3f6240 SHA1 ca65a02c115888743cd5902c1db51fc461d5394f SHA256 b32642f37decc1e62796cdef1ac4563bd17feefc8abf82cca4cd507c74fcc5bc
-EBUILD networkmanager-0.7.1-r6.ebuild 4202 RMD160 073ed5fc8df3247f1e8828f0955107c084cf4e1b SHA1 80728f3185d5216635577eec37b40195a5c7c616 SHA256 21eeff26dc2960ccd5ce5fe07ec81fb7581e2f49062d271307cbb7ae10b5154d
-EBUILD networkmanager-9999.ebuild 2605 RMD160 de6e3f3cd243923cbb8b8b6ea98cdf5629b9fc29 SHA1 849e614e978dffede4c36f54bf6e8acdc7c723a8 SHA256 3b12cb90be9121298ab70f801dcdbb19927c549370f0867a42575a62042c2526
-MISC ChangeLog 7652 RMD160 b513c7f896b3b3be1f2faf0d7cefdf495aacb153 SHA1 0a30614cb5070a123e60084741258086230361b0 SHA256 5044837b5172885dd804ad98dde6aa1c1bbe7420a63c66cf54a4bec55572cb60
-MISC metadata.xml 352 RMD160 dc1d33b6866b7a51fd60cc8508668cb80ccdf797 SHA1 401add51065c746c71da8b5992874c0556cedc04 SHA256 c5b303e6d5dbe90d34284c51a1c7ea8015e87c41d6f63446a1bf7ba5daf0d26d
diff --git a/net-misc/networkmanager/files/NetworkManagerDispatcher b/net-misc/networkmanager/files/NetworkManagerDispatcher
deleted file mode 100644
index 24aa37b97..000000000
--- a/net-misc/networkmanager/files/NetworkManagerDispatcher
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/runscript
-#
-# NetworkManagerDispatcher: NetworkManagerDispatcher daemon
-#
-# chkconfig: 345 98 02
-# description: This is a daemon for automatically executing certain
-# actions, when switching networks
-#
-# processname: NetworkManagerDispatcher
-# pidfile: /var/run/NetworkManagerDispatcher.pid
-
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-
-NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# Sanity checks.
-[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 0
-
-# so we can rearrange this easily
-processname=$NETWORKMANAGERDISPATCHER_BIN
-pidfile=/var/run/NetworkManagerDispatcher.pid
-
-depend() {
- need NetworkManager
-}
-
-start()
-{
- if [ -e ${pidfile} ]; then
- rm -f ${pidfile}
- fi
- ebegin "Starting NetworkManagerDispatcher"
- start-stop-daemon --start --quiet --exec ${processname}
- eend $?
- echo $(/bin/pidof NetworkManagerDispatcher) > ${pidfile}
-}
-
-stop()
-{
- ebegin "Stopping NetworkManagerDispatcher"
- start-stop-daemon --stop --quiet --exec ${processname} --pidfile ${pidfile}
- eend $?
- if [ -e ${pidfile} ]; then
- rm -f $pidfile
- fi
-}
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 ac15423c9..000000000
--- 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 ab703a5d4..000000000
--- 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 e4e57530f..000000000
--- 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 097cc00d8..000000000
--- 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/files/networkmanager-0.6.5-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch
deleted file mode 100644
index 8969cdae1..000000000
--- a/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch
+++ /dev/null
@@ -1,21 +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>
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch
deleted file mode 100644
index 1372c1203..000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/NetworkManager.conf
-===================================================================
---- src/NetworkManager.conf.orig
-+++ src/NetworkManager.conf
-@@ -11,7 +11,7 @@
- <allow send_destination="org.freedesktop.NetworkManager.PPP"/>
- <allow send_interface="org.freedesktop.NetworkManager.PPP"/>
- </policy>
-- <policy at_console="true">
-+ <policy group="plugdev">
- <allow send_destination="org.freedesktop.NetworkManager"/>
- <allow send_interface="org.freedesktop.NetworkManager"/>
- </policy>
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
deleted file mode 100644
index fa21c7680..000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 33547b8d8b64a10187b9c452eef7325d909889a1 Mon Sep 17 00:00:00 2001
-From: Daniel Gryniewicz <dang@gentoo.org>
-Date: Thu, 23 Apr 2009 10:42:43 -0400
-Subject: [PATCH] dhcp: use correct dhclient config file location for Gentoo (bgo #579737)
-
----
- src/dhcp-manager/nm-dhcp-dhclient.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
-index 946be0c..34b36f1 100644
---- a/src/dhcp-manager/nm-dhcp-dhclient.c
-+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -167,6 +167,8 @@ create_dhclient_config (NMDHCPDevice *device, NMSettingIP4Config *s_ip4)
- orig = g_strdup (SYSCONFDIR "/dhclient.conf");
- #elif defined(TARGET_DEBIAN)
- orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
-+#elif defined(TARGET_GENTOO)
-+ orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf");
- #else
- orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", device->iface);
- #endif
---
-1.6.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
deleted file mode 100644
index ea074bae8..000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-0.7.1-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch
deleted file mode 100644
index ca5332815..000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/networkmanager-9999-confchanges.patch b/net-misc/networkmanager/files/networkmanager-9999-confchanges.patch
deleted file mode 100644
index 2f40951fc..000000000
--- a/net-misc/networkmanager/files/networkmanager-9999-confchanges.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/NetworkManager.conf.orig 2008-11-03 23:49:29.772317558 +0000
-+++ src/NetworkManager.conf 2008-11-03 23:52:29.316349336 +0000
-@@ -11,7 +11,7 @@
- <allow send_destination="org.freedesktop.NetworkManager.PPP"/>
- <allow send_interface="org.freedesktop.NetworkManager.PPP"/>
- </policy>
-- <policy at_console="true">
-+ <policy group="plugdev">
- <allow send_destination="org.freedesktop.NetworkManager"/>
- <allow send_interface="org.freedesktop.NetworkManager"/>
- </policy>
diff --git a/net-misc/networkmanager/files/networkmanager-libnl.patch b/net-misc/networkmanager/files/networkmanager-libnl.patch
deleted file mode 100644
index c8526d099..000000000
--- a/net-misc/networkmanager/files/networkmanager-libnl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/NetworkManagerSystem.c.orig 2008-02-01 01:03:09.000000000 +0000
-+++ src/NetworkManagerSystem.c 2008-02-01 01:12:08.000000000 +0000
-@@ -234,16 +234,32 @@
-
- static struct nl_handle * new_nl_handle (void)
- {
-- struct nl_handle * nlh = NULL;
-+ struct nl_handle * nlh = NULL;
-+ struct nl_cb *cb;
-+ cb = nl_cb_alloc (NL_CB_VERBOSE);
-+ nlh = nl_handle_alloc_cb (cb);
-
-- nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE);
-- nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid()));
-- if (nl_connect(nlh, NETLINK_ROUTE) < 0)
-- {
-- nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror());
-+ if (!nlh) {
-+ nm_warning ("couldn't allocate netlink handle.");
-+ return NULL;
-+ }
-+
-+ if (nl_connect (nlh, NETLINK_ROUTE) < 0) {
-+ /* HACK: try one more time. Because the netlink monitor for link state
-+ * inits before we get here, it grabs the port that matches the PID
-+ * of the NM process, which also happens to be the PID that libnl uses
-+ * the first time too. The real fix is to convert nm-netlink-monitor.c
-+ * over to use libnl.
-+ */
- nl_handle_destroy (nlh);
- nlh = NULL;
-- }
-+
-+ nlh = new_nl_handle ();
-+ if (!nlh) {
-+ nm_error ("couldn't connect to netlink: %s", nl_geterror ());
-+ return NULL;
-+ }
-+ }
-
- return nlh;
- }
diff --git a/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch b/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch
deleted file mode 100644
index a76c41980..000000000
--- a/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/named-manager/nm-named-manager.c.orig 2006-03-25 00:38:24.000000000 -0500
-+++ src/named-manager/nm-named-manager.c 2006-03-25 00:44:15.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <resolv.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <arpa/inet.h>
- #include <syslog.h>
- #include <glib.h>
-@@ -396,6 +397,8 @@
- if (rename (tmp_resolv_conf, RESOLV_CONF) < 0)
- goto lose;
- nm_system_update_dns ();
-+
-+ chmod(RESOLV_CONF, S_IREAD | S_IWRITE | S_IRGRP | S_IROTH);
- return TRUE;
-
- lose:
diff --git a/net-misc/networkmanager/files/networkmanager-updatedbackend.patch b/net-misc/networkmanager/files/networkmanager-updatedbackend.patch
deleted file mode 100644
index 767284a28..000000000
--- a/net-misc/networkmanager/files/networkmanager-updatedbackend.patch
+++ /dev/null
@@ -1,657 +0,0 @@
-Index: NetworkManager/trunk/src/backends/NetworkManagerGentoo.c
-===================================================================
---- NetworkManagerGentoo.c (revision 15)
-+++ NetworkManagerGentoo.c (revision 38)
-@@ -1,2 +1,3 @@
-+
- /* NetworkManager -- Network link manager
- *
-@@ -250,8 +251,20 @@
- */
- void nm_system_restart_mdns_responder (void)
--{
-- nm_spawn_process("/etc/init.d/mDNSResponder stop");
-- nm_spawn_process("/etc/init.d/mDNSResponder zap");
-- nm_spawn_process("/etc/init.d/mDNSResponder start");
-+{
-+ /* Check if the daemon was already running - do not start a new instance */
-+ /* Howl */
-+ if (g_file_test("/var/run/mDNSResponder.pid", G_FILE_TEST_EXISTS))
-+ {
-+ nm_info("Restarting mDNSResponder");
-+ nm_spawn_process("/etc/init.d/mDNSResponder stop");
-+ nm_spawn_process("/etc/init.d/mDNSResponder zap");
-+ nm_spawn_process("/etc/init.d/mDNSResponder start");
-+ }
-+ /* Apple's mDNSResponder */
-+ if (g_file_test("/var/run/mDNSResponderPosix.pid", G_FILE_TEST_EXISTS))
-+ {
-+ nm_info("Restarting mDNSResponderPosix");
-+ nm_spawn_process("/etc/init.d/mDNSResponderPosix restart");
-+ }
- }
-
-@@ -266,5 +279,4 @@
- {
- char *buf;
-- char *addr;
- struct ether_addr hw_addr;
- unsigned char eui[8];
-@@ -288,4 +300,258 @@
- g_free(buf);
- }
-+/* Get the array associated with the key, and leave the current pointer
-+ * pointing at the line containing the key. The char** returned MUST
-+ * be freed by the caller.
-+ */
-+gchar **
-+svGetArray(shvarFile *s, const char *key)
-+{
-+ gchar **values = NULL, **lines, *line, *value;
-+ GList *restore;
-+ int len, strvlen, i, j;
-+
-+ g_assert(s);
-+ g_assert(key);
-+
-+ /* Attempt to do things the easy way first */
-+ line = svGetValue(s, key);
-+ if (!line)
-+ return NULL;
-+
-+ restore = s->current;
-+
-+ g_strstrip(strtok(line, "#")); /* Remove comments and whitespace */
-+
-+ if (line[0] != '(')
-+ {
-+ /* This isn't an array, so pretend it's a one item array. */
-+ values = g_renew(char*, values, 2);
-+ values[0] = line;
-+ values[1] = NULL;
-+ return values;
-+ }
-+
-+ while(!strrchr(line, ')'))
-+ {
-+ s->current = s->current->next;
-+ value = g_strjoin(" ", line, g_strstrip(strtok(s->current->data, "#")), NULL);
-+ g_free(line);
-+ line = value;
-+ value = NULL;
-+ }
-+
-+ lines = g_strsplit(line, "\"", 0);
-+
-+ strvlen = g_strv_length(lines);
-+ if (strvlen == 0)
-+ {
-+ /* didn't split, something's wrong */
-+ g_free(line);
-+ return NULL;
-+ }
-+
-+ j = 0;
-+ for (i = 0; i <= strvlen - 1; i++)
-+ {
-+ value = lines[i];
-+ len = strlen(g_strstrip(value));
-+ if ((value[0] == '(') || (value[0] == ')') || (len == 0))
-+ continue;
-+
-+ values = g_renew(char*, values, j + 2);
-+ values[j+1] = NULL;
-+ values[j++] = g_strdup(value);
-+ }
-+
-+ g_free(line);
-+ g_strfreev(lines);
-+ s->current = restore;
-+
-+ return values;
-+}
-+
-+/*
-+* GentooReadConfig
-+*
-+* Most of this comes from the arch backend, no need to re-invent.
-+* Read platform dependant config file and fill hash with relevant info
-+*/
-+static GHashTable * GentooReadConfig(const char* dev)
-+{
-+ GHashTable *ifs;
-+ shvarFile *file;
-+ int len, hits, i = 0;
-+ guint32 maskval;
-+ gchar buf[16], *value, *cidrprefix, *gateway;
-+ gchar *config_str, *iface_str, *route_str, *mtu_str, *dnsserver_str, *dnssearch_str; /* Lookup keys */
-+ gchar **conf, **config = NULL, **routes = NULL;
-+ struct in_addr mask;
-+
-+ file = svNewFile(SYSCONFDIR"/conf.d/net");
-+ if (!file)
-+ return NULL;
-+
-+ ifs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-+ if (ifs == NULL)
-+ {
-+ nm_debug("Unable to create g_hash_table.");
-+ svCloseFile(file);
-+ return NULL;
-+ }
-+
-+ /* Keys we will use for lookups later */
-+ config_str = g_strdup_printf("config_%s", dev);
-+ iface_str = g_strdup_printf("iface_%s", dev);
-+ route_str = g_strdup_printf("routes_%s", dev);
-+ mtu_str = g_strdup_printf("mtu_%s", dev);
-+ dnsserver_str = g_strdup_printf("dns_servers_%s", dev);
-+ dnssearch_str = g_strdup_printf("dns_search_%s", dev);
-+
-+
-+ if ((config = svGetArray(file, iface_str)))
-+ {
-+ /* This isn't tested, (or supported, really) so hopefully it works */
-+ nm_info("You are using a deprecated configuration syntax for %s.", dev);
-+ nm_info("You are advised to read /etc/conf.d/net.example and upgrade it accordingly.");
-+ value = svGetValue(file, "gateway");
-+ if ((value) && (gateway = strstr(value, dev)) && strtok(gateway, "/"))
-+ {
-+ /* Is it possible to specify multiple gateways using this variable? */
-+ gateway = strtok(NULL, "/");
-+ routes = g_renew(char*, routes, 2);
-+ routes[0] = g_strdup_printf("default via %s", gateway);
-+ routes[1] = NULL;
-+ g_free(value);
-+ }
-+ }
-+ else
-+ {
-+ config = svGetArray(file, config_str);
-+ routes = svGetArray(file, route_str);
-+ }
-+
-+
-+ if ((config) && g_ascii_strcasecmp(config[0], "dhcp"))
-+ {
-+ nm_debug("Found %s in %s.", config_str, SYSCONFDIR"/conf.d/net");
-+
-+ if (!g_ascii_strcasecmp(config[0], "null"))
-+ {
-+ nm_debug("Config disables device %s.", dev);
-+ g_hash_table_insert(ifs, g_strdup("disabled"), g_strdup("true"));
-+ }
-+ else
-+ {
-+ /* TODO: Handle "noop". */
-+ conf = g_strsplit(config[0], " ", 0);
-+ hits = g_strv_length(conf);
-+
-+ strtok(conf[0], "/");
-+ if ((cidrprefix = strtok(NULL, "/")))
-+ {
-+ maskval = 0xffffffff;
-+ maskval <<= (32 - atoi(cidrprefix));
-+ mask.s_addr = htonl(maskval);
-+ g_hash_table_insert(ifs, g_strdup("netmask"), g_strdup(inet_ntoa(mask)));
-+ }
-+
-+
-+ if ((hits > 0) && inet_aton(conf[0], &mask))
-+ {
-+ g_hash_table_insert(ifs, g_strdup(dev), g_strdup(conf[i++]));
-+ while ((hits -= 2) > 0)
-+ {
-+ g_hash_table_insert(ifs, g_strdup(conf[i]), g_strdup(conf[i+1]));
-+ i += 2;
-+ }
-+ }
-+ else
-+ {
-+ nm_debug("Unhandled configuration. Switching to DHCP.");
-+ nm_debug("\t%s = %s", config_str, config[0]);
-+ g_hash_table_insert(ifs, g_strdup("dhcp"), g_strdup("true"));
-+ }
-+ g_strfreev(conf);
-+ }
-+ }
-+ else
-+ {
-+ nm_debug("Enabling DHCP for device %s.", dev);
-+ g_hash_table_insert(ifs, g_strdup("dhcp"), g_strdup("true"));
-+ }
-+
-+ g_strfreev(config);
-+
-+ if (routes)
-+ {
-+ nm_debug("Found %s in config.", route_str);
-+
-+ len = g_strv_length(routes);
-+ for (i = 0; i < len; i++)
-+ {
-+ if (!sscanf(routes[i], "default via %[0-9.:]", buf))
-+ continue;
-+
-+ g_hash_table_insert(ifs,g_strdup("gateway"),g_strdup( (char*) buf));
-+ }
-+ }
-+
-+ g_strfreev(routes);
-+
-+ if ((value = svGetValue(file, mtu_str)))
-+ {
-+ nm_debug("Found %s in config.", mtu_str);
-+ g_hash_table_insert(ifs, g_strdup("mtu"), g_strdup(value));
-+ }
-+
-+ g_free(value);
-+
-+ if (!(value = svGetValue(file, dnsserver_str)))
-+ {
-+ value = svGetValue(file, "dns_servers");
-+ }
-+ if (value)
-+ {
-+ nm_debug("Found DNS nameservers in config.");
-+ g_hash_table_insert(ifs, g_strdup("nameservers"), g_strdup(value));
-+ }
-+
-+ g_free(value);
-+
-+ if (!(value = svGetValue(file, dnssearch_str)))
-+ {
-+ value = svGetValue(file, "dns_search");
-+ }
-+ if (value)
-+ {
-+ nm_debug("Found DNS search in config.");
-+ g_hash_table_insert(ifs, g_strdup("dnssearch"), g_strdup(value));
-+ }
-+
-+ g_free(value);
-+ svCloseFile(file);
-+
-+ if ((file = svNewFile(SYSCONFDIR"/conf.d/hostname")))
-+ {
-+ if ((value = svGetValue(file, "HOSTNAME")) && (strlen(value) > 0))
-+ {
-+ nm_debug("Found hostname.");
-+ g_hash_table_insert(ifs, g_strdup("hostname"), g_strdup(value));
-+ }
-+
-+ g_free(value);
-+ svCloseFile(file);
-+ }
-+
-+
-+ g_free(config_str);
-+ g_free(iface_str);
-+ g_free(route_str);
-+ g_free(mtu_str);
-+ g_free(dnsserver_str);
-+ g_free(dnssearch_str);
-+
-+ return ifs;
-+}
-
- typedef struct GentooSystemConfigData
-@@ -293,6 +559,7 @@
- NMIP4Config * config;
- gboolean use_dhcp;
-+ gboolean system_disabled;
-+ guint32 mtu;
- } GentooSystemConfigData;
--
-
- /*
-@@ -304,133 +571,172 @@
- *
- */
--void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
--{
-- char *cfg_file_path = NULL;
-- FILE *file = NULL;
-- char buffer[100];
-- char confline[100], dhcpline[100], ipline[100];
-- int ipa, ipb, ipc, ipd;
-- int nNext = 0, bNext = 0, count = 0;
-- char *confToken;
-- gboolean data_good = FALSE;
-- gboolean use_dhcp = TRUE;
-- GentooSystemConfigData *sys_data = NULL;
-- guint32 ip4_address = 0;
-- guint32 ip4_netmask = 0;
-- guint32 ip4_gateway = 0;
-- guint32 ip4_broadcast = 0;
--
-- g_return_val_if_fail (dev != NULL, NULL);
--
-- sys_data = g_malloc0 (sizeof (GentooSystemConfigData));
-- sys_data->config = nm_device_get_ip4_config(dev);
-- /* We use DHCP on an interface unless told not to */
-+void* nm_system_device_get_system_config (NMDevice * dev, NMData *app_data)
-+{
-+ GHashTable* ifh;
-+ gpointer val;
-+ gchar **strarr;
-+ GentooSystemConfigData* sys_data = NULL;
-+ int len, i;
-+
-+ g_return_val_if_fail(dev != NULL, NULL);
-+
-+ sys_data = g_malloc0(sizeof (GentooSystemConfigData));
- sys_data->use_dhcp = TRUE;
-- nm_device_set_use_dhcp (dev, TRUE);
--// nm_ip4_config_set_address (sys_data->config, 0);
--// nm_ip4_config_set_gateway (sys_data->config, 0);
--// nm_ip4_config_set_netmask (sys_data->config, 0);
--
-- /* Gentoo systems store this information in
-- * /etc/conf.d/net, this is for all interfaces.
-- */
--
-- cfg_file_path = g_strdup_printf ("/etc/conf.d/net");
-- if (!cfg_file_path)
-+ sys_data->system_disabled = FALSE;
-+ sys_data->mtu = 0;
-+ sys_data->config=NULL;
-+
-+ ifh = GentooReadConfig(nm_device_get_iface(dev));
-+ if (ifh == NULL)
-+ {
-+ g_free(sys_data);
- return NULL;
--
-- if (!(file = fopen (cfg_file_path, "r")))
-- {
-- g_free (cfg_file_path);
-- return NULL;
-- }
-- sprintf(confline, "iface_%s", nm_device_get_iface (dev));
-- sprintf(dhcpline, "iface_%s=\"dhcp\"", nm_device_get_iface (dev));
-- while (fgets (buffer, 499, file) && !feof (file))
-- {
-- /* Kock off newline if any */
-- g_strstrip (buffer);
--
-- if (strncmp (buffer, confline, strlen(confline)) == 0)
-+ }
-+
-+ val = g_hash_table_lookup(ifh, "disabled");
-+ if (val)
-+ {
-+ if (!strcasecmp (val, "true"))
-+ {
-+ nm_info ("System configuration disables device %s", nm_device_get_iface (dev));
-+ sys_data->system_disabled = TRUE;
-+ }
-+ }
-+
-+ val = g_hash_table_lookup(ifh, "mtu");
-+ if (val)
-+ {
-+ guint32 mtu;
-+
-+ mtu = strtoul(val, NULL, 10);
-+ if (mtu > 500 && mtu < INT_MAX)
-+ {
-+ nm_debug("System configuration specifies a MTU of %i for device %s", mtu, nm_device_get_iface(dev));
-+ sys_data->mtu = mtu;
-+ }
-+ }
-+ val = g_hash_table_lookup(ifh, "hostname");
-+ if (val)
-+ {
-+ nm_ip4_config_set_hostname(sys_data->config, val);
-+ }
-+
-+ val = g_hash_table_lookup(ifh, nm_device_get_iface(dev));
-+ if (val && !g_hash_table_lookup(ifh, "dhcp"))
-+ {
-+ /* This device does not use DHCP */
-+
-+ sys_data->use_dhcp=FALSE;
-+ sys_data->config = nm_ip4_config_new();
-+
-+ nm_ip4_config_set_address (sys_data->config, inet_addr (val));
-+
-+ val = g_hash_table_lookup(ifh, "gateway");
-+ if (val)
-+ nm_ip4_config_set_gateway (sys_data->config, inet_addr (val));
-+ else
-+ {
-+ nm_info ("Network configuration for device '%s' does not specify a gateway but is "
-+ "statically configured (non-DHCP).", nm_device_get_iface (dev));
-+ }
-+
-+ val = g_hash_table_lookup(ifh, "netmask");
-+ if (val)
-+ nm_ip4_config_set_netmask (sys_data->config, inet_addr (val));
-+ else
-+ {
-+ guint32 addr = nm_ip4_config_get_address (sys_data->config);
-+
-+ /* Make a default netmask if we have an IP address */
-+ if (((ntohl (addr) & 0xFF000000) >> 24) <= 127)
-+ nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000));
-+ else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191)
-+ nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000));
-+ else
-+ nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00));
-+ }
-+
-+ val = g_hash_table_lookup(ifh, "broadcast");
-+ if (val)
-+ nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val));
-+ else if ((val = g_hash_table_lookup(ifh, "brd")))
-+ nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val));
-+ else
-+ {
-+ guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config))
-+ | ~nm_ip4_config_get_netmask (sys_data->config));
-+ nm_ip4_config_set_broadcast (sys_data->config, broadcast);
-+ }
-+
-+ val = g_hash_table_lookup(ifh, "nameservers");
-+ if (val)
-+ {
-+ nm_debug("Using DNS nameservers \"%s\" from config for device %s.", val, nm_device_get_iface(dev));
-+ if ((strarr = g_strsplit(val, " ", 0)))
- {
-- /* Make sure this config file is for this device */
-- if (strncmp (&buffer[strlen(confline) - strlen(nm_device_get_iface (dev))],
-- nm_device_get_iface (dev), strlen(nm_device_get_iface (dev))) != 0)
-+ len = g_strv_length(strarr);
-+ for(i = 0; i < len; i++)
- {
-- nm_warning ("System config file '%s' does not define device '%s'\n",
-- cfg_file_path, nm_device_get_iface (dev));
-- break;
-- }
-- else
-- data_good = TRUE;
--
-- if (strncmp (buffer, dhcpline, strlen(dhcpline)) == 0)
-- {
-- use_dhcp = TRUE;
-+ guint32 addr = (guint32) (inet_addr (strarr[i]));
-+
-+ if (addr != (guint32) -1)
-+ nm_ip4_config_add_nameserver(sys_data->config, addr);
-+ }
-+
-+ g_strfreev(strarr);
- }
- else
- {
-- use_dhcp = FALSE;
-- confToken = strtok(&buffer[strlen(confline) + 2], " ");
-- while (count < 3)
-- {
-- if (nNext == 1 && bNext == 1)
-- {
-- ip4_address = inet_addr (confToken);
-- count++;
-- continue;
-- }
-- if (strcmp(confToken, "netmask") == 0)
-- {
-- confToken = strtok(NULL, " ");
-- ip4_netmask = inet_addr (confToken);
-- count++;
-- nNext = 1;
-- }
-- else if (strcmp(confToken, "broadcast") == 0)
-- {
-- confToken = strtok(NULL, " ");
-- count++;
-- bNext = 1;
-- }
-- else
-- {
-- ip4_address = inet_addr (confToken);
-- count++;
-- }
-- confToken = strtok(NULL, " ");
-- }
-+ guint32 addr = (guint32) (inet_addr (val));
-+
-+ if (addr != (guint32) -1)
-+ nm_ip4_config_add_nameserver(sys_data->config, addr);
-+ }
-+ }
-+
-+ val = g_hash_table_lookup(ifh, "dnssearch");
-+ if (val)
-+ {
-+ nm_debug("Using DNS search \"%s\" from config for device %s.", val, nm_device_get_iface(dev));
-+ if ((strarr = g_strsplit(val, " ", 0)))
-+ {
-+ len = g_strv_length(strarr);
-+ for(i = 0; i < len; i++)
-+ {
-+ if (strarr[i])
-+ nm_ip4_config_add_domain(sys_data->config, strarr[i]);
- }
-+
-+ g_strfreev(strarr);
- }
-- /* If we aren't using dhcp, then try to get the gateway */
-- if (!use_dhcp)
-+ else
- {
-- sprintf(ipline, "gateway=\"%s/", nm_device_get_iface (dev));
-- if (strncmp(buffer, ipline, strlen(ipline) - 1) == 0)
-+ nm_ip4_config_add_domain(sys_data->config, val);
-+ }
-+ }
-+
-+ nm_ip4_config_set_mtu (sys_data->config, sys_data->mtu);
-+
-+#if 0
-+ {
-+ int j;
-+ nm_debug ("------ Config (%s)", nm_device_get_iface (dev));
-+ nm_debug (" ADDR=%d", nm_ip4_config_get_address (sys_data->config));
-+ nm_debug (" GW =%d", nm_ip4_config_get_gateway (sys_data->config));
-+ nm_debug (" NM =%d", nm_ip4_config_get_netmask (sys_data->config));
-+ nm_debug (" NSs =%d",nm_ip4_config_get_num_nameservers(sys_data->config));
-+ for (j=0;j<nm_ip4_config_get_num_nameservers(sys_data->config);j++)
- {
-- sprintf(ipline, "gateway=\"%s/%%d.%%d.%%d.%%d\"", nm_device_get_iface (dev) );
-- sscanf(buffer, ipline, &ipa, &ipb, &ipc, &ipd);
-- sprintf(ipline, "%d.%d.%d.%d", ipa, ipb, ipc, ipd);
-- ip4_gateway = inet_addr (ipline);
-+ nm_debug (" NS =%d",nm_ip4_config_get_nameserver(sys_data->config,j));
- }
-- }
-- }
-- fclose (file);
-- g_free (cfg_file_path);
--
-- /* If successful, set values on the device */
-- if (data_good)
-- {
-- nm_warning("data good :-)");
-- nm_device_set_use_dhcp (dev, use_dhcp);
-- if (ip4_address)
-- nm_ip4_config_set_address (sys_data->config, ip4_address);
-- if (ip4_gateway)
-- nm_ip4_config_set_gateway (sys_data->config, ip4_gateway);
-- if (ip4_netmask)
-- nm_ip4_config_set_netmask (sys_data->config, ip4_netmask);
-- if (ip4_broadcast)
-- nm_ip4_config_set_broadcast (sys_data->config, ip4_broadcast);
-- }
-+ nm_debug ("---------------------\n");
-+ }
-+#endif
-+
-+ }
-+
-+ g_hash_table_destroy(ifh);
-+
-+
- return (void *)sys_data;
- }
-@@ -519,4 +825,11 @@
- gboolean nm_system_device_get_disabled (NMDevice *dev)
- {
-+ GentooSystemConfigData *sys_data;
-+
-+ g_return_val_if_fail (dev != NULL, FALSE);
-+
-+ if ((sys_data = nm_device_get_system_config_data (dev)))
-+ return sys_data->system_disabled;
-+
- return FALSE;
- }
-@@ -576,4 +889,35 @@
- void nm_system_set_hostname (NMIP4Config *config)
- {
-+ char *h_name = NULL;
-+ const char *hostname;
-+
-+ g_return_if_fail (config != NULL);
-+
-+ hostname = nm_ip4_config_get_hostname (config);
-+ if (!hostname)
-+ {
-+ struct in_addr temp_addr;
-+ struct hostent *host;
-+
-+ /* try to get hostname via dns */
-+ temp_addr.s_addr = nm_ip4_config_get_address (config);
-+ host = gethostbyaddr ((char *) &temp_addr, sizeof (temp_addr), AF_INET);
-+ if (host)
-+ {
-+ h_name = g_strdup (host->h_name);
-+ hostname = strtok (h_name, ".");
-+ }
-+ else
-+ nm_warning ("nm_system_set_hostname(): gethostbyaddr failed, h_errno = %d", h_errno);
-+ }
-+
-+ if (hostname)
-+ {
-+ nm_info ("Setting hostname to '%s'", hostname);
-+ if (sethostname (hostname, strlen (hostname)) < 0)
-+ nm_warning ("Could not set hostname.");
-+ }
-+
-+ g_free (h_name);
- }
-
-@@ -596,4 +940,11 @@
- guint32 nm_system_get_mtu (NMDevice *dev)
- {
-+ GentooSystemConfigData *sys_data;
-+
-+ g_return_val_if_fail (dev != NULL, 0);
-+
-+ if ((sys_data = nm_device_get_system_config_data (dev)))
-+ return sys_data->mtu;
-+
- return 0;
- }
diff --git a/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch b/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch
deleted file mode 100644
index e74c3c548..000000000
--- a/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN NetworkManager-0.5.2.orig/src/nm-device-802-3-ethernet.c NetworkManager-0.5.2/src/nm-device-802-3-ethernet.c
---- NetworkManager-0.5.2.orig/src/nm-device-802-3-ethernet.c 2006-02-04 05:20:00.000000000 -0600
-+++ NetworkManager-0.5.2/src/nm-device-802-3-ethernet.c 2006-02-04 05:20:26.000000000 -0600
-@@ -18,7 +18,7 @@
- *
- * (C) Copyright 2005 Red Hat, Inc.
- */
--
-+#define HEADERS_KERNEL
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <dbus/dbus.h>
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
deleted file mode 100644
index c37b59680..000000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
deleted file mode 100644
index 08c26474b..000000000
--- a/net-misc/networkmanager/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>steev@gentoo.org</email>
- <name>Stephen Klimaszewski</name>
- </maintainer>
- <maintainer>
- <email>rbu@gentoo.org</email>
- <name>Robert Buchholz</name>
- </maintainer>
-</pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-0.6.6.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
deleted file mode 100644
index 21e2c2b79..000000000
--- a/net-misc/networkmanager/networkmanager-0.6.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.6.6.ebuild,v 1.6 2009/04/22 13:30:43 rbu Exp $
-
-EAPI=2
-
-inherit gnome2 eutils multilib-native
-
-# 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/"
-# Release candidate for 0.6.6, Hosted in dcbw's redhat space.
-SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc 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[lib32?]
- >=sys-apps/hal-0.5.10[lib32?]
- sys-apps/iproute2
- >=dev-libs/libnl-1.1[lib32?]
- >=net-misc/dhcdbd-1.4
- >=net-wireless/wireless-tools-28_pre9
- >=net-wireless/wpa_supplicant-0.4.8
- >=dev-libs/glib-2.8[lib32?]
- gnome? ( >=x11-libs/gtk+-2.8[lib32?]
- >=gnome-base/libglade-2[lib32?]
- >=gnome-base/gnome-keyring-0.4[lib32?]
- >=gnome-base/gconf-2[lib32?]
- >=gnome-base/libgnomeui-2[lib32?] )
- crypt? ( dev-libs/libgcrypt[lib32?] )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool"
-PDEPEND="gnome? ( >gnome-extra/nm-applet-0.6.5 )"
-
-DOCS="AUTHORS ChangeLog 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"
-
-S=${WORKDIR}/${MY_P}
-
-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_prepare () {
- # 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.6.5-confchanges.patch"
-}
-
-multilib-native_src_install_internal() {
- gnome2_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"
- 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 "You will need to restart DBUS if this is your first time"
- elog "installing NetworkManager."
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild
deleted file mode 100644
index 8517bf754..000000000
--- a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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-r6.ebuild,v 1.1 2009/06/19 08:58:11 dagger Exp $
-
-EAPI="2"
-inherit eutils autotools multilib-native
-
-PATCH_VERSION="1b"
-
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-MY_P=${MY_PN}-${PV}
-PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
-
-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://dev.gentoo.org/~dagger/files/${PATCHNAME}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
-# modemmanager"
-
-RDEPEND=">=sys-apps/dbus-1.2[lib32?]
- >=dev-libs/dbus-glib-0.75[lib32?]
- >=sys-apps/hal-0.5.10[lib32?]
- >=net-wireless/wireless-tools-28_pre9
- >=dev-libs/glib-2.16[lib32?]
- >=sys-auth/policykit-0.8[lib32?]
- >=dev-libs/libnl-1.1[lib32?]
- >=net-wireless/wpa_supplicant-0.5.10[dbus]
- || ( sys-libs/e2fsprogs-libs[lib32?] <sys-fs/e2fsprogs-1.41.0[lib32?] )
- avahi? ( net-dns/avahi[autoipd,lib32?] )
- gnutls? (
- nss? ( >=dev-libs/nss-3.11[lib32?] )
- !nss? ( dev-libs/libgcrypt[lib32?]
- net-libs/gnutls[lib32?] ) )
- !gnutls? ( >=dev-libs/nss-3.11[lib32?] )
- 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 )"
-
-S=${WORKDIR}/${MY_P}
-
-multilib-native_src_prepare_internal() {
-
- # Fix up the dbus conf file to use plugdev group
- epatch "${FILESDIR}/${PN}-0.7.1-confchanges.patch"
-
- # bug #266982
- epatch "${FILESDIR}/${PN}-0.7.0-gentoo-dhclient.patch"
-
- # bug #267349
- epatch "${FILESDIR}/${PN}-0.7.1-bad-link.patch"
-
- # bug #262112
- EPATCH_SOURCE="${WORKDIR}/nm_0.7.1_patchset_${PATCH_VERSION}"
- EPATCH_SUFFIX="patch"
- epatch && eautoreconf
-
-}
-
-multilib-native_src_configure_internal() {
- ECONF="--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
- 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}
-}
-
-multilib-native_src_install_internal() {
- 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/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
deleted file mode 100644
index d62d4478a..000000000
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.6.ebuild,v 1.4 2008/08/17 16:16:38 maekke Exp $
-
-EAPI=2
-
-inherit eutils autotools gnome2 git multilib-native
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MY_PN=${PN/networkmanager/NetworkManager}
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-# Release candidate for 0.6.6, Hosted in dcbw's redhat space.
-#SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz"
-EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN}/${MY_PN}.git"
-EGIT_BOOTSTRAP="./autogen.sh"
-
-SRC_URI=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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[lib32?]
- >=sys-apps/hal-0.5.10[lib32?]
- sys-apps/iproute2
- >=dev-libs/libnl-1.1[lib32?]
- >=net-misc/dhcdbd-1.4
- >=net-wireless/wireless-tools-28_pre9
- >=net-wireless/wpa_supplicant-0.4.8
- >=dev-libs/glib-2.8
- gnome? ( >=x11-libs/gtk+-2.8
- >=gnome-base/libglade-2[lib32?]
- >=gnome-base/gnome-keyring-0.4[lib32?]
- >=gnome-base/gnome-panel-2
- >=gnome-base/gconf-2[lib32?]
- >=gnome-base/libgnomeui-2[lib32?] )
- crypt? ( dev-libs/libgcrypt[lib32?] )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool"
-PDEPEND="gnome? ( =gnome-extra/nm-applet-9999 )"
-
-DOCS="AUTHORS ChangeLog 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"
-
-S=${WORKDIR}/${MY_P}
-
-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
-}
-
-multilib-native_src_install_internal() {
- gnome2_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"
- 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 "You will need to restart DBUS if this is your first time"
- elog "installing NetworkManager."
-}