Version bump, drop old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 14 insertions, 90 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 7e60ecea59c5..9d73735a142e 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.121 2014/07/24 18:10:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.122 2014/09/23 11:56:02 pacho Exp $
+
+*nm-applet-0.9.10.0 (23 Sep 2014)
+
+  23 Sep 2014; Pacho Ramos <pacho@gentoo.org> +nm-applet-0.9.10.0.ebuild,
+  -files/nm-applet-0.9.8.8-revert-ca-certificates.patch,
+  -nm-applet-0.9.8.8-r2.ebuild:
+  Version bump, drop old
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   nm-applet-0.9.8.10-r1.ebuild, nm-applet-0.9.8.8-r2.ebuild:
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
deleted file mode 100644
index 32d501ca24a6..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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.8.8-r2.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
index 9bd778685029..08cfb117c35c 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.8-r2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
@@ -1,13 +1,13 @@
 # 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.8-r2.ebuild,v 1.2 2014/07/24 18:10:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild,v 1.1 2014/09/23 11:56:02 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -15,19 +15,19 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="bluetooth gconf +introspection modemmanager"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS=" ~amd64 ~x86"
 
 RDEPEND="
 	app-crypt/libsecret
-	>=dev-libs/glib-2.26:2
+	>=dev-libs/glib-2.32: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/gtk+-3.4:3[introspection?]
 	>=x11-libs/libnotify-0.7.0
 
 	app-text/iso-codes
-	>=net-misc/networkmanager-0.9.8[introspection?]
+	>=net-misc/networkmanager-0.9.9.95[introspection?]
 	net-misc/mobile-broadband-provider-info
 
 	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
@@ -47,7 +47,6 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	gnome2_src_configure \
-		--with-gtkver=3 \
 		--disable-more-warnings \
 		--disable-static \
 		--localstatedir=/var \
@@ -56,11 +55,3 @@ 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
-}