gentoo Easter resync : 12.04.2020

4 files changed, 40 insertions, 49 deletions

diff --git a/sci-chemistry/chemical-mime-data/Manifest b/sci-chemistry/chemical-mime-data/Manifest
index 1a972a59a0fa..0d50b7faa712 100644
--- a/sci-chemistry/chemical-mime-data/Manifest
+++ b/sci-chemistry/chemical-mime-data/Manifest
@@ -1,9 +1,9 @@
 AUX chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch 934 BLAKE2B 8c35adddc5dbed044a68c1f0f485faf01ae4d6fb4724e82956e9e73292e2b7e37f527a8225fce3fa4b3c6629038086f30912b8bce21d704244dc18ba52673f8a SHA512 f1ca2c08b33f77ccc1355edbbba53971e4c09ed004ec35554617d57cb6dd90c9a8a712ebfe1c7e0b01d9a97790004a048029a9e96323e7a105e9b15408a0d4cd
 AUX chemical-mime-data-0.1.94-namespace-svg.patch 798 BLAKE2B 4ab826dd3c76234c903a740b2e59dd4403d01aff856327d31c6707ab4563931d9fe4d9d57bdc19d6102d63d860eb2d88220844b934aa63cc3be984621ac52d28 SHA512 64addfac817a7f056f381515561b4311936410dc46385a3ded8c65f8fbc3d5dda731c4ec02e9369299c8122e7c43a6dc53005a4957e4165bbf958f683708513d
 AUX chemical-mime-data-0.1.94-pigz.patch 481 BLAKE2B dee47e41645b5d196326fb7439e1a96b3d46983fa9c9ec4295b17676d51f966f48ff51668203e59f18580939337d83d5ae904ef33fe2044dcc62fedd90fcb82e SHA512 a16839c1b88486ed26b4987a22594d0c3d45254d31157560135bdba008e5caa0a372d11e7db858564f1eca75452d2e43509899a91c2a8872465ea06277a1fb6c
+AUX chemical-mime-data-0.1.94-rsvg-convert-r2.patch 1305 BLAKE2B 22809dbd6c769a0dcc88d65c3454702021d9d6e082a50fce9a5f3a28743aafdbcb5e153a90ee43f7a42d4ccd5f98465f91f872e7fabf69086b8ecf1336a60e49 SHA512 4bea8dae65e28657ff75b5b613137c0f89f6de185db79297642616f208e841ba56181044eee194c619bad2c3bfb62454b7839b720d2f32fca0e768b75c842683
 AUX chemical-mime-data-0.1.94-rsvg-convert.patch 1039 BLAKE2B 2eff2aa39206181f56bc802c30b4b043a0aeccef55c5d4e34755dcca69cc3afadd6cac364307729d8d83c88b7ba1d91d7200a80c7bd577e22c6ec5aec3b1921d SHA512 9c12f96f16e7982a5ba11fc546293a2e74f8918ef6eb274e3b1a618fc28aff244402c9b28ffebc2e01c8f6eb0e9e2516da82852bd0f9142c10e97f027670e60d
 AUX chemical-mime-data-0.1.94-turbomole.patch 2451 BLAKE2B 86b4b08b2af4503e0f8a525ebaa4231a3d0d3727c951b9e957c9fdac790bc41b7f01092350099a64cce66dbb61bc4cbd3654ef91834310c6c7cd1dc156ca87e8 SHA512 1bfa8818d159f0f917a24a06b0bfe926f0854f4242d8c2dbbedcd4210ffd38a459298862dc1d1aedbbe648a933db99c5d647c5409af74f88b03dd3033946df54
 DIST chemical-mime-data-0.1.94.tar.bz2 146077 BLAKE2B 9996c240446dc9571b6b4afbcdc6cf16a08e11314da9f785490b1b20933b6d18a333132492e30315c08f4441c048ec593a111815253050cfb5ab562aadb784f1 SHA512 7f3d967149f27ab1de53c948dc055959e661e1be9d778e3d56d06bea95769da7770ab5fb66afab6607747ef91ffb1dbbcf921e5f06e3303351781968594b5f00
