Version bump for bug #440612; thanks to Anton Bolshakov et al. Drop old.

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

9 files changed, 67 insertions, 575 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index e116958cefef..ec5018c9da59 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.19 2012/11/07 21:53:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.20 2012/12/30 02:39:06 tetromino Exp $
+
+*cinnamon-1.6.7 (30 Dec 2012)
+
+  30 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch,
+  -files/cinnamon-1.3.1-optional-networkmanager.patch,
+  -cinnamon-1.4_p1-r1.ebuild,
+  -files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch,
+  -files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-2.patch,
+  -files/cinnamon-1.4-UP1-spin-buttons.patch,
+  -files/cinnamon-1.4-UP1-timedated.patch, +cinnamon-1.6.7.ebuild:
+  Version bump for bug #440612; thanks to Anton Bolshakov et al. Drop old.
 
   07 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -cinnamon-1.4.ebuild, -cinnamon-1.4_p1.ebuild, cinnamon-1.4_p1-r1.ebuild,
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 43826f8e3bdc..97013e15013a 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cinnamon-1.1.3-automagic-gnome-bluetooth.patch 1841 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 SHA512 43848dd5d04c3d3162d38f12c742d96b44061184ee946a502bf61952e17f11a57722163dcf59c1b78086c047dfc6d2c3046bd4c975fcf45ca565a2ed099802bd WHIRLPOOL 410f10e1bf87d90a33d193d726041e8cf5d66513a6ba31082bc57dbf9aefbb04c5ca3c1ba691ab60da99f2eb0319a3c55f2ecb205616779a113652fe838fc4b6
-AUX cinnamon-1.3.1-optional-networkmanager.patch 6649 SHA256 37bb34e61dbf4700d1a7ff92a47b1544a35edf3fc4eb5d863c295e2372613f01 SHA512 bdd89422fc63d1b89c8978aa2e7d9e1f83704fe1464340ec03a8c895fad8a86b3166acc4dc4f6ca4e45f773e1dc97c463b4f783e04a3d4d667d7be454088d5f4 WHIRLPOOL ad8ba167eaac8137eadfe327fc40d69374e2aa943b8e29da1f4abe56fdb7d70985eeec6ee4af1ed959d2e24cea069a9508216dea8e295868cbde91e50884348f
-AUX cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch 1659 SHA256 b150aee8e4fd7960f91163c2303ee9d384b42c1c0380b7ddff1be77ebcc8ad9a SHA512 2b4a75627253d700cde52749d28c7a79306b04ab0a9dd2f89fc33de21c58c39b16ae31a21476403b888151f8b3011539e799892f84776a4ad25c9b72fb5af00e WHIRLPOOL 9d557e9d8be485d936eaec35d28538b06edb424af368b5bc1c35b23a7aa8be47cac949eb12326ad4d02be016a6fb9adaccb3afa9bff2d40b089fbce53c34a4a7
-AUX cinnamon-1.4-UP1-gnome-bluetooth-3.4-2.patch 892 SHA256 484f10998ae07fa31bb81fd0f520d430bd9bca210a99ea7ca26fd828edb45db2 SHA512 dfb63801e47d13b00a70b8618649bd3a8a8152eb67c93923388f574542406e24a25e9afb7d6b27a28e16164059af474aba0155f6fc72a1d6f6833069b12fd57f WHIRLPOOL e1e46f63ffe6beff29c9ce13f00ecfe6a5f8edcccbf7c0d54291c5221124397cbd49017028b6ff7088a25281a8073fcd6ceaa28d28f3bcc3fb13ff259c510529
-AUX cinnamon-1.4-UP1-spin-buttons.patch 2590 SHA256 6f23d03048b43cce1392bb494b67ca329b5f78a3702c54d618f21cb23d508a30 SHA512 8b6a83bbc036320a0a20596864e6a8bf6a9a1564dd7e8ef2a00728a711f40f94d9d9b9f64256f4c39099dfe65cb5fedb0638afa985019331258272d1a81a308a WHIRLPOOL 922340bf9be2907337dd37dce92b6362e06d8c5808f4b5bedef03881941a02c9ff3a873d1eb1395348f6a69ebe595bdf3f53dd6a3efb47036c4bfaad244da9e7
-AUX cinnamon-1.4-UP1-timedated.patch 7154 SHA256 ecb9152ad75120a114cb4a1a89be3c876ef22c799a620c534434f82f65bf2b3f SHA512 423e1cdcaacc8e3070af4c69dd53d7090ffc39a9bc036ee83c7bc3a95896353b64a4746b47b1ffd7b207eec68b7b4113744dd0d5843fe713fe432b43f8fc3c62 WHIRLPOOL cbb69f1857b41a071edea1b704639966b348137e656ab92fc9ff48522e524adca470b469ad034ecc56a62c904f57702cff5913898a6b9ac608807e8e59dcac99
 AUX cinnamon-1.6.1-automagic-gnome-bluetooth.patch 1725 SHA256 788176a82802b45ebff7db3c8540dc4621c09f5e57f37ebeddc34771ca512847 SHA512 c2f7ae82074c98318026a651042bab40183339db4c4f9a48615487bec02a39398f19713af3ff7989632d3d415942ddfb7bb46c540ce73d7a74809d5b3625001d WHIRLPOOL 5ef7e830aff3df3dc0cda5abd0f37296c2b0ae35877fa911548eaa189d435b6ba1df66430a4b423f3a311b419ab8f72b146a330cf06b41ecf431867b4cd798ac
 AUX cinnamon-1.6.1-optional-networkmanager.patch 6418 SHA256 d5fc4f1be5a4b9f8c7e9a18c42a1179e111e8d28f01f8d8d4142d9a9fb44108a SHA512 863a2a7ada2dae38a474bc651094595bf9d0fb64a8523161605977bbfc7522946b93ecf73b4d73061e31390bc0df886e8f299dacbfdc4f076576c3e5c2094a5e WHIRLPOOL 151271653b2f6c30a1dafae93a790e4947581ec37ed8af3713dd4839e404b5b81c74d02267c8f8841c0fafdf5b8cde048cac74197ce5df843166b44e6a1e7999
