From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0E1A139694 for ; Sun, 12 Feb 2017 19:08:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B333E0C9F; Sun, 12 Feb 2017 19:08:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED622E0C9F for ; Sun, 12 Feb 2017 19:08:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECD28340F43 for ; Sun, 12 Feb 2017 19:08:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2C1E458F for ; Sun, 12 Feb 2017 19:08:47 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1486926522.e9b522a3b065fa8ce8e376a918ba257141b862ab.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/chemical-mime-data/, sci-chemistry/chemical-mime-data/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch X-VCS-Directories: sci-chemistry/chemical-mime-data/ sci-chemistry/chemical-mime-data/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: e9b522a3b065fa8ce8e376a918ba257141b862ab X-VCS-Branch: master Date: Sun, 12 Feb 2017 19:08:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 97f8271e-06de-47e7-aeb3-78ef6e2afe48 X-Archives-Hash: 1cade7ac4473627e40c718df5d5ad3f6 commit: e9b522a3b065fa8ce8e376a918ba257141b862ab Author: Justin Lecher gentoo org> AuthorDate: Sun Feb 12 18:55:54 2017 +0000 Commit: Justin Lecher gentoo 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 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 \