Update cinnamon to 2.2.3. Deal with the upower update to 0.99. Introduce

cinnamon-menus and mint-themes. Remove a lot of unused stuff in
misc/cinnamon-translations. Also try to remove deprecated stuff here and
there.


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

3 files changed, 30 insertions, 12 deletions

diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 91252686f..17a243ddb 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	nemo
-PORTVERSION=	2.0.8
+PORTVERSION=	2.2.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
 DIST_SUBDIR=	gnome3
@@ -13,6 +13,7 @@ COMMENT=	File manager for the Cinnamon desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		gtkdocize:${PORTSDIR}/textproc/gtk-doc \
+		py*-polib>=0:${PORTSDIR}/devel/py-polib \
 		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
@@ -24,11 +25,12 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-i
 
 USES=		desktop-file-utils gettext gmake pathfix \
 		pkgconfig shared-mime-info
-USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libxml2 \
-		introspection:build
+USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
+		libxml2 pygobject3
 INSTALLS_ICONS=	yes
-USE_LDCONFIG=	yes
+USE_PYTHON=	2
 USE_AUTOTOOLS=	libtool autoconf automake
+USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS=	--enable-static --disable-packagekit
@@ -71,8 +73,17 @@ post-patch:
 		${WRKSRC}/data/nemo.xml.in \
 		${WRKSRC}/libnemo-private/nemo-file-utilities.h
 
+#	@${REINPLACE_CMD} '/merge_action/d' \
+#		${WRKSRC}/files/Makefile.in
+
 	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
-		${XARGS} ${REINPLACE_CMD} -I "" -e "s|#!.*python.*|#!/usr/bin/env python|g"
+		${XARGS} ${REINPLACE_CMD} -I "" -e "s|#!.*python.*|#!${PYTHON_CMD}|g"
+
+	@${REINPLACE_CMD} 's|\"/usr|\"${PREFIX}|g' \
+		${WRKSRC}/data/merge_action_strings
+
+	@${REINPLACE_CMD} 's|"files", "usr"|"files", "${PREFIX}".strip("/")|g' \
+		${WRKSRC}/data/merge_action_strings
 
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo
index 8ff3ca826..ed9ac3089 100644
--- a/x11-fm/nemo/distinfo
+++ b/x11-fm/nemo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/nemo-2.0.8.tar.gz) = e061bd231493737e64c05448bbab29dcd34a0bcc37f0d6240b5f08109e92dbf0
-SIZE (gnome3/nemo-2.0.8.tar.gz) = 1341780
+SHA256 (gnome3/nemo-2.2.0.tar.gz) = aa72fed472cfed47963f955506684c6a20b957d9dc5385cb55376f30d3589b61
+SIZE (gnome3/nemo-2.2.0.tar.gz) = 1341504
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index b5147af0a..70b214c23 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -35,6 +35,18 @@ share/icons/hicolor/22x22/apps/nemo.png
 share/icons/hicolor/24x24/apps/nemo.png
 share/icons/hicolor/32x32/apps/nemo.png
 share/icons/hicolor/scalable/actions/location-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-edit-find-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-folder-new-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-home-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-next-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-previous-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-up-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-view-refresh-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
+share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
 share/icons/hicolor/scalable/status/progress-0-symbolic.svg
 share/icons/hicolor/scalable/status/progress-10-symbolic.svg
 share/icons/hicolor/scalable/status/progress-100-symbolic.svg
@@ -46,11 +58,6 @@ share/icons/hicolor/scalable/status/progress-60-symbolic.svg
 share/icons/hicolor/scalable/status/progress-70-symbolic.svg
 share/icons/hicolor/scalable/status/progress-80-symbolic.svg
 share/icons/hicolor/scalable/status/progress-90-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
-share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
 share/icons/hicolor/scalable/apps/nemo.svg
 share/mime/application/nemo-action.xml
 share/mime/application/x-nemo-saved-search.xml