Fix building without networkmanager (#488684 by labor_ratte), drop old.

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

8 files changed, 50 insertions, 375 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index db2a32b9af51..11a3c4b67437 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.27 2013/09/15 23:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.28 2013/10/20 08:18:14 pacho Exp $
+
+*cinnamon-1.8.8.1-r1 (20 Oct 2013)
+
+  20 Oct 2013; Pacho Ramos <pacho@gentoo.org> +cinnamon-1.8.8.1-r1.ebuild,
+  +files/cinnamon-1.8.8.1-optional-networkmanager.patch,
+  -cinnamon-1.6.7-r2.ebuild, -cinnamon-1.8.8.1.ebuild,
+  -files/cinnamon-1.6.1-optional-networkmanager.patch,
+  -files/cinnamon-1.6.7-pillow.patch,
+  -files/cinnamon-1.7.8-settings-lspci.patch,
+  -files/fix-control-center-check.patch:
+  Fix building without networkmanager (#488684 by labor_ratte), drop old.
 
   15 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   cinnamon-1.6.7-r2.ebuild, cinnamon-1.8.8.1.ebuild:
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e171e8102ca5..7464b3d1db82 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,32 +4,23 @@ Hash: SHA256
 AUX background.patch 938 SHA256 373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f SHA512 fab92f83d7d1047ff0a1ed2fe5741d14a9baa0353599295bed032930bcd530a9e293382701cad69dea64a7a998cc1bd1f5cc0bd3d03f7b5cdcb0a5518ddd7289 WHIRLPOOL 8457f040b71b142dbb79442cc6bc7eaa40917b70db583c7b4b0f1a74f865e66bf3bd6cd83544c63a2b5a5dc705e93be6544f29b006ee64decabf93f3a6f82304
 AUX bluetooth_obex_transfer.patch 1289 SHA256 4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2 SHA512 a6353192ae1df6a4b1adf3847118eb0e9d064df2eeec339fbfd13180ceb0635b9054459e5877ece5daf7e9ce942b6c258c0cd8069b996e1606f18a3a7ea8b119 WHIRLPOOL 2578586e9d888429ad11d946c15ffa9f90bd11649733f4f5dab3cdb119930e7d80ef1038111e1310b0038bd745d3049aaa533acf967cf2bdce1da981215cb2c7
 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
-AUX cinnamon-1.6.7-pillow.patch 840 SHA256 8da30d383b5a437279d177e360e0b200bbd6670e851419b0e5bb877acbad9b6e SHA512 3321d10072e60ba248dc84916bcce1254925e7b0f2a32982d66b4545294c6f3af1e10265443af35619a17707921ffc818d3f60c4aaf63bab008ba12340f55043 WHIRLPOOL b098f3d8e3bda7e76c358d939d7f4461c70f98785d6a37679974dbc42219e187c5502fbe121787b6ec5db6dc0e109bd5ff1841962130dd88876e562379e90508
-AUX cinnamon-1.7.8-settings-lspci.patch 930 SHA256 af22f896dde77eac0ff209908e95e2a528f22cd60bb34c9530747239ee762eb6 SHA512 a40ce12c7ea2c9ea0d6a5c155f8721030f32dca3038b0d47b254a8cae56237dbcad97ada0255e502ae3015533a6d8d0011c60d4cdf3eb27c70e3740de1f7a062 WHIRLPOOL d403a8bec88474f09c4900477014a5a72f36f75a472f193c78550e7ac38fa28b4d9a991a553a3c2465b2f1c3c08c175d4d9b4fed27c71fe75829716f9e08e60e
+AUX cinnamon-1.8.8.1-optional-networkmanager.patch 5183 SHA256 6a85427e2f9181ae6758ad0d632d79f8853743c008ad54951329d1ee7ebce717 SHA512 5cb244969c629c9193d791732c1cc18892fe12d03756175f8900f7069aa250a51e29f85ddc4bb2a7adb0066139a482ee40c3f4b241a615b4015ac48c4bc26f5c WHIRLPOOL a6214d7a7a1ebad1c196a8d17a061fd38718e572f259c73e48d313812c19be441a4a7353c04bd47ae42ca83e2668e88bf6ba0560e3cf2dda26cef269cdac7e82
 AUX cinnamon-screensaver.desktop 451 SHA256 19ca21fbe12ef393176c2dfa75c7c1b248c6e1560005e0c19a07349f25101323 SHA512 8e1f7b5524494336da3f469f446c45adfefee0ff55f04d069612234cc27ca39b6bf1c87bdcdb18078ddffad4b46a8750bd5b41d35ab9180b4ed1417cc82e5552 WHIRLPOOL 29a1a430f7d7aa73bd8ff5d0877772fe092c3c39b9bc1adb35b32f5432f357204b7367edd00616adc5a15f3059cd16da14db5047ddc09795ce761e53f2fec626
 AUX cinnamon2d-screensaver.desktop 455 SHA256 ce9172af04758a4078079e6bcb7b1117bfce02e3a9a7f794f32d7359612a3aa0 SHA512 2dffcbc2dba76597176ea645974208b58aca9c5809e46426e55f655a4f05a2fafffb9f024d25ec6bbe7fb05a3e8bfbfdfed055051895838db8816edfaea57791 WHIRLPOOL a4bec3d1c85b47691b2ddd337c480889a51a3140ff17ecb7fd11e3326788b9b20044a540851b3bcfae3a106e143363369d47c03310b315a78faff5201c66e215
-AUX fix-control-center-check.patch 845 SHA256 ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426 SHA512 6e60335db973ee203114527c4aeb1e5f07319916e30a834b04c57fc19992cfa5a0df8c5eb4fabbaf1d2a92337824ad60e12acbca8e8440a4ef9224588ee21a1d WHIRLPOOL f7656195bac65dc75860a753fd45539b168f07bd5f78170a42569c6d60ef2f62688de5609e59993a2e613084a86d620fafce5c949f353084084411e4790a278a
 AUX idle-dim.patch 1963 SHA256 23228a6b92d2f7cc85f8deac5c1ad622e0d86a7bd2de1288997a307421f57055 SHA512 4e28fab965019a11e12acd0c807f3413e4d1264c2c261003a626aa73a929f238ee5e4dd8ad060887e5cf160d4345e896690d91547e3e6e755b25e4a35300a157 WHIRLPOOL 94200e376fecd7a00280a94e93834b3e67258c3adea533361e2f0f732f51c583d161644f39a229f65cb196717d9037712725d318b6b8153523fa22d76f418dcb
 AUX keyboard_applet.patch 5979 SHA256 a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30 SHA512 ed9c30810eea45aae6ba76a615cec153db69ee21779c4e7c457be2aea274838724659606dba517f68324186ad55b7624cf63b222a6ff6fc1a6f1cd0c65011ca6 WHIRLPOOL 42e7bdcfceaf77689ba51d20e146d8728a58d94eded600fa5e94ec087832ef8e1aaf92d676af380993ac8f7eb425291665ac3010e3b3fc60cc754e071a268801
 AUX menu_editor.patch 34725 SHA256 9e6c1ab7612ce67ebc310888186b9a626e3251da8d525b5029d3e5e369014142 SHA512 e1ddd504db3ee80d1dcec6ccbc83276abc8ebbfc0406c815b45e6908ae6309dcad957d0b0c858d29d92c504a4a80602f67f563bb02babdb401184a46f3e984d8 WHIRLPOOL b2bfe9458e0a6c92fedc20ebc12ccba616178f8102cc907be95ef840fc732597784ab73b41b7878e94c2381b693ffdb6b866b944eebd786ede869ce0c8343820
 AUX remove_GC.patch 3772 SHA256 3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680 SHA512 6796ff6735c3480013ca59b2df4c1ac5aebfc66e6137df8d06ab06e5d6b8ae6213e452d7219e50c1eb973ebbd8b7fdd962b90c119a6bd4d3e82678dd94ed8573 WHIRLPOOL b6c36992a7dee94d76e6288d3d1350a9d08b1758ad7abba3b93f83df43b7236608e420954c7f31d9709042093ccc3d26b1dc95ca1d0c69792da1793d56097e4f
 AUX screensaver.patch 2218 SHA256 d931ca3ac5e5294a5a8afde9b861116d2b2688acaec7f31009f00debbfae9cd9 SHA512 b5a6f413333f5c9196eaab95e7376d46eb69de9cf5392eccf31f78f2bb045eac550fe0fec5760056f8828f729eeda31d8bc519aec30b74fd039bfae9e799d7c9 WHIRLPOOL 8147366ccb45f4940df7884539a55e09141adcd1624950b6772afd3403378a40b2525a9d23667e0708f6cded50179bbfb3b371da9ba101f61902ad80e4471127
-DIST cinnamon-1.6.7.tar.gz 3748727 SHA256 283d8ec894831df5c062e88196c5f0191daa99b1da1cbfada1547a700f50ab24 SHA512 73a774af74ad9223f16cf5082f7507322471f9d329b402f9d5ebba28f5c620234a9e28ffcdd8810c0ca4944b2aa7e3b82e59c445f8d64c0a8c5cd7a036f5c633 WHIRLPOOL 424201aca9d40fd64e8327ade88e662d73ed7a8ba551406a705afd8d2a386321b48b9decae8c3b39939d638b0fcc08198f1ecc415d3d9af38d67fe638e9cce70
 DIST cinnamon-1.8.8.1.tar.gz 4347516 SHA256 100cf6ca9b2622d74532323278bdefb06ac76b750bbf326cc9dadd14e99909bb SHA512 a709781b4e6cecfe97f6fb4bad4b953f6c11ec49ebacabbfcc186e57a2e6a28abebc163d7081248d6cbac24996732a4aea7e5d54991e6c09b9701b7e64a91a0f WHIRLPOOL 49533ec7c6c40aae5e76377a67efa88f16a7ae2a6b2c3b3ab9316cb61d40fbca544f00f402e2a75b54bd90537f0813dfb5ba4d3a17a2ad3ce5d7e67e88a6c543
 DIST gnome-3.8.patch 138356 SHA256 840cebcefc183076f9e9208421354e5e9cbccec62824c788b17cb564c2d2519a SHA512 1fd95720a6398607330ff445bd55f1f898dac03dda542d7a7246f81127e55793b02a4df4cc8c759a5f6c11dd7e5a6609bf0bfc05266a87e65034eab0f94077f2 WHIRLPOOL 84899979f7a4c1c6f7cb4f3d356e45e3b49f798605e48c768c3f43a90b828b3f1e9051e9e176bc099c9051d8fb4107e7d127cef27dc4797189b7c9479edf9bd5
-EBUILD cinnamon-1.6.7-r2.ebuild 8317 SHA256 80fe4386eb882aece2e2fcd4f30fc6e64454ddce0e48cd986d02079f1a3dc70a SHA512 939decb69f4c66be01c0e0db7517249cdb1eb932ad307919c3aeff39e52efc3f71856b358578e27cd26cf8c6aae1ad4e5a5e9cd909f8ed6e887786f9ac910e37 WHIRLPOOL a11311da331ec72d3f0a4c58f45ec18cd9648a636ed2ee3949411c29098c5ff7b64025df6696bf81e29b83de1a501973880b70079b11383e8c9ba31c5c40729f
-EBUILD cinnamon-1.8.8.1.ebuild 8244 SHA256 ea90a73dc9c794929d68ea4be2bc7b40e30e71d3255c35b71844c7e3bdda39c1 SHA512 68b465073da3a5db2b7d96aea653a45a24954c0f73996a9949850158278fa0cf92ed3964cc9763c88326cd09a2b1bc567bdac96b9accd4cae4525c942200899a WHIRLPOOL 981f1564827166d4933a56f2d1bd3299036b3326b623d622316d5580d75fca590246b543d5961f9d33eb2fcc9756d92c49222ec09e9cedfdf09f1ebac069f644
-MISC ChangeLog 6994 SHA256 11fc39a05a8fd00a20b4d14b2532f21c7943c453270eaf445559b47523e007a1 SHA512 0b998fd44643648e548fe48a92bc6125c73d5d80a73612d167c839e58623c0a1532de10deedac7959c6c8befe67fbe9bdbe6ee7427f67b604bc8ca9c22b84b70 WHIRLPOOL ad0830396459be53cc7f924329cadfc305252e582d041bab53f711564ead8f4a55d6b10eea6a6954c6b9a6956e1eacb30026be2c7c14db7a8c0c3c7a410ffade
+EBUILD cinnamon-1.8.8.1-r1.ebuild 8383 SHA256 78bf60dc265b4add31f52975fa5a3ad5344040872e7d83a9bc4984e3feca00aa SHA512 fa12401cdf8358bac8ffb701d02ce5421b2a4d539029a0cb4aaf2d74d63335e095b0c21325463d2135453066f2abe6a7a773dd1b274556ac26b9805bb68f5058 WHIRLPOOL 2eba2a0a3b21ffda700512f9016193310937c24151c602d5c1641d027fad308079b0a714a6abd085eab6a3411dd28d51315b211f8517dd80785f15e221c4a808
+MISC ChangeLog 7468 SHA256 bac7ec58729641709df6e8872472d8b7e5f0fa2127e92c6e2416b81b1ebd50a0 SHA512 d2f0b1817dfd546e583d52c97d751427dd13adf871f66c4d965c4c04519e96d45ad684dfe398ea92c6346bb941004e165aec65b71074ab461bcc0a3deca50d52 WHIRLPOOL f84eb412dc29960b480e7a8bd765ee5b347565edce440a971eacc97ddcdf15e84ab8850354d83f59dcdbca3af5d3d40497828e64954744fbccdd52a02f67635e
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSNkjFAAoJEJ0WA1zPCt1hwoAH/1uEe6WUXnad4W9jTv3vnOFh
-x8tLCqDQCCPA6iue6aCQFo3DWudp7bSO8663YcBokq/PSMwGK+TUJiI2NLtsX+Cn
-1hMBy3EmYxS+jhFvm6H9N3urq0koxuSoEfeExvBeSuyc3bReffgNq3NFfqaXMNRS
-t940O26IQzEpcKaXUsLMZZw3j15Od6y6KByaI4sTXYr+1OIhpO/qq/ufzVr2YDH4
-B0gUqbTc1ziEkfg4Ne+fOyVk+GSsSA/1ij/o9xKbuQ6P2o5Xd0xiU3gVUE130bPz
-q/+6X5wj3Ar4W+JQlH0rp+UVJ9OyfqD5+SZhTem1H3eLTuWF0LS0RcG/hnlILX0=
-=Cfn8
+iEYEAREIAAYFAlJjkccACgkQCaWpQKGI+9SN2QCZAZOBo5OEEnbKW0RE0FtgJBzP
+QvYAni2WKSThVWMVLfRAU1Z6vIE3gWbj
+=Sp0R
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild
deleted file mode 100644
index dc265096d24f..000000000000
--- a/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r2.ebuild,v 1.2 2013/09/15 23:54:48 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="xml"
-
-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/"
-
-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]
-	media-libs/cogl: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
-
-	${PYTHON_DEPS}
-
-	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, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 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[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2
-	virtual/python-imaging
-	dev-python/lxml
-
-	x11-themes/gnome-icon-theme-symbolic
-
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	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-5ab432d"
-
-pkg_setup() {
-	python-single-r1_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"
-
-	# Replace deprecated PIL imports, bug #471518
-	epatch "${FILESDIR}/${P}-pillow.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_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_optimize "${ED}usr/$(get_libdir)/cinnamon-"{settings,menu-editor}
-	# Fix broken shebangs
-	sed -e "s%#!.*python%#!${PYTHON}%" \
-		-i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \
-		-i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
-
-	# Required for gnome-shell on hardened/PaX, bug #398941 and #457194
-	# PaX EMUTRAMP need to be on
-	pax-mark mrE "${ED}usr/bin/cinnamon"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23:0.10' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8:0.10'; 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:0.10"
-		ewarn "and media-plugins/gst-plugins-vp8:0.10, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to 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
-}
diff --git a/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r1.ebuild
index 8e85adde1f6c..41980b2e0516 100644
--- a/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild,v 1.3 2013/09/15 23:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r1.ebuild,v 1.1 2013/10/20 08:18:14 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -156,6 +156,9 @@ src_prepare() {
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
 
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}/${PN}-1.8.8.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"
@@ -189,6 +192,7 @@ src_configure() {
 	gnome2_src_configure \
 		--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"
 }
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.6.7-pillow.patch b/gnome-extra/cinnamon/files/cinnamon-1.6.7-pillow.patch
deleted file mode 100644
index 77b98fadbce1..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.6.7-pillow.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Replace deprecated PIL imports
-https://bugs.gentoo.org/show_bug.cgi?id=471518
---- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-+++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-@@ -20,7 +20,7 @@
-     import lxml.etree
-     import locale    
-     import imtools
--    import Image
-+    from PIL import Image
-     import tempfile
-     import math
-     import cgi
---- a/files/usr/lib/cinnamon-settings/imtools.py
-+++ b/files/usr/lib/cinnamon-settings/imtools.py
-@@ -18,10 +18,10 @@
- from itertools import cycle
- from urllib import urlopen
- 
--import Image
--import ImageDraw
--import ImageEnhance
--import ImageOps, ImageChops, ImageFilter
-+from PIL import Image
-+from PIL import ImageDraw
-+from PIL import ImageEnhance
-+from PIL import ImageOps, ImageChops, ImageFilter
- 
- ALL_PALETTE_INDICES = set(range(256))
- CHECKBOARD = {}
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.7.8-settings-lspci.patch b/gnome-extra/cinnamon/files/cinnamon-1.7.8-settings-lspci.patch
deleted file mode 100644
index 87e376806b46..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-1.7.8-settings-lspci.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN a/files/usr/lib/cinnamon-settings/modules/cs_info.py b/files/usr/lib/cinnamon-settings/modules/cs_info.py
---- a/files/usr/lib/cinnamon-settings/modules/cs_info.py	2013-04-30 18:01:56.000000000 +0200
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_info.py	2013-05-01 22:30:03.725733012 +0200
-@@ -27,7 +27,7 @@
-         "T": 1024*1024*1024*1024,
-     }
-     count = 0
--    for card in getProcessOut(("lspci")):
-+    for card in getProcessOut(("/usr/sbin/lspci")):
-         if not "VGA" in card:
-             continue
-         cardId = card.split()[0]
-@@ -35,7 +35,7 @@
-         cardUnitName = ""
-         cardName = None
-         cardSize = 0
--        for line in getProcessOut(("lspci", "-v", "-s", cardId)):
-+        for line in getProcessOut(("/usr/sbin/lspci", "-v", "-s", cardId)):
-             if line.startswith(cardId):
-                 cardName = (line.split(":")[2].split("(rev")[0].strip())
-             else:
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-optional-networkmanager.patch
index 3287821c004b..4acdb9062df8 100644
--- a/gnome-extra/cinnamon/files/cinnamon-1.6.1-optional-networkmanager.patch
+++ b/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-optional-networkmanager.patch
@@ -1,28 +1,11 @@
-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
+@@ -83,8 +83,40 @@
                                 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)
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1
+                                gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION)
 +
 +##########################
 +# Check for NetworkManager
