gentoo resync : 06.08.2019

4 files changed, 2 insertions, 146 deletions

diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 1b249261f326..bfbca6936cbd 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,11 +1,7 @@
-DIST rmagick-2.16.0.gem 1545728 BLAKE2B 2f5396b5d5c6a60fabf7f67d104e68443c038a8e9431fbc8252a3ca915b4fb353d6a0740f00fbaac91cf3bbaff84c0dfb45d4adca6a81622fc1d2e395ed04cac SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c
-DIST rmagick-3.0.0.gem 1551360 BLAKE2B 3234231762bcdda60533f0b7479def61f592a7c06570ef6865b9eb488ac44d58edd6b6ebc914c88c51632dbba55ea79887a6ad816be4ac32b470c34003f3a2ce SHA512 7d8c2ae731e9565f168cb13adb8b454acb51d42b237f6bfb721735f9198d2546fbf0117d3296ac57bcd59b0a03eff611b7508d6684e533f203fdd7a6816adee4
 DIST rmagick-3.1.0.gem 1552896 BLAKE2B 192a09d080b328f5a2f942bf02f96a618f7f8fdf2dac899b66ece65f69b421aeb96edcbd660ef1e699db543c44b997a4330540086facc19c3fb96a1c285f644a SHA512 4fa02bf3fd3e3f423e638b700412c32cd30ac306c4126bdeaa6d192994f9f467837cf96cb98937cfba4a9180d6da2d94d4ee798dfc57378cc1861e8e27208057
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
 DIST rmagick-4.0.0.gem 1946624 BLAKE2B f1cec7bf1dffa94ca2803dfd64eb4a7b1cb269c935482ed42df3a8d9e3f9599b24e6d07f7268e5c641734c8e8a8984f2f0cf2a80ced0f29ee36d154a4eb1a341 SHA512 2b9e72a3f8560b8530397406d086c0d3ffa6c6ec0b8d3ec0eb9d05528f108da6023462948738bd1f420f130250fa4bf8757a9c94335b223ad1ea3e279797b0ae
-EBUILD rmagick-2.16.0.ebuild 2032 BLAKE2B f547b27b383083e6d8b5f8bbd5da93ed7fdb21a05347f95292372c5d596343d5e0c0e88a24419b1af3a383a9acad02d180813afd350fd0b3637afdb7e1f858ba SHA512 0858d2da02ea947cca05a6090b33b02e600f0bd2444c80df6ea3d210743f0b6bf7335560f2ebe046eaa520681206989c72f9903a453842ebd8373ceb78c8830b
-EBUILD rmagick-3.0.0.ebuild 2094 BLAKE2B 4fe0886e7f87360405fca1e1cd95ed20cc61a60ef6f8bb2bd3fd7dbb610c6d581af6be625b669b0798086ed1889051fd7b7e0b8df6e68f8ad2de40a2504b0859 SHA512 6b9e564ea3ac21a2b6758e5c8cdd877153ba92b87b963755f473ec1af33ba75cf92a1690971735d177d57f9f756c6e01cae7dcadeacb5543c449e2ba162a9dbf
-EBUILD rmagick-3.1.0.ebuild 1558 BLAKE2B a934fdd2a0576802cbaf528ee54222d92ee30c05fc6e8a552d9f867932ee84916e3069db9af0fc268bb8b01b81a227f2684f28c3c0779669811d10cb40a85dd0 SHA512 a9c6dbd17c5671e1fb511806565d4f0504e34ddf3029c98e29d634a8c6a471c5322e559eca2fac2de81fca64d45af52397dbf380014e257f02514f5507e58cad
+EBUILD rmagick-3.1.0.ebuild 1556 BLAKE2B 7ccb8f7c5f1cbb569eab9840b138293d1b97e83a86d5f3b352e4166e074ac2787e1e952aa1323d94ad6f8c38bff28e6499503fe2bacb643c13aca43d1a0bf580 SHA512 8f0b01f3165d84c1062e186f74791989e192a47bcc8c5e762a7f6daa7df863daba24a0525f7b1f41e43c30a34a349bcb50830863a6c9fa21c77320aef5dc3e82
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 21d03defba1bf89de680f40ee8021ed314602fc858126ea95e57a8dd5b301cb15be48d0f7fe5a4d90fdeed2fb4976b83c6f055fc6848b0f06fd8a53631723573 SHA512 2dd5a7356b139cc1af19ad9468cf0826924af7ceda50be80d7489a5eb264210a9ffdc1118782956e01ad055ea6f597ae21055024bc6d55cf2bbfd3573f541449
 EBUILD rmagick-4.0.0.ebuild 1571 BLAKE2B 1ea72c8b636c67e248434986bd052386e66cea115d8a5bddf44ff22d542a371f72d3a9d8374e70c22da840bc22ce0e87b92f462ab34dda713df2ec2048226e92 SHA512 7f41467a28f7de463d1376f842badc3328d962b3aa8d7347b746c0f54bb8ec89fe74afc9b85b611c8a45ce90a66879966f934f22211419df7f0da01877b349d5
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
deleted file mode 100644
index 6f0b1054a1af..000000000000
--- a/dev-ruby/rmagick/rmagick-2.16.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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\|compress_colormap\)/,/^  end/ s:^:#:' test/Image2.rb || die
-	sed -i -e '/test_iterations/,/^    end/ s:^:#:' test/ImageList1.rb || die
-	sed -i -e '/test_\(optimize_layers\|montage\)/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background_color\|border_color\|colors\|image_type\)/,/^  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-3.0.0.ebuild b/dev-ruby/rmagick/rmagick-3.0.0.ebuild
deleted file mode 100644
index 3d58426000b5..000000000000
--- a/dev-ruby/rmagick/rmagick-3.0.0.ebuild
+++ /dev/null
@@ -1,70 +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_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.9.0:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.9.0:=[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\|compress_colormap\)/,/^  end/ s:^:#:' test/Image2.rb || die
-	sed -i -e '/test_\(delete_if\|iterations\|reject\)/,/^  end/ s:^:#:' test/ImageList1.rb || die
-	sed -i -e '/test_\(optimize_layers\|montage\)/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background_color\|border_color\|colors\|image_type\|number_colors\|total_colors\)/,/^  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-3.1.0.ebuild b/dev-ruby/rmagick/rmagick-3.1.0.ebuild
index 6a3e016dc25b..f65f3e18051a 100644
--- a/dev-ruby/rmagick/rmagick-3.1.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-3.1.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.9.0:= =media-gfx/imagemagick-6*"