Version bump to the stable 1.6 series (bug #435828, thanks to Anton Bolshakov). Lots of new features - nameable workspaces, new and improved applets, and a new file manager. See http://cinnamon.linuxmint.com/?p=207 and http://cinnamon.linuxmint.com/?p=216 for the release notes.

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

8 files changed, 487 insertions, 18 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index a4bf3eb72ef3..8dbe495a83d2 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,17 @@
 # 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.16 2012/09/11 08:27:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.17 2012/09/28 08:13:29 tetromino Exp $
+
+*cinnamon-1.6.1 (28 Sep 2012)
+
+  28 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cinnamon-1.4.ebuild,
+  cinnamon-1.4_p1.ebuild, cinnamon-1.4_p1-r1.ebuild, +cinnamon-1.6.1.ebuild,
+  +files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch,
+  +files/cinnamon-1.6.1-optional-networkmanager.patch:
+  Version bump to the stable 1.6 series (bug #435828, thanks to Anton
+  Bolshakov). Lots of new features - nameable workspaces, new and improved
+  applets, and a new file manager. See http://cinnamon.linuxmint.com/?p=207 and
+  http://cinnamon.linuxmint.com/?p=216 for the release notes.
 
 *cinnamon-1.4_p1-r1 (11 Sep 2012)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index dfdd7879d024..ecf71963a4f9 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -7,21 +7,25 @@ AUX cinnamon-1.4-UP1-gnome-bluetooth-3.4-1.patch 1659 SHA256 b150aee8e4fd7960f91
 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.4.tar.gz 2639153 SHA256 26fa922bfd73d3b8f4c954e6b79b97450bd6be4875680acafd823814bfd6d20f SHA512 a8f7efe5d903316975e7205806b0e49c152c78b508ca591e0341987e1cfe5bedd1d0d3dcded4972d019b41899a41e95e0d8510977c34a579c02ae7ad69b15f9b WHIRLPOOL 480578fe0d6bc6a178744ee6df837f96e368ce78e86001c934aeeeec348cd99b0417efe538d19c79fe8360cda1924b0842c3bbd1c039e16ac22d3143d3cd2343
-EBUILD cinnamon-1.4.ebuild 7986 SHA256 54dfecf342233b6dc369ba29631951a72811cba9cba1d6623617886d5f10bc55 SHA512 7bf5c6370059509b8598261c2f4e1757ee23eba0a6e99e693363a05e30c403f03af21b19aacc975b7460799eb4802a18254cf04b9ca31552385d308ece230090 WHIRLPOOL 2a4bd8bcc8ae9b54e3e9de8d5154cbbb084875d8a3ad9eaad53df804b75ce10e1f385a9acdc2f9de2025b3cd665599c0f077c66bb96bc67a689786f75207edba
-EBUILD cinnamon-1.4_p1-r1.ebuild 8531 SHA256 c0be1fc4b443fe6e498b047cecfd48e4f2609519dcb53abafb29e6bf64929988 SHA512 1fe611e7b6e8aabb465d2fa10e0ed2357a0be3bb348e6d3c6d23af365ff88bc0fdbd63e8b9a6ae5b7516e6d1dae5236a681e461df9068b88056d13b252d72f18 WHIRLPOOL ceb49e3df3dda6f8bd1d0a12746955bc12f97c3a059b46b3e745c551ec75581cdcf18dec6d1dd7beba1e90d2f68258acb2115537f8f6096c22cf424dcff70677
-EBUILD cinnamon-1.4_p1.ebuild 8143 SHA256 cf19ae3730236a6651b3b73d3532330a419e0121a694104c4ebc87ed75275d88 SHA512 375152441946574e60644811852fbed61f5a8bc894a652815d37aadd453d5265716909c213d5a8b02197b03292c447fdbb92dfda6ff62d85383be0443e664240 WHIRLPOOL 6985edc276d02128cac48cf684ab7d9089b7cf5095fbaf3f8e353d0af03c53a1b020ee7d6663e1527667f9e9e4b8d9745345ebcfe07c1a317490e921c5bd642c
-MISC ChangeLog 3904 SHA256 742d64a2657462174729ee5dd957987fd36d572d29b2add7a7211e851f24e952 SHA512 957caa43a45b9a989865d628e1aaffebce0f4f6dbe028cf433b97cd0ac08326f9516da346149f0ce491cc9ffa44686ddd8384a07860ac44bbe5f63ea6ed32a1a WHIRLPOOL 45caeb234e3a348a73c08c4bd39d5bbe2097f0e65910921235772f8ee80fd63e1571e59ada3e1ec3b72aad3b2112bff216510b6c9087abef1638cb8c8c1b35ca
+DIST cinnamon-1.6.1.tar.gz 2613322 SHA256 c43a6e3aac7aca14685ba7e7cbf815f047a2afe7d5e037a6dad69067ee4760ca SHA512 1fe8be36daf35025b7cfac8e9f27b93bd271384e0516fe19e3bb273b314984fbe39a2adb3f6ef4e421d0bb0bbe1043558a2285a70d4ee48c756aa6e77852f6d6 WHIRLPOOL bd1c700fef157933214f5dfe41d31ccf6e6c7746035bf12c166b364677fe0e88b145aa6f2d828f4524a57d60986e87532091803ff079f68b3b767e6c9173bbe8
+EBUILD cinnamon-1.4.ebuild 7987 SHA256 86b52c4d39192add47c2311efce78167540bf38625eb582f9205a3845c687122 SHA512 587e439b09fda119a7e98d5d0077985d20748f68208c5dca7a4f508b1c05d1f326bd90cc7a9d1083ec99a279be9df51207e35ce820d1cd74eb0a541da5e4032e WHIRLPOOL 8894b8a87752d2176c5b5ff11e2aa9228b993c4b5c8e3e55fae368d4e9fe1fb7883e40a6e48cccb2651ee5d80e5d4d2e2077979c01f22bdfd7924a2bd2fa050c
+EBUILD cinnamon-1.4_p1-r1.ebuild 8532 SHA256 e44f7435aa6523ebe3a674e05caa4bedc6bac767e7fc35a692067d184542b7a9 SHA512 2b06e6a9d83a6180f5547515f14d853149750169957d369927e266975ce5cd69ac8b05a71b5096085f912a439b3f50eb4bd83f769ea29b6c5071f593f94a0148 WHIRLPOOL c304e68cd6ba01a475ee2619afe55630fc0cf094c20548ab0f94a0d616fbe79b9d5dac96b01b1f6d4196229ebb3dc9a50ff08d4e100360fee7a3ed113eaded63
+EBUILD cinnamon-1.4_p1.ebuild 8144 SHA256 5e8b56d90c84d53b79613daf5510427e5ec3a3d76b9f1c52ffd4b057d866ae31 SHA512 0bd3cf6e655eec3e25b42380169b55a8d7fa9cdcb4bf58ca66cabf6c56e449f312e6fde3f02daedc63268ca49a442cfa95204238243fe8a5cf0b941ed9e52864 WHIRLPOOL ca8324cc5b66755c53079a4df6fa24bedabef07631a4de2a6e147566baaa5dfed3d7215dd87c2b72f6c333721e0eae531a4b83629bedae9f91a247a01d90bd9c
+EBUILD cinnamon-1.6.1.ebuild 8181 SHA256 0b2731d46374bdd5d3b7901560c469c604cb6479d557ce4dbba640b5d96a307d SHA512 02e54325ad094695d38a2aaf6c10ac8e85d0d9d8ec0aa7a4a4054135a40e8e73bf6ad4a0b5ca7c5adb7af0986f4b314d3b22e36b1657ce3b4fd840dac6090891 WHIRLPOOL 57a4c5f92d935b91f92a1f9de98a92485e2a0b9b7eea3ad079d07af7c265e800b68202eb1d3916d93503951e6f43d62578ca2651d3772866fd4733d8f81a1365
+MISC ChangeLog 4492 SHA256 e2c22abdbfb4dfa6a9a643ed2bdf1c5d4923d540bb09932c40ded7229fc34120 SHA512 6d8062fa073e8465f08a8d9347f175e3e87a6688a4e7dfa470646dc1c22e06711146f2b6a06083b45e84eb5087775695087ba6701e81946ad350dbba70644e0d WHIRLPOOL cbef6ebf6485a55493f450af764b4871c1d02f7fb3e48fc7c243f60e3f500d5c6a97207ccd8b541936049ec996ba88d7eeab358b58b05550a14baefd0958d34d
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQTvYSAAoJEJ0WA1zPCt1h5Q8IALq+bBqnrXiedj8jjGdnibzr
-yqDTIb/W1v4rgqCFVVqRCWo07Wcb5A6/XavCKQiMlHiKIeThs+UGlRr62jnZ1Zaj
-PkzYfeGevJ50RFCAbXTR7rWHaZKqVgowOjTMRjXFlxd+zSXaZZjUP0mHKfp6Kgso
-7Y+iSSvwN+YFvouGTFMmab9jzRKdWxrxLwXAN6JBBQd7Von/NjqD8vvUuIShtm4l
-0HHQbsW2pGHHHKE8qWEHfPLdpHnAYDAheLrpb07bSWZiKkptpQ60NGtqVD4XvDxe
-d2zH8iZFsHpCejIGmyJNEEXCfJqWp8x7eRvmhnkW8qOqd63Bfkdtnfy7p8hjxD0=
-=jzFr
+iQEcBAEBCAAGBQJQZVwwAAoJEJ0WA1zPCt1hHIkH/i+Yg/TXih9Qnv+4Gtl+Hd+B
+UOp4xmCySpRmKSUtz8C2ujhNQfDR8/D1tiXJOjyVzA3/IPgME3947M0VsNn4pzKl
+/YsZ9m6Up+XUNG48+v2JgOfejiZVaeDpnBqLnHxM9cJZPeb1j7/Vf8EW4ONGTA3c
+hcf8Kyro0pph6PVSOM8aW7P57qDM7XuxZp9d4DWLeu2MYTMjJpWx2rfbzLnVFZx8
+edCaWEDHOtIzjfjohyqC91DoiMj8ZaQOPqp/6uzHXCOUiXkl/uuwT+COdmdoE7aA
+9h8ChoAAvDgXHLKA0Gm7Msfe6dIFlKFdNxPM6pvsoCbBRVap+kdxj6t7V4RBpnM=
+=ZSgd
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.4.ebuild b/gnome-extra/cinnamon/cinnamon-1.4.ebuild
index 5ce6a7c1fd01..3936c14af2e4 100644
--- a/gnome-extra/cinnamon/cinnamon-1.4.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.4 2012/05/22 03:22:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4.ebuild,v 1.5 2012/09/28 08:13:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://cinnamon.linuxmint.com/"
 
 SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+bluetooth +networkmanager"
 KEYWORDS="~amd64 ~x86"
diff --git a/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild
index 643f124b2632..2c8856eda17c 100644
--- a/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/09/11 08:27:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4_p1-r1.ebuild,v 1.2 2012/09/28 08:13:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -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"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+bluetooth +networkmanager"
 KEYWORDS="~amd64 ~x86"
diff --git a/gnome-extra/cinnamon/cinnamon-1.4_p1.ebuild b/gnome-extra/cinnamon/cinnamon-1.4_p1.ebuild
index e6ae3d9b6a09..33543a1b0dfa 100644
--- a/gnome-extra/cinnamon/cinnamon-1.4_p1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.4_p1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2012/09/09 00:31:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4_p1.ebuild,v 1.2 2012/09/28 08:13:29 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -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"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+bluetooth +networkmanager"
 KEYWORDS="~amd64 ~x86"
diff --git a/gnome-extra/cinnamon/cinnamon-1.6.1.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.1.ebuild
new file mode 100644
index 000000000000..b1abe76eb22b
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-1.6.1.ebuild
@@ -0,0 +1,239 @@
+# 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.6.1.ebuild,v 1.1 2012/09/28 08:13:29 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
+
+inherit autotools eutils gnome2 multilib pax-utils python
+
+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/tarball/${MY_PV} -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+bluetooth +networkmanager"
+KEYWORDS="~amd64 ~x86"
+
+# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
+# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
+# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
+# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome
+COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
+	>=dev-libs/gjs-1.29.18
+	>=dev-libs/gobject-introspection-0.10.1
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=media-libs/clutter-1.7.5:1.0[introspection]
+	app-misc/ca-certificates
+	>=dev-libs/json-glib-0.13.2
+	>=gnome-base/gnome-desktop-2.91.2:3[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=media-libs/gstreamer-0.10.16:0.10
+	>=media-libs/gst-plugins-base-0.10.16:0.10
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/muffin-1.0.5[introspection]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	x11-libs/pango[introspection]
+	>=dev-libs/libcroco-0.6.2:0.6
+
+	gnome-base/gconf:2[introspection]
+	>=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection]
+	gnome-base/librsvg
+	media-libs/libcanberra
+	media-sound/pulseaudio
+
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.4[introspection] )
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[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 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
+# 12. timedated or DateTimeMechanism implementation for cinnamon-settings
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-base/gnome-session-3.2.1-r1
+
+	>=gnome-base/gnome-settings-daemon-2.91
+	>=gnome-base/gnome-control-center-2.91.92-r1
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python
+	dev-python/gconf-python:2
+	dev-python/imaging
+
+	x11-themes/gnome-icon-theme-symbolic
+
+	dev-python/pygobject:3
+
+	gnome-extra/nemo
+
+	|| (
+		app-admin/openrc-settingsd
+		>=sys-apps/systemd-30
+		<gnome-base/gnome-settings-daemon-3.3.5 )
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )"
+DEPEND="${COMMON_DEPEND}
+	>=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}/linuxmint-Cinnamon-1359845"
+
+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
+}
+
+src_prepare() {
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
+
+	# Make networkmanager optional, bug #398593
+	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:" \
+		-i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
+
+	# 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/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-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
+
+	if ! use bluetooth; then
+		rm -rv files/usr/share/cinnamon/applets/bluetooth@cinnamon.org || die
+	fi
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
+	# Note: sed Makefile.in because it is generated from several Makefile.ams
+	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
+		-i src/Makefile.in browser-plugin/Makefile.in || die "sed 3 failed"
+}
+
+src_install() {
+	gnome2_src_install
+	python_convert_shebangs 2 "${ED}usr/bin/cinnamon-extension-tool" \
+		"${ED}usr/bin/cinnamon-launcher" \
+		"${ED}usr/bin/cinnamon-menu-editor" \
+		"${ED}usr/bin/cinnamon-settings" \
+		"${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+}
+
+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' || \
+	   ! has_version 'media-plugins/gst-plugins-vp8'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
+		ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.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 use GNOME in"
+		ewarn "fallback mode, or switch to open-source drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]"; 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
+
+	if has_version "media-libs/mesa[video_cards_intel]"; then
+		elog "Cinnamon is unstable under gallium-mode i915/i965 mesa drivers."
+		elog "Make sure that classic architecture for i915 and i965 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[classic]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=classic."
+		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.6.1-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch
new file mode 100644
index 000000000000..9a8f5ab444c4
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch
@@ -0,0 +1,44 @@
+From ee11a71f55eb0860fb61f5c250792221387f09bf 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 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 69728ed..58c35f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -113,6 +113,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`
+@@ -125,6 +127,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])])
+ 
+ MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin`
+ MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
+-- 
+1.7.12
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch
new file mode 100644
index 000000000000..3287821c004b
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch
@@ -0,0 +1,171 @@
+From cad7852a7b2c7cfc5f418b854c960abdb265544b 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        |  3 ++-
+ src/Makefile.am      | 17 ++++++++++++-----
+ 4 files changed, 62 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58c35f9..360b3f8 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)
+ 
+@@ -239,3 +271,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 4aff139..39a0ed9 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -11,6 +11,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 ExtensionSystem = imports.ui.extensionSystem;
+@@ -24,7 +25,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;
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 63193f0..2a984c1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -110,9 +110,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-screenshot.h	\
+ 	cinnamon-screen-grabber.h	\
+@@ -125,6 +123,10 @@ cinnamon_public_headers_h =		\
+ 	cinnamon-wm.h			\
+ 	cinnamon-xfixes-cursor.h
+ 
++if HAVE_NETWORKMANAGER
++cinnamon_public_headers_h += cinnamon-mobile-providers.h cinnamon-network-agent.h
++endif
++
+ libcinnamon_la_SOURCES =		\
+ 	$(cinnamon_built_sources)		\
+ 	$(cinnamon_public_headers_h)	\
+@@ -147,9 +149,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	\
+@@ -164,6 +164,10 @@ libcinnamon_la_SOURCES =		\
+ 	cinnamon-wm.c			\
+ 	cinnamon-xfixes-cursor.c
+ 
++if HAVE_NETWORKMANAGER
++libcinnamon_la_SOURCES += cinnamon-mobile-providers.c 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))
+ 
+@@ -275,7 +279,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 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 Soup-2.4 GMenu-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.7.12
+