[gentoo-commits] dev/dev-zero:master commit in: dev-ruby/carrierwave/files/, dev-ruby/carrierwave/

[gentoo-commits] dev/dev-zero:master commit in: dev-ruby/carrierwave/files/, dev-ruby/carrierwave/

[Tiziano Müller]

commit:     84da565e01aa89dad38299fb88aa7b15390ab816
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Jun 25 08:59:53 2013 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 08:59:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=84da565e

Yet another dep for gitlab.

---
 dev-ruby/carrierwave/Manifest                      |  6 +++
 dev-ruby/carrierwave/carrierwave-0.8.0.ebuild      | 48 ++++++++++++++++++++++
 .../carrierwave/files/0.8.0-remove-bundler.patch   | 18 ++++++++
 .../5d66582060a503af4e8fbd40fd7ff522fcf7b479.patch | 25 +++++++++++
 .../992e81e841b0a7a1f1b418fb6559e005b19af1b4.patch | 39 ++++++++++++++++++
 .../b8dac538522b27f6424d647c5b5b4d87e31702c0.patch | 31 ++++++++++++++
 6 files changed, 167 insertions(+)

diff --git a/dev-ruby/carrierwave/Manifest b/dev-ruby/carrierwave/Manifest
new file mode 100644
index 0000000..2f07fb2
--- /dev/null
+++ b/dev-ruby/carrierwave/Manifest
@@ -0,0 +1,6 @@
+AUX 0.8.0-remove-bundler.patch 404 SHA256 f0fa6b39dd42bf572f9be859f1db9c50ef99ed6347f4fa486fa19f7a15f98d1d SHA512 4083f0804f58251b0fd3f12cbb69bae285042b6ed94dd5cd42ec437b4c5f60f79a93ff4e2ca5443a3815993afdce1d4d1b2341d08fe276b317c1036e5f9a0ef5 WHIRLPOOL d53195090b0316ee5a1f626cbff13715aae1bdbd2821a856591cee512a528ab7733bdd10fe8a4c695e37777142d66238823a90f782f55a57ed429542f3f78847
+AUX 5d66582060a503af4e8fbd40fd7ff522fcf7b479.patch 854 SHA256 e5d03a83c3f94bc51598e5cf3e57c23a5ad3ae11604d9894a7c82e2e2e6f6f77 SHA512 2aa04fe89fd220b0eb4562e79761503a1eee46d81283517b475c1041ef1c1fc6a7d79a4acf303c1738dd7d17dbb8bb7c9436d934b29ac2992f7ca0d09a9d7d36 WHIRLPOOL 6cebd110297d9155633f7a23f9c070a2d0de4a51b0c5772c47f0df871bb08cfa21472974c09ecbf4b24ba6c426ec0c426d69d7034960aa11c9ecf95e70ff8d59
+AUX 992e81e841b0a7a1f1b418fb6559e005b19af1b4.patch 1530 SHA256 082dcf5d2af18472fe0e17c42106cbfa0899c3d743d1bb02d0aac6078d464898 SHA512 f0a74329c1896e7fc936ac6e932ae61da5ce0dd020862bdb7b5a9e91a5088d6a487fa7e82bf2ae2ad36aefffb77da6e7d9eaec3955280dc42336fde8be29bba7 WHIRLPOOL c68b12ab109fe888ab389d06b692e6b6e5354372977f2da8898b44e655d8cc00e4c6dc201e3e4e7e5ae2b4f827d5d8d0e349e9bcc5b846acf49b16e9852ecd12
+AUX b8dac538522b27f6424d647c5b5b4d87e31702c0.patch 833 SHA256 842aec7bfc44e060f7598b67fb27ae05253ec09980dcca08c5b7988bc0479287 SHA512 b77bf4a76c0c6e9ca81a95dbac38ce2e88ac45271f6d9cd1f54a348a94b04b6f6fae9f98a27e470111f083a7eb23ca8478f552d7c741809639f9e8cbb536ad56 WHIRLPOOL 99cf855fb9c52469d4adf4688e2b770d8ccc6600a3cae5d0bc404dc35800c4b0a8ae310014ccfdf1cdb9164823cbab1beb3f8f2666a742f628b095dd6cfeff93
+DIST carrierwave-0.8.0.tar.gz 333912 SHA256 b6dcee7fc9d7d2c9098ce9b7c16127cdd116dc351acfe020bdfed27a81889535 SHA512 7c89d2b576c7434069ed10cd6b927664dc9471bf31afc39594396e6ac2841f67b6113df6247ad101b905257f6c30e12b5914cf63397e42d9de84669b249d13b0 WHIRLPOOL 0d1bcd2915e6f2cd9e733f76b569ecfa9e0238c27633b034d4e52957978ab3d13a07613de02bb708335859c3e4991aafed1a8bab602f8dc2fbaa757006e369be
+EBUILD carrierwave-0.8.0.ebuild 1222 SHA256 448504d6cf9837508a93af684b990e6fc3f262500ec818a3881277ead0a7ba20 SHA512 5607425fc93cea984b722eea44f3adcf3c98b6a1f9d445f9ccab96d010b7d966afe5bd9ce962e0f386723171a97ec8dda9d7589adc225a23441c9af6af594518 WHIRLPOOL 87ef91de6ffc7bd1a0ebe6c3223c331849d52752c6e0c9c3a6ad985654f7d5ada919c8f22505736010979d054163846d5e27abe119ea3e5df22ad973a4262f9a

