gentoo resync : 28.04.2018

3 files changed, 2 insertions, 74 deletions

diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index c7f5500492a9..511afc511bf3 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,5 +1,3 @@
-DIST rmagick-2.15.4.gem 1545216 BLAKE2B d2924a7b928626eff30f0deff075fe8d668bd226b8fae9c9761a366c0a2047644d3b0b0701738824985123bc4f1b235856e8e31aeab192a9709b4eafa8da1ce8 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80
 DIST rmagick-2.16.0.gem 1545728 BLAKE2B 2f5396b5d5c6a60fabf7f67d104e68443c038a8e9431fbc8252a3ca915b4fb353d6a0740f00fbaac91cf3bbaff84c0dfb45d4adca6a81622fc1d2e395ed04cac SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c
-EBUILD rmagick-2.15.4.ebuild 1984 BLAKE2B 62426b077398bbe9aa24cac3ecc3b4e770dc8cb738afba5ca9bce9f6030f2010157d4ccb764a7d7300f44df57af61de449c875a5a5db05c1d19ef47a9f73206e SHA512 7ff0190946630cdf76ca996c85b457f241ad90ac717d4e05f498042ab2ced0f4f58daf4650c36cfddc62086c9d0916cd9f9132fa5d0baf3e84c578905d7c2c6c
-EBUILD rmagick-2.16.0.ebuild 2036 BLAKE2B 42a74ea6a03d155a8723068d46a7337f8e07eecbf254d31ccf326dfbf9594c5cd79a5e5a7df9034d6b7d0a60697fdd2618e5fdd9edab3a86abd5e939c8c94d5e SHA512 8a698ee01657b6bccd0768bafb5c8f07c9f87286d2f7f129e128fd90957d743b18391bcc4d4a4015645606591e907bceeaec9ff0872f990d527eb3798c735a59
+EBUILD rmagick-2.16.0.ebuild 2034 BLAKE2B 0ce3eff9602b4bb713d817e8c362e5c1850d9e56777f9412cf9a6f83392d168da85c9b57578fdc080ad194e3932dfce113ad456fb0e2189c878b86e227e8d885 SHA512 2cc267bbf285aa7259672fb38345b816de7565232a9826955e85b52ca0f0cbb9e1a95799f94de785eef73386e22d2831c63abed9cf84da70c24b59383824f050
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-2.15.4.ebuild b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
deleted file mode 100644
index 444a98a96ccd..000000000000
--- a/dev-ruby/rmagick/rmagick-2.15.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-
-	# Avoid simplecov dependency
-	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Avoid some tests that seem to be very dependent on specific
-	# imagemagick versions. color defs?
-	sed -i -e '/test_gray/,/^  end/ s:^:#:' test/Image2.rb || die
-	sed -i -e '/test_\(delete_if\|reject\)/,/^    end/ s:^:#:' test/ImageList1.rb || die
-	sed -i -e '/test_optimize_layers/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background\|border\)_color/,/^  end/ s:^:#:' test/Image_attributes.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test || die
-	RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		dohtml -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
index b2278ca41038..1f4f12eba14e 100644
--- a/dev-ruby/rmagick/rmagick-2.16.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"