[gnome-extra/cinnamon] 1.7.8 ebuild added

6 files changed, 450 insertions, 0 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
new file mode 100644
index 0000000..141e52b
--- /dev/null
+++ b/gnome-extra/cinnamon/Manifest
@@ -0,0 +1,6 @@
+AUX cinnamon-1.6.1-automagic-gnome-bluetooth.patch 1725 SHA256 788176a82802b45ebff7db3c8540dc4621c09f5e57f37ebeddc34771ca512847 SHA512 c2f7ae82074c98318026a651042bab40183339db4c4f9a48615487bec02a39398f19713af3ff7989632d3d415942ddfb7bb46c540ce73d7a74809d5b3625001d WHIRLPOOL 5ef7e830aff3df3dc0cda5abd0f37296c2b0ae35877fa911548eaa189d435b6ba1df66430a4b423f3a311b419ab8f72b146a330cf06b41ecf431867b4cd798ac
+AUX cinnamon-1.7.8-optional-networkmanager.patch 5284 SHA256 e62042744569f120348b8dc7cf18f1068cca68cd9cf1d934bc63257c0665874c SHA512 cb9a5ec26b40b6b321f9cf8eb426f0473579bea51fa24d91355a1b4ba402b5a285bd70e94fcffa144d443bf7d289e2fc9baf070f92853184b8e225031379fd21 WHIRLPOOL b01af5a4c3068677f72b7d3c0508f39960c07234849f1670e0871e6d86b1f827431b272f59563459f890a6cfcc07b46f82cb1d8c52d5b63863edbebc71d85bbe
+AUX cinnamon-1.7.8-settings-lspci.patch 930 SHA256 af22f896dde77eac0ff209908e95e2a528f22cd60bb34c9530747239ee762eb6 SHA512 a40ce12c7ea2c9ea0d6a5c155f8721030f32dca3038b0d47b254a8cae56237dbcad97ada0255e502ae3015533a6d8d0011c60d4cdf3eb27c70e3740de1f7a062 WHIRLPOOL d403a8bec88474f09c4900477014a5a72f36f75a472f193c78550e7ac38fa28b4d9a991a553a3c2465b2f1c3c08c175d4d9b4fed27c71fe75829716f9e08e60e
+DIST cinnamon-1.7.8.tar.gz 3450195 SHA256 812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969 SHA512 d68810f50cb919b9b2c1cd8ddf96b44707e4d8302e0a32f6aef22495e78aa9f451ee2ab6dd9affb156b57a5aa80318c91d61d3a7aa6fa952e66cfef8632b6864 WHIRLPOOL e29bdf1c36e2c22489585865fd14ea831aba3cc27ec0eb6151bfabbcdae0d42e13274c72ebfbe4ef11e6e9e2b9986d8cb276dda47eca2f21ea56e27f8eaa06a9
+EBUILD cinnamon-1.7.8.ebuild 8164 SHA256 5e80bc8ef5d1fa05883d2e07d24f983d7867ecec65ffbe56429f9cbd81c97dff SHA512 53c64785ff793b852dc3c1e899527a6ff831483033e556ccc074ced7a53db857a2ae52011e20bf1efa411e77aa3ab69876104cd211345b26cc674661975a69df WHIRLPOOL 1e4dc820cac00a7f3e12f5190bfc66997a6df12a1e8764fbb823fa194796b2d6c6c67dde605b604cd219921b40f8ae38347a6b282c6aef6cde6318eae30472dd
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
diff --git a/gnome-extra/cinnamon/cinnamon-1.7.8.ebuild b/gnome-extra/cinnamon/cinnamon-1.7.8.ebuild
new file mode 100644
index 0000000..8ea9e0e
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-1.7.8.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.7.4[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
+	dev-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-a464dc9"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix cinnamon-settings lspci path
+	epatch "${FILESDIR}/${PN}-1.7.8-settings-lspci.patch"
+	# 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.7.8-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/cme/config.py \
+		-i files/usr/lib/cinnamon-menu-editor/cme/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_get_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
+	pax-mark mr "${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/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 0000000..9a8f5ab
--- /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.7.8-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-1.7.8-optional-networkmanager.patch
new file mode 100644
index 0000000..505271f
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.7.8-optional-networkmanager.patch
@@ -0,0 +1,134 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-01 20:28:51.034888832 +0200
++++ b/configure.ac	2013-05-01 20:41:49.252872166 +0200
+@@ -81,8 +81,40 @@
+                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+ 			       libcanberra
+-                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1)
++                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
++
++##########################
++# Check for NetworkManager
++##########################
++NM_MIN_VERSION=0.9
++AC_ARG_ENABLE(networkmanager,
++              AS_HELP_STRING([--disable-networkmanager],
++                             [disable NetworkManager support @<:@default=auto@:>@]),,
++              [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++   PKG_CHECK_MODULES(NETWORKMANAGER,
++                     [libnm-glib libnm-util gnome-keyring-1],
++                     [have_networkmanager=yes],
++                     [have_networkmanager=no])
++
++   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
++   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
++else
++   have_networkmanager="no  (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++   AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++   if test "x$enable_networkmanager" = "xyes"; then
++      AC_MSG_ERROR([Couldn't find NetworkManager.])
++   fi
++   AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+ 
+ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+ 
+diff -urN a/js/misc/config.js.in b/js/misc/config.js.in
+--- a/js/misc/config.js.in	2013-04-30 18:01:56.000000000 +0200
++++ b/js/misc/config.js.in	2013-05-01 20:43:56.491869440 +0200
+@@ -8,5 +8,7 @@
+ 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 -urN a/js/ui/main.js b/js/ui/main.js
+--- a/js/ui/main.js	2013-04-30 18:01:56.000000000 +0200
++++ b/js/ui/main.js	2013-05-01 20:46:09.748866584 +0200
+@@ -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;
+@@ -70,7 +71,7 @@
+ 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 -urN a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am	2013-04-30 18:01:56.000000000 +0200
++++ b/src/Makefile.am	2013-05-01 20:51:51.508859263 +0200
+@@ -110,9 +110,7 @@
+ 	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-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 @@
+ 	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 @@
+ 	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_CPPFLAGS = $(cinnamon_cflags)
+ 
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 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)
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
new file mode 100644
index 0000000..87e3768
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.7.8-settings-lspci.patch
@@ -0,0 +1,21 @@
+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/metadata.xml b/gnome-extra/cinnamon/metadata.xml
new file mode 100644
index 0000000..da6fd63
--- /dev/null
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>