--- cinnamon-1.6.7-r1.ebuild	2013-05-18 10:46:30.347349477 -0500
+++ cinnamon-1.8.2.ebuild	2013-05-18 10:18:22.236313517 -0500
@@ -125,7 +125,7 @@
 # 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"
+S="${WORKDIR}/linuxmint-Cinnamon-ded6f27"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -136,7 +136,7 @@
 	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-1.6.1-optional-networkmanager.patch"
+	epatch "${FILESDIR}/${P}-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:" \
@@ -147,8 +147,8 @@
 		-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-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"