Update cinnamon to 2.2.13 and related ports to the most

up to date version:

  - Add libtool to x11-fm/nemo. The only users are
    nemo-extensions (portrevision bump) and cinnamon (which is
    version bumped anyway and doesn't need a portrevision bump)
  - Remove :keepla everywhere.
  - Add install-strip everywhere where needed (except for the
    translations)

I hope I did not miss something.


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

12 files changed, 25 insertions, 37 deletions

diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index bd66ae79b..ab11c02d1 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	cinnamon-desktop
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/
 		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
 
 USE_XORG=	x11 xrandr xext
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index 094cb9d33..52284cf3d 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-desktop-2.2.0.tar.xz) = 4f833a3914b7e822c1dd6a495b688d614c4ae6663faa3d0b74d948dae3bcf33b
-SIZE (gnome3/cinnamon-desktop-2.2.0.tar.xz) = 556338
+SHA256 (gnome3/cinnamon-desktop-2.2.3.tar.xz) = 0950bdee8671e4693bfd375f01a25fb8ef5d38d246338600083cd181400619d8
+SIZE (gnome3/cinnamon-desktop-2.2.3.tar.xz) = 555916
diff --git a/x11/cinnamon-desktop/pkg-plist b/x11/cinnamon-desktop/pkg-plist
index 250250c87..e3114f0a6 100644
--- a/x11/cinnamon-desktop/pkg-plist
+++ b/x11/cinnamon-desktop/pkg-plist
@@ -9,7 +9,6 @@ include/cinnamon-desktop/libcinnamon-desktop/gnome-rr-labeler.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-rr.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-wall-clock.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-xkb-info.h
-lib/libcinnamon-desktop.la
 lib/libcinnamon-desktop.so
 lib/libcinnamon-desktop.so.4
 lib/libcinnamon-desktop.so.4.0.0
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index 70d381431..4254f1ebe 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -17,8 +17,9 @@ BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
 		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
-USE_GNOME=	gnomehier gnomeprefix gtk30 intlhack introspection:build
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomehier gnomemenus3 gnomeprefix gtk30 intlhack \
+		introspection:build
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -26,14 +27,7 @@ USE_AUTOTOOLS=	autoconf automake libtool
 PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-post-patch:
-	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
-		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
-		${STAGEDIR}${PREFIX}/share/desktop-directories
+INSTALL_TARGET=	install-strip
 
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/x11/cinnamon-menus/files/KDE.directory b/x11/cinnamon-menus/files/KDE.directory
deleted file mode 100644
index d8cacb750..000000000
--- a/x11/cinnamon-menus/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=KDE
-Comment=Some comment about KDE menu
-Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png
-Type=Directory
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 2f4dcbbbe..9d6c40327 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	cinnamon-screensaver
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.3
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
@@ -20,7 +20,7 @@ RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper \
 		gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libgnomekbd libxml2
 GNU_CONFIGURE=	yes
@@ -30,6 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d \
 		--without-systemd
+INSTALL_TARGET=	install-strip
 
 SUB_FILES+=	cinnamon-screensaver.pam
 
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index c544456e4..6612ab242 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-screensaver-2.2.0.tar.xz) = 2ba075f8bceb5ff853d76b0426e0d3fedcfd503016c4752f1e5b3813b0d8aef9
-SIZE (gnome3/cinnamon-screensaver-2.2.0.tar.xz) = 141541
+SHA256 (gnome3/cinnamon-screensaver-2.2.3.tar.xz) = 0893bb4a78dbe0647ffacd38c685da0cbe9d1274cbd40ec063a1615a6b1bf5c8
+SIZE (gnome3/cinnamon-screensaver-2.2.3.tar.xz) = 141638
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index 57f138cb2..5d8d393ab 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	cinnamon-session
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -20,10 +20,10 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
 		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
-USES=		gettext libtool:keepla gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
-USE_GNOME=	gnomeprefix intltool gtk30
+USE_GNOME=	gnomeprefix gtk30 intltool
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtoolize autoconf automake
@@ -32,6 +32,7 @@ CONFIGURE_ARGS=	--disable-docbook-docs
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
 CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.cinnamon.SessionManager.gschema.xml
 
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 360f0eb3d..e528815b1 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-session-2.2.0.tar.xz) = b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae
-SIZE (gnome3/cinnamon-session-2.2.0.tar.xz) = 900954
+SHA256 (gnome3/cinnamon-session-2.2.1.tar.xz) = 357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e
+SIZE (gnome3/cinnamon-session-2.2.1.tar.xz) = 902111
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index d764649ce..f46d1d60d 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -3,8 +3,7 @@
 #    $MCom$
 
 PORTNAME=	cinnamon
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.2.13
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -39,7 +38,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
 
 WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix
+USES=		gettext gmake libtool pathfix pkgconfig shebangfix
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 \
 		gnomeprefix gtk30 intlhack introspection:build
 # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index c3ac121da..c7c84b1ee 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-2.2.3.tar.gz) = 9151452f81ffb7edc28cbdb107818f64bb9bd55610711781345418166372f0fe
-SIZE (gnome3/cinnamon-2.2.3.tar.gz) = 2638409
+SHA256 (gnome3/cinnamon-2.2.13.tar.gz) = 123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a
+SIZE (gnome3/cinnamon-2.2.13.tar.gz) = 2656518
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index e252c98ae..9d033dd91 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -86,7 +86,6 @@ man/man1/cinnamon.1.gz
 man/man1/cinnamon2d.1.gz
 man/man1/gnome-session-cinnamon.1.gz
 man/man1/gnome-session-cinnamon2d.1.gz
-share/applications/cinnamon-add-panel-launcher.desktop
 share/applications/cinnamon-menu-editor.desktop
 share/applications/cinnamon-settings-applets.desktop
 share/applications/cinnamon-settings-backgrounds.desktop
@@ -575,7 +574,6 @@ share/applications/cinnamon2d.desktop
 %%DATADIR%%/js/ui/appSwitcher/timelineSwitcher.js
 %%DATADIR%%/search_providers/google.xml
 %%DATADIR%%/search_providers/wikipedia.xml
-%%DATADIR%%/shaders/dim-window.glsl
 %%DATADIR%%/theme/add-workspace-hover.png
 %%DATADIR%%/theme/add-workspace.png
 %%DATADIR%%/theme/calendar-arrow-left.svg
@@ -635,6 +633,8 @@ share/polkit-1/actions/org.cinnamon.settings-users.policy
 share/xsessions/cinnamon.desktop
 share/xsessions/cinnamon2d.desktop
 @dirrm share/xsessions
+share/icons/hicolor/16x16/categories/cs-backgrounds.svg
+share/icons/hicolor/16x16/categories/cs-desklets.svg
 share/icons/hicolor/scalable/categories/cs-applets.svg
 share/icons/hicolor/scalable/categories/cs-backgrounds.svg
 share/icons/hicolor/scalable/categories/cs-bluetooth.svg
@@ -683,7 +683,6 @@ share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
 share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
 @dirrm %%DATADIR%%/theme
-@dirrm %%DATADIR%%/shaders
 @dirrm %%DATADIR%%/search_providers
 @dirrm %%DATADIR%%/js/ui/appSwitcher
 @dirrm %%DATADIR%%/js/ui