Don't autostart in KDE (bug #394379, thanks to Marc Schiffbauer for reporting). Also, show connection editor in all non-KDE desktop environments. Drop old.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

5 files changed, 62 insertions, 86 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 68b0d870bfd0..193b863c006b 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.73 2011/11/20 10:11:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.74 2011/12/14 07:40:04 tetromino Exp $
+
+*nm-applet-0.9.2.0-r1 (14 Dec 2011)
+
+  14 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -nm-applet-0.9.1.95.ebuild, -files/nm-applet-0.9.1.95-glib-2.31.patch,
+  +nm-applet-0.9.2.0-r1.ebuild, +files/nm-applet-0.9.2.0-not-show-in-kde.patch:
+  Don't autostart in KDE (bug #394379, thanks to Marc Schiffbauer for
+  reporting). Also, show connection editor in all non-KDE desktop environments.
+  Drop old.
 
   20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> nm-applet-0.8.4.ebuild:
   ppc stable wrt #369901
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 437104ed5ddb..65e0841b2e5d 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -2,33 +2,22 @@
 Hash: SHA256
 
 AUX nm-applet-0.8.2-libnotify-0.7.patch 1111 RMD160 3a63b65cf30848b60e681ee05d63f645d8276e6a SHA1 059346b94cda77bbe2ce97c2ba90a9fe8ba54c1e SHA256 542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d
-AUX nm-applet-0.9.1.95-glib-2.31.patch 2161 RMD160 ac9efac0ab37028650407014096236d456dff9fb SHA1 d96ae8a9a725a702ffea2299690d90c90516ffe0 SHA256 0b2388b0396b23f23188776f5ff2a0374a4a0b41e7dd754896c34b72f610185b
+AUX nm-applet-0.9.2.0-not-show-in-kde.patch 1392 RMD160 8cf26bec49213f2ddc2773da8a2e0796356349ba SHA1 e40b8e4e81c6106a49107946d2eda5342875def0 SHA256 de8f307f9111b294c05190c0aaa449b120da71561fc82879e5d3f373c802cc98
 DIST network-manager-applet-0.8.4.tar.bz2 1153760 RMD160 eeafc3b5653ddb778317d4b2283dbc5ac9173d9d SHA1 a5af2f6920a356848d5f3578376b57d956648b81 SHA256 552bd805aa09261ff7bac6e599551439b93c26bd563a2bba6d04f1af77c434a9
 DIST network-manager-applet-0.8.tar.bz2 978462 RMD160 764d7ebf7a716a795539fdc34f0545e3134311c0 SHA1 51f684396e034064568d356f0d961aa71af574dd SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
 DIST network-manager-applet-0.9.0.tar.xz 1060440 RMD160 a4c4c9c4b72c12a51e27f1df325886357b5426d7 SHA1 34b507ba506a6132faaa927f7ff487beb61c06df SHA256 0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24
-DIST network-manager-applet-0.9.1.95.tar.xz 1076556 RMD160 f23d74cdba9f9c882c17a724a0df9e281a4fa575 SHA1 040b18cbd96c84111d281cb03bcc86036636206e SHA256 6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc
 DIST network-manager-applet-0.9.2.0.tar.xz 1076760 RMD160 e82bf9a58cf27771fc0fcef46e984dd0bcf0efc1 SHA1 84b774c609345ebf84ecb5ab40f9adadb0c12a9f SHA256 ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de
 EBUILD nm-applet-0.8.4.ebuild 1093 RMD160 73a080e0d65e6bf9815c829c53fc14c3c0d9bffc SHA1 73bdd6258f3bdf7f227893aeca1a6a443f107cbb SHA256 484547850655f762154c62d406a006a59d84f024b6f6bedc877bdc420ed62438
 EBUILD nm-applet-0.8.ebuild 1403 RMD160 726eeed317f1d27a5db5cb74f5168e0482cf61bd SHA1 fb02ef8ab0e0a2144526b36a325baa3195156a5f SHA256 a3e13d1cd0f9e9c550ebbd798600e9773609d8ae917c994ce99159e4063217e9
 EBUILD nm-applet-0.9.0.ebuild 1112 RMD160 c12e3df6e298c4cdb337e1a2bb80d32070365679 SHA1 3a92e96a6a6b17f797460762956fa00db3f2bb35 SHA256 aefd1d590ecd8e4484b4815769b711d02242c4001fdc283fd3ad148689e453ec