@@ -59,7 +42,7 @@ index 58c35f9..360b3f8 100644
  
  PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
  
-@@ -239,3 +271,15 @@ AC_CONFIG_FILES([
+@@ -242,3 +274,15 @@
    files/Makefile
  ])
  AC_OUTPUT
@@ -67,19 +50,17 @@ index 58c35f9..360b3f8 100644
 +echo "
 +Build configuration:
 +
-+	Prefix:                                 ${prefix}
-+	Source code location:                   ${srcdir}
-+	Compiler:                               ${CC}
-+	Compiler Warnings:                      $enable_compile_warnings
++       Prefix:                                 ${prefix}
++       Source code location:                   ${srcdir}
++       Compiler:                               ${CC}
++       Compiler Warnings:                      $enable_compile_warnings
 +
-+	Support for NetworkManager:             $have_networkmanager
-+	Support for GStreamer recording:        $build_recorder
++       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@';
+@@ -8,5 +8,7 @@
  const GJS_VERSION = '@GJS_VERSION@';
  /* 1 if gnome-bluetooth is available, 0 otherwise */
  const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
@@ -87,19 +68,17 @@ index 704989b..df7e014 100644
 +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;
- 
+@@ -57,6 +57,7 @@
+ const AppletManager = imports.ui.appletManager;
  const AutomountManager = imports.ui.automountManager;
  const AutorunManager = imports.ui.autorunManager;
 +const Config = imports.misc.config;
