gentoo resync : 15.12.2019

3 files changed, 76 insertions, 85 deletions

diff --git a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
deleted file mode 100644
index c338a385a969..000000000000
--- a/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nuar redmine-3.3.7.orig/Gemfile redmine-3.3.7/Gemfile
---- redmine-3.3.7.orig/Gemfile	2018-05-23 22:36:30.756737829 +0300
-+++ redmine-3.3.7/Gemfile	2018-05-23 22:42:20.227720874 +0300
-@@ -4,7 +4,7 @@
-   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
- end
- 
--gem "rails", "4.2.7.1"
-+gem "rails", "~> 4.2.10"
- gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
- if RUBY_VERSION < "2.1"
-   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
-@@ -17,12 +17,12 @@
- gem "protected_attributes"
- gem "actionpack-action_caching"
- gem "actionpack-xml_parser"
--gem "roadie-rails", "~> 1.1.1"
--gem "roadie", "~> 3.2.1"
-+gem "roadie-rails", "~> 1.2.1"
-+gem "roadie", "~> 3.3"
- gem "mimemagic"
--gem "mail", "~> 2.6.4"
-+gem "mail", "~> 2.7"
- 
--gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
-+gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.2" : "~> 1.6.8")
- gem "i18n", "~> 0.7.0"
- gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
- 
-@@ -35,12 +35,12 @@
- 
- # Optional gem for LDAP authentication
- group :ldap do
--  gem "net-ldap", "~> 0.12.0"
-+  gem "net-ldap", "~> 0.16.0"
- end
- 
- # Optional gem for OpenID authentication
- group :openid do
--  gem "ruby-openid", "~> 2.3.0", :require => "openid"
-+  gem "ruby-openid", "~> 2.7.0", :require => "openid"
-   gem "rack-openid"
- end
- 
diff --git a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
deleted file mode 100644
index df49ccbe1dc9..000000000000
--- a/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nuar redmine-3.4.5.orig/Gemfile redmine-3.4.5/Gemfile
---- redmine-3.4.5.orig/Gemfile	2018-05-23 02:01:54.591358114 +0300
-+++ redmine-3.4.5/Gemfile	2018-05-23 02:05:19.531348171 +0300
-@@ -4,7 +4,7 @@
-   abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
- end
- 
--gem "rails", "4.2.8"
-+gem "rails", "~> 4.2.10"
- gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
- if RUBY_VERSION < "2.1"
-   gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
-@@ -15,10 +15,10 @@
- gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
- gem "protected_attributes"
- gem "actionpack-xml_parser"
--gem "roadie-rails", "~> 1.1.1"
--gem "roadie", "~> 3.2.1"
-+gem "roadie-rails", "~> 1.2.1"
-+gem "roadie", "~> 3.3"
- gem "mimemagic"
--gem "mail", "~> 2.6.4"
-+gem "mail", "~> 2.7"
- 
- gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
- gem "i18n", "~> 0.7.0"
-@@ -33,12 +33,12 @@
- 
- # Optional gem for LDAP authentication
- group :ldap do
--  gem "net-ldap", "~> 0.12.0"
-+  gem "net-ldap", "~> 0.16.0"
- end
- 
- # Optional gem for OpenID authentication
- group :openid do
--  gem "ruby-openid", "~> 2.3.0", :require => "openid"
-+  gem "ruby-openid", "~> 2.7", :require => "openid"
-   gem "rack-openid"
- end
- 
diff --git a/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch b/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
new file mode 100644
index 000000000000..46aebf2b8254
--- /dev/null
+++ b/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
@@ -0,0 +1,76 @@
+diff -Nuar redmine-4.0.5.orig/Gemfile redmine-4.0.5/Gemfile
+--- redmine-4.0.5.orig/Gemfile	2019-10-24 22:20:32.412728804 +0300
++++ redmine-4.0.5/Gemfile	2019-10-24 22:27:40.356708042 +0300
+@@ -3,46 +3,45 @@
+ gem "bundler", ">= 1.5.0"
+ 
+ gem "rails", "5.2.3"
+-gem "rouge", "~> 3.3.0"
++gem "rouge", ">= 3.3.0"
+ gem "request_store", "1.0.5"
+-gem "mini_mime", "~> 1.0.1"
++gem "mini_mime", ">= 1.0.1"
+ gem "actionpack-xml_parser"
+-gem "roadie-rails", "~> 1.3.0"
++gem "roadie-rails", ">= 1.3.0"
+ gem "mimemagic"
+-gem "mail", "~> 2.7.1"
+-gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
++gem "mail", ">= 2.7.1"
+ 
+-gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
++gem "nokogiri", (RUBY_VERSION >= "2.3" ? ">= 1.10.0" : "~> 1.9.1")
+ gem "i18n", "~> 0.7.0"
+ gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
+ 
+ # TODO: Remove the following line when #32223 is fixed
+-gem "sprockets", "~> 3.7.2"
++gem "sprockets", ">= 3.7.2"
+ 
+ # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
+-gem "rbpdf", "~> 1.19.6"
++gem "rbpdf", ">= 1.19.6"
+ 
+ # Optional gem for LDAP authentication
+ group :ldap do
+-  gem "net-ldap", "~> 0.16.0"
++  gem "net-ldap", ">= 0.16.0"
+ end
+ 
+ # Optional gem for OpenID authentication
+ group :openid do
+-  gem "ruby-openid", "~> 2.9.2", :require => "openid"
++  gem "ruby-openid", ">= 2.9.2", :require => "openid"
+   gem "rack-openid"
+ end
+ 
+ platforms :mri, :mingw, :x64_mingw do
+   # Optional gem for exporting the gantt to a PNG file, not supported with jruby
+   group :rmagick do
+-    gem "rmagick", "~> 2.16.0"
++    gem "rmagick", ">= 2.16.0"
+   end
+ 
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+-    gem "redcarpet", "~> 3.4.0"
++    gem "redcarpet", ">= 3.4.0"
+   end
+ end
+ 
+@@ -58,11 +57,11 @@
+     adapters.each do |adapter|
+       case adapter
+       when 'mysql2'
+-        gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "mysql2", ">= 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
+       when /postgresql/
+-        gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "pg", ">= 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
+       when /sqlite3/
+-        gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
++        gem "sqlite3", ">= 1.3.12", :platforms => [:mri, :mingw, :x64_mingw]
+       when /sqlserver/
+         gem "tiny_tds", "~> 1.0.5", :platforms => [:mri, :mingw, :x64_mingw]
+         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]