-EBUILD nm-applet-0.9.1.95.ebuild 1274 RMD160 c4f52df9fb79ef286a01904bbc8e0b13b19c1e10 SHA1 c8bdacee3d4603ca433e85360dd36430b742740d SHA256 1fd5c45a2b1e8edeb72cf463d683541d83dd4f140e13ad127ffa70c5aacced41
+EBUILD nm-applet-0.9.2.0-r1.ebuild 1309 RMD160 b4a3b56bd7bc43c33ac326700bf8416ab0d28b3b SHA1 222a6bbfc510544dcf212e4b945d3c0d6cc846e3 SHA256 a2d59fce686c0d838cd74472f2b48c23df86ca343f8c67071bdeeb035329c36e
 EBUILD nm-applet-0.9.2.0.ebuild 1135 RMD160 c19c4a931cf23bfbb4dab7aa613b490d5abc1643 SHA1 93b735e4e466b2ffa4d641380b1d4e5ec3d5cf11 SHA256 85a61c55cc5a92bad977487eb6a61d534dc8344586a67bbc719f4d44d468e8a9
-MISC ChangeLog 12917 RMD160 45b84535b17ff1b6cbafeabac3decef261f7fec6 SHA1 6a8ff4a478782463813e69a55adebfaab4258371 SHA256 2178ccdbed8a3594188950f238d50696f31b6417bd45b443b78657aaaef24daa
+MISC ChangeLog 13328 RMD160 2b5b3a7ad0ec6ae3e0564a692cd105ed0161ac49 SHA1 48db658a4353a2d2ddc4c37223c3cdd304a95280 SHA256 140b181e521f4654c4f93b7cb81f4266bdbcb2841b4ac879c11d19ba60696cc0
 MISC metadata.xml 517 RMD160 400e7c255754bcee547640d99b532aab79610120 SHA1 98c3f5e20fa145a8f16217350ba5f6b254d594f4 SHA256 4349695172dc69f311ffe37b6370714b5feb38cd2fc11cd7adeabe0c3d21e0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOyNJEAAoJEF0huFKJUZL5q6AQAJ9OXENDOrySEi87zxYFkSVw
