Try to fix x11-fm/nemo and sysutils/cinnamon-control-center. Commit r19612

removed both ports .so.X major shared libraries. That is obviously bad.

The problem seems to be USES=libtool[:keepla] related. The only way I managed
to put back those libraries is by completely removing the libtool from USES.

Because of this, c-c-c keep its .so.1 there, but x11-fm/nemo bumped the lib
to .5. To track that I updated the nemo users (x11/cinnamon and
deskutils/nemo-extensions).

This commit shoulds make cinnamon stable enough until we figure out why
libtool is breaking the major shared object installation.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19618 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 133 insertions, 128 deletions

diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile
index 1f7ffa355..7a99177dc 100644
--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	nemo-extensions
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 DIST_SUBDIR=	gnome3
 
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index c98be8051..3991a73f8 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	cinnamon-control-center
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -36,7 +37,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
 		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-USES=		gettext libtool:keepla gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
 		gtk30 intlhack libgnomekbd
 USE_XORG=	x11 xfixes sm
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index e50f4c8d9..456bb3697 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -31,7 +31,7 @@ lib/cinnamon-control-center-1/panels/libuniversal-access.la
 lib/cinnamon-control-center-1/panels/libuniversal-access.so
 lib/libcinnamon-control-center.la
 lib/libcinnamon-control-center.so
-lib/libcinnamon-control-center.so.1.0.0
+lib/libcinnamon-control-center.so.1
 libdata/pkgconfig/libcinnamon-control-center.pc
 share/applications/cinnamon-color-panel.desktop
 share/applications/cinnamon-control-center.desktop
@@ -41,133 +41,133 @@ share/applications/cinnamon-region-panel.desktop
 share/applications/cinnamon-sound-nua-panel.desktop
 share/applications/cinnamon-sound-panel.desktop
 share/applications/cinnamon-universal-access-panel.desktop
