Remove ruby18. Cleanup old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

5 files changed, 12 insertions, 105 deletions

diff --git a/dev-ruby/mini_magick/ChangeLog b/dev-ruby/mini_magick/ChangeLog
index a5babeb14360..79b4088571d4 100644
--- a/dev-ruby/mini_magick/ChangeLog
+++ b/dev-ruby/mini_magick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/mini_magick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/ChangeLog,v 1.18 2014/01/18 07:10:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/ChangeLog,v 1.19 2014/04/05 14:42:58 mrueg Exp $
+
+  05 Apr 2014; Manuel Rüger <mrueg@gentoo.org>
+  -files/mini_magick-3.6.0+ruby18.patch, -mini_magick-3.6.0.ebuild,
+  mini_magick-3.7.0.ebuild:
+  Remove ruby18. Cleanup old.
 
 *mini_magick-3.7.0 (18 Jan 2014)
 
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index bcf1fa9c5ea7..e038530c40f1 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX mini_magick-3.6.0+ruby18.patch 1355 SHA256 6dce2c271691db4392b67b9b021120d6f6d78f5e8c07e86d5a1ce95b6251df84 SHA512 ce8211b95775366c668783424e9f2710cd8920e2a172c256ed00b165456af7a1e0df358f83b9d4a7aacd2057e3449a83069902bb6490a269eaee3daca0698fee WHIRLPOOL d523e930cc8377a5d75e7b1560d684b93affa2ef77b0c7aa7fe1f8b12f7536cd5ae169184d61108cf50105734b177b0c92057595cb58db44aa38097791ca91df
-DIST mini_magick-3.6.0.gem 58880 SHA256 78f8fb259c2b0c5b61fe379bb7f176e3f326c3bc4ae32aa1be19d7b36b75c52a SHA512 22f6d4c1b96b4be6e51492a632b06a80621d22faf417733f1dcdf6b3bb729496b8ea0472f3d8ffe1586810010df086e9406efd3af5b481cb88ad4f2a6b633cd3 WHIRLPOOL bbb6a4ea24533f64f76a1cf202fbaec51e15dad08239af6221aba9a0c6f13fc649ffc2ec801bac4b5d0c4720719b22ad2b6022f7b1541b2c3123c9aa9b7bf528
 DIST mini_magick-3.7.0.tar.gz 48238 SHA256 d22a20fa5511e1a175b611f16fe207a568097fafecbcfe0a8a4c0ed5c4cde7b9 SHA512 9f7e5709e4335e49880cc47f4233cc83faf97c96280e27f12fbff96cdbf9c4db32987437b9aeadd97d541fa7c283c79b214027fc4de1a526583aa8c21c336311 WHIRLPOOL 1cf589485a8b84a27c874d7b95c6510855668f9206ee49e4dcb1ff4cc95b41eb5f351628e4537fd3cdc169dfa009b9fc2a914d27a875ccf226c702f4d9e4b37a