-XdbMXDGE74c6te5Wjpwf+qlBAzzpcyFU6na48RPHO0i2Euyxdx7IP9B36a0xc4I6
-xjsXyVl+a7NTkCadQNpaUrj32FXqywxubTHf+gYs+ES3FGlzCn9TAL4FtRNX2g6F
-SobD2MwacENOKzGwT7L09ZnnSzn6i4FTWdeZVkeN8TiPFkhIdav7xnnezdPVeEhj
-QXfJbnC1+gmS5gCT2mDYwHShnAaceOLCSEGxT0zXlEKugITBlHvH/5PPtPm1koDX
-5aFYhoJJwp7JqZvXzYnLzJxg83AL8t8J/33XbJaC441ArMyyPIt0QB35dtIbDDyN
-oVggzpnFdQk1fuQ447N70Maz61VgDQuJUE1fUnP0M+x4bqek71JGg+3DWLoF23nQ
-WDV13KMFmg2QPpUTvXZPMZIVA/xwjb05v4BdffBdxOtX/Y19Yc+Z93/TiOmGEOr6
-kkIA+bgAi0xcgujqXZgEf4LnZFRUtINxoZykjbDMZhLxvJR+w74BaS76OREe9G1h
-jdCPKyInhWDhXOabQ8rzuexBYJ8BYOHLPhwpwd5IgBjI6o7Hn8YdHa5npbEcbYQp
-prtSitqhFwaqw0B+BRL0whZDKrPZSyY3GKXdRNG2i4pnxx8Hco9mC8YZ2BT/KBYC
-NRaOgdKDGA2vNl5gOERK
-=8VJM
+iF4EAREIAAYFAk7oUtoACgkQdjK8w9WeBnA7NgD9FhxM1CimQ56zvS3Ow8NnLN6s
+d8Zvn9BpK80wQug6o+sA/0zbvI9h59ZhN4zZc4fp2uCVi0OL1GzFcS6Vvp0sQEKu
+=dp8k
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch
deleted file mode 100644
index 66b45427c4dd..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.1.95-glib-2.31.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e06a4b0d2f96fd185ed6c85a07d4f2c8c0077fdd Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Thu, 3 Nov 2011 18:12:50 -0500
-Subject: [PATCH] trivial: fix compat with glib 2.31+
-
-g_value_get_char is deprecated.
----
- src/connection-editor/ce-page.c   |    7 ++++++-
- src/gconf-helpers/gconf-helpers.c |    7 ++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
-index 25e2240..44fd952 100644
---- a/src/connection-editor/ce-page.c
-+++ b/src/connection-editor/ce-page.c
-@@ -35,6 +35,11 @@
- #include "ce-page.h"
- #include "nma-marshal.h"
- 
-+#if !GLIB_CHECK_VERSION(2,31,0)
-+#define g_value_set_schar g_value_set_char
-+#define g_value_get_schar g_value_get_char
-+#endif
-+
- G_DEFINE_ABSTRACT_TYPE (CEPage, ce_page, G_TYPE_OBJECT)
- 
- enum {
-@@ -88,7 +93,7 @@ ce_get_property_default (NMSetting *setting, const char *property_name)
- 	g_param_value_set_default (spec, &value);
- 
- 	if (G_VALUE_HOLDS_CHAR (&value))
--		return (int) g_value_get_char (&value);
-+		return (int) g_value_get_schar (&value);
- 	else if (G_VALUE_HOLDS_INT (&value))
- 		return g_value_get_int (&value);
- 	else if (G_VALUE_HOLDS_INT64 (&value))
-diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
-index 2327c62..10c522d 100644
---- a/src/gconf-helpers/gconf-helpers.c
-+++ b/src/gconf-helpers/gconf-helpers.c
-@@ -54,6 +54,11 @@
- #include "gconf-helpers.h"
- #include "gconf-upgrade.h"
- 
-+#if !GLIB_CHECK_VERSION(2,31,0)
-+#define g_value_set_schar g_value_set_char
-+#define g_value_get_schar g_value_get_char
-+#endif
-+
- #define S390_OPT_KEY_PREFIX "s390-opt-"
- 
- #define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH    (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
-@@ -2664,7 +2669,7 @@ copy_one_setting_value_to_gconf (NMSetting *setting,
- 	} else if (type == G_TYPE_CHAR) {
- 		nm_gconf_set_int_helper (info->client, info->dir,
- 							key, setting_name,
--							g_value_get_char (value));
-+							g_value_get_schar (value));
- 	} else if (type == DBUS_TYPE_G_UCHAR_ARRAY) {
- 		GByteArray *ba_val = (GByteArray *) g_value_get_boxed (value);
- 
--- 
-1.7.7.2
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.2.0-not-show-in-kde.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.2.0-not-show-in-kde.patch
new file mode 100644
index 000000000000..db22964a122b
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.2.0-not-show-in-kde.patch
@@ -0,0 +1,41 @@
+From 7f2466edf036721844ddfd91eea3dfb0ead8e7d7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 14 Dec 2011 02:05:21 -0500
+Subject: [PATCH] Add NotShowIn=KDE to .desktop files
+
+We do not want to autostart nm-applet in KDE, it has native tools for
+network configuration. But we still want to auto-start in other DEs like
+XFCE, and if we auto-start there, then we should show the connection
+editor there.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660046
+---
+ nm-applet.desktop.in            |    1 +
+ nm-connection-editor.desktop.in |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/nm-applet.desktop.in b/nm-applet.desktop.in
+index 4eb669a..0cda7e1 100644
+--- a/nm-applet.desktop.in
++++ b/nm-applet.desktop.in
+@@ -6,6 +6,7 @@ Exec=nm-applet
+ Terminal=false
+ Type=Application
+ NoDisplay=true
++NotShowIn=KDE;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=NetworkManager
+ X-GNOME-Bugzilla-Component=general
+diff --git a/nm-connection-editor.desktop.in b/nm-connection-editor.desktop.in
+index 664200e..b3e469f 100644
+--- a/nm-connection-editor.desktop.in
++++ b/nm-connection-editor.desktop.in
+@@ -10,4 +10,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=NetworkManager
+ X-GNOME-Bugzilla-Component=general
+ Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
+-OnlyShowIn=GNOME;
++NotShowIn=KDE;
+-- 
+1.7.8
+
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.2.0-r1.ebuild
index eb1b0af96221..369e5e97dd9a 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.1.95.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.2.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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.1.95.ebuild,v 1.1 2011/11/07 18:28:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.2.0-r1.ebuild,v 1.1 2011/12/14 07:40:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
@@ -47,7 +47,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix building with glib-2.31, will be in next release
-	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+	# bug #394379, https://bugzilla.gnome.org/show_bug.cgi?id=660046
+	epatch "${FILESDIR}/${PN}-0.9.2.0-not-show-in-kde.patch"
+
 	gnome2_src_prepare
 }