-%%DATADIR%%/datetime/backward
-%%DATADIR%%/icons/hicolor/16x16/devices/cin-audio-headset.svg
-%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/24x24/devices/cin-audio-headset.svg
-%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/32x32/devices/cin-audio-headset.svg
-%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
-%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
-%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
-%%DATADIR%%/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
-%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
-%%DATADIR%%/ui/datetime/bg.png
-%%DATADIR%%/ui/datetime/bg_dim.png
-%%DATADIR%%/ui/datetime/cc.png
-%%DATADIR%%/ui/datetime/datetime.ui
-%%DATADIR%%/ui/datetime/pin.png
-%%DATADIR%%/ui/datetime/timezone_-1.png
-%%DATADIR%%/ui/datetime/timezone_-10.png
-%%DATADIR%%/ui/datetime/timezone_-10_dim.png
-%%DATADIR%%/ui/datetime/timezone_-11.png
-%%DATADIR%%/ui/datetime/timezone_-11_dim.png
-%%DATADIR%%/ui/datetime/timezone_-1_dim.png
-%%DATADIR%%/ui/datetime/timezone_-2.png
-%%DATADIR%%/ui/datetime/timezone_-2_dim.png
-%%DATADIR%%/ui/datetime/timezone_-3.5.png
-%%DATADIR%%/ui/datetime/timezone_-3.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_-3.png
-%%DATADIR%%/ui/datetime/timezone_-3_dim.png
-%%DATADIR%%/ui/datetime/timezone_-4.5.png
-%%DATADIR%%/ui/datetime/timezone_-4.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_-4.png
-%%DATADIR%%/ui/datetime/timezone_-4_dim.png
-%%DATADIR%%/ui/datetime/timezone_-5.5.png
-%%DATADIR%%/ui/datetime/timezone_-5.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_-5.png
-%%DATADIR%%/ui/datetime/timezone_-5_dim.png
-%%DATADIR%%/ui/datetime/timezone_-6.png
-%%DATADIR%%/ui/datetime/timezone_-6_dim.png
-%%DATADIR%%/ui/datetime/timezone_-7.png
-%%DATADIR%%/ui/datetime/timezone_-7_dim.png
-%%DATADIR%%/ui/datetime/timezone_-8.png
-%%DATADIR%%/ui/datetime/timezone_-8_dim.png
-%%DATADIR%%/ui/datetime/timezone_-9.5.png
-%%DATADIR%%/ui/datetime/timezone_-9.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_-9.png
-%%DATADIR%%/ui/datetime/timezone_-9_dim.png
-%%DATADIR%%/ui/datetime/timezone_0.png
-%%DATADIR%%/ui/datetime/timezone_0_dim.png
-%%DATADIR%%/ui/datetime/timezone_1.png
-%%DATADIR%%/ui/datetime/timezone_10.5.png
-%%DATADIR%%/ui/datetime/timezone_10.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_10.png
-%%DATADIR%%/ui/datetime/timezone_10_dim.png
-%%DATADIR%%/ui/datetime/timezone_11.5.png
-%%DATADIR%%/ui/datetime/timezone_11.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_11.png
-%%DATADIR%%/ui/datetime/timezone_11_dim.png
-%%DATADIR%%/ui/datetime/timezone_12.75.png
-%%DATADIR%%/ui/datetime/timezone_12.75_dim.png
-%%DATADIR%%/ui/datetime/timezone_12.png
-%%DATADIR%%/ui/datetime/timezone_12_dim.png
-%%DATADIR%%/ui/datetime/timezone_13.png
-%%DATADIR%%/ui/datetime/timezone_13_dim.png
-%%DATADIR%%/ui/datetime/timezone_14.png
-%%DATADIR%%/ui/datetime/timezone_14_dim.png
-%%DATADIR%%/ui/datetime/timezone_1_dim.png
-%%DATADIR%%/ui/datetime/timezone_2.png
-%%DATADIR%%/ui/datetime/timezone_2_dim.png
-%%DATADIR%%/ui/datetime/timezone_3.5.png
-%%DATADIR%%/ui/datetime/timezone_3.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_3.png
-%%DATADIR%%/ui/datetime/timezone_3_dim.png
-%%DATADIR%%/ui/datetime/timezone_4.5.png
-%%DATADIR%%/ui/datetime/timezone_4.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_4.png
-%%DATADIR%%/ui/datetime/timezone_4_dim.png
-%%DATADIR%%/ui/datetime/timezone_5.5.png
-%%DATADIR%%/ui/datetime/timezone_5.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_5.75.png
-%%DATADIR%%/ui/datetime/timezone_5.75_dim.png
-%%DATADIR%%/ui/datetime/timezone_5.png
-%%DATADIR%%/ui/datetime/timezone_5_dim.png
-%%DATADIR%%/ui/datetime/timezone_6.5.png
-%%DATADIR%%/ui/datetime/timezone_6.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_6.png
-%%DATADIR%%/ui/datetime/timezone_6_dim.png
-%%DATADIR%%/ui/datetime/timezone_7.png
-%%DATADIR%%/ui/datetime/timezone_7_dim.png
-%%DATADIR%%/ui/datetime/timezone_8.75.png
-%%DATADIR%%/ui/datetime/timezone_8.75_dim.png
-%%DATADIR%%/ui/datetime/timezone_8.png
-%%DATADIR%%/ui/datetime/timezone_8_dim.png
-%%DATADIR%%/ui/datetime/timezone_9.5.png
-%%DATADIR%%/ui/datetime/timezone_9.5_dim.png
-%%DATADIR%%/ui/datetime/timezone_9.png
-%%DATADIR%%/ui/datetime/timezone_9_dim.png
+share/cinnamon-control-center/datetime/backward
+share/cinnamon-control-center/icons/hicolor/16x16/devices/cin-audio-headset.svg
+share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
+share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
+share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
+share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
+share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
+share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
+share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
+share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
+share/cinnamon-control-center/icons/hicolor/24x24/devices/cin-audio-headset.svg
+share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
+share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
+share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
+share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
+share/cinnamon-control-center/icons/hicolor/32x32/devices/cin-audio-headset.svg
+share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
+share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
+share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
+share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
+share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-subwoofer.svg
 share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
 share/cinnamon-control-center/ui/cinnamon-region-panel.ui
 share/cinnamon-control-center/ui/color.ui
