Drop nm-0.8 as requested in bug #382045.

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 16 insertions, 835 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 4c7883865389..97ac49fa52e4 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.153 2012/12/02 22:31:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.154 2012/12/11 21:43:28 tetromino Exp $
+
+  11 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-0.8.4.0-r2.ebuild,
+  -files/networkmanager-0.8.4.0-fix-tests.patch,
+  -files/networkmanager-0.8.4.0-ifnet-smarter-write.patch,
+  -files/networkmanager-0.8.4.0-shared-connection.patch:
+  Drop nm-0.8 as requested in bug #382045.
 
   02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   networkmanager-0.8.4.0-r2.ebuild, networkmanager-0.9.4.0-r5.ebuild,
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index b817976dfafe..24716a5c21e6 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,9 +6,6 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 SHA256 70
 AUX 10-openrc-status-r2 899 SHA256 4391d3c53f7904bfd287e767c791c5c1b605d5bff7f5aaa00b8d7655101f2732 SHA512 5b5f783d2c68da4f47db919aea60963986638c313645e8f0ba3c89b3b339257b28eaaf65571536254e266e1da510cde7a157a8fdba1feb0d79b4d0c8ee3c51af WHIRLPOOL b941201368ee8c419fbbd0b33752deb70d9b9e140c76d74f50836734d22eeae70790cc3c7ac3b07cd40f95c3635fd99db92e161a21d74af1889dc0c48bb049ac
 AUX 10-openrc-status-r3 1103 SHA256 3ee158de440df6e6a8ddcc7c0622cb94039cffe6b0cc0b88d35a53333d32f73d SHA512 b848327b0975a59420a4e7132c45a15267a7d98b0f430f52d95991e7946eca787faf5b9a5adb3f1b294f5cc761f14d693d9d4e604ff091160da9610b76cb72e8 WHIRLPOOL 7745a0469e1bec653736c14e4e6f5f9593ef9a752d4973ad538350a1f934bcdf1e2cd4c276ce3f57515e9d8c34168014e138ab9627e57cd3cef79b852ebacc40
 AUX conf.d.NetworkManager 230 SHA256 4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a WHIRLPOOL 7dbb15bf184e918369187605af91816ed11c460147066ede11f200d73103bb6f7f63ccc7abe7996d485294f44282d6bbd9520cc9e50f04ce41262c9817f7b994
-AUX networkmanager-0.8.4.0-fix-tests.patch 2079 SHA256 33ca19856777794b558b88972a5ba15a13c53d77834eaf2339a64c6b072c31a7 SHA512 b8174d43882086a5f2a703678f1a899fd23757682c74a2fe177cd50485a91648a83e1eb8e07be6268223a668b61bd5da5de443f728e0f8acfe4cbc5324c1bf1f WHIRLPOOL 11fe50e11e96db19459a03eb1568784ac5ff7ca56a54ec5fc30e6dfd61127cc8e2eba01cb0119844b8a2b344142624370d0a70770e86116993bc362556f37667
-AUX networkmanager-0.8.4.0-ifnet-smarter-write.patch 5969 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a SHA512 fe35000d391bedd28458967a4b884a23fc79d82a185503f702ae36ddf9c57a3f75bb35191f8fd709268f8c1f02eb9c4adfcff872c14d1d1ea26968382260e95b WHIRLPOOL 2f23579bea7ff24a05ab90e40fa87e01fc84eb31876bb6969e936490cdc2945a4be3f1ade4ebee731732be55716df1f39b80fddd7df9ba91511c77f495e82d25
-AUX networkmanager-0.8.4.0-shared-connection.patch 15067 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6 SHA512 86c1df9feef18398251b21ede55818da979838674bf43c4cdee36304b3df3a64d9f551f8e591063c7be65019ac8593ea848bd1d0c49a31268d0b80b47b606822 WHIRLPOOL 32b04f6d81790e10dbfe9aa3399998e4eb80f55352aac1c4531ddbe4955a1ef35ee6295d7a62dfb42638fcd78635c34bba01d53abb20813048e49b0c254e3258
 AUX networkmanager-0.9.2.0-init-provide-net-r1.patch 2282 SHA256 fd46086be527bdd79978142eb8b46653ecc919f2dcab0a02dea2d0fd28232f92 SHA512 d639f1bc6442a92ad9d759d09abc963131ca13ddae13129c0ef21affb3888426a8301aad6fe4b71eddfca2a9f21213d515ba90662abff981701090581ed6bb9e WHIRLPOOL fee0fa3b2b148e210d9bb547a327d42866a70fb817b0a8e5375ece10c09bbe1a67b048ca25cadba0296eeb4e8359245369e9b0c213fd0343a6e75792755bc0d3
 AUX networkmanager-0.9.2.0-pre-sleep.patch 9163 SHA256 e391907c8699b22b6c48ff27bf4d7a116600e643d788bd579339adc180e1ed97 SHA512 ca71814dec88e294776d8b9155063eeb10128b1236e19f159fe6f4071109716d2dce4422b8efa733ddbef222b44d02f909e75861623118d744966c45f097cea7 WHIRLPOOL f676bc5951ed07c07bb713894b576710b9e56495d2d80ef5e41b0845c0bccbc74a9bc76ae07981cbd5bec0de89f25129809798734da529f72b65881db08e6719
 AUX networkmanager-0.9.4.0-dhclient-ipv6.patch 1230 SHA256 5db0d4654c9844cc329f30ef3d6370eddc00148a60e6dd0935cd91206239f52c SHA512 9fbbdf6d7af6dc6d59b4f6c4e6ebd90de85feac1e62c2f4f019ba25036fe1c5ae8437b2404ffafb7f8fe614db78d7c583df269dc5caafc15658c2842663dbdc9 WHIRLPOOL c345f75533e3a1c85263f0e5e89ce70eef2c63756c265573addc70bae59130e397d07c6df24e50ad27e2d077f596660d65246c0ca394a7bc0f685b74e72c0527
