Revert 'libnm-gtk: default to system CA certificates for validation for new connections', bug #497296 by mateakos. Drop old.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 104 insertions, 205 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 452ade7b4a57..c029d47977e8 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/nm-applet
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.110 2013/12/08 18:58:50 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.111 2014/01/10 20:32:13 pacho Exp $
+
+*nm-applet-0.9.8.8-r1 (10 Jan 2014)
+
+  10 Jan 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/nm-applet-0.9.8.8-revert-ca-certificates.patch,
+  +nm-applet-0.9.8.8-r1.ebuild,
+  -files/nm-applet-0.9.6.4-systray-icon-size.patch,
+  -files/nm-applet-0.9.8.4-autostart.patch, -nm-applet-0.9.6.4-r1.ebuild,
+  -nm-applet-0.9.8.2.ebuild, -nm-applet-0.9.8.4.ebuild:
+  Revert 'libnm-gtk: default to system CA certificates for validation for new
+  connections', bug #497296 by mateakos. Drop old.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> nm-applet-0.9.8.8.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 829ea9732e12..d51b823f8099 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nm-applet-0.9.6.4-systray-icon-size.patch 1599 SHA256 6aae8a3533072581fe25571df55e00a304514cfba98eee4f4dffe1ccf7626db8 SHA512 7aadf6333ad2dde827699fe3339a26e239a099ea5cd683fb4ccc6970caef7fb68dadfc9ad80d6b15fc351dd828ef8e5efd8e58dba0a800baf6fbc874f2fb97a7 WHIRLPOOL 9c901f2e8433066b03d36ae5d9570df72ebc995a3579c170f14caf256b8121bf33622e25d87acdd3c5a61b7513b6fa48b3731e45bd447562a711d7d969d111bc
-AUX nm-applet-0.9.8.4-autostart.patch 821 SHA256 da7f6b19f2e54520f5069780d3d91734be2f68aaff6357bb9a54508562a27db5 SHA512 a971ce52dc9ef0491b358bd5b05a88e0ff7201477f7576eceeae1f41d8ab1107a22ca57df012e709e51f9867d81f72373d1098368e28214fc7dfdbae9e03c20f WHIRLPOOL d805557cfb7ff92333b9f99404fd6e9dfb8deb7ec9eb78641f61ca999a68432934d1b157592d953102db3428b7e1f7f79a804feb800c61f51189ffd1cbc6ee6d
+AUX nm-applet-0.9.8.8-revert-ca-certificates.patch 3205 SHA256 e47f1758b19e7108488e9f19860842f5cf881046391148592c549d3bf08b81a3 SHA512 3482851570a98982b45f18b360064d7d432b223d2c9266f3f19924a9bdc7faf4c065a8b75a0ea364da558da162dc1b57574194c3389a167c3039f3a0065117f1 WHIRLPOOL 6effcb87ee41457d8292ce4f6cfc496d58acfc0a0619366f37a510be810e11c6b5039c5a20cb8d7f53d6505f741b735c616390ccea787c78eaa670700a3a938d
 DIST network-manager-applet-0.9.6.4.tar.xz 1140868 SHA256 ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141 SHA512 16aab6e5786d0d6e89b880e34c6b8883bd57a190fb7ae73048db69ad2757317822eff4c8e825239fba969f67a760ce90ac94c27c79780158f3a2d82a9069d242 WHIRLPOOL 940c31ef95cd0b3b7a78ca5083c442dd229c98cf389a0615e4a6ba39b39e3df947b2d3e9b59100e8379b8cdfb845eb2899b637a89a09647b777b2143018e5e80