-EBUILD chemical-mime-data-0.1.94-r3.ebuild 924 BLAKE2B 16f1360fe9d074a4eb52d40e3951ec334780664e8fef794362ce1d48e582ac1b70fa1a150be610a4f41bba2fe606336f5b6221aafe1f40296467c2d14d48e3d1 SHA512 c90b05d4fecc6649b1449f42d1cb520867c3ec2991e87b00a83d1fa32001d4971b8c2f44834c17b2cd9fa63783d514f1d1dc4e2efa2a9c5973f97523065d7893
-EBUILD chemical-mime-data-0.1.94-r4.ebuild 1091 BLAKE2B d48e62af64089a866ffc7fa07d7165a934039e4289fffb914b2dd351397ffaa7a7ca97950ce398bb20b7786b844863d4d0709ac428e2cd6f5aa8e589b9dbcd21 SHA512 f0bd3338089a3897ac41903411314fc3df2200a1c057e5cc7bba10ec4f70bd631c607f23ce4db0d29ae99555e687d3b3eb1821287f2800e895d1892daed37014
+EBUILD chemical-mime-data-0.1.94-r4.ebuild 1091 BLAKE2B 2014dc00aed88c563263444a32fa008b440413ddacca3a8e08a9f07191a0595f5166715e12f31c5454b32fe0561476b4b4400aeee6e7a99c9d791f923bd8b4fa SHA512 6760106eb5303b951b3a245de3da8356cf73a7bc6ba788554b308fd31c004ff18729e7c223264df011ac2a3493e201525e394b4f2a63bc4e7fbade9f0056663f
 MISC metadata.xml 474 BLAKE2B c4d6ffbdf66f856fc9e404202d9a9956d8bbfaeb31eb1eb056300ca5049c02d0499ead32a2013080e397eba272bd3a290b81f343baab1fb40204364bfa5208ec SHA512 59cfe759a75bf49fb020652168434fb610c2d5ba56507945253f556b5542a119bc9c9dc4f2b71ceed93f6672b31e5713cc9d76c433e95b0a08c51e9e577bac00
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
deleted file mode 100644
index 7989cf9ef6dc..000000000000
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg
-
-DESCRIPTION="A collection of data files to add support for chemical MIME types"
-HOMEPAGE="https://github.com/dleidert/chemical-mime"
-SRC_URI="mirror://sourceforge/${PN/-data/}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE=""
-
-RDEPEND="
-	gnome-base/gnome-mime-data
-	x11-misc/shared-mime-info"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/desktop-file-utils
-	dev-libs/libxslt
-	|| (
-		gnome-base/librsvg
-		media-gfx/imagemagick[xml,png,svg]
-	)
-	media-gfx/imagemagick[png]
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-turbomole.patch
-	"${FILESDIR}"/${P}-pigz.patch
-	"${FILESDIR}"/${P}-namespace-svg.patch
-	"${FILESDIR}"/${P}-rsvg-convert.patch
-	)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-update-database
-}
diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
index 3abec36ba7d1..bbc0bfb9e26e 100644
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN/-data/}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE=""
 
 RDEPEND="
@@ -33,7 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-turbomole.patch
 	"${FILESDIR}"/${P}-pigz.patch
 	"${FILESDIR}"/${P}-namespace-svg.patch
-	"${FILESDIR}"/${P}-rsvg-convert.patch
+	"${FILESDIR}"/${P}-rsvg-convert-r2.patch
 	# https://github.com/dleidert/chemical-mime/issues/1
 	"${FILESDIR}"/${P}-drop-turbomole-vibrational.patch
 )
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch
new file mode 100644
index 000000000000..55039f8be07e
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert-r2.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac.old	2020-03-20 23:32:05.866604992 +0100
++++ b/configure.ac	2020-03-20 23:32:30.866022834 +0100
+@@ -97,14 +97,12 @@
+ AC_PATH_PROG([CONVERT], [convert], [no])
+ AC_SUBST([CONVERT])
+ 
+-if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then
+-	AC_ARG_VAR(
+-		[RSVG],
+-		[The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
+-	)
+-	AC_PATH_PROG([RSVG], [rsvg], [no])
+-	AC_SUBST([RSVG])
+-fi
++AC_ARG_VAR(
++	[RSVG],
++	[The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
++)
++AC_PATH_PROG([RSVG], [rsvg-convert], [no])
++AC_SUBST([RSVG])
+ 
+ if test "x$RSVG" = "xno" -a "x$CONVERT" = "xno" ; then
+ 	AC_MSG_ERROR([Cannot find rsvg (librsvg binary) or convert (imagemagick). Please install one of them.])
+--- a/icons/hicolor/Makefile.am.old	2020-03-20 23:32:54.292414381 +0100
++++ b/icons/hicolor/Makefile.am	2020-03-20 23:33:40.052179227 +0100
+@@ -23,8 +23,8 @@
+ .svg.svgz:
+ 	gzip $< -c > $@
+ 	for size in $(icon_sizes) ; do \
+-		if test "x$(RSVG)" != "x" ; then \
+-			$(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
++		if test "x$(RSVG)" != "xno" ; then \
++			$(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \
+ 		else \
+ 			$(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
+ 		fi \