@@ -24,26 +21,24 @@ AUX networkmanager-0.9.6.0-cached-ipv6-routes-1.patch 1259 SHA256 14c413c4e1c0aa
 AUX networkmanager-0.9.6.0-cached-ipv6-routes-2.patch 1074 SHA256 bbe8b50a4a74f838a3fcc43e03dff97d80fdbacef6d75381d0294e28989a66f5 SHA512 093a6b91768ac205c6663ef3c18b544fea5996df150d9657c31f924291b216ec11326af06a6b16b1b9006b5b4311a36e87729eb16cd35af5635fde25ab06fde4 WHIRLPOOL e5148d52660d3e23796cb75e794b9c9be8bbe8d56493ce76615d956014563c4cc530ee583962f51020b6a2c70f18364a6cb210efb4aeb7e6a8b5c9d49b162182
 AUX networkmanager-0.9.6.0-daemon-signals.patch 1045 SHA256 eb9e01f5622aabf611f881e3bf7989cdaa9df25dc19b0087747f04c423efe503 SHA512 2f6e7fcb76eb3944ae5df0fcc7b894ed45a8e852b0cba425fc6001de8a5532a1691ed847bb6c0b54988b9f2df5e9fa1720e4c6306e295477d7c8d246d00bf29a WHIRLPOOL 3243def958145d734954b8baaf4fefce4b9becf7e274f297010be9fb80998ae43df987061a7e0d00348df68bb84e92e1f90b5419567b88ed5a72e0db200a9598
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
-DIST NetworkManager-0.8.4.0.tar.bz2 1672926 SHA256 e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588 SHA512 be0b1c705102457c1966f9ecfde4a19e3272421c8ecc12108a0d91e5dcf99acc33e7ec5333622b95262a256cfcde711d4855fbdd97282658647cdade3a638c18 WHIRLPOOL b5b15ee1f5a3853e7850f976b9bf21edb2f1dd2a44cc616e9ce19e188011d931f7c141fa1fe686209aa079d3b6cd7242c874c5a3febd68509f6ea13453ead321
 DIST NetworkManager-0.9.4.0.tar.xz 1885364 SHA256 eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f SHA512 1895bb10d6d1954bd083729ac0f4529a983c510701cb5460cc6621651ea6b3e3db2585799594746701e5b6ded37b799f0a8a03b09baccc44fd371973e3ab22dd WHIRLPOOL af7ba4a1d5402e9062a0d333e8ad0d8a8669f7a881316d447f4d567f0354be63e12074cde2d94dc476de7bcbe594c49b27906ae495df0577b1a16d2e065b9581
 DIST NetworkManager-0.9.6.0.tar.xz 1965208 SHA256 3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07 SHA512 eecf7c389aa677069bc988427f05df8a2302447d3827e8bbb4a44bea8f0cf37ee2c3dd92d864ead9c665f86423f72784c8c9bdb5675ec10f32f2802889bf19c2 WHIRLPOOL 52859c2fb4549afe0d9c2c44948bca75ef4ae7f3be8b55a3560b7b1732d0a8e9668831bc035e9ba613157b3aeced03ec3110180da3805a87cf1a22c090cd3b0d
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
-EBUILD networkmanager-0.8.4.0-r2.ebuild 4407 SHA256 586fcecf9d950d3236cf31577961e4289ae42fe36ec28ee98a1376e665ba5d5d SHA512 7519beca505a54ef163796d9b01b7ef4a92a56c85f3c4e1b68f6487e416089645131697802fee80752e71ce3a9ebf6465316d08a0bfaf9c58a6b65c9e6a34511 WHIRLPOOL 5a4150921c6c1e1ad32635da3c6652899f1008178da897c8e581bc8323fe8619ac3cd07a164386b9d0d69a86edc0c96d1941fd4d7e932a4ab21fd9cca0dc7661
 EBUILD networkmanager-0.9.4.0-r5.ebuild 7670 SHA256 f73533de276884f93c119390800a6babee58512c38b0e6492314d300426243a4 SHA512 e539a9909892b1253181f681f599fd5072e045d4d5cad8cd3bd86e3d5f312cbfe0837eb6701071cbed402b2b9118f1b2315282c84ec6928919ab8aa289e1eb8e WHIRLPOOL 0cec98abeeaea289c212e732ee91a9e1c113af0a262a08b04d0f01854d1686fda4adf2f3534a5d6b8e2af2d1b7fafbd1ec68d65d3289ba15813ba1dfb58ff63c
 EBUILD networkmanager-0.9.4.0-r6.ebuild 7726 SHA256 50c81e92d05d304b3d9725f337f02dee347a79d3153350e64eecc6cfe80d79c3 SHA512 aa3dfc6d96397d65d954c7c2964dad14797a75293bb5d24a2f5ae93b762ccc03508c4dd957f655dc15363f76ace9f220dbdb984b3bb3c702eed7a78dcf3f5c67 WHIRLPOOL ba5bc3d8cb47e6cef4d96bf0064f8ba9ab5fdb137ee7124c92e1f709e0581b87abe9b5a28942bff272e03c57b0abea3f3a1f76a456efa596f516878137bb4468
 EBUILD networkmanager-0.9.4.0-r7.ebuild 7701 SHA256 bbb2932908fc32d393658a29a7bc995b62867ce5f26493ceaf04573c5c3742a5 SHA512 a95cbc42c5edf24b96b4d1eb0df953931a11ab1efa7160b4fbdd22e5d8be6bd16447c1ed9a62f9ef1e39003e00d10c6a1d12f7647d2be0d9ab6d645ded46a008 WHIRLPOOL a7c137b2e84f00c35f67dd971ff062bd67dfea8ce5b71a847009c90b40a6e22b762614c82a941bfb87a52a6fb4830d0da0da0a3550d834adbd0010e427c38248
 EBUILD networkmanager-0.9.6.0.ebuild 7656 SHA256 82689af65316821efb33c9f4ff99c9b922e4436f27ee6b76d5376a5bd55cd075 SHA512 f44cea2119a5af5699220ae76c247c9050417ada2dc4861aa39ab34be2a4fdcd84903223b0a4fc949e678639a59b49690df9239cbc9b82df1c44720c6bc7fa13 WHIRLPOOL e1f76994b8a5fb4e035d255a98dca24b3fde1a4b49841c96f77e0f8a052134ba5c0747309c6410d24ac995c6924288856258e06a498f9a9712560d33bffef71e
 EBUILD networkmanager-0.9.6.4.ebuild 7554 SHA256 12aeac5a8f4d954d917e4f299f75df16a16a5e13c37fac9a23d7d4c46d0e02d2 SHA512 263a96c8ff203a8cd88de1a3769bef392955c04f4ba996d609fc49a8cbf7458176b0766ec738bcb1ce750c0e07b3fe7ca10e3cbe38783c78da0e130c0e9380b9 WHIRLPOOL bc41bd0fa8e2a1e83a531f154b6787e82e0dccada39f1f3e75132584491a4232b0c568a30d63754fb7a9b84e6291e7e7aea50a585d00cfadbe8e1dd19db42413
