Add AutostartCondition to not autostart with authentication agent GNOME Shell

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 14 insertions, 5 deletions

diff --git a/gnome-extra/polkit-gnome/ChangeLog b/gnome-extra/polkit-gnome/ChangeLog
index 6d5f6aefb8ca..b0e11fa9a543 100644
--- a/gnome-extra/polkit-gnome/ChangeLog
+++ b/gnome-extra/polkit-gnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/polkit-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.31 2011/03/19 12:13:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.32 2011/03/21 11:21:33 nirbheek Exp $
+
+*polkit-gnome-0.101-r1 (21 Mar 2011)
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -polkit-gnome-0.101.ebuild, +polkit-gnome-0.101-r1.ebuild,
+  files/polkit-gnome-authentication-agent-1.desktop:
+  Add AutostartCondition to not autostart with authentication agent GNOME
+  Shell
 
   19 Mar 2011; Raúl Porcel <armin76@gentoo.org> polkit-gnome-0.96-r1.ebuild,
   polkit-gnome-0.99.ebuild, polkit-gnome-0.100.ebuild,
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index 555b436cfc08..1b90e7491c31 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -1,13 +1,13 @@
 AUX polkit-gnome-0.95-fix-make-check.patch 196 RMD160 9fab67298badb3f951a09704ea588c456f139871 SHA1 31f68277441bb529ca821c872bf667396bb1feeb SHA256 9df1e9bf693383a99b6604035793802596a014537995f0916dc859762bcd736d
 AUX polkit-gnome-0.95-parallel-build-failure.patch 303 RMD160 7aec98c3a2141e26647e1f4025abdfe94ba4efcc SHA1 efb5577503f14ef94fb95276f49f9b13f45b8ad1 SHA256 74d38c00aa3e782d3712ba296a85344618a8bd936822d0148df660ff058e69b7
-AUX polkit-gnome-authentication-agent-1.desktop 219 RMD160 9881aa9d69f1e2dcc0920aa35468ab6e125f4407 SHA1 9f72bca42e1847d5f6c8f9aa2cd57bf9671f9cf8 SHA256 53b6f8601624bed73a6acf831c6bf272dd60c1e43a4450e897f78cde77e092ea
+AUX polkit-gnome-authentication-agent-1.desktop 271 RMD160 bc2558e787344055b885fc86716a6d68863abe53 SHA1 0a259469459f3f932891c8455ae7fd341cf01163 SHA256 9dad12b09e921d088c0d3687fc2c08eaf32976844c8c17a94e1c1daf8b72c218
 DIST polkit-gnome-0.100.tar.bz2 390684 RMD160 70036d738fa625d38fb71a6ab75b29da5627ae1e SHA1 0788842005821051c86961ae9cc4a615e9893240 SHA256 d52bbcf6cdb7b0be499e6b220653dccaf0fed860806bdfd8112ef1fd1c26653d
 DIST polkit-gnome-0.101.tar.bz2 408431 RMD160 cb620f245f9b2b2fb463db76f1e3e684d79c5886 SHA1 23a886cecba4a7466deb6655224f20f29d87d305 SHA256 f1452e37b6681a0ade2c0cbb3734e6f78c421b958ab4d4eb6a2cd3b9f50db8d0
 DIST polkit-gnome-0.96.tar.bz2 362723 RMD160 7c038c357a6df3d732bef28f7744768fb241092a SHA1 b4189f4e01f6775afe305ab361a535c86d3ceff0 SHA256 0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92
 DIST polkit-gnome-0.99.tar.bz2 388069 RMD160 1f6d6840693d3d88682af8295b1f8b5030bd9f33 SHA1 8d67b03943be3da9b8bbe1b4a036d778f998a3d0 SHA256 73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba
 EBUILD polkit-gnome-0.100.ebuild 1891 RMD160 1660227b6d647ae37c16e89194350eea1307222d SHA1 7f213c8fc7d5dbaf6c70decbd8a198f2f0094c92 SHA256 eafd962f48e52deabdc82ef8ed95733933940b8afefb037615336cf737615f71
-EBUILD polkit-gnome-0.101.ebuild 1837 RMD160 7cd3b98d876bf53cb17011eaf1a83878a2a17d41 SHA1 8824c52e5c643cff61022f22ab96618448e2bd43 SHA256 4c16be7ba057ffde26ecbf22d901cbafe10d76b998e3fbf2a1a0fbfce1f365ce
+EBUILD polkit-gnome-0.101-r1.ebuild 1841 RMD160 752cbfd6549fa0c08084a9ba7035d45f418c5588 SHA1 0c47cc56c1b07431d5d47bcb0e883d4373a9a40f SHA256 de8d9e855338641397003c5e4fa4765683dc4f6180726f54b2a379e84ae87415
 EBUILD polkit-gnome-0.96-r1.ebuild 1634 RMD160 71b6d073f18245b73356a2d3bcccf32b078f973c SHA1 aebc6688863dc444a3b1170939a44c7faff0e664 SHA256 720e7f89558d5d84622139efa11077b23f686134877332dd1658bb0d94752e93
 EBUILD polkit-gnome-0.99.ebuild 1701 RMD160 8f98341fc6301a66efe311c7c55c2adaa8017542 SHA1 eabc85ebe0dd40fb94fff67e29a2187d99660e27 SHA256 a258c948edc0ee25d2069cc4319500b53ff60ceb63e4c57173b3a11a8845d20c
-MISC ChangeLog 4472 RMD160 d2440c0bc9c83697d848947ec3699e167e076383 SHA1 0ba0f3b4dd23fa9fc1374f8039d40af165f127f5 SHA256 d0c0113ee33c26eddaf9fe502008c73ba3d5aec62a6795f90d5471aac3e488c7
+MISC ChangeLog 4762 RMD160 d82f7503ba715040e86c55f7fd2a04afcea1a109 SHA1 c2608aa66def70868492dbbff25533ef7a1373c8 SHA256 9c3a98c459f61e4522642cedd4c85647b05c6208144aaa94bddb60010c0ad988
 MISC metadata.xml 376 RMD160 8c718557c5de01a6b342f7c866c9690a90e1928e SHA1 b19aa2a188a24437f3529396ca9471437a3b012b SHA256 b201b0413405789b51dc0e76833050159a011be2312de5068976f228ca9b3ab3
diff --git a/gnome-extra/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop b/gnome-extra/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop
index a8b630074044..eaf17795b1aa 100644
--- a/gnome-extra/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop
+++ b/gnome-extra/polkit-gnome/files/polkit-gnome-authentication-agent-1.desktop
@@ -7,3 +7,4 @@ Type=Application
 Categories=
 NoDisplay=true
 NotShowIn=KDE;
+AutostartCondition=GNOME3 if-session gnome-fallback
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.101.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.101-r1.ebuild
index fd2f785c7ae7..dc2e06427152 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.101.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.101-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.101.ebuild,v 1.2 2011/03/19 12:13:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.101-r1.ebuild,v 1.1 2011/03/21 11:21:33 nirbheek Exp $
 
 EAPI=3
 inherit autotools eutils