From: Sebastian Pipping <sping@gentoo.org>
Date: Mon, 31 Oct 2016 18:44:22 +0000 (+0100)
Subject: media-gfx/gimp: Resolve svg use flag (bug #597460)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a76e1f129dd7755ad6a0d0a237f55267cd8ea97;p=gentoo.git

media-gfx/gimp: Resolve svg use flag (bug #597460)

Related upstream commit:
https://git.gnome.org/browse/gimp/commit/?id=43e218859b09ff648088f4820642d92c57f0ddb6

Package-Manager: portage-2.3.2
---

diff --git a/media-gfx/gimp/gimp-2.9.4-r1.ebuild b/media-gfx/gimp/gimp-2.9.4-r1.ebuild
index 7d4f595334c1..d68dd68bd593 100644
--- a/media-gfx/gimp/gimp-2.9.4-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.4-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg udev vector-icons webkit wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webkit wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
@@ -59,7 +59,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
 	)
 	>=media-libs/tiff-3.5.7:0
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
+	>=gnome-base/librsvg-2.36.0:2
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	x11-libs/libXcursor
 	sys-libs/zlib
@@ -81,7 +81,7 @@ DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 S="${WORKDIR}"/${PF}
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) vector-icons? ( svg )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 pkg_setup() {
 	G2CONF="--enable-default-binary \
@@ -100,7 +100,7 @@ pkg_setup() {
 		$(use_enable python) \
 		$(use_enable smp mp) \
 		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
+		--with-librsvg \
 		$(use_with udev gudev) \
 		$(use_with wmf) \
 		--with-xmc \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 7b4220a9e701..4a652741c955 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS=""
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev webkit wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
@@ -60,7 +60,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 	)
 	>=media-libs/tiff-3.5.7:0
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
+	>=gnome-base/librsvg-2.36.0:2
 	wmf? ( >=media-libs/libwmf-0.2.8 )
 	x11-libs/libXcursor
 	sys-libs/zlib
@@ -101,7 +101,6 @@ pkg_setup() {
 		$(use_enable python) \
 		$(use_enable smp mp) \
 		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
 		$(use_with udev gudev) \
 		$(use_with wmf) \
 		--with-xmc \