Cleanup old versions; revision bump latest 1.3 series (which I'm still using for Typo) to fix the gem specification's dependency over subexec.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

7 files changed, 20 insertions, 153 deletions

diff --git a/dev-ruby/mini_magick/ChangeLog b/dev-ruby/mini_magick/ChangeLog
index e463229d5d7f..ae240a370433 100644
--- a/dev-ruby/mini_magick/ChangeLog
+++ b/dev-ruby/mini_magick/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ruby/mini_magick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/ChangeLog,v 1.10 2011/09/25 14:20:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/ChangeLog,v 1.11 2011/12/21 10:31:47 flameeyes Exp $
+
+*mini_magick-1.3.3-r1 (21 Dec 2011)
+
+  21 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +mini_magick-1.3.3-r1.ebuild, -files/mini_magick-1.2.5-tests-tempdir.patch,
+  -mini_magick-1.2.5.ebuild, -mini_magick-1.3.3.ebuild, -mini_magick-3.1.ebuild,
+  -mini_magick-3.2.ebuild:
+  Cleanup old versions; revision bump latest 1.3 series (which I'm still using
+  for Typo) to fix the gem specification's dependency over subexec.
 
   25 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> mini_magick-3.3.ebuild:
   Remove ruby19 support as subexec does not declare supporting it.
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 347b3c27b2fd..300aeaf34c8f 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,23 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mini_magick-1.2.5-tests-tempdir.patch 551 RMD160 2e7bd13df54084ca317e8298456ce3f11e063459 SHA1 3dae6c8c7427e084aedfb95ada9729cf514da5cc SHA256 d45733a58ee6fe7a3f27442190b907bdceaa3ea0daa0860bec9138ff9735e8de
-DIST mini_magick-1.2.5.gem 1082368 RMD160 a43812248126cab16a4eb56610af6f68745d23f3 SHA1 d1875a9baf658f7ff051071378dbfbf258316a4e SHA256 ced23395ff771a1d1475a5efbf611feb33d4278dde9bdcd567b83a8771294485
 DIST mini_magick-1.3.3.gem 41472 RMD160 60df421470faac1c06e02bf86442f3445129417a SHA1 6a2e605ef872e36e09142c7d5c4ddfbd94de87ab SHA256 4634f09a8e6a879ab1baee58cdb15ea18aa08802c2c6a24d8b46d51e3e00b94d
-DIST mini_magick-3.1.gem 45568 RMD160 cbd5e25f2fd4e8d456a4ba720669e1b58b048490 SHA1 e1facf5cab203e54129c0fdf37d38f110787aebb SHA256 514cef555bd1cee2807243f0f1602a0f6dad7f74cc552d50a4cfc6fa34811839
-DIST mini_magick-3.2.gem 45568 RMD160 b7328e0499da6a126938fef7e08fb7f64b1c6543 SHA1 3314501a85f8952249d6509254c7b49a93713838 SHA256 18b70532ee43b527ef3967f207e430e163ed64685f7a4ddb573562b96bec799a
 DIST mini_magick-3.3.gem 50176 RMD160 5e3b8b5e5be6906c3d0d86ce1e388125385f15a2 SHA1 7c7894694e10d4db39d40a3809b1d50fc87f5ac5 SHA256 0fe91f2c7eba00d76aebd0dcc54290850255ce378f91596bb2ba8a3a3da492f8
-EBUILD mini_magick-1.2.5.ebuild 1267 RMD160 b36e6f700eb56eb1ec787502a9fc90955af010a1 SHA1 4ec4d72fcb7e1c3f1aeee92567a0b0c77324e024 SHA256 c1c529c01b4a80fc2003eac1bc27fdb849ced6a16daa8460bedd8569f565f4ea
-EBUILD mini_magick-1.3.3.ebuild 1422 RMD160 1169ad3a4cb5b66b6cfe58aac287c328e0499675 SHA1 1474b529a8fd50e65aa74827a45c2e1d0ffacd4d SHA256 f2e7dc522ff96f9ea445c14c3ff0a3d1f619af700c7984628fd79aa15202c5c0
-EBUILD mini_magick-3.1.ebuild 1420 RMD160 4e5c78951dbe446272917e3870e09f2c68e7c940 SHA1 268f449bf2a0d24707f3782ee17b3687a56e4d8c SHA256 8ebbea9b8fdc731b5dee397f528eadc1f2c80e7d80aac515d6df5f001b0cac50
-EBUILD mini_magick-3.2.ebuild 1420 RMD160 157409c7cc14fc9baefdc8b3fbca2e83137abf29 SHA1 f01573ebb850e175b25eaea588168ec8d270d8e4 SHA256 356e9b9f829efb552dc176dc56deb86e23cfea1aeb3ec75def5f30d342cc1f9c
+EBUILD mini_magick-1.3.3-r1.ebuild 1575 RMD160 c98a583f1bdc2112e7e04c7c96cc35e3edfed228 SHA1 814be5dadd3bf7de71299c7dd72fb41941490ec7 SHA256 d292f430d37616a0e9ac04377bb0fc0cdd6af809c6cf23657685f5ed58221449
 EBUILD mini_magick-3.3.ebuild 1422 RMD160 f600aa9675ed91d55cdce73e4c7d8cf0f3d24582 SHA1 823e6d1e40a2e392f6d4e1bec573bb2d9c17adf5 SHA256 53befb1f1f12f585266a852ba6eb9d8d9c2ab6818acd4896b2b0f12a2ec13de6
-MISC ChangeLog 1746 RMD160 c5eeab6e24d3600eb24ae7535e101334a1c0a29e SHA1 99ffcd4810b7afa58239056a8116db3e1d81e81d SHA256 428722be2c145ab6a5e6f4a7d299eb249da4bfb2b77b360e865fe7bafeeb975d
+MISC ChangeLog 2173 RMD160 c1e0cfec1cb43b3536746c71764c4003a0f01e6b SHA1 caba02c891df626bf199c5a7a7c5a13f578ab2f4 SHA256 e9bef9a2d41c556a6745a1e3d45c0c4f4328f01c5c8da113cb42ec45f771d7a2
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5/OKEACgkQAiZjviIA2Xg67gCgugTnp2ZP9lI2IuQ5v66EIam9
-kFoAoKlymaMcZzSrDDWDJViq6d0WE999
-=wvVP
+iEYEARECAAYFAk7xtXIACgkQAiZjviIA2XhIjwCg1f1DWn+iL0tiSGFW0kb6ICIP
+l9EAoJGtx2eKdlZSY5uFlp28i3Mqypko
+=KQw+
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/mini_magick/files/mini_magick-1.2.5-tests-tempdir.patch b/dev-ruby/mini_magick/files/mini_magick-1.2.5-tests-tempdir.patch
deleted file mode 100644
index 99f01f8a2eaf..000000000000
--- a/dev-ruby/mini_magick/files/mini_magick-1.2.5-tests-tempdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/image_temp_file_test.rb b/test/image_temp_file_test.rb
-index bf6a368..7478688 100644
---- a/test/image_temp_file_test.rb
-+++ b/test/image_temp_file_test.rb
-@@ -11,7 +11,7 @@ class ImageTempFileTest < Test::Unit::TestCase
-   end
- 
-   def test_temp_file_has_given_extension
--    assert_match /^[^.]+\.jpg$/, ImageTempFile.new('jpg').path
--    assert_match /^[^.]+\.png$/, ImageTempFile.new('png').path
-+    assert_match /^.+\.jpg$/, ImageTempFile.new('jpg').path
-+    assert_match /^.+\.png$/, ImageTempFile.new('png').path
-   end
- end
diff --git a/dev-ruby/mini_magick/mini_magick-1.2.5.ebuild b/dev-ruby/mini_magick/mini_magick-1.2.5.ebuild
deleted file mode 100644
index 278ea865e106..000000000000
--- a/dev-ruby/mini_magick/mini_magick-1.2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-1.2.5.ebuild,v 1.2 2010/05/22 15:25:00 flameeyes Exp $
-
-EAPI=2
-
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-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
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	epatch "${FILESDIR}"/${P}-tests-tempdir.patch
-}
diff --git a/dev-ruby/mini_magick/mini_magick-3.2.ebuild b/dev-ruby/mini_magick/mini_magick-1.3.3-r1.ebuild
index 3e6f575f9450..707b7db38bce 100644
--- a/dev-ruby/mini_magick/mini_magick-3.2.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.2.ebuild,v 1.1 2011/01/14 07:41:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-1.3.3-r1.ebuild,v 1.1 2011/12/21 10:31:47 flameeyes Exp $
 
 EAPI=2
 
