Fix build failure with mozjs17, bug #499980.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 316 insertions, 17 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index a8e235eaa035..fcd975147cb3 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,12 @@
 # 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.31 2013/12/12 07:38:27 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.32 2014/02/26 10:52:07 mgorny Exp $
+
+*cinnamon-1.8.8.1-r2 (26 Feb 2014)
+
+  26 Feb 2014; Michał Górny <mgorny@gentoo.org> +cinnamon-1.8.8.1-r2.ebuild,
+  +files/cinnamon-1.8.8.1-mozjs17.patch:
+  Fix build failure with mozjs17, bug #499980.
 
   12 Dec 2013; Justin Lecher <jlec@gentoo.org> cinnamon-1.8.8.1-r1.ebuild,
   metadata.xml:
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 9eabf2ef7c96..49a01533b335 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.8.8.1-mozjs17.patch 1077 SHA256 f94110e9f113da29816b5e7e20baffa533a839e2ea31593f7b51ca1d964c627e SHA512 eba7db9819d58375d7ac999b4ce64ae211240ea3d6794176b9ed34f6725fa285eba6e7188d2b1288616b6852bcb94a87fefdd195929977e350e5df2f5bec5909 WHIRLPOOL 61aff9ec67a6ac471a8a7213233ff29f84351c3728aa74184162cfb656ec7da133b72efe150e803d27701f5bbeebcce91ae50ae6704b586f931b905019b55cb8
 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
@@ -15,22 +16,25 @@ AUX screensaver.patch 2218 SHA256 d931ca3ac5e5294a5a8afde9b861116d2b2688acaec7f3
 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.8.8.1-r1.ebuild 8348 SHA256 513e0c1fb878c69eb569beca37bde16dbaf1386f6a704f56977763cacb430647 SHA512 bde00dd51a93b1d18f16b498b040022e53a83bdf54a4f05fb4233741f4d0f354a23944734c4f100bf64439290d1928d819bd248e0f8e85e4e7703d2925371f82 WHIRLPOOL afe42b2a99ff840220312ee46ed5fc003f941cd323057981fca770d82ebcab3216053922526ba0c9b71414dedb20ffbde4c42b73b84291963ee0f00ec4e599bc
