Add librsvg[${MULTILIB_USEDEP}] to pdepend to ensure normal icon themes (png/svg) can always be loaded (bug #547710, thanks to haarp and nE0sIghT).

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

5 files changed, 26 insertions, 9 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index a626fc903e15..f79b29d6f22e 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.775 2015/03/29 10:20:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.776 2015/04/25 18:40:54 tetromino Exp $
+
+  25 Apr 2015; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-2.24.27.ebuild,
+  gtk+-2.24.27-r1.ebuild, gtk+-3.14.9.ebuild, gtk+-3.14.10.ebuild:
+  Add librsvg[${MULTILIB_USEDEP}] to pdepend to ensure normal icon themes
+  (png/svg) can always be loaded (bug #547710, thanks to haarp and nE0sIghT).
 
   29 Mar 2015; Jeroen Roovers <jer@gentoo.org> gtk+-2.24.27.ebuild,
   gtk+-3.14.9.ebuild:
diff --git a/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild
index 68ac54bbcfef..8f365c851b1f 100644
--- a/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild,v 1.1 2015/03/20 19:58:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.27-r1.ebuild,v 1.2 2015/04/25 18:40:54 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -77,7 +77,10 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
diff --git a/x11-libs/gtk+/gtk+-2.24.27.ebuild b/x11-libs/gtk+/gtk+-2.24.27.ebuild
index 7be55c4d840b..d5dbc8230cde 100644
--- a/x11-libs/gtk+/gtk+-2.24.27.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.27.ebuild,v 1.6 2015/03/29 10:20:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.27.ebuild,v 1.7 2015/04/25 18:40:54 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -77,7 +77,10 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
diff --git a/x11-libs/gtk+/gtk+-3.14.10.ebuild b/x11-libs/gtk+/gtk+-3.14.10.ebuild
index cf9b4b946462..2e8a37ee37c5 100644
--- a/x11-libs/gtk+/gtk+-3.14.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.10.ebuild,v 1.1 2015/03/28 09:52:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.10.ebuild,v 1.2 2015/04/25 18:40:54 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -93,7 +93,10 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gtk-query-immodules-3.0
diff --git a/x11-libs/gtk+/gtk+-3.14.9.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild
index 0f628870431c..03609bb17a9a 100644
--- a/x11-libs/gtk+/gtk+-3.14.9.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild,v 1.6 2015/03/29 10:20:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild,v 1.7 2015/04/25 18:40:54 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -93,7 +93,10 @@ RDEPEND="${COMMON_DEPEND}
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gtk-query-immodules-3.0