Index: Mk/extensions/gnome.mk
===================================================================
diff -u -N -re61c6dd303471d0a297a484e781ee2d396f844dd -r3aebcd445fc11fd1e9d79f48383377c210f4be8f
--- Mk/extensions/gnome.mk	(.../gnome.mk)	(revision e61c6dd303471d0a297a484e781ee2d396f844dd)
+++ Mk/extensions/gnome.mk	(.../gnome.mk)	(revision 3aebcd445fc11fd1e9d79f48383377c210f4be8f)
@@ -78,7 +78,7 @@
 		libgnomecanvas libgnomekbd \
 		libgnomeui libgsf libgtkhtml libidl librsvg2 libwnck \
 		libxml2 libxslt \
-		orbit2 pango pangox-compat pygobject pygtk2 \
+		orbit2 pango pangox-compat pygobject \
 		vte
 
 # GNOME 3 components
@@ -89,9 +89,9 @@
 		pygobject3 vte3
 
 # C++ bindings
-_USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm20 gtkmm24 \
+_USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm24 \
 		gtkmm30 gtksourceviewmm3 libgdamm5 \
-		libgtksourceviewmm libxml++26 libsigc++12 libsigc++20 \
+		libgtksourceviewmm libxml++26 libsigc++20 \
 		pangomm
 
 # glib-mkenums often fails with C locale
@@ -101,7 +101,7 @@
 GNOME_MAKEFILEIN?=	Makefile.in
 SCROLLKEEPER_DIR=	/var/db/rarian
 
-referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 				"s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|"
 
 GNOME_HTML_DIR?=	${PREFIX}/share/doc
@@ -137,9 +137,6 @@
 gsound_RUN_DEPENDS=	gsound-play:audio/gsound
 gsound_USE_GNOME_IMPL=	glib20
 
-gtkmm20_LIB_DEPENDS=	libgtkmm-2.0.so:x11-toolkits/gtkmm20
-gtkmm20_USE_GNOME_IMPL=	libsigc++12 gtk20
-
 gtkmm24_LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 gtkmm24_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk20
 
@@ -155,8 +152,6 @@
 libgtksourceviewmm_LIB_DEPENDS=		libgtksourceviewmm-2.0.so:x11-toolkits/libgtksourceviewmm
 libgtksourceviewmm_USE_GNOME_IMPL=	gtksourceview2 gtkmm24
 
-libsigc++12_LIB_DEPENDS=	libsigc-1.2.so:devel/libsigc++12
-
 libsigc++20_LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 pangomm_LIB_DEPENDS=	libpangomm-1.4.so:x11-toolkits/pangomm
@@ -262,13 +257,22 @@
 vte3_LIB_DEPENDS=	libvte-2.91.so:x11-toolkits/vte3
 vte3_USE_GNOME_IMPL=	gtk30
 
+# Use librsvg2-rust where lang/rust is available
+#.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le)
+#librsvg2_BUILD_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
+#librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2-rust
+#librsvg2_RUN_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
+#.else
+librsvg2_BUILD_DEPENDS=	librsvg2>=0:graphics/librsvg2
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+librsvg2_RUN_DEPENDS=	librsvg2>=0:graphics/librsvg2
+#.endif
 librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango
 
 nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
-nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2
+nautilus3_USE_GNOME_IMPL=gnomedesktop3 libxml2
 
-metacity_LIB_DEPENDS=	libmetacity-private.so:x11-wm/metacity
+metacity_LIB_DEPENDS=	libmetacity.so:x11-wm/metacity
 
 gnomecontrolcenter3_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
 gnomecontrolcenter3_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
@@ -292,26 +296,22 @@
 libgsf_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 libgsf_USE_GNOME_IMPL=	glib20 libxml2
 
-pygobject_BUILD_DEPENDS=	pygobject-codegen-2.0:devel/py-gobject@${PY_FLAVOR}
-pygobject_RUN_DEPENDS=		pygobject-codegen-2.0:devel/py-gobject@${PY_FLAVOR}
+pygobject_BUILD_DEPENDS=	pygobject-codegen-2.0:devel/py-gobject
+pygobject_RUN_DEPENDS=		pygobject-codegen-2.0:devel/py-gobject
 pygobject_USE_GNOME_IMPL=	glib20
 
 pygobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 pygobject3_USE_GNOME_IMPL=	glib20
 
-pygtk2_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2@${PY_FLAVOR}
-pygtk2_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2@${PY_FLAVOR}
-pygtk2_USE_GNOME_IMPL=	libglade2 pygobject
-
 intltool_BUILD_DEPENDS=	${LOCALBASE}/bin/intltool-extract:textproc/intltool
 
-intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \
+intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \
 			's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
 			 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
 			 s|/usr/bin/iconv|${ICONV_CMD}|g ; \
 			 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' ; \
-			${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \
+			${FIND} ${WRKSRC} -name configure | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \
 			's/DATADIRNAME=lib/DATADIRNAME=share/'
 intlhack_USE_GNOME_IMPL=intltool
 
@@ -472,9 +472,9 @@
 	@for i in ${GLIB_SCHEMAS}; do \
 		${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \
 	done
-	@${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
+	@${ECHO_CMD} "@postexec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
 			>> ${TMPPLIST}; \
-	${ECHO_CMD} "@unexec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
+	${ECHO_CMD} "@postunexec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \
 			>> ${TMPPLIST};
 .endif