+ const DeskletManager = imports.ui.deskletManager;
  const EndSessionDialog = imports.ui.endSessionDialog;
  const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
- const ExtensionSystem = imports.ui.extensionSystem;
-@@ -24,7 +25,7 @@ const PlacesManager = imports.ui.placesManager;
+@@ -70,7 +71,7 @@
  const RunDialog = imports.ui.runDialog;
  const Layout = imports.ui.layout;
  const LookingGlass = imports.ui.lookingGlass;
@@ -108,11 +87,9 @@ index 4aff139..39a0ed9 100644
  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 =		\
+@@ -111,9 +111,7 @@
  	cinnamon-generic-container.h	\
  	cinnamon-gtk-embed.h		\
  	cinnamon-global.h			\
@@ -122,18 +99,18 @@ index 63193f0..2a984c1 100644
  	cinnamon-perf-log.h		\
  	cinnamon-screenshot.h	\
  	cinnamon-screen-grabber.h	\
-@@ -125,6 +123,10 @@ cinnamon_public_headers_h =		\
+@@ -125,6 +123,10 @@
+ 	cinnamon-window-tracker.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 =		\
+@@ -149,9 +151,7 @@
  	cinnamon-generic-container.c	\
  	cinnamon-gtk-embed.c		\
  	cinnamon-global.c			\
