gentoo resync : 15.01.2020

3 files changed, 6 insertions, 71 deletions

diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 758518807387..1aa58a653b64 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,7 +1,5 @@
-DIST mini_magick-4.9.3.tar.gz 1187910 BLAKE2B d0eaa19da0d7310316ed6c11befa2e48ba75f441021f3ecd6533b0e04d9a44cc6da18c867cec87198abd3e433d63643ab61e21bd3c8b059a757634445f718207 SHA512 4a8cd953a8281229c36cb2482115a8fd127099729fbffd4be7db8967da90916e07c062c96ee066d9740d7261c07f263db8f020eabae59cf10fa6043e4be590c8
-DIST mini_magick-4.9.4.tar.gz 1188193 BLAKE2B bd3ae9eb2f5796c42093d9162cd7b1437eccd7ffc2fccd257e2f18b7d34709fa723e413d36045f50bdc13aff1ba5220a4d277d95e419cd37c5b22d304628403d SHA512 9d1bcd7925a26332ff35daba67d78dab88690ea403e70042485d3c1499a41080365b73c03116f26cf11f9cc05c75cf7a8c40f660764f45ece5fdb9ca8a521757
+DIST mini_magick-4.10.1.tar.gz 1192455 BLAKE2B 269f0fbf0e49bb14c3a39124dfeb8171775db7a9e51e4662e5dac0a98c4668156bf5bbf22af62a9f62d7834d2205a9475e5631b768d27cac0527cab0baad25fa SHA512 28e4a4cf213db69182adb56daa3e09eb576e96e8ff4ad95121f9a16f8ecceb98ad790d3897463fa1ab3b7d4b9925777f9e71302adfd3f31b3f88aa520371e77b
 DIST mini_magick-4.9.5.tar.gz 1192220 BLAKE2B 18867664682b82c689beadd190d203f9a460a229ee07271fdfd3b9ef7c7fb2a913107b2f318c33b7aa15aad88488a4da5548f371f9f9b38246aa8f2210e04d15 SHA512 06a82b3c5bf47ae1254fb669f4cb63a7a944977eaa790501ee715740c6a2fdfe81ea886235fe310d2c0ca07253f4167e72ddae6e29a551315ecafc595c2a3a53
-EBUILD mini_magick-4.9.3.ebuild 2105 BLAKE2B d2b8ed34b54c73fc62ae4b48e064f3120a33f0543ba36614372c6272be85439d7439831e87ed4dcd55fb2b08d033a0baa8d327e48b3e009f8a1c4651980d5994 SHA512 db02126d3153e387d9b63e481d99ba864eeb0e50dfb89facc22f8fbe1cba583acdaeb101dcb3ae3069b2aa1a85ed3bf2d69b58997415d65a75c4bbd88d6d900e
-EBUILD mini_magick-4.9.4.ebuild 2098 BLAKE2B 45f3efc413dc295df0b52f6b41fd3e6a262221b9b32670c912aef0a712490cd9fbdd8c499bca85e3cdeead9c73f2a768643d62a3827704d3e382ab0ccc469d37 SHA512 5098a7173dca084b2299ace9073cb2294483bcbc113e8430084f36c06c8e3a2e31b9d275558f259709d67e95d830629e5e8d64a8b6c443400403e8534c0301a1
+EBUILD mini_magick-4.10.1.ebuild 1895 BLAKE2B fd5e63a87c95d87b4f522a58c4c43b655ad5868e539fba34b0bc0201e4ce8666c72d4dab5dba33677669edf7890a9a8d500a1bdfa2d39e724a3568489f1616c6 SHA512 4efecfbfbbc954a76b797bb3c67cbf65404ae3261e8031dd69ebab15b83c55b997a08cb807b3ce15708a25716050fe722759d7285dde50b29176d336e127f83f
 EBUILD mini_magick-4.9.5.ebuild 1895 BLAKE2B c77ec716b48f65c6f06c3962c2adab40ab9b452cfb87022c8b4ee26b51bb438cabe279965506d9a78344ccc570bb67ea749929de5affe5074eab2603655a99df SHA512 42e1d875de68bc5b47a8761f24c1afb6d6303e86a353f9a04362da7b026676249da8da5e1b0822f4eb715e6deab750757480c0392ca565f0cf9317ff8020011f
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.9.4.ebuild b/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
index b8093b12ed23..c215478ddbec 100644
--- a/dev-ruby/mini_magick/mini_magick-4.9.4.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -45,11 +44,8 @@ all_ruby_prepare() {
 	# Avoid broken spec that does not assume . in path name
 	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
 
-	# Avoid failing spec that also fails in upstream Travis
-	sed -i -e '/returns a hash of verbose information/,/^        end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
-
-	# Make spec more lenient to imagemagick quoting
-	sed -i -e "/unable to open image/ s/'foo'/.foo./" spec/lib/mini_magick/shell_spec.rb || die
+	# Avoid spec broken by recent imagemagick updates
+	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
 
 	# Avoid graphicsmagick tests because installing both in parallel for
 	# tests is hard.
diff --git a/dev-ruby/mini_magick/mini_magick-4.9.3.ebuild b/dev-ruby/mini_magick/mini_magick-4.9.3.ebuild
deleted file mode 100644
index 33f0ef57dcb9..000000000000
--- a/dev-ruby/mini_magick/mini_magick-4.9.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Manipulate images with minimal use of memory"
-HOMEPAGE="https://github.com/minimagick/minimagick"
-SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minimagick-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# It's only used at runtime in this case because this extension only
-# _calls_ the commands. But when we run tests we're going to need tiff
-# and jpeg support at a minimum.
-RDEPEND+=" media-gfx/imagemagick"
-DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
-
-	# Don't force a specific formatter but use overall Gentoo defaults.
-	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
-
-	# Avoid broken spec that does not assume . in path name
-	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid failing spec that also fails in upstream Travis
-	sed -i -e '/returns a hash of verbose information/,/^        end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
-
-	# Make spec more lenient to imagemagick quoting
-	sed -i -e "/unable to open image/ s/'foo'/.foo./" spec/lib/mini_magick/shell_spec.rb || die
-
-	# Avoid graphicsmagick tests because installing both in parallel for
-	# tests is hard.
-	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
-	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
-	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
-}