-MISC ChangeLog 7795 SHA256 ee16f1bc085056f72a104d65ff1fa04f61eafa1e6acdbb305a13c07f8be363e2 SHA512 3f8b6907ee209680d8f90c7b06b0d2109733a3afbf8df27b2ec9c54e66ebcaf071c5ef3a53bda0d61df3d2fccb6defde5f382b34d88f30e86182ded5322208cf WHIRLPOOL 9abd44197fe686a978044dd8c861163a986ef756de4baa260f2119f28c55792b3a7937677c947b4ab0fb1aa9516ff174759a8a2c1e70a33585fbddd006f18c32
+EBUILD cinnamon-1.8.8.1-r2.ebuild 8432 SHA256 bbecadca99ce2438a8756a5b40acafebc7db6a99d15bb870a36dc77a37872f34 SHA512 925f6f0984574648e83cb44711bac75579f66c1657e9b10c8039b0c2bb62675645c341c472148ec45d5f04db0654950046b489b7112ba4ec7e604557a18b5db5 WHIRLPOOL a005412db44d37a445961cb641749756ba85bc911d801c5a320622c548026228f37716fb17ee11f9c65e365085e02cfd6239f287b7292a2a4327633001a8fd37
+MISC ChangeLog 8001 SHA256 63eda482166118da81c0527bfd992c0a55686f90b13bf30662140d7ee9e450b4 SHA512 090cdf6bc1609814c6696a5e4af6763fede3b3fb399b6c7d57b4f8eaf7eba2074c6b8464872552c7374828b039531876dc0c9d4bfd61cd65b3060d098fcee30c WHIRLPOOL 52cd716488219133c6e62d5fc6ef8b4d6821253e40186adeaea00be72b09bb7e1bc38ed1cf26a0c969d924f16dec73dcc178466b81dbae01e18d5f64095f8c04
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSqWf0AAoJELnU8jG9FViruUAP/Rw32MQSNZFmIs5disut+EO6
-ObBGaJrcUcAoCvXQgJVWd2bJzj9XUhVvO1xo6D6XjeyyyqXfqGh0jlCrlJxk9alc
-12Y0p+zJYErlAU+JH7DOdZqMT7PiswZGg0ppxrYdL7ebInUiAG1CExphl9OebYGQ
-41iV/j/8nADkwl/ch5VVY6AkgxBQ+rfzRnkp7iM63+7MxAbQdrwmjAzuk1K3vx7H
-fyyGkZjVbHPdnce2TM9m1eI1YHlbISgs/6jqkUZV022iOTFsspWdOYQKE8Cdp9sq
-630RidvyxgL6G4X2Zkg+s5Ar5qeg4TtHh5JZbXiJ6zyDuGeFQuazsNZ9zE93d9Hr
-h4+UVA1h6Q5EeRTW+gtv1Jzw1CMezuaitQy7/8OkMeU1E1hem7Arm9RYTeYA+dx5
-+7jB8MX37c7RR9p8wHO2irF2eE1qq89tjf7UbIlQUofRxTgTIQVTjdhL8IN+uqku
-oFfBU3M71g0HFgOrPip1dRonhQG9dnYiAmeNPjCdeUF8o7UYqxW9w3bqXccWqsQs
-7mpcTNu6133gM5QNfa+hamLfxsdRZIFjIYeCLI1L6sFHjH7BFjTrHhNJyIiCXHJe
-kKCBMAh3w3FmraTtsYu94GwOZdGlFmEr3njRBglolbordEM2Qft+JzrE/cmyOxnX
-pk/BbcGHE+iQP6ivntpM
-=7/L7
+iQJ8BAEBCABmBQJTDcdZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQa4QAJuwf2+lEPjL0l9qArg5K9Uv
+96L3kgb9Q8x/G5l+ugYnAThEBksVeuIuQIfQV64vr0Yu2WgNQn6x03wO5n3jDPdL
+5SeK1orheqb2Tv8mfp6atNW+cqe1uB331vNelpFMmJ+y55OByES+LLIhgSns1mKn
+ZXNVih9mcW3m3+u3Ke3TYoc0EggNAz2UqRn6VbqTHxQ1+bqU9BPxdZMOlhsMTvN1
+qDmzhGOJBzZAgrhV/3CoNzBuE/exSVNLO+x6ff7ztFc0934QtG1rqf52CVjI8KW8
+Yvj1C27HsKUMpBdtU5SdYxlgD8tSGrhMCAdBnHuZqy3XOhHpDdJUKWyZRsbHrrDm
+/zkGm8gd3G4gs2JqTrB2OqmBIBcqFP1LEJEoNwgwlAANO/R2ZzD9gevbH9XGkvar
+03j09VkZ/Zw4dkAtIwFxZCenBeoVu+dfJN5NGi/kgGUrUwiA1PM/FVg/9Kv8xsYS
+0Td8AKtE/Ce5dfkehwWpErrt4LOEVe4eawzE9SzgjfvfAgUYtyS70IQOp5DOOUQQ
+RwdVFRgEO1lO3cAhEffqZZaWnwRyeZ/6ycVoAK4rMFdOuykxSwWWoXY8HBSO+ZdV
+8EwYqPCSJ5gKr4hGRyyngHWH1q/K6akgDsVyrhrIyr9NoX6COJkSx283h362NtTu
+ddQE9h6iOq9NPG6ruJ2E
+=UZLG
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild
new file mode 100644
index 000000000000..d2b05a64ebb3
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2014/02/26 10:52:07 mgorny 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/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
+	http://dev.gentoo.org/~pacho/gnome/cinnamon-1.8/gnome-3.8.patch"
+
+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-3.0.0: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
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+# 	=gnome-extra/cinnamon-control-center-1.8*
+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.8
+
+	>=gnome-base/gnome-settings-daemon-2.91
+
+	>=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
+	gnome-extra/gnome-screensaver
+
+	|| (
+		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 )
+"
+# gnome-extra/gnome-screensaver due screensaver patch, otherwise it uses
+# cinnamon-screensaver
+
+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}/Cinnamon-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix GNOME 3.8 support
+	epatch "${DISTDIR}/gnome-3.8.patch"
+	epatch "${FILESDIR}/background.patch"
+	epatch "${FILESDIR}/idle-dim.patch"
+	# https://github.com/linuxmint/Cinnamon/issues/1337
+	epatch "${FILESDIR}/keyboard_applet.patch"
+	epatch "${FILESDIR}/screensaver.patch"
+	epatch "${FILESDIR}/bluetooth_obex_transfer.patch"
+	epatch "${FILESDIR}/remove_GC.patch"
+	epatch "${FILESDIR}/menu_editor.patch"
+
+	# 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"
+
+	# mozjs17 build failure, bug #499980
+	epatch "${FILESDIR}/${P}-mozjs17.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
+}
+
+src_configure() {
+	# Don't error out on warnings
+	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"
+}
+
+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
+
+	domenu\
+		"${FILESDIR}/cinnamon-screensaver.desktop" \
+		"${FILESDIR}/cinnamon2d-screensaver.desktop"
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+}
+
+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 switch to"
+		ewarn "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
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch b/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch
new file mode 100644
index 000000000000..cd29462ef784
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-1.8.8.1-mozjs17.patch
@@ -0,0 +1,36 @@
+From 914d7da8baea24b1b31e2bcf982d12996f86694a Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux@fedoraproject.org>
+Date: Tue, 4 Jun 2013 14:02:15 +0200
+Subject: [PATCH] Fix build error so cinnamon compiles with mozjs-17
+
+https://mail.gnome.org/archives/desktop-devel-list/2013-March/msg00135.html
+
+Fixes #2113
+---
+ src/cinnamon-global.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/cinnamon-global.c b/src/cinnamon-global.c
+index ab5d5d4..69958d3 100644
+--- a/src/cinnamon-global.c
++++ b/src/cinnamon-global.c
+@@ -1237,14 +1237,11 @@ enum
+                          0,
+                          &target_object))
+     {
+-      char *message;
+-      gjs_log_exception(context,
+-                        &message);
++      gjs_log_exception(context);
+       g_set_error(error,
+                   G_IO_ERROR,
+                   G_IO_ERROR_FAILED,
+-                  "%s", message ? message : "(unknown)");
+-      g_free(message);
++                  "Unable to import %s", target_object_script);
+       goto out_error;
+     }
+ 
+-- 
+1.8.5.5
+