Version bump (with a patch to restore auto-starting in gnome-2 and gnome-3.6 fallback sessions). Drop old.

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

5 files changed, 56 insertions, 79 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index e1544b796eb9..acd6bc14fffe 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,14 @@
 # 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.104 2013/07/21 12:35:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.105 2013/09/16 00:59:20 tetromino Exp $
+
+*nm-applet-0.9.8.4 (16 Sep 2013)
+
+  16 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -nm-applet-0.9.8.0.ebuild, -nm-applet-0.9.8.0-r1.ebuild,
+  +nm-applet-0.9.8.4.ebuild, +files/nm-applet-0.9.8.4-autostart.patch:
+  Version bump (with a patch to restore auto-starting in gnome-2 and gnome-3.6
+  fallback sessions). Drop old.
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> nm-applet-0.9.8.2.ebuild:
   Revert unexpected commit
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index bc97373e20ab..ab9f7b447608 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -2,21 +2,25 @@
 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
 DIST network-manager-applet-0.9.6.4.tar.xz 1140868 SHA256 ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141 SHA512 16aab6e5786d0d6e89b880e34c6b8883bd57a190fb7ae73048db69ad2757317822eff4c8e825239fba969f67a760ce90ac94c27c79780158f3a2d82a9069d242 WHIRLPOOL 940c31ef95cd0b3b7a78ca5083c442dd229c98cf389a0615e4a6ba39b39e3df947b2d3e9b59100e8379b8cdfb845eb2899b637a89a09647b777b2143018e5e80
-DIST network-manager-applet-0.9.8.0.tar.xz 1214956 SHA256 1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590 SHA512 0c2acb8ded7621369e96a9fc748bfbc75af1eb03415c2109e6f577c9c5d8996cc6b9b11d9c2c445ae7b50c2016f5c90f5a649632738eb056bfa99f115a3b1270 WHIRLPOOL e49e11bec0c2a292567c403b689db429db0aab71778f8b328106a33d95dee66da9d36f04dea7c2f55bb0e887342b3c7ea9ad6f43b2a80e4df592f6a3b495bc41
 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 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.0-r1.ebuild 1705 SHA256 b4b7aa0b34fff9be0f3dad34e65905c1e8eb31893db0f638ad48ec15b239cc45 SHA512 eb382bc78f639d282a597a95f1f80c08cc521bb9e6ae6e25554c42f1187ee47affd6a10d0b49b70516289588b1eb7ffff76e1f91b37fcc750a892ffab0b72eb3 WHIRLPOOL b4aede3f982fe24bf871a90e6893135f2149bf56a59264011ddea2a13de48dd989c969e9e21667d21244a33291bee4e55eb836aa570c4d84cdc0a2a6cbf57bd7
-EBUILD nm-applet-0.9.8.0.ebuild 1641 SHA256 f6373d048d8e2befc6ac24c7910cbe008c64b4cdcde664d85acaad578232cb15 SHA512 8841b9d647d82f76f096dd5f5c7a4de0f3fc7be7d06ae19116b56651696de9b8c04d32075edb4fbff66858dfdcfc0967bd3bdea592c3a1ac91b3111ab7c40e47 WHIRLPOOL d70b440fb5f1f9252bc78e34f8d774aca0a8c55db39ad950be47dedcaf836ed9802475839e13806da422da1ae6b7de71061b506413af6ae420a0174d59d4f37e
 EBUILD nm-applet-0.9.8.2.ebuild 1483 SHA256 8e409e4699622e4b2d10c451e2d8fce25e653fd958dee9f85b650e85d8115948 SHA512 20879b93e761a5670604ca867e3358ed36889c6d807942e637a4d319412d9749dddaa9ddf076be02591890645876e5586ae823bd69469ec6991624abca3616fb WHIRLPOOL 54643b8fac97108179e228b279a333c854fb1ae7baad89c8c5d62276e4f3c144c7ff12cfa3db4001bd718224aeaabd0b8feea7f1c3b6b99f286a9a95d8486090