-MISC ChangeLog 38915 SHA256 ef4e89777a0e0e2cdf854b19b0cb63983378ad66434c150e93545b19186fe82f SHA512 fcd5551f5e769d4c638e5c9af83e30bc329bd981b53d496dd07ce7a51dc57b97320d617c4cd2bbde8cd063c80360bc579afbf28546cd09036a18dc1224bce19b WHIRLPOOL f93c7766c2b9b7452eb701d647ec76113fbdca87376bd9576e868eb941b63ed0735e38d954c9230be576a6650d8c2eaa71edce180c6cc11471b081468f380d2a
+MISC ChangeLog 39220 SHA256 864f06dfd687c255b2caad8beff19392399c7bf96b4a3c268acd33c87d868f5c SHA512 7f51cf8adf6ae495ab626ecdc88718e21d557b0e216e886784d92713a6397ddc6f083468ad3d625dd0f693a4c2b5a66f3de1d2c080eb581c77f285aab3ee67c5 WHIRLPOOL 591336a7982a7f18af914f5f63502b807f7591c49992f885a3d4c43bb1044d260037b3225134015e0010d9c792df941261783bac6ba42feb01c855076bed5b60
 MISC metadata.xml 1719 SHA256 59389638e363cf7454d60f5799d0744a98e22618480f327ded50aa5c7b390676 SHA512 5fae699bc621beb604abdffc4bb4afc6d4619dd7ad08a351cbbdea9c3a5521dfd050d9e526f40f068c93e0f8c0cd46116ab107ad11abe40a0750c58ecb55ceed WHIRLPOOL f51bb0d682f723e90878f2470426b65c02429d44ba3b3749bd0d182ec474ebcdc3a542347c38e6fabb1add4ed8ac9429d15a0e16fd4c159242d309496c6a8ed5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQu9a2AAoJEEdUh39IaPFNln4H/1g2rzbJcfU0ghy+jVrSMZOa