-DIST cinnamon-1.4-UP1.tar.gz 2639484 SHA256 a684d479729879fe257704eb7466e2b194fb534d931adceb32679ced4cc51ef9 SHA512 56da20535fc73f36a4232001b8c499453b9a3692831f9c581e64526eda8feea74cfa84a67e98dc55b64fbd48b956b6039098b11180cbd78ef5621c93f0e53d23 WHIRLPOOL a4f55dc104ec1813a18647a736dd05f5029f590a6667903393b5dba66ca3b8f95f3e65a9e5a08cab4427bb4013ab6edd08f1c584df6c1705b12a03ea522809f0
 DIST cinnamon-1.6.1.tar.gz 2613322 SHA256 c43a6e3aac7aca14685ba7e7cbf815f047a2afe7d5e037a6dad69067ee4760ca SHA512 1fe8be36daf35025b7cfac8e9f27b93bd271384e0516fe19e3bb273b314984fbe39a2adb3f6ef4e421d0bb0bbe1043558a2285a70d4ee48c756aa6e77852f6d6 WHIRLPOOL bd1c700fef157933214f5dfe41d31ccf6e6c7746035bf12c166b364677fe0e88b145aa6f2d828f4524a57d60986e87532091803ff079f68b3b767e6c9173bbe8
-EBUILD cinnamon-1.4_p1-r1.ebuild 8556 SHA256 06d96bd9090a6afd94f1ce998303da7e6707b0b447ab6399bcc300ecabac2687 SHA512 70f961b5a452267af121392f5a270fdad6cd416bc08fceff49b958ec5d16a51ce91070f29fdc8b15e14c5cb50c9efe196e48b829f52050e631bb2299dd83e3a8 WHIRLPOOL ed4270a6c83bb5d8fc9f1117caee72ee21cf52a08476d3b756f586d037ad315f4bc1a1de26a0d60709645ddb96c18d6df165c7895677940219fca7503c3411dc
+DIST cinnamon-1.6.7.tar.gz 3748727 SHA256 283d8ec894831df5c062e88196c5f0191daa99b1da1cbfada1547a700f50ab24 SHA512 73a774af74ad9223f16cf5082f7507322471f9d329b402f9d5ebba28f5c620234a9e28ffcdd8810c0ca4944b2aa7e3b82e59c445f8d64c0a8c5cd7a036f5c633 WHIRLPOOL 424201aca9d40fd64e8327ade88e662d73ed7a8ba551406a705afd8d2a386321b48b9decae8c3b39939d638b0fcc08198f1ecc415d3d9af38d67fe638e9cce70
 EBUILD cinnamon-1.6.1.ebuild 8229 SHA256 0239f0474ff9b447a9d1fa239fac673bb26a406040da8c5ac9e92dbcfab5babb SHA512 d782d2189bc2c63f28430d0a469c02422b9ff4c50fce39a87f6ea0f648a8be0941fc6c05fee616836782392e59d4d6dd696321924e1dee57fda775638b313b8d WHIRLPOOL 753c070c62d62116b71dfe620613ef48eb8f2cc3b232b018fd4ea770dfbe68a884453610cdf1eb404653363cc40fdcb0cd7075aeadbe7a3da00abff24158d560