-DIST network-manager-applet-0.9.8.2.tar.xz 1214284 SHA256 a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7 SHA512 c2c8e264bdafc367ffd31f1c6ad3278cb2cdb042a532c260982803109601906e61be6b2ea9298e19b06646acf995a36875d18f9c3c2a0edfac61929a77f885c5 WHIRLPOOL add58064103039b5fc527450714fc3b47966a665c40cb6f2950fe0dacef9dc5134e277dadc511e08f89c2962c9a7a2ee1ba180abab08d57ab307a8a603e13199
-DIST network-manager-applet-0.9.8.4.tar.xz 1218564 SHA256 f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c SHA512 f8dccaef1566db37ab7e89a6a5d3e1b70b6d5bc7cc1506b613814f1a9037cfef1aa8cab1e89dd90ba776586ea020633837e094ff82d131f78b29ad3de1a522db WHIRLPOOL a596fad673a23a64ef06fd813ee6b7e4bb30211891a21245c0ea092274aafbd9cc63c4894a8f90d8a22ea7768cd6d7369e4ddc9cd15cc45c41706ebfb18c8925
 DIST network-manager-applet-0.9.8.8.tar.xz 1223116 SHA256 581ebf9ead919e33d7e910322c2f64919f98716d8636f1a640b72c9b2e3ba9eb SHA512 a43cb00ac60b9401a035aac22a3384625624ca7e3b852106c55c1dc79a6a409d68f482615df6420778cafee0eb38e0088768198de78af52358db48ce9b7222f7 WHIRLPOOL 25dee2f0bb411182c9670cf78e536576521ba65e9aaddd301f899d0c22e954c18b6050ffb4eb9b89f492ccc5304195765a21824c8992bc2ca0d4881299e02253
 DIST pngcrush-fixed-nm-signal-icons.tar.xz 2052 SHA256 49adffa785572463e17674caec605d9ce5b6021f1c91b918380654cfc380defa SHA512 88af2109e2e2a26775af1121b4e9bab0a03aa817fe60cd4bdb0bed5e56e046fdb87d2783cf96b36d22da66869884313d9635e4a70f1e2579b5536e7d62595b39 WHIRLPOOL f50b2ba429e9bded025e97995ecd96c7a3b2b668cb6aafaae1d4c3785393fbebb5bdd61f44eff2398023550524c0459b281a07813b94d38e61dc865aec584c0d
-EBUILD nm-applet-0.9.6.4-r1.ebuild 1473 SHA256 108807aed96b1ea28475035dd9f73aaf334903fa927f19c30698a6c2cc68e564 SHA512 0acabd3b523cdc38e38e623ee3248a4a018a1832619cd55ce0fdbc72fe037f68bc83f81a11f934d0ceccb08f82813193cb75dff4cd367fcba4e8d3bfba4c6f0a WHIRLPOOL f8acf4737f20743ec64034a97985f590dc2dc77fe8f528a9bf4805bd1f99a62288e6b808d7f866c8188f1d401eb0c8196625d99b61e939fc27b56fc4f1dc5d97
 EBUILD nm-applet-0.9.6.4.ebuild 1410 SHA256 6c50aefdc6754be70240fca4841aad950ad99255640260827256322c3168bbd8 SHA512 0c0b5b028a08e1be60268c0797a9da79c8ff42b17d8e314ab040572d2de321bb66747945ce9a47ab78f34afea4032abdee0d832d5d7fbc3801074d2a6604ce05 WHIRLPOOL f3050eff77f2f67104c827ebf224b9b58ff297aad36ee69eb318d81f3d6dab215b58fcc982dd3f928b68786164734f262acd3d584ef876b979e42240c74cf621
