Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -420,6 +420,7 @@
 	elif [ ${pkg} = "devel/libIDL" ]; then warn "you need USE_GNOME+=libidl"
 	elif [ ${pkg} = "x11-fm/nautilus" ]; then warn "you need USE_GNOME+=nautilus3"
 	elif [ ${pkg} = "devel/ORBit2" ]; then warn "you need USE_GNOME+=orbit2"
+	elif [ ${pkg} = "graphics/librsvg2-rust" ]; then warn "you need USE_GNOME+=librsvg2"
 	# mate
 	# grep LIB_DEPENDS= Mk/Uses/mate.mk |sed -e 's|\(.*\)_LIB_DEPENDS.*:\(.*\)\/\(.*\)|elif [ ${pkg} = "\2/\3" ]; then warn "you need USE_MATE+=\1"|'
 	elif [ ${pkg} = "x11-fm/caja" ]; then warn "you need USE_MATE+=caja"
Index: Mk/Uses/gnome.mk
===================================================================
--- Mk/Uses/gnome.mk
+++ Mk/Uses/gnome.mk
@@ -265,7 +265,16 @@
 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)
+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
Index: deskutils/shutter/Makefile
===================================================================
--- deskutils/shutter/Makefile
+++ deskutils/shutter/Makefile
@@ -13,7 +13,6 @@
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	ImageMagick6>=6.9.3.1,1:graphics/ImageMagick6 \
-		librsvg2>=2.40.6:graphics/librsvg2 \
 		p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
 		p5-File-Copy-Recursive>=0.38_1:devel/p5-File-Copy-Recursive \
 		p5-File-Spec-Native>=1.003_1:devel/p5-File-Spec-Native \
Index: graphics/osg/Makefile
===================================================================
--- graphics/osg/Makefile
+++ graphics/osg/Makefile
@@ -98,8 +98,7 @@
 SDL_USE=		SDL=sdl
 SDL_VARS=		FORCE_REQUIRE+=SDL
 SDL_VARS_OFF=		FORCE_IGNORE+=SDL
-SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
-SVG_USE=		GNOME=cairo
+SVG_USE=		GNOME=cairo,librsvg2
 SVG_VARS=		FORCE_REQUIRE+=RSVG
 SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
Index: math/asymptote/Makefile
===================================================================
--- math/asymptote/Makefile
+++ math/asymptote/Makefile
@@ -18,16 +18,16 @@
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libsigsegv.so:devel/libsigsegv
-RUN_DEPENDS=	rsvg-convert:graphics/librsvg2 \
-		${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qt5-svg>0:graphics/py-qt5-svg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \
 		${PY_PILLOW}
 
-USES=		compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python:3.6+ \
+USES=		compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python:3.6+ \
 		shebangfix tar:tgz
 SHEBANG_FILES=	GUI/*.py
 USE_GL=		gl glu glut
+USE_GNOME=	librsvg2:run
 USE_PERL5=	build
 USE_TEX=	dvipsk formats
 
Index: science/chemical-mime-data/Makefile
===================================================================
--- science/chemical-mime-data/Makefile
+++ science/chemical-mime-data/Makefile
@@ -10,11 +10,9 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of chemical MIME types for UNIX desktops
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/librsvg2
-
 USES=		gettext-tools gmake gnome pathfix pkgconfig shared-mime-info \
 		tar:bzip2
-USE_GNOME=	gnomemimedata intlhack libxslt:build
+USE_GNOME=	gnomemimedata intlhack librsvg2:build libxslt:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-update-database
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: www/midori/Makefile
===================================================================
--- www/midori/Makefile
+++ www/midori/Makefile
@@ -13,8 +13,7 @@
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	rsvg-convert:graphics/librsvg2 \
-		valac:lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup \
@@ -26,7 +25,8 @@
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext gnome \
 		libarchive localbase:ldflags pkgconfig sqlite tar:bzip2 xorg
-USE_GNOME=	cairo glib20 gtk30 intltool introspection libxml2
+USE_GNOME=	cairo glib20 gtk30 intltool introspection librsvg2:build \
+		libxml2
 USE_XORG=	xscrnsaver
 
 CFLAGS+=	-Wno-return-type
Index: x11-themes/gnome-icons-gartoon-redux/Makefile
===================================================================
--- x11-themes/gnome-icons-gartoon-redux/Makefile
+++ x11-themes/gnome-icons-gartoon-redux/Makefile
@@ -12,11 +12,10 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rsvg-convert:graphics/librsvg2
-
-USES=		perl5
+USES=		gnome perl5
 USE_PERL5=	build
 
+USE_GNOME=	librsvg2:build
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 INSTALLS_ICONS=	yes
Index: x11-toolkits/gtk30/Makefile
===================================================================
--- x11-toolkits/gtk30/Makefile
+++ x11-toolkits/gtk30/Makefile
@@ -25,13 +25,13 @@
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS+=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
-		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
-		librsvg2>=0:graphics/librsvg2
+		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme
 
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango
+USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango \
+		librsvg2:run
 USES=		compiler:c11 gettext gmake gnome libtool localbase \
 		pathfix perl5 pkgconfig tar:xz
 CONFIGURE_ARGS=	--enable-introspection
Index: x11/lavalauncher/Makefile
===================================================================
--- x11/lavalauncher/Makefile
+++ x11/lavalauncher/Makefile
@@ -35,8 +35,7 @@
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_MESON_ENABLED=	watch-config
 
-LIBRSVG2_USE=		GNOME=glib20
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so.2:graphics/librsvg2-rust
+LIBRSVG2_USE=		GNOME=glib20,librsvg2
 LIBRSVG2_MESON_ENABLED=	librsvg
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc