Version bump, as-needed doesn't work ok for this (#536374 , upstream bug https://github.com/linuxmint/Cinnamon/issues/3843 ), drop old.

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

4 files changed, 23 insertions, 244 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 522d20634e2c..1a3706035db8 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2015/01/11 22:46:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.54 2015/01/27 12:07:13 pacho Exp $
+
+*cinnamon-2.4.6 (27 Jan 2015)
+
+  27 Jan 2015; Pacho Ramos <pacho@gentoo.org> +cinnamon-2.4.6.ebuild,
+  -cinnamon-2.2.14.ebuild, -cinnamon-2.4.5.ebuild:
+  Version bump, as-needed doesn't work ok for this (#536374 , upstream bug
+  https://github.com/linuxmint/Cinnamon/issues/3843 ), drop old.
 
 *cinnamon-2.4.5 (11 Jan 2015)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e0739a1dc7d0..7631d953a7de 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -15,18 +15,16 @@ AUX cinnamon-2.4.5-set-wheel.patch 3141 SHA256 d7c38162bc0c8bf56f8fc6f58c0439763
 AUX cinnamon-screensaver.desktop 451 SHA256 19ca21fbe12ef393176c2dfa75c7c1b248c6e1560005e0c19a07349f25101323 SHA512 8e1f7b5524494336da3f469f446c45adfefee0ff55f04d069612234cc27ca39b6bf1c87bdcdb18078ddffad4b46a8750bd5b41d35ab9180b4ed1417cc82e5552 WHIRLPOOL 29a1a430f7d7aa73bd8ff5d0877772fe092c3c39b9bc1adb35b32f5432f357204b7367edd00616adc5a15f3059cd16da14db5047ddc09795ce761e53f2fec626
 AUX cinnamon2d-screensaver.desktop 455 SHA256 ce9172af04758a4078079e6bcb7b1117bfce02e3a9a7f794f32d7359612a3aa0 SHA512 2dffcbc2dba76597176ea645974208b58aca9c5809e46426e55f655a4f05a2fafffb9f024d25ec6bbe7fb05a3e8bfbfdfed055051895838db8816edfaea57791 WHIRLPOOL a4bec3d1c85b47691b2ddd337c480889a51a3140ff17ecb7fd11e3326788b9b20044a540851b3bcfae3a106e143363369d47c03310b315a78faff5201c66e215
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 SHA256 bfdbdc3e2ab360100bf85007f8762ae055611f4071535a6b207cd34437f2ec83 SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 WHIRLPOOL 7fcc04c4bc28fe08ed8b3a6b5574f55392c0fcc13902e0b9f311279e1ac4f282fa999cd5d804a0f41d684ac03a3f9706745df7cdf6a98ab3ddd4b3200d3c080a
-DIST cinnamon-2.2.14.tar.gz 2656809 SHA256 ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9 SHA512 fab14dd7ba7ec0ed0ae8e9eb57befdd9d85239dc0215900192475fb7b256bb7c54df068ccedaa01c97651ce97f6bb2837bf1b2f56189d34eaf5a1d5f2ffad227 WHIRLPOOL 4f19e3bd44fcb63d650d3a8c8748605f55e5e3c8a1796bb88968addcefd277d9572a8192aead9c5e3ceae7f1132ad6d060e56060e6780dc836312f7281c0f655
 DIST cinnamon-2.2.16.tar.gz 2656994 SHA256 1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793 SHA512 1e671c02393bb42ffcf20766a4bda005199115f9686784b3baa85828182d630cedce392a589689e639005aaf4ae05a2fb5c9b852cd94691f62ef55ab415a53fa WHIRLPOOL a8f86eb71449fd8281ff85b0e93e92d53fde43c7cf617621d2093b8222b8061ed278a7fe13413fc4f896dfbbdd12f67cb5b20536637ac53d6b06564b76dd918f
-DIST cinnamon-2.4.5.tar.gz 2734142 SHA256 118a42fe9c6450fd345ea98e48fb855e02b4cee017d171f9d08d6396a20e844c SHA512 fe252a7d5d784a4228c5cba2129d33228bfb3cbd0c8db2dd064d94b53b9f3bd54b49d52095abd3a0f2ca104aac7945b39c55ad26f8527d6a17945e7ef590dffc WHIRLPOOL b22d2ae55a002c8215f6f5520277409a15be733141c649a69bfe1ef20e853f4014db7b512b93623685f3b4f85d493448beeff5f8b4d2883040d022765f587b1a
-EBUILD cinnamon-2.2.14.ebuild 8086 SHA256 21d6337ca37c0bb716a6fce83489f23477e2371e49b7d6296ecb17768c3fc06c SHA512 99ba24b0f9404d5aaec93ccded5fb101e234f31f00c5dfeb621be0e623b645975b43c48be470930ac53bcf2180461d00058246251c55ec45adcfed7201b14a83 WHIRLPOOL ab8b8af2da5230390b5498b1122c3bf073b7a1e0a182b2802fbaec853c51be1c9b9af143042edd012205d2ba3531cf172de0724b047aa2b4adb2740b18e2b7a8
+DIST cinnamon-2.4.6.tar.gz 2813177 SHA256 f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 SHA512 c7553b3af4a46dc25e7b39ce8b66036d6975b9487ecaba023df3d5b4176fc9f2cea90f1e6a8daadcf482f5cfc0c495c011b2734b60af1bf3577c033c587de43d WHIRLPOOL 2060d1784e285b084e576e33e0dfcf3721779a8ce92be0cd7187db792b8ac631d931cdd327203b694904552657133e1a418ce8e23e1d2b1ef165cc97f1b8477b
 EBUILD cinnamon-2.2.16-r2.ebuild 9328 SHA256 6893dc734d355fcbcc913cbc9b9db9bfdfe95619af2267fc2a9131647665490a SHA512 7a5b5b9de285f670040585b62dce6be4150bbcc7d6877c9f0989f7bd984cd082bed7f1ce3b49fdb5b748542a9d6a1645a569b2686f59e9bbddc9b0da5918d698 WHIRLPOOL 802dffa3cb025948c10d3a004717d7bee2d1bfbf65ec3d5b7ff847afa999e0be7ed438f6547ef6cfcd7937766c1e7f8f2d90ba5aa05d1af5dc69a2521da15ce8
-EBUILD cinnamon-2.4.5.ebuild 8221 SHA256 077723b112f20b1266b4aa81d9c3ebeabc736e816ce104931041e3c256c52e16 SHA512 aa7970e6db1732d7ceb181c14021ba683c6256ca8776f3c3a80c650327ed6ce61dadfdde61a11907ace00676c59062255fc791b80c60e4d1121f0f94475abb6b WHIRLPOOL cb98c354eee0988d0e5150b5f2f4703a0bfaed2626f21e2ee29264af7842b202d765c842db5325cc91825aa6cce7ba67158e4bff83635c414d15de8fea19f243
-MISC ChangeLog 12444 SHA256 0c03184668d0eeb65b46fda4403fd7098040c6eec3b1330eba60b1371a1711ea SHA512 0d97f173e2b221cc4ffb97cbedb9dfcc9eddae9e98d164ea358639e8232bb39634d2abda3a4042c09abfb5bf55ba624766e525f7bb75d0f51a10dd0c18dbd5d4 WHIRLPOOL 39dee8fa0085ecb4dd8626acbb1a6fa2604e58cadf5f9cb1f46c5a885756a86b34563ab867ab64bdffcd0b55ede262dc41c37b511061c8995a04b51be4fb6944
+EBUILD cinnamon-2.4.6.ebuild 8422 SHA256 2cce17ddb7fc6be70aed79ea89d6ab6450e0c1b810aa22e6d81729cd2da7592b SHA512 875c3a17b7aeb5d4ec7280b6a91bad17c225ac2ffe5c60903ca1b52492fc6b57dd1365b40a1ab7bb542ef538761e117ae493c111b3fee6bf7d25f35433c8bbb5 WHIRLPOOL d4f25632e53a40824f69c0690c86a98158eb2eee41b92d030f33a3d1d1ca9937993a18da20cf579ea250cc2684e3e07b8e67f0246b6d178191b8655d09d64aa7
+MISC ChangeLog 12739 SHA256 7febadd21ac85e30dd378991cd5039ecdcad5690c7f1d291df5d260e0c3fa9ca SHA512 97c7a245185ca9cf23d8623bfe341aae4df06bdaf896cb7b831a90b750d50e15af692ddf53611806f76b505b6932a248470da2aaaeae58ce601c7c4cfa48b59d WHIRLPOOL 5a30336226a28099883d1dbdfca662d249331fa605cd834c3889037617db18e9a67246552b20fb3aa54ae6ce4ab2d028e806608521c33c3252402fe26a5b58b2
 MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSy/TgACgkQ1fmVwcYIWAb+fACg2YD6YQ5corCUAXToSIFc3aIu
-QGcAn0nqLjvyqXgXLMfjoOcsx6Hx9D1w
-=xHd/
+iEYEAREIAAYFAlTHf3IACgkQCaWpQKGI+9TrtgCfdc2rHNp7JNnNQSYKgbaLTu8O
++cUAn1KpCvLhwqLXuTxOeLX/9MsRpQxO
+=pQ9H
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.14.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.14.ebuild
deleted file mode 100644
index 77233ec5b321..000000000000
--- a/gnome-extra/cinnamon/cinnamon-2.2.14.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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-2.2.14.ebuild,v 1.3 2014/07/23 15:17:35 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_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"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# bluetooth support dropped due bug #511648
-IUSE="+l10n +networkmanager" #+bluetooth
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2
-	>=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-1.0:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-1.9.0
-	>=media-libs/clutter-1.7.5: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-libs/libcanberra
-	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.0.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-1.9.1[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
-# note: needs gksu, not gksu-polkit, due to extensive use of --message/-m arg
-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
-
-	gnome-extra/cinnamon-settings-daemon
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-libs/gksu
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	gnome-extra/nemo
-	gnome-extra/cinnamon-control-center
-	gnome-extra/cinnamon-screensaver
-
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[${PYTHON_USEDEP}]
-	>=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 "${FILESDIR}/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.2.6-optional-networkmanager.patch"
-
-	# 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/cinnamon-settings-users/cinnamon-settings-users.py \
-		-i files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
-		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
-		-i files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py \
-		-i files/usr/lib/cinnamon-settings/data/spices/applet-detail.html \
-		-i files/usr/lib/cinnamon-settings/bin/*.py \
-		-i files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py \
-		-i files/usr/lib/cinnamon-menu-editor/cme/*.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
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Don't error out on warnings
-	gnome2_src_configure \
-		--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
-		#$(use_with bluetooth)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users}
-	# Fix broken shebangs
-	sed -e "s%#!.*python%#!${PYTHON}%" \
-		-i "${ED}usr/bin/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users} \
-		-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"
-
-	# 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: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
-}
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.5.ebuild b/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
index fdfa2f3e7003..1caed15aa4b1 100644
--- a/gnome-extra/cinnamon/cinnamon-2.4.5.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # 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.4.5.ebuild,v 1.1 2015/01/11 22:46:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.4.6.ebuild,v 1.1 2015/01/27 12:07:13 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit autotools eutils gnome2 multilib pax-utils python-single-r1
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
@@ -164,6 +164,7 @@ src_prepare() {
 		-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"
@@ -182,10 +183,15 @@ 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) \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
 		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
 		--without-bluetooth