-MISC ChangeLog 4890 SHA256 3e246ba3d23fc0d187c54e8ef3393c8c0a7013164156df0428c0cc20252d50e0 SHA512 f3393acfd6b5e670b7e24eac8e03304d4c6e42373a052ae6cbcd37e5cc8b3e7d0d43974facb2c69a119debe91f1bdcb77faa3c0a69cf2b81ee3c89df1622751a WHIRLPOOL 407f7d7b5cb3b98fb59e68bf64a823a3321a2d7133a5e248082df6c7d846106d2f48ae7d30f1def117c01cbdc5fa317f2796cd3a0d50231206ac392c400a5895
+EBUILD cinnamon-1.6.7.ebuild 8119 SHA256 bed168a371653d00e3401fe409c195edb9afd0b95d6e3cf6444ba4daf84aa426 SHA512 81e4b8080cd9dc816abd3a36a742f3b3124e84937712dab5023ab9c1b4d950e814b93b5fdb1a826ef0520b5e904d41f868945868c534710442f5d2986e5f46a9 WHIRLPOOL f6822a0f2dc956cb4e0f9cf5946acecb65702322dddb096acf9548147a517e9d06ecaf4fc4ce970b734f16a33af7dfd4c637ecc32c413c925002edd3bcb5de3a
+MISC ChangeLog 5421 SHA256 dcf9e4e56148bf4fedd419b38e336714026a102706b342e2e821432032799e2e SHA512 1c6abd2efe003c6367bb536e35aca6513ef55598af1d453210ae4c1d3a771bfae45d683993d086980355561861c79c33ab0ad1945980fc95e489335960b36f80 WHIRLPOOL 03363290f1e617741aafaa4b63094e9d7c22b80965f7d8591be94e0781ef31fe8733509b94f883e0f2226eeb44bd7e15ce662ab8125560187bdadf96e641eeb3
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQmthlAAoJEJ0WA1zPCt1hTeEIAI2wigy6AbqTXzMH/UwzaJ5E
-JBElP9fGkF6+bNqUDBHRslcF2U6KArUK4jnR9SkxThTt2VOD/2bpuXZUq67rghBO
-SibTd69lsLjjzMF0GW11b1VtcRIoxNAlFrGSbYsCxDak+tLs7g6sR9MYj6+UdFbH
-VKL/JVEdIeXQf4XeNZ2JbIrtjSEHAywTMbizn1HS6MRrr9CK4XZfSSYZ5NfrW2w5
-OundBJRM3IQwThUpZGChzmuFyT+uoA2SoGNkrto1bck2gV2YTKH6OjlUZgDPjf/k
-tsU6IyVh8wasGhXFTg7cq/YZqMsyKUWOdI3ZZBBTS0RKlSYbGTjdBDe8DXjpaB8=
-=1NTV
+iQEcBAEBCAAGBQJQ36lLAAoJEJ0WA1zPCt1huW4IALQABFTqS7HdNqsiWIQ3TOLn
+o4iJ+FDdKReF+RFLNssU41zUMbeCoXYGCL+78QZCHa3dLWCRiVmJd/2PaaBF7gOY
+2fuJL8/XfhpdsvegNXTWfl9oz9RpaylIkmtSPej5aE0Ob5zURndZDT1kXBrvUCKD
+tjgPlZwEGQ2rIQeupCZmfkS0+0YgHXA+FfxfXP9z3aFmw3oNb0ZRVgki+6p3BQk3
+qK0/n0a0WeMJYZf6GA0WITnZMUa8VbkMDA/65gSLfSJ5XFvQ60RnBOH93kCn5wUV
+lKLBlmG5zNEcu6W2XeFAqX78gUelIqP9BXMcUBuu94P1mIYr98ILiYTZkfE7xqQ=
+=EIB2
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7.ebuild
index 9aca0e504f68..6a44c7204c5f 100644
--- a/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.6.7.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild,v 1.3 2012/11/07 21:53:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7.ebuild,v 1.1 2012/12/30 02:39:06 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
 