-zLytsMdoAJNECdnboa9fgfUKJhJ5LAnxgiorMdXFDV4BcxQZkhqzTtISgYJjZlmm
-yJcVFnVG6qGde/eXaH73obxFHaSUiGHS48nIPO+Dj2qrQfaXBkmuqEvH9OgVQ3yY
-dv5B4X/2cukm26zx/klkEDm4aBFHoJZ8tKZ2xq1tQEKA82kMNIhQNG84HlIeJRuX
-vJUreqA5BKvdH/IaCSZxoPyNBuo5lcCIb5YSK3ocrLnuVpR2//gMK3mpNwQaPjQg
-W9QwHk5rT70hGIlWdeSol9pSWs+Z0srmwHNnujpySy6TamUjRTJWpIjZEBN8m14=
-=viRM
+iQEcBAEBCAAGBQJQx6kBAAoJEJ0WA1zPCt1h8q4H/RutxqQU+QDKfA9nEWc+1uX+
+Wg1omX/A26YqF+vFSCcOn1TgwNyhcW6pFy8DEETv1IJRzSuFa+HjlsmcCZqxMTSy
+Qr4F19TTGRjN8fduydLsbDNf3I9V1ydHJ+wZsblR2IRUNkPTOqF+mvvBF6U2mM3q
+z+liT6QKtIicqkZWmmfmFZY0znzS+hwfI/aiNLv08X3BMIKLT3GOFlZIwGpbu6WL
+cDamCFzelqZv5G2fQX9DPnKcdroUmOQOk59Jjn4KFzo7d6OiAH5I7OA6sCH4IppS
+2vzXozlQpcoxUlI8M1OyWS3u0Jj/m9/XwWnXnBsxMe8irgII/RSJA0E5i4HIIlw=
+=prZy
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.4.0-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.8.4.0-fix-tests.patch
deleted file mode 100644
index d8af30fc5a5a..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.4.0-fix-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 21e7fda25507e68c13b97040b3b9e5dc3c9726bf Mon Sep 17 00:00:00 2001
-From: Mu Qiao <qiaomuf@gentoo.org>
-Date: Wed, 18 May 2011 19:02:40 +0800
-Subject: [PATCH] fix-tests
-
----
- configure.ac                                    |    1 -
- system-settings/plugins/ifnet/Makefile.am       |    1 -
- system-settings/plugins/ifnet/tests/Makefile.am |   13 -------------
- 3 files changed, 0 insertions(+), 15 deletions(-)
- delete mode 100644 system-settings/plugins/ifnet/tests/Makefile.am
-
-diff --git a/configure.ac b/configure.ac
-index d8a266e..8304aa4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -571,7 +571,6 @@ system-settings/plugins/Makefile
- system-settings/plugins/ifupdown/Makefile
- system-settings/plugins/ifupdown/tests/Makefile
- system-settings/plugins/ifnet/Makefile
--system-settings/plugins/ifnet/tests/Makefile
- system-settings/plugins/ifcfg-rh/Makefile
- system-settings/plugins/ifcfg-rh/tests/Makefile
- system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
-diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am
-index 86d5ea2..f61e112 100644
---- a/system-settings/plugins/ifnet/Makefile.am
-+++ b/system-settings/plugins/ifnet/Makefile.am
-@@ -1,4 +1,3 @@
--SUBDIRS = . tests
- INCLUDES = \
- 	-I$(top_srcdir)/src/system-settings \
- 	-I$(top_srcdir)/include \
-diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am
-deleted file mode 100644
-index 17a081f..0000000
---- a/system-settings/plugins/ifnet/tests/Makefile.am
-+++ /dev/null
-@@ -1,13 +0,0 @@
--INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\
--	 -I$(top_srcdir)/libnm-glib \
--	 -I$(top_srcdir)/libnm-util \
--	 -I$(top_srcdir)/include \
--	 -I$(top_srcdir)/src/system-settings
--TESTS = check_ifnet
--check_PROGRAMS = check_ifnet
--check_ifnet_SOURCES = test_all.c 
--check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS)
--check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\
--		    $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\
--		    $(CHECK_LIBS)\
--		    $(GLIB_LIBS)
--- 
-1.7.3.4
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.4.0-ifnet-smarter-write.patch b/net-misc/networkmanager/files/networkmanager-0.8.4.0-ifnet-smarter-write.patch
deleted file mode 100644
index ff4c1f253677..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.4.0-ifnet-smarter-write.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 776fafc133e18df48dc92a717c662e1b2858567e Mon Sep 17 00:00:00 2001
-From: Mu Qiao <qiaomuf@gentoo.org>
-Date: Fri, 25 Feb 2011 16:25:07 +0000
-Subject: [PATCH 3/3] Won't write when nothing changed
- Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
- Make log less excessive, accept non-alnum ssid (bug #356337)
-
-Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
----
- system-settings/plugins/ifnet/connection_parser.c |   33 +++++++++-----------
- system-settings/plugins/ifnet/net_parser.c        |    8 ++++-
- system-settings/plugins/ifnet/plugin.c            |    4 --
- system-settings/plugins/ifnet/wpa_parser.c        |    7 +++-
- 4 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index 9b5ddc1..4ac2173 100644
---- a/system-settings/plugins/ifnet/connection_parser.c
-+++ b/system-settings/plugins/ifnet/connection_parser.c
-@@ -55,9 +55,16 @@ update_connection_id (NMConnection * connection, gchar * conn_name)
- 	gchar *idstr = NULL;
- 	gchar *uuid_base = NULL;
- 	gchar *uuid = NULL;
-+	int name_len;
- 	NMSettingConnection *setting;
- 
--	idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name);
-+	name_len = strlen (conn_name);
-+	if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) {
-+		gchar * conn_name_printable = utils_hexstr2bin (conn_name + 2, name_len - 2);
-+		idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name_printable);
-+		g_free (conn_name_printable);
-+	} else
-+		idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name);
- 	uuid_base = idstr;
- 	uuid = nm_utils_uuid_generate_from_string (uuid_base);
- 	setting =
-@@ -627,23 +634,13 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 				g_object_set (ip4_setting,
- 					      NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES,
- 					      TRUE, NULL);
--			if (nm_setting_ip4_config_add_address
--			    (ip4_setting, ip4_addr)) {
--				PLUGIN_PRINT (IFNET_PLUGIN_NAME,
--					      "new address: %d", iblock->ip);
--				PLUGIN_PRINT (IFNET_PLUGIN_NAME,
--					      "ipv4 addresses count: %d",
--					      nm_setting_ip4_config_get_num_addresses
--					      (ip4_setting));
--			} else {
--				PLUGIN_WARN (IFNET_PLUGIN_NAME,
--					     "ignoring duplicate IP4 address");
--			}
-+			if (!nm_setting_ip4_config_add_address (ip4_setting, ip4_addr))
-+				PLUGIN_WARN (IFNET_PLUGIN_NAME, 
-+						"ignoring duplicate IP4 address");
- 			nm_ip4_address_unref (ip4_addr);
- 			current_iblock = iblock;
- 			iblock = iblock->next;
- 			destroy_ip_block (current_iblock);
--
- 		}
- 		g_object_set (ip4_setting,
- 			      NM_SETTING_IP4_CONFIG_METHOD,
-@@ -2276,11 +2273,12 @@ write_wireless_setting (NMConnection * connection,
- 		return FALSE;
- 	}
- 
--	/* If the SSID contains any non-printable characters, we need to use the
--	 * hex notation of the SSID instead.
-+	/* If the SSID contains any non-alnum characters, we need to use 
-+	 * the hex notation of the SSID instead. (Because openrc doesn't 
-+	 * support these characters, see bug #356337)
- 	 */
- 	for (i = 0; i < ssid->len; i++) {
--		if (!isprint (ssid->data[i])) {
-+		if (!isalnum (ssid->data[i])) {
- 			hex_ssid = TRUE;
- 			break;
- 		}
-@@ -2487,7 +2485,6 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
- 		ifnet_set_data (conn_name, "config", "dhcp");
- 
- 	/* DNS Servers */
--	ifnet_set_data (conn_name, "dns_servers", NULL);
- 	num = nm_setting_ip4_config_get_num_dns (s_ip4);
- 	if (num > 0) {
- 		dns = g_string_new (NULL);
-diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
-index de2db8a..57f3688 100644
---- a/system-settings/plugins/ifnet/net_parser.c
-+++ b/system-settings/plugins/ifnet/net_parser.c
-@@ -411,12 +411,16 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
- 	}
- 	/* Remove existing key value pair */
- 	if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
--		if (new_value && !strcmp (orin_value, new_value))
-+		if (new_value && !strcmp (orin_value, new_value)){
-+			g_free (new_value);
- 			return;
-+		}
- 		g_hash_table_remove (conn, orin_key);
- 		g_free (orin_key);
- 		g_free (orin_value);
--	}
-+	/* old key/value doesn't exist but new value is NULL  */
-+	} else if (!value)
-+		return;
- 	if (new_value)
- 		g_hash_table_insert (conn, g_strdup (key), new_value);
- 	net_parser_data_changed = TRUE;
-diff --git a/system-settings/plugins/ifnet/plugin.c b/system-settings/plugins/ifnet/plugin.c
-index 94f9e79..3952e91 100644
---- a/system-settings/plugins/ifnet/plugin.c
-+++ b/system-settings/plugins/ifnet/plugin.c
-@@ -91,8 +91,6 @@ update_system_hostname (gpointer config)
- {
- 	SCPluginIfnetPrivate *priv = SC_PLUGIN_IFNET_GET_PRIVATE (config);
- 
--	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Updating hostname");
--
- 	if (priv->hostname)
- 		g_free (priv->hostname);
- 	priv->hostname = read_hostname (IFNET_SYSTEM_HOSTNAME_FILE);
-@@ -184,8 +182,6 @@ monitor_file_changes (const char *filename,
- 				   info);
- 		g_signal_connect (monitor, "changed", G_CALLBACK (file_changed),
- 				  info);
--		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Monitoring %s", filename);
--
- 	} else
- 		PLUGIN_WARN (IFNET_PLUGIN_NAME,
- 			     "Monitoring %s failed, error: %s", filename,
-diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c
-index 42c52c3..338c338 100644
---- a/system-settings/plugins/ifnet/wpa_parser.c
-+++ b/system-settings/plugins/ifnet/wpa_parser.c
-@@ -463,12 +463,15 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
- 	/* Remove old key value pairs */
- 	if (g_hash_table_lookup_extended
- 	    (security, key, &orig_key, &orig_value)) {
--		if (new_value && !strcmp(orig_value, new_value))
-+		if (new_value && !strcmp(orig_value, new_value)){
-+			g_free (new_value);
- 			return;
-+		}
- 		g_hash_table_remove (security, orig_key);
- 		g_free (orig_key);
- 		g_free (orig_value);
--	}
-+	} else if (!value)
-+		return;
- 
- 	/* Add new key value */
- 	if (new_value)
--- 
-1.7.3.4
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.4.0-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.4.0-shared-connection.patch
deleted file mode 100644
index 3ce883aa7c1c..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.4.0-shared-connection.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-From d252fad6aa69aefa17b592111c2db23864f63907 Mon Sep 17 00:00:00 2001
-From: Mu Qiao <qiaomuf@gentoo.org>
-Date: Tue, 25 Jan 2011 10:31:53 +0000
-Subject: [PATCH] shared-connection
-
-Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
----
- system-settings/plugins/ifnet/connection_parser.c  |   90 ++++++++++++++------
- system-settings/plugins/ifnet/net_parser.c         |   55 +++++++-----
- system-settings/plugins/ifnet/net_parser.h         |    4 +-
- system-settings/plugins/ifnet/net_utils.c          |    6 +-
- .../plugins/ifnet/nm-ifnet-connection.c            |    8 +-
- system-settings/plugins/ifnet/wpa_parser.c         |   21 +++--
- 6 files changed, 122 insertions(+), 62 deletions(-)
-
-diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index f9fae51..9b5ddc1 100644
---- a/system-settings/plugins/ifnet/connection_parser.c
-+++ b/system-settings/plugins/ifnet/connection_parser.c
-@@ -557,7 +557,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 
- 	NMSettingIP4Config *ip4_setting =
- 	    NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
--	gchar *value;
-+	gchar *value, *method = NULL;
- 	gboolean is_static_block = is_static_ip4 (conn_name);
- 	ip_block *iblock = NULL;
- 
-@@ -569,13 +569,41 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 		      && strstr (value, "nogateway") ? TRUE : FALSE, NULL);
- 
- 	if (!is_static_block) {
--		g_object_set (ip4_setting,
--			      NM_SETTING_IP4_CONFIG_METHOD,
--			      NM_SETTING_IP4_CONFIG_METHOD_AUTO,
--			      NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
--		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using DHCP for %s",
--			      conn_name);
--	} else {
-+		method = ifnet_get_data (conn_name, "config");
-+		if (!method){
-+			g_set_error (error, ifnet_plugin_error_quark (), 0,
-+						 "Unknown config for %s", conn_name);
-+			g_object_unref (ip4_setting);
-+			return;
-+		}
-+		if (!strcmp (method, "dhcp"))
-+			g_object_set (ip4_setting,
-+						  NM_SETTING_IP4_CONFIG_METHOD,
-+						  NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-+						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+		else if (!strcmp (method, "autoip")){
-+			g_object_set (ip4_setting,
-+						  NM_SETTING_IP4_CONFIG_METHOD,
-+						  NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-+						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+			nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
-+			return;
-+		} else if (!strcmp (method, "shared")){
-+			g_object_set (ip4_setting,
-+						  NM_SETTING_IP4_CONFIG_METHOD,
-+						  NM_SETTING_IP4_CONFIG_METHOD_SHARED,
-+						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+			nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
-+			return;
-+		} else {
-+			g_set_error (error, ifnet_plugin_error_quark (), 0,
-+						 "Unknown config for %s", conn_name);
-+			g_object_unref (ip4_setting);
-+			return;
-+		}
-+		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using %s method for %s",
-+					  method, conn_name);
-+	}else {
- 		iblock = convert_ip4_config_block (conn_name);
- 		if (!iblock) {
- 			g_set_error (error, ifnet_plugin_error_quark (), 0,
-@@ -625,7 +653,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 	}
- 
- 	/* add dhcp hostname and client id */
--	if (!is_static_block) {
-+	if (method && !strcmp (method, "dhcp")) {
- 		gchar *dhcp_hostname, *client_id;
- 
- 		get_dhcp_hostname_and_client_id (&dhcp_hostname, &client_id);
-@@ -712,7 +740,6 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 		iblock = iblock->next;
- 		destroy_ip_block (current_iblock);
- 	}
--
- 	/* Finally add setting to connection */
- 	nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
- }
-@@ -1243,10 +1270,10 @@ parse_wpa_psk (gchar * psk, GError ** error)
- 	 * the passphrase contains spaces.
- 	 */
- 
--	p = psk;
--	if (p[0] == '"' && psk[strlen (psk) - 1] == '"')
-+	p = g_strdup (psk);
-+	if (p[0] == '"' && p[strlen (p) - 1] == '"')
- 		quoted = TRUE;
--	if (!quoted && (strlen (psk) == 64)) {
-+	if (!quoted && (strlen (p) == 64)) {
- 		/* Verify the hex PSK; 64 digits */
- 		if (!is_hex (p)) {
- 			g_set_error (error, ifnet_plugin_error_quark (),
-@@ -1254,7 +1281,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
- 				     "Invalid WPA_PSK (contains non-hexadecimal characters)");
- 			goto out;
- 		}
--		hashed = g_strdup (psk);
-+		hashed = g_strdup (p);
- 	} else {
- 		strip_string (p, '"');
- 
-@@ -1276,6 +1303,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
- 	}
- 
-       out:
-+	g_free (p);
- 	return hashed;
- }
- 
-@@ -2085,7 +2113,8 @@ write_wireless_security_setting (NMConnection * connection,
- 	} else if (!strcmp (key_mgmt, "wpa-eap")) {
- 		wpa_set_data (conn_name, "key_mgmt", "WPA-EAP");
- 		wpa = TRUE;
--	}
-+	} else
-+		PLUGIN_WARN (IFNET_PLUGIN_NAME, "Unknown key_mgmt: %s", key_mgmt);
- 
- 	if (auth_alg) {
- 		if (!strcmp (auth_alg, "shared"))
-@@ -2180,8 +2209,11 @@ write_wireless_security_setting (NMConnection * connection,
- 			g_string_append (quoted, psk);
- 			g_string_append_c (quoted, '"');
- 		}
--		wpa_set_data (conn_name, "psk",
--			      quoted ? quoted->str : (gchar *) psk);
-+		if (psk)
-+			wpa_set_data (conn_name, "psk",
-+					  quoted ? quoted->str : (gchar *) psk);
-+		else
-+			PLUGIN_WARN (IFNET_PLUGIN_NAME, "Use WPA, but no psk received from NM");
- 		if (quoted)
- 			g_string_free (quoted, TRUE);
- 	} else
-@@ -2190,15 +2222,19 @@ write_wireless_security_setting (NMConnection * connection,
- 	return TRUE;
- }
- 
--/* remove old ssid and add new one*/
-+/* Only remove old config when ssid is changed. 
-+ * See bug #350476.
-+ * */
- static void
- update_wireless_ssid (NMConnection * connection, gchar * conn_name,
- 		      gchar * ssid, gboolean hex)
- {
--	ifnet_delete_network (conn_name);
--	ifnet_add_connection (ssid, "wireless");
-+	if (strcmp (conn_name, ssid)){
-+		ifnet_delete_network (conn_name);
-+		wpa_delete_security (conn_name);
-+	}
- 
--	wpa_delete_security (conn_name);
-+	ifnet_add_network (ssid, "wireless");
- 	wpa_add_security (ssid);
- }
- 
-@@ -2443,7 +2479,11 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
- 		}
- 		ifnet_set_data (conn_name, "config", ips->str);
- 		g_string_free (ips, TRUE);
--	} else
-+	} else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
-+		ifnet_set_data (conn_name, "config", "shared");
-+	else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL))
-+		ifnet_set_data (conn_name, "config", "autoip");
-+	else
- 		ifnet_set_data (conn_name, "config", "dhcp");
- 
- 	/* DNS Servers */
-@@ -2858,7 +2898,7 @@ get_wired_name ()
- 	for (; i < 256; i++) {
- 		gchar *conn_name = g_strdup_printf ("eth%d", i);
- 
--		if (!ifnet_has_connection (conn_name)) {
-+		if (!ifnet_has_network (conn_name)) {
- 			return conn_name;
- 		} else
- 			g_free (conn_name);
-@@ -2875,7 +2915,7 @@ get_ppp_name ()
- 	for (; i < 256; i++) {
- 		gchar *conn_name = g_strdup_printf ("ppp%d", i);
- 
--		if (!ifnet_has_connection (conn_name)) {
-+		if (!ifnet_has_network (conn_name)) {
- 			return conn_name;
- 		} else
- 			g_free (conn_name);
-@@ -2982,7 +3022,7 @@ ifnet_add_new_connection (NMConnection * connection,
- 		goto out;
- 	}
- 
--	if (ifnet_add_connection (new_name, new_type))
-+	if (ifnet_add_network (new_name, new_type))
- 		success =
- 		    ifnet_update_parsers_by_connection (connection, new_name,
- 							NULL, config_file,
-diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
-index b4a381d..de2db8a 100644
---- a/system-settings/plugins/ifnet/net_parser.c
-+++ b/system-settings/plugins/ifnet/net_parser.c
-@@ -37,6 +37,9 @@ static GList *functions_list;
- /* Used to decide whether to write changes to file*/
- static gboolean net_parser_data_changed = FALSE;
- 
-+static void
-+destroy_connection_config (GHashTable * conn);
-+
- static GHashTable *
- add_new_connection_config (const gchar * type, const gchar * name)
- {
-@@ -58,8 +61,10 @@ add_new_connection_config (const gchar * type, const gchar * name)
- }
- 
- gboolean
--ifnet_add_connection (gchar * name, gchar * type)
-+ifnet_add_network (gchar * name, gchar * type)
- {
-+	if (ifnet_has_network (name))
-+		return TRUE;
- 	if (add_new_connection_config (type, name)) {
- 		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name);
- 		net_parser_data_changed = TRUE;
-@@ -69,11 +74,27 @@ ifnet_add_connection (gchar * name, gchar * type)
- }
- 
- gboolean
--ifnet_has_connection (gchar * conn_name)
-+ifnet_has_network (gchar * conn_name)
- {
- 	return g_hash_table_lookup (conn_table, conn_name) != NULL;
- }
- 
-+gboolean
-+ifnet_delete_network (gchar * conn_name)
-+{
-+	GHashTable *network = NULL;
-+
-+	g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE);
-+	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name);
-+	network = g_hash_table_lookup (conn_table, conn_name);
-+	if (!network)
-+		return FALSE;
-+	g_hash_table_remove (conn_table, conn_name);
-+	destroy_connection_config (network);
-+	net_parser_data_changed = TRUE;
-+	return TRUE;
-+}
-+
- static GHashTable *
- get_connection_config (gchar * name)
- {
-@@ -377,21 +398,27 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
- {
- 	gpointer orin_key = NULL, orin_value = NULL;
- 	GHashTable *conn = g_hash_table_lookup (conn_table, conn_name);
-+	gchar *new_value = NULL;
- 
- 	if (!conn) {
- 		PLUGIN_WARN (IFNET_PLUGIN_NAME,
- 			     "%s does not exsit!", conn_name);
- 		return;
- 	}
-+	if (value){
-+		new_value = g_strdup (value);
-+		strip_string (new_value, '"');
-+	}
- 	/* Remove existing key value pair */
- 	if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
-+		if (new_value && !strcmp (orin_value, new_value))
-+			return;
- 		g_hash_table_remove (conn, orin_key);
- 		g_free (orin_key);
- 		g_free (orin_value);
- 	}
--	if (value)
--		g_hash_table_insert (conn, g_strdup (key),
--				     strip_string (g_strdup (value), '"'));
-+	if (new_value)
-+		g_hash_table_insert (conn, g_strdup (key), new_value);
- 	net_parser_data_changed = TRUE;
- }
- 
-@@ -467,7 +494,7 @@ ifnet_flush_to_file (gchar * config_file)
- 	gboolean result = FALSE;
- 
- 	if (!net_parser_data_changed)
--		return FALSE;
-+		return TRUE;
- 	if (!conn_table || !global_settings_table)
- 		return FALSE;
- 
-@@ -583,22 +610,6 @@ ifnet_flush_to_file (gchar * config_file)
- 	return result;
- }
- 
--gboolean
--ifnet_delete_network (gchar * conn_name)
--{
--	GHashTable *network = NULL;
--
--	g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE);
--	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name);
--	network = g_hash_table_lookup (conn_table, conn_name);
--	if (!network)
--		return FALSE;
--	g_hash_table_remove (conn_table, conn_name);
--	destroy_connection_config (network);
--	net_parser_data_changed = TRUE;
--	return TRUE;
--}
--
- void
- ifnet_destroy (void)
- {
-diff --git a/system-settings/plugins/ifnet/net_parser.h b/system-settings/plugins/ifnet/net_parser.h
-index 73a44c8..b71a01f 100644
---- a/system-settings/plugins/ifnet/net_parser.h
-+++ b/system-settings/plugins/ifnet/net_parser.h
-@@ -36,11 +36,11 @@ GList *ifnet_get_connection_names (void);
- gchar *ifnet_get_data (gchar * conn_name, const gchar * key);
- gchar *ifnet_get_global_data (const gchar * key);
- gchar *ifnet_get_global_setting (gchar * group, gchar * key);
--gboolean ifnet_has_connection (gchar * conn_name);
-+gboolean ifnet_has_network (gchar * conn_name);
- 
- /* Writer functions */
- gboolean ifnet_flush_to_file (gchar * config_file);
- void ifnet_set_data (gchar * conn_name, gchar * key, gchar * value);
--gboolean ifnet_add_connection (gchar * name, gchar * type);
-+gboolean ifnet_add_network (gchar * name, gchar * type);
- gboolean ifnet_delete_network (gchar * conn_name);
- #endif
-diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c
-index 2dc253c..83b4325 100644
---- a/system-settings/plugins/ifnet/net_utils.c
-+++ b/system-settings/plugins/ifnet/net_utils.c
-@@ -278,6 +278,10 @@ is_static_ip4 (gchar * conn_name)
- 
- 	if (!data)
- 		return FALSE;
-+	if (!strcmp (data, "shared"))
-+		return FALSE;
-+	if (!strcmp (data, "autoip"))
-+		return FALSE;
- 	dhcp6 = strstr (data, "dhcp6");
- 	if (dhcp6) {
- 		gchar *dhcp4;
-@@ -942,8 +946,8 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id)
- 		else if ((tmp = strstr (line, "send host-name")) != NULL) {
- 			tmp += strlen ("send host-name");
- 			g_strstrip (tmp);
--			strip_string (tmp, '"');
- 			strip_string (tmp, ';');
-+			strip_string (tmp, '"');
- 			if (tmp[0] != '\0')
- 				*hostname = g_strdup (tmp);
- 			else
-diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.c b/system-settings/plugins/ifnet/nm-ifnet-connection.c
-index e47495c..ebe2581 100644
---- a/system-settings/plugins/ifnet/nm-ifnet-connection.c
-+++ b/system-settings/plugins/ifnet/nm-ifnet-connection.c
-@@ -71,12 +71,14 @@ nm_ifnet_connection_new (gchar * conn_name)
- {
- 	NMConnection *tmp;
- 	GObject *object;
--	GError **error = NULL;
-+	GError *error = NULL;
- 
- 	g_return_val_if_fail (conn_name != NULL, NULL);
--	tmp = ifnet_update_connection_from_config_block (conn_name, error);
--	if (!tmp)
-+	tmp = ifnet_update_connection_from_config_block (conn_name, &error);
-+	if (!tmp){
-+		g_error_free (error);
- 		return NULL;
-+	}
- 	object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION,
- 					   NM_IFNET_CONNECTION_CONN_NAME,
- 					   conn_name, NULL);
-diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c
-index 5e94108..42c52c3 100644
---- a/system-settings/plugins/ifnet/wpa_parser.c
-+++ b/system-settings/plugins/ifnet/wpa_parser.c
-@@ -366,7 +366,7 @@ wpa_flush_to_file (gchar * config_file)
- 	gboolean result = FALSE;
- 
- 	if (!wpa_parser_data_changed)
--		return FALSE;
-+		return TRUE;
- 	if (!wsec_table || !wsec_global_table)
- 		return FALSE;
- 
-@@ -450,26 +450,29 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
- {
- 	gpointer orig_key = NULL, orig_value = NULL;
- 	GHashTable *security = g_hash_table_lookup (wsec_table, ssid);
-+	gchar *new_value = NULL;
- 
- 	g_return_if_fail (security != NULL);
- 
-+	if (value){
-+		new_value = g_strdup(value);
-+		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
-+			&& !g_str_has_prefix (key, "wep_key"))
-+			strip_string (new_value, '"');
-+	}
- 	/* Remove old key value pairs */
- 	if (g_hash_table_lookup_extended
- 	    (security, key, &orig_key, &orig_value)) {
-+		if (new_value && !strcmp(orig_value, new_value))
-+			return;
- 		g_hash_table_remove (security, orig_key);
- 		g_free (orig_key);
- 		g_free (orig_value);
- 	}
- 
- 	/* Add new key value */
--	if (value) {
--		gchar *new_value = g_strdup (value);
--
--		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
--		    && !g_str_has_prefix (key, "wep_key"))
--			strip_string (new_value, '"');
-+	if (new_value)
- 		g_hash_table_insert (security, g_strdup (key), new_value);
--	}
- 	wpa_parser_data_changed = TRUE;
- }
- 
-@@ -483,7 +486,7 @@ gboolean
- wpa_add_security (gchar * ssid)
- {
- 	if (wpa_has_security (ssid))
--		return FALSE;
-+		return TRUE;
- 	else {
- 		GHashTable *security =
- 		    g_hash_table_new (g_str_hash, g_str_equal);
--- 
-1.7.3.4
-
diff --git a/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
deleted file mode 100644
index 146dbb16f4e4..000000000000
--- a/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild,v 1.12 2012/12/02 22:31:17 ssuominen Exp $
-
-EAPI="3"
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux +ppp resolvconf connection-sharing"
-
-RDEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.75
-	>=net-wireless/wireless-tools-28_pre9
-	virtual/udev[gudev]
-	>=dev-libs/glib-2.18
-	>=sys-auth/polkit-0.92
-	>=dev-libs/libnl-1.1:1.1
-	ppp? ( >=net-misc/modemmanager-0.4
-		>=net-dialup/ppp-2.4.5 )
-	>=net-wireless/wpa_supplicant-0.5.10[dbus]
-	bluetooth? ( net-wireless/bluez )
-	|| ( 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[client] ) )
-	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq
-		net-firewall/iptables )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See http://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See http://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-src_prepare() {
-	# backported ifnet patches
-	epatch "${FILESDIR}/${P}-shared-connection.patch"
-	epatch "${FILESDIR}/${P}-fix-tests.patch"
-	epatch "${FILESDIR}/${P}-ifnet-smarter-write.patch"
-	# Fix building against linux-headers-3.4, #417055
-	epatch "${FILESDIR}/${PN}-0.9.4.0-ip_ppp.h.patch"
-	eautoreconf
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-distro=gentoo
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		--with-udev-dir=/lib/udev
-		--with-iptables=/sbin/iptables
-		$(use_enable doc gtk-doc)
-		$(use_with doc docs)
-		$(use_enable ppp)
-		$(use_with resolvconf)
-		$(systemd_with_unitdir)"
-
-	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
-	if use dhclient ; then
-		if use dhcpcd ; then
-			ECONF="${ECONF} --with-dhcpcd --without-dhclient"
-		else
-			ECONF="${ECONF} --with-dhclient --without-dhcpcd"
-		fi
-	else
-		ECONF="${ECONF} --with-dhcpcd --without-dhclient"
-	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}
-}
-
-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-ifnet" nm-system-settings.conf \
-		|| die "newins failed"
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "You will need to reload DBus if this is your first time installing"
-	elog "NetworkManager, or if you're upgrading from 0.7 or older."
-	elog ""
-}