Version bump (bug #552126), fixes various applet bugs.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

3 files changed, 288 insertions, 16 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 9af17ad266f1..b7f45d1ee797 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.60 2015/06/14 17:39:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.61 2015/06/14 22:02:06 tetromino Exp $
+
+*cinnamon-2.6.8 (14 Jun 2015)
+
+  14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cinnamon-2.6.8.ebuild:
+  Version bump (bug #552126), fixes various applet bugs.
 
   14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
   cinnamon-2.6.7.ebuild:
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 6ecd07a7ebbb..919d80a95cb9 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -20,27 +20,29 @@ AUX polkit-cinnamon-authentication-agent-1.desktop 213 SHA256 9bc4aa73d429ed0563
 DIST cinnamon-2.4.6.tar.gz 2813177 SHA256 f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 SHA512 c7553b3af4a46dc25e7b39ce8b66036d6975b9487ecaba023df3d5b4176fc9f2cea90f1e6a8daadcf482f5cfc0c495c011b2734b60af1bf3577c033c587de43d WHIRLPOOL 2060d1784e285b084e576e33e0dfcf3721779a8ce92be0cd7187db792b8ac631d931cdd327203b694904552657133e1a418ce8e23e1d2b1ef165cc97f1b8477b
 DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
 DIST cinnamon-2.6.7.tar.gz 2967804 SHA256 839ab0ea86b718809e53a0209d72701638ab3ac68263f2469e70967aaf21a004 SHA512 f76aa7401e44b0529ec5041b613df2ad95393701949fe8a25de75332984d102b441da32d08b06618cdf132d5026a92cd21ebaf8cac1707798dae667c468d57f0 WHIRLPOOL 0b1acc4e4e03c374cfcf12abe1e9cfb2593d0b72c2ace10db113665e517b1d9204ac54bdb9237ae2dc544b50b10b94d581fa7163ea2a0b07669bfbd0f8a3e30b
+DIST cinnamon-2.6.8.tar.gz 2967957 SHA256 fe2e0e0a128711875a24c3511eff78e48ecd131db8f758781950784270af15a6 SHA512 687048660dbc7797dfa3fb6aeb6f58c334d1ae4c384d600031e74db661ce5edc8109dec5dfc7b643e0d52211e41723e22da725f7866a99949f0b3e07e0716c9e WHIRLPOOL 2dd103e0db3e80fddc94850936942d6ef13d3603f1fde4ad69fb554bb79f39bd7dbcb08bfd5c2f156f9da2802a43ee2c7c6169b0a68b6e8e269ed7774bb203dc
 EBUILD cinnamon-2.4.6.ebuild 8420 SHA256 0771b3abecdbc455cc9f7f26c59fe1dc318b099c3b769623a1837c341dbe74ce SHA512 aaceda46cc0f002325d23145c43138411c02757afea482268187a4edf9969bbeb86a7fc9db342e01525a35ebe1cc00e93c4dd971e265b717e8675eba09b620e9 WHIRLPOOL 03eb83357ab9cb51a057e7a80ad95dc6e7b7f8ae53c410a407febc3d153f81a1774fa89177b82c1b45f823e5528bf7063964796e79b840c5c604d6b7382fce20
 EBUILD cinnamon-2.4.7.ebuild 8426 SHA256 7a8ab76dde16638f4d76259ca540a29cbeb9f7577a27f5c7bc306d3f476d052a SHA512 58ebcf834d2cff460e9acd6590030faa9ebb927a201e653559fde1b50ad268ed51c83a397ffd0e706591cfcf84e180dc341b2495e6fea22a734a3c3ba900bd3b WHIRLPOOL f03fd8742c0ac58604ef9470dcc47fbae90629cb1f91206d99b1d5bc59019f70a9404239084c7dd8e2803251448f5bb2f79c603474b6d20bc909f95b91bf669a
 EBUILD cinnamon-2.6.7.ebuild 8888 SHA256 946d86c1d1ab7f24e2310fc1a03a347da15e3a99fcd8760424072d07f02ea5e8 SHA512 64a854492b221a02d0854757f60f9d3d77c23c5257828283b571fe3b148f7a39e7adfbf488bb7a5137e29ee70bf50c1626987ce21f5bc10b41b3ea0364afbf62 WHIRLPOOL bc79dcfc074488c27ab16d81aebcde4fe823f3f7a13028fa548ed47bf2850ef41244f90f988aea666f2a020912fbd9528ff1bd4ec03801a1b080d821a46fea0c
-MISC ChangeLog 13698 SHA256 22993107ad3a272964d42bececa4344f5b479d5f43377f8244ac45f48266f806 SHA512 a53c3a7af07969ea5d6c8d0ca562b15d272bcc31d298e248e0a10b3faa8be29805a22d3455dbec102f93674f3d4e8b1ce6a01792a2d8213c9ff8abd9631ccb02 WHIRLPOOL 517b08eb50463277ebc26ad8fe7e752d3b0cc1f09db2636a7478943ea60bb9412faa69c1bb99936e984c2857fd14e15a948c6b324992647e023c44e5f5918d4f
+EBUILD cinnamon-2.6.8.ebuild 8888 SHA256 18c4e77389afb4854a1f228298b20695d0ea2ee05fdd6cd9f5540c6f0a8b381c SHA512 94dbc1afb570ed22d7e176d9a4fe7cb6be7c36ef6208b5443c2f36b65f91550166e18b5c1dd0c9f00961344dd34c3b1613d75f1a5f291178a876cf4a863c4735 WHIRLPOOL 5d25dc180b798dd5dc367a30d386387b09d21f28d7407a00ea4e079edbd141f4d0b00cbc17d9f1161f9eaea251d0e75dc8d80dedfe868d01742553da992dca78
+MISC ChangeLog 13872 SHA256 fcb68a4754a8ddc1be8f7c4907e6122e621f2ffbcb1c858174eb4fdf6d2fd7f0 SHA512 4af251e3087f03a40a6dd78dc1bcd520202453dace4233ae68d6d0e3009c0f3e8fafa8e8cff1424406962b27e089f3930cda0062644d1749d757e69de511934e WHIRLPOOL 7583a3565981315f618437f122e6dfed9c1f4435798972f662d0697f727afcc8bdb872b7461fe3fcc171e720118178234604ec89b1b6ed1c3f7ef65f6efadc00
 MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVfbxdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVffngXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNTNkP/0tmlZRoNRf/vzGBcJnXR8fx
-uVdSH2+sB0A7vBTM/WcBp3dAa1jNkZNG+/hocN8pxa4O8zfpo94LALO1frh1O3aO
-LJQZ9xrKwnByEVQeL3q2vDGOECKKnsItN3HFnCWy64xccPhxFA1rfF3fZKJqvFMS
-2piwIzgnwUz4ocLYF7hxc68B3ogWT1sronn3c0WvLmOIjOhJFXFSoQDMh/Hk90ys
-h1reCHTmUJe92DpYqddMM5raNd++Y04pil3yLwwnMR6V1xPsLn1F48SliYuZVBGg
-c9OpHhDJbA8T+AX2Hd64W+1be4FuQ3XgamqYx1u7NM3dC5PbnQqGYmC/4vCXSZzY
-GE6WmUhuk/gY9k3hy5hugfcQ6W2v3FjR5wc++T7c9SelPCZCRJ5uzao+tv71hoqQ
-j09iuRJTI9cvpcQLcHHmq/l1x1QignzOjbrPAFotzbOR2uIy8iyL/BZB7csKFHPh
-kcuExddYNDdf+fEeQB5GhfgkrL3AzQUFcCLVxsCmykRq16FFJGxDlchWcG71awIC
-Skr3z29ku/vNdEMdBP9tNt1LeIevHPoVeZkpmk6CfsRYteNHrQpGnryHgLouUDJP
-QW0fvigElSMIEWCCpKHC5baET/5kYy/lJOm7ceqaYx2bvCGrsL2jUzaBk9ui5PXm
-/xstl1JSv3LOJgl7RNX1
-=VRSS
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNwTYQALGWmlsYJqsQ4iJkrGG//CqD
+HarHbXjpIIza213PBKyaq9KKse1WM3Yf/9s6X2Koq7EuLywj/mo3vy8Mcv7D7ao6
+y8FYbsRJLuoe7rv2KkcydPoCRCF3CfCtfZGrMXFqciPcwRL4dbzCGcUKPNMRaAFi
+yip5wDcvWzld8w+RRihB68ywT6GgyDoSuzXe0m2qnGQvhIFSsRKESCgDeUz44dKJ
+ar548PCVj3pzkeiUHVBQwlAsTJIt7dm4c6G61ifyuG63zWjjuAtsRyyOGrJvzCpc
+63SqTCZvxSzfbPBl8qUTFx5rrJU0fHkKq/5tflDbUUlMXk9Xa5J324G99vEGXqaR
+wbogaXXfDZlyafsQ86nmUI5EF4d6nzAUi5UWyUrkUJBT4MQkaI1KtppBdom2a/hz
+XzkyPDK38aF4NS+dNKGiYX6EZc84UGT92LvUYAn6x2p53QVUtPH7/k5bQr5nMini
+kOmCW1YczeumX0nrPaeL9LxRqsapqsezB0xHvVqWqZJIKq4bV5toicQenYncCUFg
+Z1iMYfOW5aUyYknmOHvxXtDJcqncS/cnmjHve/hBeXy/f6aFVk10SfPnYuiXLFtK
+jzn1KXGtBVLHv7B9LajTdrHLV9AiGi/asKRK9T+/wIiRD0PxbsgYhMmSTe7iF7VR
+8H65VnGA1KVrOmsl3ZkE
+=UcvC
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
new file mode 100644
index 000000000000..19f89ba68aed
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild,v 1.1 2015/06/14 22:02:06 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-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"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	python_targets_python2_7
+	|| ( python_targets_python3_3 python_targets_python3_4 )
+	"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.29.10:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	gnome-base/gconf:2[introspection]
+	gnome-base/librsvg
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+	gnome-extra/cinnamon-menus[introspection]
+	>=gnome-extra/cjs-2.4
+	>=media-libs/clutter-1.10:1.0[introspection]
+	media-libs/cogl:1.0=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-sound/pulseaudio:0=[glib]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.9.12:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-2.4[introspection]
+	${PYTHON_DEPS}
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[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
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+	>=gnome-extra/cinnamon-session-2.4
+	>=gnome-extra/cinnamon-settings-daemon-2.4
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	dev-python/dbus-python[python_targets_python2_7]
+	dev-python/gconf-python:2[python_targets_python2_7]
+	dev-python/lxml[python_targets_python2_7]
+	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pycairo[python_targets_python2_7]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinotify[python_targets_python2_7]
+	dev-python/pypam[python_targets_python2_7]
+	virtual/python-imaging[python_targets_python2_7]
+
+	x11-themes/gnome-themes-standard[gtk]
+	x11-themes/gnome-icon-theme-symbolic
+
+	>=gnome-extra/nemo-2.4
+	>=gnome-extra/cinnamon-control-center-2.4
+	>=gnome-extra/cinnamon-screensaver-2.4
+
+	networkmanager? (
+		gnome-extra/nm-applet
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/polib[python_targets_python2_7]
+	>=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_setup
+}
+
+src_prepare() {
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+	# Optional NetworkManager, bug #488684
+	epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
+
+	# Fix GNOME 3.14 support (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3577
+	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
+
+	# Use pkexec instead of gksu (from Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3565
+	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+	# 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/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+		-i files/usr/lib/*/*.py \
+		-i files/usr/lib/*/*/*.py \
+		-i files/usr/bin/* || die "sed failed"
+	if [[ "$(get_libdir)" != lib ]]; then
+		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+	fi
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
+	epatch_user
+
+	# python 2-and-3 shebang fixing craziness
+	local p
+	python_setup 'python3*'
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+
+	python_setup 'python2*'
+	for p in $(grep -rl '#!.*python[^3]'); do
+		python_fix_shebang "${p}"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=536374
+	# https://github.com/linuxmint/Cinnamon/issues/3843
+	append-ldflags $(no-as-needed)
+
+	gnome2_src_configure \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-rpath \
+		--disable-jhbuild-wrapper-script \
+		$(use_enable networkmanager) \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+		--without-bluetooth
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+	# 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
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, 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]" ||
+	   has_version "media-libs/mesa[video_cards_r300]" ||
+	   has_version "media-libs/mesa[video_cards_r600]"; 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
+}