Version bump, drop old

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

9 files changed, 59 insertions, 281 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index d0f30b59396e..28fff6ea469d 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,17 @@
 # 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.65 2015/06/30 19:15:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.66 2015/07/04 19:15:09 pacho Exp $
+
+*cinnamon-2.6.9 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +cinnamon-2.6.9.ebuild,
+  -cinnamon-2.4.6.ebuild, -files/background.patch,
+  -files/cinnamon-2.2.16-calendar-upower.patch,
+  -files/cinnamon-2.2.16-gnome-3.14.patch,
+  -files/cinnamon-2.2.16-sbin-lspci.patch,
+  -files/cinnamon-2.2.16-set-wheel.patch,
+  -files/cinnamon-2.2.6-optional-networkmanager.patch:
+  Version bump, drop old
 
   30 Jun 2015; Pacho Ramos <pacho@gentoo.org> cinnamon-2.6.8.ebuild:
   Drop no longer needed warnings about r300/r600 (#553548)
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 13a4e5551af6..c6d0d6a99dc7 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,13 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-AUX cinnamon-2.2.16-gnome-3.14.patch 1011 SHA256 eee6c44bcc6123cd1c29abdde884e3dd7cc4f636709bab108777f77c94870eef SHA512 14ad2c5abbe49b2fa4cf6b2af1938f19c4c6a96320b76868ac1264783824f77f5da25023305ca6f7d4046946a4904d68869433067216c2756134ac70555592d4 WHIRLPOOL 26aeb6212d2a6cbd8631c33bea25cb30ea4f6e3c960d1692f0524960040dae4d78594a1b42a43d296c812ba1e28da9d672d2c6e4188be03c9f5ef9a74236e2ee
-AUX cinnamon-2.2.16-sbin-lspci.patch 1171 SHA256 cf8e02ff1aa824771962ca47b9b1e2dead841735032c574c6e89fc34433c9d6b SHA512 a947d7f62c89e3b08a7b1ba1725b91686d0dbe027156c905f49c96ee41ef8f9905554ca233fd1b461cfd48703f0ba2308c4d2eb6cf4641ac2010769310b40b6f WHIRLPOOL 5ebe00e80836b0ce799da82c9585718b9958dd1e6e70ff4fc65542579b612863b3643d90a0912e982d0295bcddc80a3bfcbee8a1448be6b826844d6c0dfe6338
-AUX cinnamon-2.2.16-set-wheel.patch 2570 SHA256 3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444 SHA512 451f7802be176b98834164bd8b61736edbbb3655459c1e713ff77bda4917a3cf96cfd2ed455bec0ddf739adc996303ea2d8fb8b8884d1bd3ac9fc7ab22cd59c1 WHIRLPOOL 27e5d0a35a0c8ac5b0d8c0228b2d36d97e9779bf813bf1b91dfc0e994975e54ef76e893ec08cf57b363113162a689e64971d12c61e4876579ebfed7154105a6a
 AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 SHA256 094c4d22e6eb53558aeeeec7eb12a3d35e9921daf2c851655d6463e550a0db96 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460 WHIRLPOOL eb1df3d101c9085a9f1ec3c0eeb64cb66175471a99688ffdfb309ed8d6da53057370ed546ab31259086013c3096ab9103f649145c3fce56ae4ccb1a63b8c81db
-AUX cinnamon-2.2.6-optional-networkmanager.patch 3527 SHA256 46d38bb5e6d6219be3d738bc1362431e633ba8369887b9f6983149a7db9aba11 SHA512 f5f046a518d365b69bb3fc22417406b11a4795d1cfc5ae2e7cb101f0f0514f81d104ae42f79e3b00d5b702050626e2b141164208e7ba22811d25090d985c12f1 WHIRLPOOL db506981950455c08ba5412a6968cc92d436b5013a316c19c9f57989fbc0f6c2a95b1dcd983cb53a874e63f00e5be2f993f5a6d7cac3a3e71845bb61ecf2a9ed
 AUX cinnamon-2.4.5-background.patch 1084 SHA256 d13d14917cd5372f1078963c33f3e32d68574fb68109ec2eed64ad3926d6033d SHA512 123b882db366e5f069887d293d96994c39f3b3974477c20f6587d5a6a8019198e1498889eee9e983a5273262695fa27c7dd7b61f2381f5084c0469d150dbebf1 WHIRLPOOL 0eefef6f165025c09587dbef148b924aaee60c1aa32cdaa462aacd63ca5170bc7d542210f5097c96433f98ec81fb170874eaec215dbb8f5d929ad2ca35bc8b2a
 AUX cinnamon-2.4.5-gnome-3.14.patch 1761 SHA256 a26e0b876c49abf9bb610bdb7766e689d2a5a3459de31c1a1f86c7cf4041c321 SHA512 bd0b8f19c628c634c9e8ca939d4a6e0d16da1dd12d2ef3e0ffcc1b7605fbf103847a6d0d2e41e2143033fc8a50b222515e8638fe7807ad595ac34d4975835c10 WHIRLPOOL 101a5b4c3e735e376cb063f0b30573adde6f79bca47501bd376820443f3105013de81b5560a26adf56c88cac8261ecda39e7debbc863890c66068d121c2f7fc2
 AUX cinnamon-2.4.5-optional-networkmanager.patch 3579 SHA256 6bd12e4fc844457399f004a30371c34774016a3f6ee3e6203393edb781488c8b SHA512 47bac1d6e52ee7fca305e5ee910229d84142eda40826281f6773a62125604609c4ac8df1f4274f09f1e9a99118b9c12cf3f1889b80a4b7a566b528606cfac207 WHIRLPOOL 79757d88f07e928c3f45a5b97399c67c555a63367a2e8294c2210fbe774f139062011f9d448b0f4cd97495e318ea25cacec161ca7fa133daf1d6e7d9d49ef8f3
@@ -17,18 +11,18 @@ AUX cinnamon-2.6.7-set-wheel.patch 3309 SHA256 61fa87e33cca75ce0e947513a1f95e3fe
 AUX cinnamon-screensaver.desktop 451 SHA256 19ca21fbe12ef393176c2dfa75c7c1b248c6e1560005e0c19a07349f25101323 SHA512 8e1f7b5524494336da3f469f446c45adfefee0ff55f04d069612234cc27ca39b6bf1c87bdcdb18078ddffad4b46a8750bd5b41d35ab9180b4ed1417cc82e5552 WHIRLPOOL 29a1a430f7d7aa73bd8ff5d0877772fe092c3c39b9bc1adb35b32f5432f357204b7367edd00616adc5a15f3059cd16da14db5047ddc09795ce761e53f2fec626
 AUX cinnamon2d-screensaver.desktop 455 SHA256 ce9172af04758a4078079e6bcb7b1117bfce02e3a9a7f794f32d7359612a3aa0 SHA512 2dffcbc2dba76597176ea645974208b58aca9c5809e46426e55f655a4f05a2fafffb9f024d25ec6bbe7fb05a3e8bfbfdfed055051895838db8816edfaea57791 WHIRLPOOL a4bec3d1c85b47691b2ddd337c480889a51a3140ff17ecb7fd11e3326788b9b20044a540851b3bcfae3a106e143363369d47c03310b315a78faff5201c66e215
 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.8.tar.gz 2967957 SHA256 fe2e0e0a128711875a24c3511eff78e48ecd131db8f758781950784270af15a6 SHA512 687048660dbc7797dfa3fb6aeb6f58c334d1ae4c384d600031e74db661ce5edc8109dec5dfc7b643e0d52211e41723e22da725f7866a99949f0b3e07e0716c9e WHIRLPOOL 2dd103e0db3e80fddc94850936942d6ef13d3603f1fde4ad69fb554bb79f39bd7dbcb08bfd5c2f156f9da2802a43ee2c7c6169b0a68b6e8e269ed7774bb203dc
-EBUILD cinnamon-2.4.6.ebuild 8501 SHA256 f59a7405e1ea961cc61fa7441722f9e2a2aeb737f78c9957476ccb7935cf6520 SHA512 ce483914696878c551da3eb8173a008a8d0a068fe1021d50ef8b9d46a92768d25b83ff1aee84c254b5753f29ad73a6399bb13d8c553f3526170edf3658d33886 WHIRLPOOL f523071cf0de3d45a13bb152feea135d218d7f11ab92a19b10e3603baebae83a3453f8498b0cc49cd0edaa15f48f6b59696a5d43f396144d3a08b9b2dc25edcd
+DIST cinnamon-2.6.9.tar.gz 2968234 SHA256 9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756 SHA512 372492f9a9833ae3b7ba2b22d6c4cec8bb8c0a02282d1efe595e8a822a7064d7129b2a56f9df7dd4ec8f329bee3db22ffb41672752f5daa6811973d42cae150d WHIRLPOOL 83e04e781ac175f4ce885c84554d70d8322a613fac30735af3efb57e43afb8ffb757771cc153b4b1ae8070a219972d76f707ce2fe40b7714aee6854e9a0bdd0d
 EBUILD cinnamon-2.4.7.ebuild 8499 SHA256 bee42c6315fe648e889cd4afc3859c57d110ebb743ea6d7ee9421afa66970046 SHA512 31b14496fd85aa0c14c7fd94cd3fdfa7c2130ae06fa8a774669ca6e5c309817f322ab8547f784b99ea26f53decf70108209ffb971b19499de1b820a7101a663b WHIRLPOOL 8037bf891c1a013c380dcbbe7a5a295bc852b9a1825581d6a1f30c16116dcba1feb4397e9aa840ea406fb762c7c17b8e3a26390662bdaa34776b510545fb2ddc
 EBUILD cinnamon-2.6.8.ebuild 8473 SHA256 34f75515e2ad9b96db3d15a4701e9aa8db6ff0ed81943103dd5ed7281e0e190f SHA512 fb58669b33425d1f1c991a47b6b23927d386a8efc4ad137c55c09075532866daa50476d1453c93f8135d25e475279f0738bdb009dd1c9f16c2bf983418b787e4 WHIRLPOOL dc07af715802b93c990cb8e60ac7cf8dd61a02eb4ec240d24ece54ae415e3e1cf635e8f3d01430028901426e12802e8ab29c35883dc4833fc82cef1acaff9043
-MISC ChangeLog 14445 SHA256 3c391e76ed9d8fa3949bfe826d3673c67133e44b8129d4043ada7082f67b3ef3 SHA512 aa239badc403f65d9fcc6987062ff889c843a7f127c47b823e8e7d32a6ed362de86d46edc639fb60819c9ea5ccc571c51677f4b3e18c26e5d5a921f0fea19b43 WHIRLPOOL 884630d39332be5a142f2b5d2f13db8ff53dc024c61aa48875bfbf057dcc7af07adacf5434b3c3737bb0a487e85b8fb4c3dfca958b11e913dad2b90f6068d4ba
+EBUILD cinnamon-2.6.9.ebuild 8477 SHA256 868c0b7ae329cb90a4c6d58169bb99d4f0b9b992cefc07a44e98a4768bc447c6 SHA512 f412c88afd5b025b19cf9cd1d5d920e8b68617cc6d208e064bf0d80e1e9b4ee7b4c647167e22d9f1681f4bd95159919452bf606c80ba7800c6c30a5dae19001b WHIRLPOOL badaaad9cb797a0f3fb34f750fbb4568899269f809663bd76615523d2105c86fe279f00af3d4c19fa4329301175e50e16171a60e008bf71172b7c45d293061e3
+MISC ChangeLog 14854 SHA256 0845b3471c9294fd7341e131b4c85e5fcb407b4e073192d170860e2112f13329 SHA512 d7dcb46ea57d321c5a51beb045445801c68d682d0602c735bdca59102b8cbef1b7491a5375c65d5f09dc8b19e1c7b1743608a833a2aaebd9eea6ecc4aa695c96 WHIRLPOOL 8b0705e22976390fbccec8ca648004b094d4fd02d2e31890f7b7436da6688025b6f6338b042bf231a1e3c8f56748897e3d8fce9cab482a95b2743fb4243be083
 MISC metadata.xml 364 SHA256 4c232fde143989a108b0b74b6dca28da510ab213dab1b1bb5b82a84bd5a13315 SHA512 826fe13c197807fb659fc43b5d4a404009d360d033104dfabf6daef23f49d0693cf7bf8f62d68cec19da195757062a1896dbecd5409b5dd9d94304aa999e7cd2 WHIRLPOOL 676306c7522ce4677892abb97d765fe686ed79ab623fad8e95510889ef63d87eb808d403d9a4c7a9609b2bb43b01c76f941d9d3d9b309633352fa87a0c67a0a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWS6uoACgkQCaWpQKGI+9TPtQCbB2TfYf0b/f1dUAWbfOuxoFXE
-5TEAnAn1uRZhz99Kqo2TqhMmmrZF1FKb
-=YkS1
+iEYEAREIAAYFAlWYML4ACgkQCaWpQKGI+9Re0wCfcT4JiK1dHrcaGSprNnGPwiM8
+/u4An36fv5ULNzUfk2EKR0agw9rs191G
+=rely
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
index 81a8a845c183..e35f63c9c546 100644
--- a/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
@@ -1,14 +1,14 @@
 # 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.4 2015/06/20 02:32:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild,v 1.1 2015/07/04 19:15:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 PYTHON_REQ_USE="xml"
 
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
+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/"
@@ -20,17 +20,24 @@ SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P
 
 LICENSE="GPL-2+"
 SLOT="0"
+
 # bluetooth support dropped due bug #511648
-IUSE="+l10n +networkmanager" #+bluetooth
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+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"
+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
-	>=dev-libs/gobject-introspection-0.10.1
+	>=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
@@ -39,7 +46,7 @@ COMMON_DEPEND="
 	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
 	gnome-extra/cinnamon-menus[introspection]
 	>=gnome-extra/cjs-2.4
-	>=media-libs/clutter-1.7.5:1.0[introspection]
+	>=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
@@ -48,7 +55,7 @@ COMMON_DEPEND="
 	net-libs/libsoup:2.4[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
 	x11-libs/pango[introspection]
 	>=x11-libs/startup-notification-0.11
 	x11-libs/libX11
@@ -90,15 +97,15 @@ RDEPEND="${COMMON_DEPEND}
 
 	x11-misc/xdg-utils
 
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
+	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_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${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
@@ -109,16 +116,16 @@ RDEPEND="${COMMON_DEPEND}
 
 	gnome-extra/polkit-gnome
 
-	l10n? ( >=gnome-extra/cinnamon-translations-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_USEDEP}]
+	dev-python/polib[python_targets_python2_7]
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40
@@ -131,7 +138,7 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/Cinnamon-${PV}"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python_setup
 }
 
 src_prepare() {
@@ -143,11 +150,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
 
 	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}"/${PN}-2.4.5-optional-networkmanager.patch
+	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.4.5-set-wheel.patch
+	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
 
 	# Fix GNOME 3.14 support (from Fedora/Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3577
@@ -179,7 +186,17 @@ src_prepare() {
 
 	epatch_user
 
-	python_fix_shebang .
+	# 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
@@ -238,15 +255,4 @@ pkg_postinst() {
 		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/files/background.patch b/gnome-extra/cinnamon/files/background.patch
deleted file mode 100644
index ccfdce4cf22c..000000000000
--- a/gnome-extra/cinnamon/files/background.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-@@ -334,10 +334,9 @@ class BackgroundWallpaperPane (Gtk.VBox)
-     
-     def update_icon_view(self):
-         pictures_list = []
--        if os.path.exists("/usr/share/cinnamon-background-properties"):
--            for i in os.listdir("/usr/share/cinnamon-background-properties"):
--                if i.endswith(".xml"):
--                    pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/cinnamon-background-properties", i))
-+        for i in os.listdir("/usr/share/gnome-background-properties"):
-+            if i.endswith(".xml"):
-+                    pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/gnome-background-properties", i))
-         
-         path = os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds")
-         if os.path.exists(path):
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch
deleted file mode 100644
index fefd9c539b40..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: cinnamon/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
-===================================================================
---- cinnamon.orig/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js	2014-04-27 11:56:10.582581808 +0200
-+++ cinnamon/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js	2014-07-14 00:44:37.882215797 +0200
-@@ -94,7 +94,11 @@
- 
-             // https://bugzilla.gnome.org/show_bug.cgi?id=655129
-             this._upClient = new UPowerGlib.Client();
--            this._upClient.connect('notify-resume', this._updateClockAndDate);
-+            try {
-+                this._upClient.connect('notify-resume', this._updateClockAndDate);
-+            } catch (e) {
-+                this._upClient.connect('notify::resume', this._updateClockAndDate);
-+            }
- 
-             // Start the clock
-             this.on_settings_changed();
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch
deleted file mode 100644
index e2a2d99eb220..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/data/theme/cinnamon.css
-+++ b/data/theme/cinnamon.css
-@@ -1445,7 +1445,8 @@
- .applet-icon:hover,
- .applet-box:hover > .applet-icon {
- 	color: #fff;
--	icon-shadow: white 0px 0px 3px;
-+/* Broken with GNOME 3.14 (icon-size is not honoured)
-+ *	icon-shadow: white 0px 0px 3px;*/
- }
- 
- /* ===================================================================
---- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
-@@ -91,7 +91,7 @@
-     
-     def _load_icon_themes(self):
-         dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
-+        valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-sbin-lspci.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-sbin-lspci.patch
deleted file mode 100644
index 5c9ea66a797f..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-sbin-lspci.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 973446912684a07204a8b9d40fe23a98f0235a97 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 30 Sep 2014 09:24:58 -0400
-Subject: [PATCH] cinnamon-settings: append /usr/sbin to PATH before calling
- lspci
-
-Some distros, e.g. Gentoo, install lspci in /usr/sbin
----
- files/usr/lib/cinnamon-settings/modules/cs_info.py | 5 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_info.py b/files/usr/lib/cinnamon-settings/modules/cs_info.py
-index aa5e4da..d50be27 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_info.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_info.py
-@@ -31,6 +31,8 @@ def getProcessOut(command):
- def getGraphicsInfos():
-     cards = {}
-     count = 0
-+    envpath = os.environ["PATH"]
-+    os.environ["PATH"] = envpath + ":/usr/local/sbin:/usr/sbin:/sbin"
-     for card in getProcessOut(("lspci")):
-         if not "VGA" in card:
-             continue
-@@ -43,6 +45,7 @@ def getGraphicsInfos():
-         if cardName:
-             cards[count] = (cardName)
-             count += 1
-+    os.environ["PATH"] = envpath
-     return cards
- 
- def getDiskSize():
--- 
-2.1.1
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch
deleted file mode 100644
index 81c6dc4b583f..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
- 
- class PasswordDialog(Gtk.Dialog):
- 
--    def __init__ (self, user, password_mask, group_mask):            
-+    def __init__ (self, user, password_mask):
-         super(PasswordDialog, self).__init__()
- 
-         self.user = user
-         self.password_mask = password_mask
--        self.group_mask = group_mask
- 
-         self.set_modal(True)
-         self.set_skip_taskbar_hint(True)
-@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
-     def change_password(self):        
-         newpass = self.new_password.get_text()
-         self.user.set_password(newpass, "")
--        os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
--        mask = self.group_mask.get_text()
--        mask = mask.split(", ")
--        mask.remove("nopasswdlogin")
--        mask = ", ".join(mask)
--        self.group_mask.set_text(mask)        
-         self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-         self.destroy()  
- 
-@@ -515,7 +508,7 @@ class Module:
-         model, treeiter = self.users_treeview.get_selection().get_selected()
-         if treeiter != None:
-             user = model[treeiter][INDEX_USER_OBJECT]       
--            dialog = PasswordDialog(user, self.password_mask, self.groups_label)                
-+            dialog = PasswordDialog(user, self.password_mask)                
-             response = dialog.run()
- 
-     def _on_groups_button_clicked(self, widget): 
-@@ -745,11 +738,11 @@ class Module:
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) 
-+                os.system("usermod %s -G %s,wheel" % (username, username)) 
-             else:
--                os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+                os.system("usermod %s -G %s" % (username, username))
-             self.load_groups()
-         dialog.destroy()
-          
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch
deleted file mode 100644
index aeed8deac007..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-optional-networkmanager.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 26fbdd602e60baded13e203fdc5c90c063a089e4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 10 May 2014 15:14:05 -0400
-Subject: [PATCH] Make networkmanager dependency optional for Gentoo
-
----
- configure.ac         | 36 ++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |  2 ++
- src/Makefile.am      |  5 ++++-
- 3 files changed, 40 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bc764e1..894379b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
-                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
- 			       libcanberra
--                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
--                               libnm-glib libnm-util gnome-keyring-1)
-+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-+
-+##########################
-+# Check for NetworkManager
-+##########################
-+NM_MIN_VERSION=0.9
-+AC_ARG_ENABLE(networkmanager,
-+              AS_HELP_STRING([--disable-networkmanager],
-+                             [disable NetworkManager support @<:@default=auto@:>@]),,
-+              [enable_networkmanager=auto])
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+                     [libnm-glib libnm-util gnome-keyring-1],
-+                     [have_networkmanager=yes],
-+                     [have_networkmanager=no])
-+
-+   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
-+   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
-+else
-+   have_networkmanager="no  (disabled)"
-+fi
-+
-+if test "x$have_networkmanager" = "xyes"; then
-+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+   if test "x$enable_networkmanager" = "xyes"; then
-+      AC_MSG_ERROR([Couldn't find NetworkManager.])
-+   fi
-+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
- 
- PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
- 
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 704989b..df7e014 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- const GJS_VERSION = '@GJS_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* The system TLS CA list */
- const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 06d7f93..fe12cb9 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -267,7 +267,10 @@ libcinnamon_la_LIBADD =		\
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
- 
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
-+if HAVE_NETWORKMANAGER
-+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
--- 
-1.9.2
-