[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/, sci-chemistry/chemical-mime-data/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     e9b522a3b065fa8ce8e376a918ba257141b862ab
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 18:55:54 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 19:08:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b522a3

sci-chemistry/chemical-mime-data: Add back support for rsvg from gnome-base/librsvg

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../chemical-mime-data-0.1.94-r3.ebuild            |  8 ++++--
 .../chemical-mime-data-0.1.94-rsvg-convert.patch   | 30 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
index 5b8fc00d5b..a120487084 100644
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,13 +22,17 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/desktop-file-utils
 	dev-libs/libxslt
-	media-gfx/imagemagick[xml,png,svg]
+	|| (
+		gnome-base/librsvg[tools]
+		media-gfx/imagemagick[xml,png,svg]
+	)
 	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-turbomole.patch
 	"${FILESDIR}"/${P}-pigz.patch
 	"${FILESDIR}"/${P}-namespace-svg.patch
+	"${FILESDIR}"/${P}-rsvg-convert.patch
 	)
 
 src_prepare() {

diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
new file mode 100644
index 0000000000..8a92e19e15
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
@@ -0,0 +1,30 @@
+ configure.ac              | 2 +-
+ icons/hicolor/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6f87a94..a503da4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,7 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then
+ 		[RSVG],
+ 		[The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
+ 	)
+-	AC_PATH_PROG([RSVG], [rsvg], [no])
++	AC_PATH_PROG([RSVG], [rsvg-convert], [no])
+ 	AC_SUBST([RSVG])
+ fi
+ 
+diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am
+index ba0847a..f2e0a84 100644
+--- a/icons/hicolor/Makefile.am
++++ b/icons/hicolor/Makefile.am
+@@ -24,7 +24,7 @@ if BOOL_HICOLOR_THEME
+ 	gzip -c $< > $@
+ 	for size in $(icon_sizes) ; do \
+ 		if test "x$(RSVG)" != "x" ; then \
+-			$(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
++			$(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \
+ 		else \
+ 			$(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
+ 		fi \