@@ -40,4 +40,8 @@ all_ruby_prepare() {
 
 	# Remove spec definition part because the gemspec file is not included
 	sed -i -e '/gemspec/,$ d' Rakefile || die
+
+	# fix dependency over subexec, so that 0.1.x is also accepted (tests
+	# pass just fine, package works).
+	sed -i -e 's:~>:>=:' ../metadata || die
 }
diff --git a/dev-ruby/mini_magick/mini_magick-1.3.3.ebuild b/dev-ruby/mini_magick/mini_magick-1.3.3.ebuild
deleted file mode 100644
index 2bf26ca42aa6..000000000000
--- a/dev-ruby/mini_magick/mini_magick-1.3.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-1.3.3.ebuild,v 1.1 2010/09/19 07:07:01 graaff Exp $
-
-EAPI=2
-
-# 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_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-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.0.4"
-
-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
-}
diff --git a/dev-ruby/mini_magick/mini_magick-3.1.ebuild b/dev-ruby/mini_magick/mini_magick-3.1.ebuild
deleted file mode 100644
index 66b3de8747ee..000000000000
--- a/dev-ruby/mini_magick/mini_magick-3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 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.1.ebuild,v 1.1 2011/01/02 13:04:53 graaff Exp $
-
-EAPI=2
-
-# 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_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-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.0.4"
-
-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
-}