diff --git a/dev-ruby/carrierwave/carrierwave-0.8.0.ebuild b/dev-ruby/carrierwave/carrierwave-0.8.0.ebuild
new file mode 100644
index 0000000..2f01095
--- /dev/null
+++ b/dev-ruby/carrierwave/carrierwave-0.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_TASK_TEST="default"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION=""
+HOMEPAGE="https://github.com/carrierwaveuploader/carrierwave"
+SRC_URI="https://github.com/carrierwaveuploader/carrierwave/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+ruby_add_rdepend "dev-ruby/activemodel:3.2 dev-ruby/activesupport:3.2"
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? (
+		=dev-ruby/rspec-2.13*
+		=dev-util/cucumber-1.1*
+		dev-ruby/activerecord:3.2
+		dev-ruby/rails:3.2
+		dev-ruby/mysql2
+		dev-ruby/json
+		dev-ruby/sham_rack
+		dev-ruby/timecop
+		>=dev-ruby/fog-1.3.1
+		>=dev-ruby/mini_magick-3.6
+		dev-ruby/rmagick
+	)"
+
+RESTRICT="test"
+# the following packages are missing:
+# * sham_rack .. should be easy (only rack)
+# * fog .. a lot of deps here!
+
+RUBY_PATCHES=( ${PV}-remove-bundler.patch
+	992e81e841b0a7a1f1b418fb6559e005b19af1b4.patch
+	5d66582060a503af4e8fbd40fd7ff522fcf7b479.patch
+	b8dac538522b27f6424d647c5b5b4d87e31702c0.patch )

diff --git a/dev-ruby/carrierwave/files/0.8.0-remove-bundler.patch b/dev-ruby/carrierwave/files/0.8.0-remove-bundler.patch
new file mode 100644
index 0000000..bbfd8a9
--- /dev/null
+++ b/dev-ruby/carrierwave/files/0.8.0-remove-bundler.patch
@@ -0,0 +1,18 @@
+diff --git a/Rakefile b/Rakefile
+index 477b010..4ed4b02 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,13 +1,5 @@
+ # encoding: UTF-8
+ require 'rubygems'
+-begin
+-  require 'bundler/setup'
+-rescue LoadError
+-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+-end
+-
+-require 'bundler'
+-Bundler::GemHelper.install_tasks
+ 
+ require 'rake'
+ require 'rspec/core/rake_task'

diff --git a/dev-ruby/carrierwave/files/5d66582060a503af4e8fbd40fd7ff522fcf7b479.patch b/dev-ruby/carrierwave/files/5d66582060a503af4e8fbd40fd7ff522fcf7b479.patch
new file mode 100644
index 0000000..d8db976
--- /dev/null
+++ b/dev-ruby/carrierwave/files/5d66582060a503af4e8fbd40fd7ff522fcf7b479.patch
@@ -0,0 +1,25 @@
+From 5d66582060a503af4e8fbd40fd7ff522fcf7b479 Mon Sep 17 00:00:00 2001
+From: James Miller <bensie@gmail.com>
+Date: Mon, 18 Mar 2013 19:22:39 -0700
+Subject: [PATCH] RSpec 2.13.0 works now
+
+---
+ carrierwave.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/carrierwave.gemspec b/carrierwave.gemspec
+index 9f94932..f8662b1 100644
+--- a/carrierwave.gemspec
++++ b/carrierwave.gemspec
+@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
+   s.add_development_dependency "rails", ">= 3.2.0"
+   s.add_development_dependency "cucumber", "~> 1.1.4"
+   s.add_development_dependency "json"
+-  s.add_development_dependency "rspec", "~> 2.12.0"
++  s.add_development_dependency "rspec", "~> 2.13.0"
+   s.add_development_dependency "sham_rack"
+   s.add_development_dependency "timecop"
+   s.add_development_dependency "fog", ">= 1.3.1"
+-- 
+1.8.1.6
+