-EBUILD nm-applet-0.9.8.2.ebuild 1514 SHA256 61f6b3b49d365c6809c24e87a5a984a668b314f96d9c329035459576b2b342bd SHA512 a7d3d97000d0821fa6c92ed9e7aab0a4960d50d177400d33df0785b3a60f4050a95c3ae5794563c4a61855abf5bc859d6b0248ae352c30ed371ecede7cdfedca WHIRLPOOL e0a46235a920e2015b244b60a6190081d4bb3abb1f112bf0b62a79aa141c71883a51f7ee7579044b61a9f501de0a6118e761cdda7f3e03f43ab89adeead71fe1
-EBUILD nm-applet-0.9.8.4.ebuild 1681 SHA256 8d63a201687708ff778976d24aa8910f6ea5adcd5760f17ed4e450f039cd0743 SHA512 3447ae42f5da7be748b32ecffa83a92b45d7fce78309d5740e49a0d997810efd72293bf9c8967063861a613a77d76cb7686cb8638a40e7cc6bdec8a804fe3715 WHIRLPOOL cc0b29c4abf34f9bbd6e5f9519ef4ed10ef33e6ea39f79fcdc6a919696de523112feecc6bf0c2ebb8439737cb54e1e011270cd5af3d292c72384c72fba9e404f
+EBUILD nm-applet-0.9.8.8-r1.ebuild 1751 SHA256 33273b98131f20cf2ee98a393e3dd9d468afb4f1dbb9449513423effcf5a2782 SHA512 0b8cdccbc8194bf67c16add3e7f43f5767e039685ac325d20d85e2511651d3c0d663b3238d09527677479d436954bc68bcac666a7ce4488dbe3bc2279ce487b5 WHIRLPOOL e7f036c66098e2a94a65761acda359cc1307b1508b5ea9b33831bc28cc0aca9e8e43c8da35376a9f793dfa1f82b80792345cac24050b09b92e514e51b630a496
 EBUILD nm-applet-0.9.8.8.ebuild 1506 SHA256 1b54b253a60caa3e865b6b5208bc60ca824464a3ddbb6a12b5ed9308471ecafd SHA512 9d5917cdfa0a65f5a90c2c49ecc3a955aa85b3a10931488dc2a80b63880535939696a8cda4c23176c3de6220d2e1a58262317627cdfd34931d64b548a59d47bc WHIRLPOOL 1f4535afeefded15f119d226596a8a53f8c06c96ab0c31f06a1f8e5d50124a4ea9ba2c7be8a48a9bb8396c68eeab6766e661b1b98311b14f5b2a7dc24dad1558
-MISC ChangeLog 18845 SHA256 93cbf3d898554cab4bb5c616811346e0fd12ba23ded89ed4e38d316c5748e3d6 SHA512 5982ec7b4e9fa9b3f21e0ebf0821384cc72395dc2bc9e23d36fb3bd1b0f857ce7c8be38c5d635d8ec35803945166a4bb9d016fac8d48bcfec68412468d8ff500 WHIRLPOOL 69b1ce5958d83d454928822f885f26fe07f24d7f5a5da473f852b2bcf6bd1295b0f09eac820aec7bb052ca6c803b90067bd0ccd6220302e4293a6aee9c6a1409
+MISC ChangeLog 19329 SHA256 e3900b76e1973a3f4a2629b006086759269d9378f7f881a8e9303c2efa2699ee SHA512 34cb7c9eb6ed08534d98d75dfc7cfef2996d9c224c251f4b671ed053b0c9b7bbd9d68a482c6ec87db1b6ea80ef3665a400d4b28f307ef0a52e06c0d0c68d565f WHIRLPOOL 5001f879373e91846f807e6ffcb2b40f750b887c01195dc8e2d3f07d668bb56e3fb72ea1df42c197218d80e88cacc917db9e863cc81bf5678f771ac81ccb9d67
 MISC metadata.xml 386 SHA256 11ac59c3d3e6aa7d2960358ccadc66df45e823c6cc88433a74810f03f39caec9 SHA512 6b9b209da423954b94a97de7d8e6f4d398d62e6527b3a387de1787da9fec77d5c9a71d52497598d6379df5a7427b736b1e7674a834120ebe88e8f1a2cac2c048 WHIRLPOOL 7158c5dc3f39b3586e289e28972dfa9cdccc6e8b34ebe8b0bdf02406535a7d46e2386ad934ce650ca3832ac5f388bfca6d9e37d76f88baf9cfedb99ae072f7d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkwWwACgkQCaWpQKGI+9RToQCfXhHUxm/420TNbfVajhnf5NkV
