Add polkit-gnome runtime dependency (bug #552590, thanks to j.l.). Drop old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

6 files changed, 38 insertions, 290 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index b7f45d1ee797..d7bd49d64eb4 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.61 2015/06/14 22:02:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.62 2015/06/20 02:32:11 tetromino Exp $
+
+  20 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cinnamon-2.4.6.ebuild, cinnamon-2.4.7.ebuild, -cinnamon-2.6.7.ebuild,
+  cinnamon-2.6.8.ebuild:
+  Add polkit-gnome runtime dependency (bug #552590, thanks to j.l.). Drop old.
 
 *cinnamon-2.6.8 (14 Jun 2015)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 76595e9236fb..c031ad15a7bd 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX background.patch 938 SHA256 373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f SHA512 fab92f83d7d1047ff0a1ed2fe5741d14a9baa0353599295bed032930bcd530a9e293382701cad69dea64a7a998cc1bd1f5cc0bd3d03f7b5cdcb0a5518ddd7289 WHIRLPOOL 8457f040b71b142dbb79442cc6bc7eaa40917b70db583c7b4b0f1a74f865e66bf3bd6cd83544c63a2b5a5dc705e93be6544f29b006ee64decabf93f3a6f82304
 AUX cinnamon-2.2.16-calendar-upower.patch 909 SHA256 9ba15442531537759a78a4ab6d0be55dc2fa84a5157bb3fd912c259bfe24dcd8 SHA512 59ec14308f195a1d8bb1a4d15b776945ea865580d2de21aa1d690871428006bb7b2d5d439d263d3fc20df2337b681134c3deb2d1c6e05c0b31418088949ed41b WHIRLPOOL 1ef4a7814f7f072a406a523952789c0a40b3d5a821faac486a6ed9f7179658a7f0f1db2ad84a52382f0b67f45c49b584b0cbe60f550a01de92a2c963de99c0a4
@@ -19,30 +19,28 @@ AUX cinnamon2d-screensaver.desktop 455 SHA256 ce9172af04758a4078079e6bcb7b1117bf
 AUX polkit-cinnamon-authentication-agent-1.desktop 213 SHA256 9bc4aa73d429ed0563390fa1abdb4512b664c60ef5043f01db7bda9a0635d645 SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db WHIRLPOOL dacb03daf730732ea9b8f9a7bd694e212152e2f2129ce300302bad5f4ae3d49c6be3c3adca38523d301c7469558faebe100ff605e7e3931766d95e9108f203b0
 DIST cinnamon-2.4.6.tar.gz 2813177 SHA256 f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 SHA512 c7553b3af4a46dc25e7b39ce8b66036d6975b9487ecaba023df3d5b4176fc9f2cea90f1e6a8daadcf482f5cfc0c495c011b2734b60af1bf3577c033c587de43d WHIRLPOOL 2060d1784e285b084e576e33e0dfcf3721779a8ce92be0cd7187db792b8ac631d931cdd327203b694904552657133e1a418ce8e23e1d2b1ef165cc97f1b8477b
 DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
-DIST cinnamon-2.6.7.tar.gz 2967804 SHA256 839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004 SHA512 f76aa7401e44b0529ec5041b613df2ad95393701949fe8a25de75332984d102b441da32d08b06618cdf132d5026a92cd21ebaf8cac1707798dae667c468d57f0 WHIRLPOOL 0b1acc4e4e03c374cfcf12abe1e9cfb2593d0b72c2ace10db113665e517b1d9204ac54bdb9237ae2dc544b50b10b94d581fa7163ea2a0b07669bfbd0f8a3e30b
 DIST cinnamon-2.6.8.tar.gz 2967957 SHA256 fe2e0e0a128711875a24c3511eff78e48ecd131db8f758781950784270af15a6 SHA512 687048660dbc7797dfa3fb6aeb6f58c334d1ae4c384d600031e74db661ce5edc8109dec5dfc7b643e0d52211e41723e22da725f7866a99949f0b3e07e0716c9e WHIRLPOOL 2dd103e0db3e80fddc94850936942d6ef13d3603f1fde4ad69fb554bb79f39bd7dbcb08bfd5c2f156f9da2802a43ee2c7c6169b0a68b6e8e269ed7774bb203dc
-EBUILD cinnamon-2.4.6.ebuild 8420 SHA256 0771b3abecdbc455cc9f7f26c59fe1dc318b099c3b769623a1837c341dbe74ce SHA512 aaceda46cc0f002325d23145c43138411c02757afea482268187a4edf9969bbeb86a7fc9db342e01525a35ebe1cc00e93c4dd971e265b717e8675eba09b620e9 WHIRLPOOL 03eb83357ab9cb51a057e7a80ad95dc6e7b7f8ae53c410a407febc3d153f81a1774fa89177b82c1b45f823e5528bf7063964796e79b840c5c604d6b7382fce20
-EBUILD cinnamon-2.4.7.ebuild 8426 SHA256 7a8ab76dde16638f4d76259ca540a29cbeb9f7577a27f5c7bc306d3f476d052a SHA512 58ebcf834d2cff460e9acd6590030faa9ebb927a201e653559fde1b50ad268ed51c83a397ffd0e706591cfcf84e180dc341b2495e6fea22a734a3c3ba900bd3b WHIRLPOOL f03fd8742c0ac58604ef9470dcc47fbae90629cb1f91206d99b1d5bc59019f70a9404239084c7dd8e2803251448f5bb2f79c603474b6d20bc909f95b91bf669a
-EBUILD cinnamon-2.6.7.ebuild 8888 SHA256 946d86c1d1ab7f24e2310fc1a03a347da15e3a99fcd8760424072d07f02ea5e8 SHA512 64a854492b221a02d0854757f60f9d3d77c23c5257828283b571fe3b148f7a39e7adfbf488bb7a5137e29ee70bf50c1626987ce21f5bc10b41b3ea0364afbf62 WHIRLPOOL bc79dcfc074488c27ab16d81aebcde4fe823f3f7a13028fa548ed47bf2850ef41244f90f988aea666f2a020912fbd9528ff1bd4ec03801a1b080d821a46fea0c
-EBUILD cinnamon-2.6.8.ebuild 8888 SHA256 18c4e77389afb4854a1f228298b20695d0ea2ee05fdd6cd9f5540c6f0a8b381c SHA512 94dbc1afb570ed22d7e176d9a4fe7cb6be7c36ef6208b5443c2f36b65f91550166e18b5c1dd0c9f00961344dd34c3b1613d75f1a5f291178a876cf4a863c4735 WHIRLPOOL 5d25dc180b798dd5dc367a30d386387b09d21f28d7407a00ea4e079edbd141f4d0b00cbc17d9f1161f9eaea251d0e75dc8d80dedfe868d01742553da992dca78
-MISC ChangeLog 13872 SHA256 fcb68a4754a8ddc1be8f7c4907e6122e621f2ffbcb1c858174eb4fdf6d2fd7f0 SHA512 4af251e3087f03a40a6dd78dc1bcd520202453dace4233ae68d6d0e3009c0f3e8fafa8e8cff1424406962b27e089f3930cda0062644d1749d757e69de511934e WHIRLPOOL 7583a3565981315f618437f122e6dfed9c1f4435798972f662d0697f727afcc8bdb872b7461fe3fcc171e720118178234604ec89b1b6ed1c3f7ef65f6efadc00
+EBUILD cinnamon-2.4.6.ebuild 8501 SHA256 f59a7405e1ea961cc61fa7441722f9e2a2aeb737f78c9957476ccb7935cf6520 SHA512 ce483914696878c551da3eb8173a008a8d0a068fe1021d50ef8b9d46a92768d25b83ff1aee84c254b5753f29ad73a6399bb13d8c553f3526170edf3658d33886 WHIRLPOOL f523071cf0de3d45a13bb152feea135d218d7f11ab92a19b10e3603baebae83a3453f8498b0cc49cd0edaa15f48f6b59696a5d43f396144d3a08b9b2dc25edcd
+EBUILD cinnamon-2.4.7.ebuild 8507 SHA256 109c76ae23ca2fd71085409306cf0a5aaddf3dd1abc1e9d0414cb455f7024525 SHA512 4ad79258064f7164fb8f541661061662bb5f1d2c28957e583f9f4c024b24a47d5ead7ef0ed190623b8c290b5f504d3483a081c618952b3894cd0b891aa26c103 WHIRLPOOL 00773581a79b4c10ef467f39a4b2fc973b7f270e4c552b2601208864a727a58dc7495ef6cbae4034d8763fae67266c7f53d37adf1ec86d6d5d722211e53589f7
+EBUILD cinnamon-2.6.8.ebuild 8965 SHA256 858e233ff657ad5d329144cf55b980c6f004634102bf03e51067dc4a3f62ca36 SHA512 89ce633fb240dd00d629b2d171728238bb05175eea85dc969e79192a2361377c4115da10a0e95de251677b9b65fa2bc53a286c4ce3da7e960f3247da0b841d84 WHIRLPOOL 4fcdaa5d1dbf4fbb95ebd5366da0a8a7b9673c73c5bb6971f37a81d04f0b9084424b9c79f89c8e5324f6b12ce03b770c8155494fe7d1352117013ce7c3e7f528
+MISC ChangeLog 14108 SHA256 0652e91a8ae6f33d7dd2b83b978d132f2e01a2109cacd1e52bf9927e46205c93 SHA512 33cd085cca8371f17b136c4fd6f731a4311bc398d98b56df1e95044ec2e2e28f8aa665c97a840bcecca4cc7c160060dfb5f0a803728b835d5835578ef5eb7855 WHIRLPOOL 48d96066b01b3c01dea5809fd5b74469b0705f890322b79873e6a961ccea41218bbde12d1c68ecdd81e8a74447536f31a32fa4a7764b51a8a3a1b293ce19173c
 MISC metadata.xml 364 SHA256 4c232fde143989a108b0b74b6dca28da510ab213dab1b1bb5b82a84bd5a13315 SHA512 826fe13c197807fb659fc43b5d4a404009d360d033104dfabf6daef23f49d0693cf7bf8f62d68cec19da195757062a1896dbecd5409b5dd9d94304aa999e7cd2 WHIRLPOOL 676306c7522ce4677892abb97d765fe686ed79ab623fad8e95510889ef63d87eb808d403d9a4c7a9609b2bb43b01c76f941d9d3d9b309633352fa87a0c67a0a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVfszYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixy0P/jDE6x0iwNAKcFnHP02b3clj
-5hqzgmWhBljY454vZKXTnivG5VaBXbEZLFEJ5xK1Im+bH6Q63rHs7bfdflVu1nP1
-kzzVJntQ03nm9xn0+H738lFvkApv0OkmsNmaUHWxadGK8x16+msqcd83ec7WA1WD
-fL1WdhaL++deOas87JzYMos/eTq2XvEsHgYa44Za4sUFerBvNUyCuvHCKmYkkskO
-NenPI9t9tWH/PLHc9oriQSP81RcbQGzmbXsCOVGseUvtUvQI7an9Mbg8vhcCJjH7
-2+NTcjNXWfCTi8Jd7Jpd6cqavaoSoeTa149YrlPnTa0qq/hESJvtFcAis84dIqCZ
-cD4RgWXZRHhoVgWbUuq2/6cLKcXis6soT/gO8fXB2gOtwJUoH+jCYeNfRnuWubbq
-n50y5FuYSkFrVWAsmfF6sDFPdKhVe1PzFZSDiMMT9MLkexmZzOw3cnZ6VTQ48H2B
-ttLv/Pel8csjoFFciASpDnipruvStbm1+MZxtG2RxvfGb+kEP4s4Tp4kjalejQK3
-vk63FJVZicLfqXlE6phkqagoIY4feCC288kKq2omg0xwrlDKLfr3KKb4O1gv8QLV
-55PSJzCnVM+TOosSJHLGL9JycbED6mRHzUJqTzWynBhB25ljd6ATqVhdMJmeHVhT
-T1An8hifoqbtTo+uX1Rt
-=KGWm
+iQJ8BAEBCABmBQJVhNCzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN1xoQALwbGj5vOsuYeMnwMOc2Mynh
+OBvbYAeMKAeJIX7Dy0qG6EtDsH1x8YxRDbGuupTXZvi0D9IZCxQPW7xc4MxKM1m4
+v6cpkJr4ZWAaTOnQPcUM7OrFxsgYIGFU9OSjktD6ungxMFJawegLlI2A1cXZDuBI
+pt1hf2VGjWurdcxJgdoVLDIm5KCahFcevfEYmyK67iIIhWkdHBhNmHQD6Vq0ajZo
+tYjJTzS2cgR1QLhcqD/Q6kIt3s8GWZsmKZJ4RVb/g/FrlCqxNazywHkEFHpxLMvq
+xhG1mvym1fqjk/JupI5LtTX36WT+cy760zAt/2YJbtvZ4LEEtwOpjRcwSn5W50/u
+YzgWYtpLNouwbd8WX2tkV6aRJqiENs0ZoBnu7zeqZ8ZwqUki29e6iWvoynOW+mWB
+FX4K7CzPLbtNLgV8WaYCshOJ27xw+77LsgxyYLFZG2QHV/JP4yCreDoz6s/dgloX
+NBtijBsX4Ulyy7r0R4UG6t537i5id9vP87i4v8ZO+awqJCfGIR62/IAqpzrAh4fF
+1UD0ybJHjfKLMUSCPpYs9nmflz2GhR/vCF0MiH3xMj+Jpf5NFmHty3FLuNbFzix7
+z8ENjQVFodM4zhwkOoPftrD9z5DhgYhf7tSJ+4C3KlB+qRjtsdph05GOHTcJAXIH
+wYwItTniqifc5C+dI6Iu
+=oU/F
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
index ce5b97210a2e..81a8a845c183 100644
--- a/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild,v 1.3 2015/03/15 13:24:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild,v 1.4 2015/06/20 02:32:11 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -74,6 +74,7 @@ COMMON_DEPEND="
 # 9. gnome-icon-theme-symbolic needed for various icons
 # 10. pygobject needed for menu editor
 # 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
 # TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
@@ -106,6 +107,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-extra/cinnamon-control-center-2.4
 	>=gnome-extra/cinnamon-screensaver-2.4
 
+	gnome-extra/polkit-gnome
+
 	l10n? ( >=gnome-extra/cinnamon-translations-2.4 )
 	networkmanager? (
 		gnome-extra/nm-applet
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
index f76e41926aec..14d62d9a0119 100644
--- a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild,v 1.1 2015/06/07 11:00:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild,v 1.2 2015/06/20 02:32:11 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -74,6 +74,7 @@ COMMON_DEPEND="
 # 9. gnome-icon-theme-symbolic needed for various icons
 # 10. pygobject needed for menu editor
 # 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
 # TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
@@ -106,6 +107,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-extra/cinnamon-control-center-2.4
 	>=gnome-extra/cinnamon-screensaver-2.4
 
+	gnome-extra/polkit-gnome
+
 	networkmanager? (
 		gnome-extra/nm-applet
 		net-misc/mobile-broadband-provider-info
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
deleted file mode 100644
index 291576f5e102..000000000000
--- a/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.2 2015/06/14 17:39:40 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# bluetooth support dropped due bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-# We need *both* python 2.7 and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python_targets_python2_7
-	|| ( python_targets_python3_3 python_targets_python3_4 )
-	"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-2.4[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-2.4
-	>=gnome-extra/cinnamon-settings-daemon-2.4
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[python_targets_python2_7]
-	dev-python/gconf-python:2[python_targets_python2_7]
-	dev-python/lxml[python_targets_python2_7]
-	dev-python/pexpect[python_targets_python2_7]
-	dev-python/pycairo[python_targets_python2_7]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[python_targets_python2_7]
-	dev-python/pypam[python_targets_python2_7]
-	virtual/python-imaging[python_targets_python2_7]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	>=gnome-extra/nemo-2.4
-	>=gnome-extra/cinnamon-control-center-2.4
-	>=gnome-extra/cinnamon-screensaver-2.4
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[python_targets_python2_7]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
-
-	# Fix GNOME 3.14 support (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3577
-	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/*/*.py \
-		-i files/usr/lib/*/*/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	epatch_user
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=536374
-	# https://github.com/linuxmint/Cinnamon/issues/3843
-	append-ldflags $(no-as-needed)
-
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-rpath \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
index 19f89ba68aed..82f62697585a 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild,v 1.1 2015/06/14 22:02:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild,v 1.2 2015/06/20 02:32:11 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -79,6 +79,7 @@ COMMON_DEPEND="
 # 9. gnome-icon-theme-symbolic needed for various icons
 # 10. pygobject needed for menu editor
 # 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
 # TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
@@ -111,6 +112,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-extra/cinnamon-control-center-2.4
 	>=gnome-extra/cinnamon-screensaver-2.4
 
+	gnome-extra/polkit-gnome
+
 	networkmanager? (
 		gnome-extra/nm-applet
 		net-misc/mobile-broadband-provider-info