diff --git a/dev-ruby/carrierwave/files/992e81e841b0a7a1f1b418fb6559e005b19af1b4.patch b/dev-ruby/carrierwave/files/992e81e841b0a7a1f1b418fb6559e005b19af1b4.patch
new file mode 100644
index 0000000..7dba6a4
--- /dev/null
+++ b/dev-ruby/carrierwave/files/992e81e841b0a7a1f1b418fb6559e005b19af1b4.patch
@@ -0,0 +1,39 @@
+From 992e81e841b0a7a1f1b418fb6559e005b19af1b4 Mon Sep 17 00:00:00 2001
+From: Jason Woodward <jason@recovend.com>
+Date: Wed, 22 May 2013 13:31:46 -0400
+Subject: [PATCH] update tests to match changes in MiniMagick v3.6.0 committed
+ in 26e955d9854f9acbf7eb809dce968156de09780a
+
+---
+ carrierwave.gemspec                 | 2 +-
+ spec/processing/mini_magick_spec.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/carrierwave.gemspec b/carrierwave.gemspec
+index f8662b1..197addc 100644
+--- a/carrierwave.gemspec
++++ b/carrierwave.gemspec
+@@ -35,6 +35,6 @@ Gem::Specification.new do |s|
+   s.add_development_dependency "sham_rack"
+   s.add_development_dependency "timecop"
+   s.add_development_dependency "fog", ">= 1.3.1"
+-  s.add_development_dependency "mini_magick"
++  s.add_development_dependency "mini_magick", ">= 3.6.0"
+   s.add_development_dependency "rmagick"
+ end
+diff --git a/spec/processing/mini_magick_spec.rb b/spec/processing/mini_magick_spec.rb
+index ca50ccd..0c3833b 100644
+--- a/spec/processing/mini_magick_spec.rb
++++ b/spec/processing/mini_magick_spec.rb
+@@ -53,7 +53,7 @@
+       @instance.resize_and_pad(200, 200)
+       image = ::MiniMagick::Image.open(@instance.current_path)
+       x, y = 0, 0
+-      color = image.run_command("convert", "#{image.escaped_path}[1x1+#{x}+#{y}]", "-depth 8", "txt:").split("\n")[1]
++      color = image.run_command("convert", "#{image.path}[1x1+#{x}+#{y}]", "-depth", "8", "txt:").split("\n")[1]
+       color.should include('#FFFFFF')
+     end
+ 
+-- 
+1.8.1.6
+

diff --git a/dev-ruby/carrierwave/files/b8dac538522b27f6424d647c5b5b4d87e31702c0.patch b/dev-ruby/carrierwave/files/b8dac538522b27f6424d647c5b5b4d87e31702c0.patch
new file mode 100644
index 0000000..0be7093
--- /dev/null
+++ b/dev-ruby/carrierwave/files/b8dac538522b27f6424d647c5b5b4d87e31702c0.patch
@@ -0,0 +1,31 @@
+From b8dac538522b27f6424d647c5b5b4d87e31702c0 Mon Sep 17 00:00:00 2001
+From: sanemat <o.gata.ken@gmail.com>
+Date: Sat, 12 Jan 2013 16:10:30 +0900
+Subject: [PATCH] Add ```require 'date'```, because Date.today requires this
+
+For Ruby2.0.0-rc1
+```
+$ bundle exec rake -T
+There was an error in your Gemfile, and Bundler cannot continue.
+$ rake -T
+There was an error in your Gemfile, and Bundler cannot continue.
+```
+---
+ carrierwave.gemspec | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/carrierwave.gemspec b/carrierwave.gemspec
+index 14d64cb..d36fcbc 100644
+--- a/carrierwave.gemspec
++++ b/carrierwave.gemspec
+@@ -3,6 +3,7 @@ lib = File.expand_path('../lib/', __FILE__)
+ $:.unshift lib unless $:.include?(lib)
+ 
+ require 'carrierwave/version'
++require 'date'
+ 
+ Gem::Specification.new do |s|
+   s.name = "carrierwave"
+-- 
+1.8.1.6
+