-MISC ChangeLog 17940 SHA256 cacb1920b2dcb5a35469856d0f9b0db14f687f7ce8cf161752963f76ce3fdb20 SHA512 1effd96569900c6540cdee7184b6158f200d686e1951277545449fe65b7c6ec98cfc8849ea302037b7533423c6ebdf3e8dc4d8f1a1a824557485f15e999b9574 WHIRLPOOL 63e103b414305683275cb6fc05ab39a48e5be34e8644cc723c9a98159f69ae39a97c75833e7aaddee2535b615939c0fd07f6ef7bc19942eef738be051641b819
+EBUILD nm-applet-0.9.8.4.ebuild 1654 SHA256 00a68e3b0dea70a416c89c341d290b0e51ebdef809006778708d6e77128b70c0 SHA512 85d97b0dbfed5be62bb19407fa6f8433b2d2d387ecd385768adb1fc1f19fd349cbd093673ddb4d0996b203a17acd6bfadf69c4b3dff5a9958319c8ea62f26562 WHIRLPOOL abe7ca13ee63365e63c8041da7b2915ae61085682fe16fc842681ee6d137e26b48b43dbeb8436ba2e1444dda1326d6eac71ca35198b7082b46baee46b547b57d
+MISC ChangeLog 18279 SHA256 0755ab98e64aa4a6069acf20aa43206888e42c3e83d3010eb348a3dde075788f SHA512 bef02e0b1c4f96146bed897746c0e79151395e16a01fd5d0c7a85e4ffc6fa04bf99a29a73d64703f21252eddd44baca41fa2f9a62f09fbe160e4ccb7aed5187f WHIRLPOOL e5dea206f252363349cd9a3221c9ae2c47e894ed17d43c4c60ecf1339502b80dbc53471808ec2e099aa191e3ecf39a77332686c02e4cab1b70cc2c79b48ad01d
 MISC metadata.xml 568 SHA256 287c10633139a1bb2c4a58faa5c77425442627db42ce65e7dc97596fe6a4dff9 SHA512 e23d8fdcfcda1c126cb074a28b13e2abcb45809d0a33302452c1d35bc55ae1d2d9725c9ae6e1fed39ba31b30b7bdd14b142b6a75d7f6a8eccf3ec17178c97a3a WHIRLPOOL 87f86d28d8de6d73b8d8c921b1efdf1811f604af85a2895af6b7b1d09d4f24424b51ca61a5c84df029afcfeeb07891b49da19092394da2df52de108e86bc1018
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlHr1aUACgkQCaWpQKGI+9SKYwCeN21E8FnWrCyVW1EjpmZ/Pt7r
-4LQAn2bt2W/p+GerDe1W9BeQ1C33Kk55
-=m/1d
+iQEcBAEBCAAGBQJSNlfmAAoJEJ0WA1zPCt1h7ysIALugh8WFvp7OvPdaS6DWoImZ
+KAeYXfR7Sja8qOwOGPyRiU32mQFGqKfjnCoS/iy2eCNo1Uc6/uz/+auaBj6+bfRQ
+I+UL1jWoCjJmyHpMt4XRpWcakfX/6N7F9sQGcuvWhB/pOqobg0UEWVo02+WNUcjR
+6oAsZx+invsqg0qxp7pIMSAgpTASydHYvNmAdphUG6kwNxxUFFW8f6AbOtMdUYaS
+jdKFUkVnbUjfU8WWNukKsZeugKMBpuWd79rZK74lK8k8kH1YFSiY8qUIMDOhzonN
+JcMMW8gwTGgZTubV1dYNlbGLzPJXvpzcuLCLHpfQ6nSigtqets+PjIoaqfxrueg=
+=RWws
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..512551f5f3be
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch
@@ -0,0 +1,27 @@
+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/nm-applet-0.9.8.0-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.0-r1.ebuild
deleted file mode 100644
index 8e69158360df..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.0-r1.ebuild
+++ /dev/null
@@ -1,64 +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.0-r1.ebuild,v 1.1 2013/06/10 10:08:14 sping 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/"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth gconf +introspection modemmanager"
-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.8
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	gconf? ( >=gnome-base/gconf-2.20:2 )
-	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_prepare() {
-	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.9.6.4-systray-icon-size.patch
-}
-
-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.0.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild
index 84683fbbc053..316dc55465c4 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.5 2013/05/18 15:43:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild,v 1.1 2013/09/16 00:59:20 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -11,8 +11,6 @@ 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"
@@ -20,9 +18,9 @@ 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
-	>=gnome-base/gnome-keyring-2.20
 	>=sys-apps/dbus-1.4.1
 	>=sys-auth/polkit-0.96-r1
 	>=x11-libs/gtk+-3:3
@@ -33,7 +31,9 @@ RDEPEND="
 	net-misc/mobile-broadband-provider-info
 
 	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	gconf? ( >=gnome-base/gconf-2.20:2 )
+	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
@@ -45,7 +45,9 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
+	# 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
 }