+share/cinnamon-control-center/ui/datetime/bg.png
+share/cinnamon-control-center/ui/datetime/bg_dim.png
+share/cinnamon-control-center/ui/datetime/cc.png
+share/cinnamon-control-center/ui/datetime/datetime.ui
+share/cinnamon-control-center/ui/datetime/pin.png
+share/cinnamon-control-center/ui/datetime/timezone_-1.png
+share/cinnamon-control-center/ui/datetime/timezone_-10.png
+share/cinnamon-control-center/ui/datetime/timezone_-10_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-11.png
+share/cinnamon-control-center/ui/datetime/timezone_-11_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-1_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-2.png
+share/cinnamon-control-center/ui/datetime/timezone_-2_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-3.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-3.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-3.png
+share/cinnamon-control-center/ui/datetime/timezone_-3_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-4.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-4.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-4.png
+share/cinnamon-control-center/ui/datetime/timezone_-4_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-5.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-5.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-5.png
+share/cinnamon-control-center/ui/datetime/timezone_-5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-6.png
+share/cinnamon-control-center/ui/datetime/timezone_-6_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-7.png
+share/cinnamon-control-center/ui/datetime/timezone_-7_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-8.png
+share/cinnamon-control-center/ui/datetime/timezone_-8_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-9.5.png
+share/cinnamon-control-center/ui/datetime/timezone_-9.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_-9.png
+share/cinnamon-control-center/ui/datetime/timezone_-9_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_0.png
+share/cinnamon-control-center/ui/datetime/timezone_0_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_1.png
+share/cinnamon-control-center/ui/datetime/timezone_10.5.png
+share/cinnamon-control-center/ui/datetime/timezone_10.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_10.png
+share/cinnamon-control-center/ui/datetime/timezone_10_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_11.5.png
+share/cinnamon-control-center/ui/datetime/timezone_11.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_11.png
+share/cinnamon-control-center/ui/datetime/timezone_11_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_12.75.png
+share/cinnamon-control-center/ui/datetime/timezone_12.75_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_12.png
+share/cinnamon-control-center/ui/datetime/timezone_12_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_13.png
+share/cinnamon-control-center/ui/datetime/timezone_13_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_14.png
+share/cinnamon-control-center/ui/datetime/timezone_14_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_1_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_2.png
+share/cinnamon-control-center/ui/datetime/timezone_2_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_3.5.png
+share/cinnamon-control-center/ui/datetime/timezone_3.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_3.png
+share/cinnamon-control-center/ui/datetime/timezone_3_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_4.5.png
+share/cinnamon-control-center/ui/datetime/timezone_4.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_4.png
+share/cinnamon-control-center/ui/datetime/timezone_4_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_5.5.png
+share/cinnamon-control-center/ui/datetime/timezone_5.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_5.75.png
+share/cinnamon-control-center/ui/datetime/timezone_5.75_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_5.png
+share/cinnamon-control-center/ui/datetime/timezone_5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_6.5.png
+share/cinnamon-control-center/ui/datetime/timezone_6.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_6.png
+share/cinnamon-control-center/ui/datetime/timezone_6_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_7.png
+share/cinnamon-control-center/ui/datetime/timezone_7_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_8.75.png
+share/cinnamon-control-center/ui/datetime/timezone_8.75_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_8.png
+share/cinnamon-control-center/ui/datetime/timezone_8_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_9.5.png
+share/cinnamon-control-center/ui/datetime/timezone_9.5_dim.png
+share/cinnamon-control-center/ui/datetime/timezone_9.png
+share/cinnamon-control-center/ui/datetime/timezone_9_dim.png
 share/cinnamon-control-center/ui/display-capplet.ui
 share/cinnamon-control-center/ui/language-chooser.ui
 share/cinnamon-control-center/ui/power.ui
@@ -287,6 +287,7 @@ share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-timezones.mo
 share/polkit-1/rules.d/cinnamon-control-center.rules
 @dirrmtry share/locale/ilo/LC_MESSAGES
 @dirrmtry share/locale/ilo
+@dirrmtry share/desktop-directories
 @dirrm share/cinnamon-control-center/ui/datetime
 @dirrm share/cinnamon-control-center/ui
 @dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices
@@ -310,3 +311,4 @@ share/polkit-1/rules.d/cinnamon-control-center.rules
 @dirrm lib/cinnamon-control-center-1
 @dirrm include/cinnamon-control-center-1/libcinnamon-control-center
 @dirrm include/cinnamon-control-center-1
+@dirrmtry etc/xdg/menus
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 7baf407f1..a4d60faa8 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	nemo
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+USES=		desktop-file-utils gettext gmake pathfix \
 		pkgconfig shared-mime-info
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
 		libxml2 pygobject3
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index 03f7946a1..52ca8d215 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -16,7 +16,7 @@ lib/girepository-1.0/Nemo-3.0.typelib
 lib/libnemo-extension.a
 lib/libnemo-extension.la
 lib/libnemo-extension.so
-lib/libnemo-extension.so.1.4.0
+lib/libnemo-extension.so.5
 libdata/pkgconfig/libnemo-extension.pc
 libexec/nemo-convert-metadata
 man/man1/nemo-connect-server.1.gz
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 571808f55..d764649ce 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	cinnamon
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3