@@ -143,7 +120,7 @@ index 63193f0..2a984c1 100644
  	cinnamon-perf-log.c		\
  	cinnamon-polkit-authentication-agent.h	\
  	cinnamon-polkit-authentication-agent.c	\
-@@ -164,6 +164,10 @@ libcinnamon_la_SOURCES =		\
+@@ -166,6 +166,10 @@
  	cinnamon-wm.c			\
  	cinnamon-xfixes-cursor.c
  
@@ -154,18 +131,15 @@ index 63193f0..2a984c1 100644
  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 =		\
+@@ -277,7 +281,10 @@
  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
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.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-Muffin.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
-
diff --git a/gnome-extra/cinnamon/files/fix-control-center-check.patch b/gnome-extra/cinnamon/files/fix-control-center-check.patch
deleted file mode 100644
index 981b1c1a5435..000000000000
--- a/gnome-extra/cinnamon/files/fix-control-center-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/files/usr/bin/cinnamon-settings
---- cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings	2013-02-21 17:23:45.000000000 +0100
-+++ cinnamon-1.7.1/files/usr/bin/cinnamon-settings	2013-03-03 03:03:24.151209998 +0100
-@@ -7,7 +7,7 @@
- 	if os.path.exists("/usr/lib/cinnamon-settings/modules/cs_%s.py" % module):
- 		print "Python module"
- 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
--	elif os.path.exists("/usr/bin/cinnamon-control-center"):
-+	elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"):
- 		print "Unknown module %s, using cinnamon-control-center" % module
- 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
- 	elif os.path.exists("/usr/bin/gnome-control-center"):	
\ No newline at end of file