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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 43 insertions, 359 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/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