-Q4kAn3uic3i6mpz/nbfnrPN4D54mnU5V
-=Ft2i
+iEYEAREIAAYFAlLQWNAACgkQCaWpQKGI+9SlDQCeIGX4RWbigwMlgbgyUshEgOUs
+cV0AnjfSg6PSxyilMbxlfwG32r8J8rkW
+=LbG7
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch
deleted file mode 100644
index c06d47e150ee..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d6f5bd36387d278e60ffc746f79d2b1851fc441a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 08 Apr 2013 19:48:23 +0000
-Subject: applet: improve icon size handling
-
-Always return an icon of exactly the requested size, and let that size
-be less than 16. Fixes the display in various non-GNOME panels.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698901
----
-diff --git a/src/applet.c b/src/applet.c
-index 6c39509..a213173 100644
---- a/src/applet.c
-+++ b/src/applet.c
-@@ -3321,7 +3321,7 @@ nma_icon_check_and_load (const char *name, GdkPixbuf **icon, NMApplet *applet)
- 	/* Try to load the icon; if the load fails, log the problem, and set
- 	 * the icon to the fallback icon if requested.
- 	 */
--	*icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size, 0, &error);
-+	*icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size, GTK_ICON_LOOKUP_FORCE_SIZE, &error);
- 	if (!*icon) {
- 		g_warning ("Icon %s missing: (%d) %s",
- 		           name,
-@@ -3425,13 +3425,13 @@ status_icon_size_changed_cb (GtkStatusIcon *icon,
-                              NMApplet *applet)
- {
- 	if (getenv ("NMA_SIZE_DEBUG")) {
--		g_message ("%s(): status icon size now %d", __func__, size);
-+		g_message ("%s(): status icon size %d requested", __func__, size);
- 	}
- 
- 	/* icon_size may be 0 if for example the panel hasn't given us any space
- 	 * yet.  We'll get resized later, but for now just load the 16x16 icons.
- 	 */
--	applet->icon_size = MAX (16, size);
-+	applet->icon_size = size ? size : 16;
- 
- 	nma_icons_reload (applet);
- 
---
-cgit v0.9.2
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch
deleted file mode 100644
index 512551f5f3be..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From db0e5f4ac25dba28d0943b6cbca7b2dd9282ab9e Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Sep 2013 20:46:49 -0400
-Subject: [PATCH] Allow nm-applet to autostart for gnome3 fallback sessions
-
-Gentoo's patched gnome-session-2.32.1-r3 will also autostart it.
----
- nm-applet.desktop.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/nm-applet.desktop.in b/nm-applet.desktop.in
-index 8f94a88..20d9aff 100644
---- a/nm-applet.desktop.in
-+++ b/nm-applet.desktop.in
-@@ -6,7 +6,8 @@ Exec=nm-applet
- Terminal=false
- Type=Application
- NoDisplay=true
--NotShowIn=KDE;GNOME;
-+NotShowIn=KDE;
-+AutostartCondition=GNOME3 if-session gnome-fallback
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=NetworkManager
- X-GNOME-Bugzilla-Component=nm-applet
--- 
-1.8.3.2
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch
new file mode 100644
index 000000000000..32d501ca24a6
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch
@@ -0,0 +1,74 @@
+From c798c40c5dce3bc6d9b615621cefe59660b5a504 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 29 Oct 2013 20:07:38 +0000
+Subject: Revert "libnm-gtk: default to system CA certificates for validation for new connections"
+
+This reverts commit 3021ce121b162fc69ec2fd800776a5dd28d72042.
+
+For EAP connections it usually does not make sense to validate the
+certificate with the system CA store. User mostly either want to
+provide the one exact certificate (ca-cert) or don't do any validation
+at all.
+
+Previously, nm-connection-editor set the property system-ca-certs=true
+for new connections, but there was no field in the UI to unset this
+setting. This effectively meant, that if the user did not provide a
+valid ca-cert (or put the certificate in the system wide store) the
+connection could not be established.
+
+Change the behavior, so that new connections created by nm-c-e don't
+have system-ca-certs set.
+
+The system-ca-certs property cannot be configured from the UI and nm-c-e
+will not touch it in existing connection. This makes sense, because referring
+to the system store is not a common use case. On the other hand, users who
+*really* want to use this option, can do so using e.g. nmcli. In that case,
+nm-c-e will not tamper with the setting.
+
+Connections that were created by older versions of nm-c-e might be
+unable to connect. The system-ca-certs option can be unset with:
+
+  $ nmcli connection modify id "$ID" 802-1x.system-ca-certs false
+
+https://bugzilla.gnome.org/show_bug.cgi?id=702608
+
+Signed-off-by: Thomas Haller <thaller@redhat.com>
+---
+diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
+index ad5d369..44f2342 100644
+--- a/src/wireless-security/eap-method-leap.c
++++ b/src/wireless-security/eap-method-leap.c
+@@ -98,7 +98,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
+ 	if (method->new_connection) {
+ 		g_object_set (s_8021x,
+ 		              NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+-		              NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
+ 		              NULL);
+ 	}
+ }
+diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
+index 117997b..74830bc 100644
+--- a/src/wireless-security/eap-method-simple.c
++++ b/src/wireless-security/eap-method-simple.c
+@@ -162,7 +162,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
+ 	if (method->new_connection && (not_saved == FALSE)) {
+ 		g_object_set (s_8021x,
+ 		              NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+-		              NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
+ 		              NULL);
+ 	}
+ }
+diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
+index b57d1ed..a48b491 100644
+--- a/src/wireless-security/eap-method-tls.c
++++ b/src/wireless-security/eap-method-tls.c
+@@ -186,7 +186,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
+ 	if (method->new_connection) {
+ 		g_object_set (s_8021x,
+ 		              secret_flag_prop, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+-		              NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
+ 		              NULL);
+ 	}
+ 
+--
+cgit v0.9.2
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild
deleted file mode 100644
index a403b6a3690d..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild,v 1.1 2013/06/10 10:08:14 sping Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth gconf"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=dev-libs/dbus-glib-0.88
-	>=gnome-base/gnome-keyring-2.20
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3:3
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-0.9.6
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	gconf? ( >=gnome-base/gconf-2.20:2 )
-	virtual/freedesktop-icon-theme"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--with-gtkver=3
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_with bluetooth)
-		$(use_enable gconf migration)"
-
-	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
-
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.9.6.4-systray-icon-size.patch
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild
deleted file mode 100644
index 5aa8de978720..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild,v 1.4 2013/11/20 13:15:49 leio Exp $
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth gconf +introspection modemmanager"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	app-crypt/libsecret
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-0.9.8[introspection?]
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	gconf? (
-		>=gnome-base/gconf-2.20:2
-		gnome-base/libgnome-keyring )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
-	virtual/freedesktop-icon-theme
-	virtual/udev[gudev]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-gtkver=3 \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		$(use_with bluetooth) \
-		$(use_enable gconf migration) \
-		$(use_enable introspection) \
-		$(use_with modemmanager modem-manager-1)
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.8-r1.ebuild
index b42095e427c2..50f918fd969e 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.8.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild,v 1.2 2013/11/20 13:15:49 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.8-r1.ebuild,v 1.1 2014/01/10 20:32:13 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ GNOME_ORG_MODULE="network-manager-applet"
 inherit eutils gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -44,13 +44,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 "
 
-src_prepare() {
-	# Allow nm-applet to autostart in gnome-2 and gnome-3.6 fallback sessions
-	epatch "${FILESDIR}/${PN}-0.9.8.4-autostart.patch"
-
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--with-gtkver=3 \
@@ -62,3 +55,11 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_with modemmanager modem-manager-1)
 }
+
+src_prepare() {
+	# Revert "libnm-gtk: default to system CA certificates for validation for new connections"
+	# bug #497296 (from 'master')
+	epatch "${FILESDIR}/${PN}-0.9.8.8-revert-ca-certificates.patch"
+
+	gnome2_src_prepare
+}