-inherit autotools eutils gnome2 multilib pax-utils python
+inherit autotools eutils gnome2 multilib pax-utils python-single-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -18,7 +18,7 @@ MY_P="${PN}-${MY_PV}"
 
 SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${MY_PV} -> ${MY_P}.tar.gz"
 
-LICENSE="GPL-2+ LGPL-2+"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+bluetooth +networkmanager"
 KEYWORDS="~amd64 ~x86"
@@ -34,19 +34,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=x11-libs/gtk+-3.0.0:3[introspection]
 	>=media-libs/clutter-1.7.5:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
 	app-misc/ca-certificates
-	>=dev-libs/folks-0.5.2
 	>=dev-libs/json-glib-0.13.2
-	>=gnome-base/gnome-desktop-2.91.2:3[introspection]
+	>=gnome-base/gnome-desktop-2.91.2:3=[introspection]
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-extra/evolution-data-server-2.91.6
 	>=media-libs/gstreamer-0.10.16:0.10
 	>=media-libs/gst-plugins-base-0.10.16:0.10
-	>=net-im/telepathy-logger-0.2.4[introspection]
 	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.5[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/muffin-1.0.2[introspection]
+	>=x11-wm/muffin-1.0.5[introspection]
 
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
@@ -64,7 +61,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 	>=x11-libs/libXfixes-5.0
 	x11-apps/mesa-progs
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	${PYTHON_DEPS}
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.4:=[introspection] )
 	networkmanager? (
 		gnome-base/libgnome-keyring
 		>=net-misc/networkmanager-0.8.999[introspection] )"
@@ -77,10 +76,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 #    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 needed for cinnamon-settings
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
 # 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygtk and gnome-menus:0 needed for menu editor
-# 11. timedated or DateTimeMechanism implementation for cinnamon-settings
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. timedated or DateTimeMechanism implementation for cinnamon-settings
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
@@ -97,13 +97,16 @@ RDEPEND="${COMMON_DEPEND}
 
 	x11-misc/xdg-utils
 
-	dev-python/dbus-python
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/gconf-python:2
+	dev-python/imaging
+	dev-python/lxml
 
 	x11-themes/gnome-icon-theme-symbolic
 
