[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

["Andrew Savchenko" <bircoph@gentoo.org>]

commit:     33385b46bea50e05915917ebdb14f6adb97a8797
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 18:02:02 2020 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 18:04:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33385b46

app-text/xpdf: switch from inkscape to rsvg-convert

rsvg-convert is faster, more lightweight and less troublesome
dependency than inkscape, so use it for png generation.
This is a better fix of bug 739166.

Bug: https://bugs.gentoo.org/739166
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 288d1e75901..e887f2ce996 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -28,7 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="
-	icons? ( media-gfx/inkscape )
+	icons? ( gnome-base/librsvg )
 "
 DEPEND="
 	cups? (
@@ -88,18 +88,12 @@ src_compile() {
 	cmake_src_compile
 
 	if use icons; then
-		# in some cases inkscape tries to write font cache to the
-		# system dir, see bug 739166
-		addpredict /usr/share/inkscape/fonts
-		local inkarg="-e"
-		has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
-
 		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
 		cd xpdf-qt
 		mkdir $sizes
 		local i
 		for i in $sizes; do
-			inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
 		done
 	fi
 }