-EBUILD mini_magick-3.6.0.ebuild 1477 SHA256 aac8bca24891776f65bc5ef32f5eaab586bc37f371834d540993d6593fa71c91 SHA512 5affec7fe1eef1a6cbf86d879282db019c30dd1b4ac4e50f8105013125d509d2507b7f12932294464db1deba768aeee77760eabfe913ec42e4de5dbe2ceb1c3e WHIRLPOOL ed1c362a6a85513d3e05685620489e8b5286294d76612089249f8b5961219b5e308b373c51c2f1bcae204c1c9574f4ac29a758c58d264216700cacf5db99f725
-EBUILD mini_magick-3.7.0.ebuild 1464 SHA256 305e443c430e6add3d697f3dee1a5eb84e70f65c77fed7b86e957845606d51df SHA512 e4328aa5766a16b7d0197fed9f4e12e52e82a49770b26b63f549c129f938ed15260d0d91f6d1c32bcadef506b1a741e4a1bbd54bc5f87a8060b18b20beef7526 WHIRLPOOL 5fa8802a1ee3c963c82dcc54f66463dc1fbad909dfc2bb4083c450320480f14d51b4e5b590e9c5bf670e2088476789ddeb1c8fd3344d99e3e3dd6cd58db96053
-MISC ChangeLog 3179 SHA256 f750be6dca875dea885f687ecbc66137467580eb7a3808fd81399ccf73ba70f0 SHA512 63ebcfb6dfa1d88f2d732c51cf9c952ba2c8482b7de09eff9183e77c854862a54ea58c04688b98b0ee0db66452ff51235395a0c545b2aebe815c1ebd739db2da WHIRLPOOL 99acfed687243691975b022796922844fdc11f66e843995f7b4702d110a4051e8103ad48afc19f4f53ded3a8a4cb5a31d369de3246943a6104c75238291e21c7
+EBUILD mini_magick-3.7.0.ebuild 1460 SHA256 855c4f64c895657f8506af5ede49d157d6a6da9042a64f8c4f4ec0914cc9f440 SHA512 50f56702eada1021187734e4f71e48133ea7dbba0efdb6d40141d8b20cfc0e38564229f3d1ee516152459ed3fc7729f47e944fde845d44b9046f07041899d1cd WHIRLPOOL bced830a55884e1ccbdae23113cc92fe10f868d7b13f9c115dc5886ed36c9cb3695935661a099cc795d441f5a6f904e60128ccf0c1468a89e60fcaefee40b315
+MISC ChangeLog 3353 SHA256 4b1fe8bd5611a797a140e3dafba72c6a197d9ca6d8365ce7196bc9b733d006fb SHA512 dc5373f533b7799b3ed4bc2b7a2ebb3100e5250355eff083e39e5d2324f778a7770267398073540fff2cefa6ec0b869b66891d93cdf92f89cd56fdfdc2c9b94a WHIRLPOOL 9fc209a5a02239e1cc332513bf89f564758f11c2993a02d0411dc6d7ab40e8d025dbe78f9e0381b10a65cbf3187d2c6b7efac5f19e3cbe55b93b10f021e7f5f2
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlLaKNAACgkQiIP6VqMIqNezuQEAhgkqvNIKpgSnSKdePiegWEjt
-jlQ1mEG9K+kc0mADtTAA/RoUzoCl77Rtra1UMr5f5ldEQdWfTpa7fG2gpbvu1A/H
-=1Dqr
------END PGP SIGNATURE-----
diff --git a/dev-ruby/mini_magick/files/mini_magick-3.6.0+ruby18.patch b/dev-ruby/mini_magick/files/mini_magick-3.6.0+ruby18.patch
deleted file mode 100644
index bc544e7e07c1..000000000000
--- a/dev-ruby/mini_magick/files/mini_magick-3.6.0+ruby18.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1cb23fc096e16514acac8ff6befe12beaffb188b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Thu, 30 May 2013 10:27:36 -0700
-Subject: [PATCH] Don't use assert_true so that tests work on Ruby 1.8 as well.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- test/image_test.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/image_test.rb b/test/image_test.rb
-index e6fd1b7..0a62d87 100644
---- a/test/image_test.rb
-+++ b/test/image_test.rb
-@@ -125,7 +125,7 @@ class ImageTest < Test::Unit::TestCase
-     assert_equal 150, image[:width]
-     assert_equal 55, image[:height]
-     assert_equal [150, 55], image[:dimensions]
--    assert_true String == image[:colorspace].class
-+    assert String == image[:colorspace].class
-     assert_match(/^gif$/i, image[:format])
-     image.destroy!
-   end
-@@ -281,7 +281,7 @@ class ImageTest < Test::Unit::TestCase
-       result = image.composite(Image.open(TIFF_IMAGE_PATH)) do |c|
-         c.gravity "center"
-       end
--      assert_true File.exists?(result.path)
-+      assert File.exists?(result.path)
-     else
-       puts "Need at least version #{MiniMagick.minimum_image_magick_version} of ImageMagick"
-     end
--- 
-1.8.2.1
-
diff --git a/dev-ruby/mini_magick/mini_magick-3.6.0.ebuild b/dev-ruby/mini_magick/mini_magick-3.6.0.ebuild
deleted file mode 100644
index d94fdf6e778f..000000000000
--- a/dev-ruby/mini_magick/mini_magick-3.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-3.6.0.ebuild,v 1.1 2013/05/30 17:42:34 flameeyes Exp $
-
-EAPI=5
-
-# jruby → test_tempfile_at_path_after_format fails with jruby 1.3.1,
-# sounds like a bug in JRuby itself, or the code not being compatible.
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Manipulate images with minimal use of memory."
-HOMEPAGE="http://github.com/probablycorey/mini_magick"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-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? ( media-gfx/imagemagick[tiff,jpeg] )"
-
-# tests are known to fail under imagemagick 6.5 at least, reported upstream:
-# http://github.com/probablycorey/mini_magick/issues/#issue/2
-# update: still fails with imagemagick 6.6.
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-
-ruby_add_rdepend ">=dev-ruby/subexec-0.1.0"
-
-RUBY_PATCHES=( "${P}+ruby18.patch" )
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	# Remove spec definition part because the gemspec file is not included
-	sed -i -e '/gemspec/,$ d' Rakefile || die
-
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/mini_magick/mini_magick-3.7.0.ebuild b/dev-ruby/mini_magick/mini_magick-3.7.0.ebuild
index 9818af36e4f3..d45476af5294 100644
--- a/dev-ruby/mini_magick/mini_magick-3.7.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-3.7.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-3.7.0.ebuild,v 1.1 2014/01/18 07:10:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-3.7.0.ebuild,v 1.2 2014/04/05 14:42:58 mrueg Exp $
 
 EAPI=5
 
 # jruby → test_tempfile_at_path_after_format fails with jruby 1.3.1,
 # sounds like a bug in JRuby itself, or the code not being compatible.
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -27,8 +27,8 @@ 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? ( media-gfx/imagemagick[tiff,jpeg] )"
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( media-gfx/imagemagick[tiff,jpeg] )"
 
 ruby_add_rdepend ">=dev-ruby/subexec-0.2.1"