-	dev-python/pygtk
-	gnome-base/gnome-menus:0[python]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+	gnome-extra/nemo
 
 	|| (
 		app-admin/openrc-settingsd
@@ -122,38 +125,18 @@ DEPEND="${COMMON_DEPEND}
 # 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}/linuxmint-Cinnamon-af1653f"
+S="${WORKDIR}/linuxmint-Cinnamon-5ab432d"
 
 pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		$(use_enable networkmanager)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
+	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-1.3.1-optional-networkmanager.patch"
-
-	# Fix building with gnome-bluetooth-3.4
-	epatch "${FILESDIR}/${MY_P}-gnome-bluetooth-3.4-"{1,2}.patch
-
-	# cinnamon-settings spin button fix, in UP2
-	epatch "${FILESDIR}/${MY_P}-spin-buttons.patch"
-
-	# https://github.com/linuxmint/Cinnamon/issues/515, bug #434494
-	epatch "${FILESDIR}/${MY_P}-timedated.patch"
+	epatch "${FILESDIR}/${PN}-1.6.1-optional-networkmanager.patch"
 
 	# Gentoo uses /usr/libexec
 	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
@@ -165,8 +148,8 @@ src_prepare() {
 		-i files/usr/bin/cinnamon-menu-editor \
 		-i files/usr/bin/cinnamon-settings \
 		-i files/usr/lib/cinnamon-menu-editor/Alacarte/config.py \
-		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
-		-i files/generate_desktop_files || die "sed 2 failed"
+		-i files/usr/lib/cinnamon-menu-editor/Alacarte/MainWindow.py \
+		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py || die "sed 2 failed"
 	if [[ "$(get_libdir)" != lib ]]; then
 		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
 	fi
@@ -188,12 +171,24 @@ src_prepare() {
 		-i src/Makefile.in browser-plugin/Makefile.in || die "sed 3 failed"
 }
 
+src_configure() {
+	# Don't error out on warnings
+	gnome2_src_configure \
+		--enable-compile-warnings=maximum \
+		--disable-schemas-compile \
+		--disable-jhbuild-wrapper-script \
+		$(use_with bluetooth) \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
 src_install() {
 	gnome2_src_install
-	python_convert_shebangs 2 "${ED}usr/bin/cinnamon-extension-tool" \
-		"${ED}usr/bin/cinnamon-menu-editor" \
-		"${ED}usr/bin/cinnamon-settings" \
-		"${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py"
+	python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{settings,menu-editor}
+	# Fix broken shebangs
+	sed -e "s%#!.*python%#!$(python_get_PYTHON)%" \
+		-i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} || die
 
 	# Required for gnome-shell on hardened/PaX, bug #398941
 	pax-mark mr "${ED}usr/bin/cinnamon"
@@ -201,7 +196,6 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings}
 
 	if ! has_version '>=media-libs/gst-plugins-good-0.10.23:0.10' || \
 	   ! has_version 'media-plugins/gst-plugins-vp8:0.10'; then
@@ -241,8 +235,3 @@ pkg_postinst() {
 		fi
 	fi
 }
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings}
-}
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch
deleted file mode 100644
index ae23a6c8f6d6..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.1.3-automagic-gnome-bluetooth.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001
-From: root <admin@catmur.co.uk>
-Date: Sun, 8 Jan 2012 13:55:05 +0000
-Subject: [PATCH] Fix automagic gnome-bluetooth dependency
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1c64122..a699838 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
- PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
- 
- AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
- 	 AC_SUBST([HAVE_BLUETOOTH],[0])
- 	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
- AC_SUBST(CALENDAR_SERVER_CFLAGS)
--- 
-1.7.8.2
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch
deleted file mode 100644
index 6e2d431d1542..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.3.1-optional-networkmanager.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From aebde5fad2f477f40b62c96118128011bd821be0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 25 Jan 2012 01:58:07 -0500
-Subject: [PATCH] Make NM optional
-
-Derived from a patch for gnome-shell by Michael Biebl <biebl@debian.org>
-(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29)
----
- configure.ac         |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
- js/misc/config.js.in |    2 ++
- js/ui/main.js        |    7 +++++--
- src/Makefile.am      |   13 ++++++++-----
- 4 files changed, 61 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 49b5401..508a8cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,8 +94,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- 			       libcanberra
-                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
--                               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)
- 
-@@ -250,3 +282,15 @@ AC_CONFIG_FILES([
-   files/Makefile
- ])
- AC_OUTPUT
-+
-+echo "
-+Build configuration:
-+
-+	Prefix:                                 ${prefix}
-+	Source code location:                   ${srcdir}
-+	Compiler:                               ${CC}
-+	Compiler Warnings:                      $enable_compile_warnings
-+
-+	Support for NetworkManager:             $have_networkmanager
-+	Support for GStreamer recording:        $build_recorder
-+"
-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/js/ui/main.js b/js/ui/main.js
-index ae15997..803e6f4 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -14,6 +14,7 @@ const St = imports.gi.St;
- 
- const AutomountManager = imports.ui.automountManager;
- const AutorunManager = imports.ui.autorunManager;
-+const Config = imports.misc.config;
- const EndSessionDialog = imports.ui.endSessionDialog;
- const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
- const Environment = imports.ui.environment;
-@@ -27,7 +28,7 @@ const PlacesManager = imports.ui.placesManager;
- const RunDialog = imports.ui.runDialog;
- const Layout = imports.ui.layout;
- const LookingGlass = imports.ui.lookingGlass;
--const NetworkAgent = imports.ui.networkAgent;
-+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
- const NotificationDaemon = imports.ui.notificationDaemon;
- const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
-@@ -88,7 +89,9 @@ function _createUserSession() {
-     placesManager = new PlacesManager.PlacesManager();    
-     automountManager = new AutomountManager.AutomountManager();
-     autorunManager = new AutorunManager.AutorunManager();
--    networkAgent = new NetworkAgent.NetworkAgent();
-+    if (Config.HAVE_NETWORKMANAGER) {
-+        networkAgent = new NetworkAgent.NetworkAgent();
-+    }
- }
- 
- function _createGDMSession() {
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 182bf17..54770e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -108,9 +108,7 @@ cinnamon_public_headers_h =		\
- 	cinnamon-generic-container.h	\
- 	cinnamon-gtk-embed.h		\
- 	cinnamon-global.h			\
--	cinnamon-mobile-providers.h	\
- 	cinnamon-mount-operation.h		\
--	cinnamon-network-agent.h		\
- 	cinnamon-perf-log.h		\
- 	cinnamon-slicer.h			\
- 	cinnamon-stack.h			\
-@@ -145,9 +143,7 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-generic-container.c	\
- 	cinnamon-gtk-embed.c		\
- 	cinnamon-global.c			\
--	cinnamon-mobile-providers.c	\
- 	cinnamon-mount-operation.c		\
--	cinnamon-network-agent.c		\
- 	cinnamon-perf-log.c		\
- 	cinnamon-polkit-authentication-agent.h	\
- 	cinnamon-polkit-authentication-agent.c	\
-@@ -161,6 +157,10 @@ libcinnamon_la_SOURCES =		\
- 	cinnamon-wm.c			\
- 	cinnamon-xfixes-cursor.c
- 
-+if HAVE_NETWORKMANAGER
-+libcinnamon_la_SOURCES += cinnamon-mobile-providers.h cinnamon-mobile-providers.c cinnamon-network-agent.h cinnamon-network-agent.c
-+endif
-+
- libcinnamon_la_gir_sources = \
- 	$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES))
- 
-@@ -272,7 +272,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-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
-+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.7.8.4
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch b/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch
deleted file mode 100644
index a40cf8218d79..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f4eaadb948a4b2011647d812f99521199bcde5ea Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 3 Nov 2011 18:26:03 -0400
-Subject: [PATCH] Pass bluetooth directory to g-ir-scanner
-
-Rather than relying on the .la file that jhbuild deletes, we
-explicitly tell g-ir-scanner to look in this subdirectory.
----
- configure.ac    | 1 +
- src/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f0ce5e3..a0fc338 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,6 +133,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
- 	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
-+	 AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
- 	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
- 	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
- 	 AC_SUBST([HAVE_BLUETOOTH],[1])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1cfea99..9cdfc89 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -275,7 +275,7 @@ 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)
- Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
--	--add-include-path=$(MUFFIN_GIR_DIR)
-+	--add-include-path=$(MUFFIN_GIR_DIR) -L $(BLUETOOTH_DIR)
- INTROSPECTION_GIRS += Cinnamon-0.1.gir
- CLEANFILES += Cinnamon-0.1.gir
- 
--- 
-1.7.12
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-2.patch b/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-2.patch
deleted file mode 100644
index 2c36ca86207f..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-gnome-bluetooth-3.4-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 618a53b34fb9d80cb0cb51d51b844fe19ffa2911 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 3 Nov 2011 21:27:50 -0400
-Subject: [PATCH] build: Fix when bluetooth is disabled
-
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9cdfc89..375ff91 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -275,7 +275,7 @@ 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)
- Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
--	--add-include-path=$(MUFFIN_GIR_DIR) -L $(BLUETOOTH_DIR)
-+	--add-include-path=$(MUFFIN_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
- INTROSPECTION_GIRS += Cinnamon-0.1.gir
- CLEANFILES += Cinnamon-0.1.gir
- 
--- 
-1.7.12
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-spin-buttons.patch b/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-spin-buttons.patch
deleted file mode 100644
index 321bfbbd9581..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-spin-buttons.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 2a099e8be78db1c7fd0617daf54190ba65b84619 Mon Sep 17 00:00:00 2001
-From: Clement Lefebvre <clement.lefebvre@linuxmint.com>
-Date: Fri, 18 May 2012 18:33:14 +0100
-Subject: [PATCH] Fix a regression in GTK3's SpinButtons (non-editable now
- means non-changeable at all now.. eventually we'll need to
- port Cinnamon-settings to GTK2)
-
----
- debian/changelog                                     |  6 ++++++
- files/usr/lib/cinnamon-settings/cinnamon-settings.py | 12 ++++++------
- 2 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/debian/changelog b/debian/changelog
-index 726780c..5914cd4 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,9 @@
-+cinnamon (1.4-UP1) maya; urgency=low
-+
-+  * 1.4 UP1
-+
-+ -- Clement Lefebvre <root@linuxmint.com>  Sun, 13 May 2012 23:43:22 +0100
-+
- cinnamon (1.4.0) lisa; urgency=low
- 
-   * New Cinnamon release
-diff --git a/files/usr/lib/cinnamon-settings/cinnamon-settings.py b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-index 7310ec9..fa1e212 100755
---- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-+++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-@@ -537,7 +537,7 @@ class GSettingsSpinButton(Gtk.HBox):
-         
-         self.content_widget.set_range(min, max)
-         self.content_widget.set_increments(step, page)
--        self.content_widget.set_editable(False)
-+        #self.content_widget.set_editable(False)
-         
-         self.settings = Gio.Settings.new(schema)        
-         self.content_widget.set_value(self.settings.get_int(self.key))
-@@ -687,7 +687,7 @@ class GSettingsRangeSpin(Gtk.HBox):
- 
-         self.content_widget.set_range(_min, _max)
-         self.content_widget.set_increments(_increment, _increment)
--        self.content_widget.set_editable(False)
-+        #self.content_widget.set_editable(False)
-         self.content_widget.set_digits(1)
-         self.content_widget.set_value(self.settings.get_double(self.key))
- 
-@@ -862,10 +862,10 @@ class ChangeTimeWidget(Gtk.HBox):
-         self.minSpin.configure(minAdj, 0.5, 0)
-         self.yearSpin.configure(yearAdj, 0.5, 0)
-         self.daySpin.configure(dayAdj, 0.5, 0)
--        self.hourSpin.set_editable(False)
--        self.minSpin.set_editable(False)
--        self.yearSpin.set_editable(False)
--        self.daySpin.set_editable(False)
-+        #self.hourSpin.set_editable(False)
-+        #self.minSpin.set_editable(False)
-+        #self.yearSpin.set_editable(False)
-+        #self.daySpin.set_editable(False)
-         
-         self.update_time()
-         GObject.timeout_add(1000, self.update_time)
--- 
-1.7.12
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-timedated.patch b/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-timedated.patch
deleted file mode 100644
index e26080a8d0ce..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.4-UP1-timedated.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 4c9d4bddcbec9cf0e4cd866f70a498f321880693 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 11 Sep 2012 02:50:34 -0400
-Subject: [PATCH] Add a wrapper to switch between timedated and g-s-d's
- DateTimeMechanism
-
-Upstream gnome-settings-daemon-3.4 and higher no longer implements
-org.gnome.SettingsDaemon.DateTimeMechanism. In some distros (e.g.
-Debian) this change had been reverted, and the old interface for now
-remains available. Other distros agree with the upstream decision and
-have switched to the new timedated interface as implemented by systemd
-and openrc-settingsd.
-
-This patch adds a simple wrapper around the two interfaces, allowing
-cinnamon-settings to support both. If the timedated interface is not
-available, the traditional g-s-d DateTimeMechanism is used.
-
-Fixes https://github.com/linuxmint/Cinnamon/issues/515
----
- .../usr/lib/cinnamon-settings/cinnamon-settings.py | 72 +++++++++++++++++++---
- 1 file changed, 62 insertions(+), 10 deletions(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/cinnamon-settings.py b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-index fa1e212..fbcfef2 100755
---- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-+++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-@@ -28,7 +28,51 @@ gettext.install("cinnamon", "/usr/share/cinnamon/locale")
- menuName = _("Desktop Settings")
- menuGenericName = _("Desktop Configuration Tool")
- menuComment = _("Fine-tune desktop settings")
--                                  
-+
-+# wrapper for timedated or gnome-settings-daemon's DateTimeMechanism
-+class DateTimeWrapper:
-+    def __init__(self):
-+        try:
-+            proxy = dbus.SystemBus().get_object("org.freedesktop.timedate1", "/org/freedesktop/timedate1")
-+            self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.freedesktop.timedate1")
-+            self.properties_iface = dbus.Interface(proxy, dbus_interface=dbus.PROPERTIES_IFACE)
-+            self.timedated = True
-+        except dbus.exceptions.DBusException:
-+            proxy = dbus.SystemBus().get_object("org.gnome.SettingsDaemon.DateTimeMechanism", "/")
-+            self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.gnome.SettingsDaemon.DateTimeMechanism")
-+            self.timedated = False
-+
-+    def set_time(self, seconds_since_epoch):
-+        if self.timedated:
-+            # timedated expects microseconds
-+            return self.dbus_iface.SetTime(seconds_since_epoch * 1000000, False, True)
-+        else:
-+            return self.dbus_iface.SetTime(seconds_since_epoch)
-+
-+    def get_timezone(self):
-+        if self.timedated:
-+            return self.properties_iface.Get("org.freedesktop.timedate1", "Timezone")
-+        else:
-+            return self.dbus_iface.GetTimezone()
-+
-+    def set_timezone(self, tz):
-+        if self.timedated:
-+            return self.dbus_iface.SetTimezone(tz, True)
-+        else:
-+            return self.dbus_iface.SetTimezone(tz)
-+
-+    def get_using_ntp(self):
-+        if self.timedated:
-+            return self.properties_iface.Get("org.freedesktop.timedate1", "NTP")
-+        else:
-+            return self.dbus_iface.GetUsingNtp()
-+
-+    def set_using_ntp(self, usingNtp):
-+        if self.timedated:
-+            return self.dbus_iface.SetNTP(usingNtp, True)
-+        else:
-+            return self.dbus_iface.SetUsingNtp(usingNtp)
-+
- class SidePage:
-     def __init__(self, name, icon, content_box):        
-         self.name = name
-@@ -521,7 +565,17 @@ class DBusCheckButton(Gtk.CheckButton):
-         
-     def on_my_value_changed(self, widget):
-         getattr(self.dbus_iface, self.dbus_set_method)(self.get_active())
--        
-+
-+class NtpCheckButton(Gtk.CheckButton):
-+    def __init__(self, label):
-+        super(NtpCheckButton, self).__init__(label)
-+        self.date_time_wrapper = DateTimeWrapper()
-+        self.set_active(self.date_time_wrapper.get_using_ntp())
-+        self.connect('toggled', self.on_my_value_changed)
-+
-+    def on_my_value_changed(self, widget):
-+        self.date_time_wrapper.set_using_ntp(self.get_active())
-+
- class GSettingsSpinButton(Gtk.HBox):    
-     def __init__(self, label, schema, key, min, max, step, page, units):        
-         self.key = key
-@@ -742,8 +796,7 @@ class TimeZoneSelectorWidget(Gtk.HBox):
-     def __init__(self):
-         super(TimeZoneSelectorWidget, self).__init__()
-         
--        proxy = dbus.SystemBus().get_object("org.gnome.SettingsDaemon.DateTimeMechanism", "/")
--        self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.gnome.SettingsDaemon.DateTimeMechanism")
-+        self.date_time_wrapper = DateTimeWrapper()
-         
-         self.timezones = tz.load_db()
-         
-@@ -789,7 +842,7 @@ class TimeZoneSelectorWidget(Gtk.HBox):
-         tree_iter = widget.get_active_iter()
-         if tree_iter != None:
-             self.selected_city = self.city_model[tree_iter][0]
--            self.dbus_iface.SetTimezone(self.selected_region+"/"+self.selected_city)
-+            self.date_time_wrapper.set_timezone(self.selected_region+"/"+self.selected_city)
-     def on_region_changed(self, widget):
-         tree_iter = widget.get_active_iter()
-         if tree_iter != None:            
-@@ -810,7 +863,7 @@ class TimeZoneSelectorWidget(Gtk.HBox):
-             if selected_city_iter is not None:
-                 self.city_widget.set_active_iter(selected_city_iter)
-     def get_selected_zone(self):
--        tz = self.dbus_iface.GetTimezone()
-+        tz = self.date_time_wrapper.get_timezone()
-         if "/" in tz:
-             i = tz.index("/")
-             region = tz[:i]
-@@ -822,8 +875,7 @@ class TimeZoneSelectorWidget(Gtk.HBox):
- class ChangeTimeWidget(Gtk.HBox):
-     def __init__(self):
-         super(ChangeTimeWidget, self).__init__()
--        proxy = dbus.SystemBus().get_object("org.gnome.SettingsDaemon.DateTimeMechanism", "/")
--        self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.gnome.SettingsDaemon.DateTimeMechanism")
-+        self.date_time_wrapper = DateTimeWrapper()
-         
-         # Ensures we are setting the system time only when the user changes it
-         self.changedOnTimeout = False
-@@ -949,7 +1001,7 @@ class ChangeTimeWidget(Gtk.HBox):
-             self._time_to_set = None
-             self._setting_time_lock.release()
-             
--            self.dbus_iface.SetTime(time_to_set)
-+            self.date_time_wrapper.set_time(time_to_set)
-             
-             # Check whether another request to set the time was done since this thread started
-             self._setting_time_lock.acquire()
-@@ -1129,7 +1181,7 @@ class MainWindow:
-         sidePage.add_widget(Gtk.LinkButton.new_with_label("http://www.foragoodstrftime.com/", _("Generate your own date formats")))
-         self.ntpCheckButton = None 
-         try:
--            self.ntpCheckButton = DBusCheckButton(_("Use network time"), "org.gnome.SettingsDaemon.DateTimeMechanism", "/", "GetUsingNtp", "SetUsingNtp")
-+            self.ntpCheckButton = NtpCheckButton(_("Use network time"))
-             sidePage.add_widget(self.ntpCheckButton)
-         except:
-             pass
--- 
-1.7.12
-