gentoo resync : 15.12.2019

6 files changed, 164 insertions, 171 deletions

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 44c2f3fc1136..cf496fbf6e78 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,12 +1,10 @@
 AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
-AUX redmine-3.3.7_gemfile_versions.patch 1401 BLAKE2B 978258b8226260edb2af735d6dacdb357e7e58f7ca99b1719a78dc8a7b77863f074e405d5980739849c3307c5d91cc82464d3d12262ad2a152a469d1b37e40d9 SHA512 a81367c5d27273c54274241a76fbbf0c3bf72344b696af419224e75a3e4350f22a15bf95699714f5c4aae0fdf0b2e6d4900c0a1b7aa8f05b845feaa6bd5f7839
-AUX redmine-3.4.5_gemfile_versions.patch 1294 BLAKE2B 2aac6c6eb74b2abbfc436f30834566dba5760ef9a5dca1fda28d4a2cbfb7db58fed31b0cc5149618defcd17eaac6b2fac9a864e61e6168ef87dbb6097d97a685 SHA512 89645b6d03ff48804201bd385557468c9c10c339021c83de7633f669147c58e2884e8eed921add5a4ed2548e350ecba025f7ab6b56e13f207d3bc3903609d125
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
+AUX redmine-4.0.5_gemfile_versions.patch 2609 BLAKE2B 5841c5d7b13ae5808c1a111f9a452cf5cbb5a1be6b730a6379d583f7bf7e7b94f8cd086d4d9700886096c20ab93140c1c8d6ddbe2f1611d0dd1ec920aa9537dd SHA512 1a765504dbd1f84c2e03eee6eaa4882195e89a23ddf2f070f34abd8b278d87dabd0e367d48247350b0ffe5a5795f4552500514882cb4fae69ffcda80841eabe7
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
-DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad
-EBUILD redmine-3.3.7.ebuild 6660 BLAKE2B f8e8e9785b682c5ad1d7fa4ba06157a171438d3fed1bfaaebcaad0a063638d87897ea3cade28669fe30b7e69674b4617cf4095777b35dd1ec4f27fff37a5a1ec SHA512 873308418eb2a231d4ecdf41ca2f24da31af8c438a3e02e2982a9d99c80d82c7ed05a13cb67d3c48bd251efdd40658fa62954d84d5e30c29d2c3dce58ec46be3
-EBUILD redmine-3.4.5.ebuild 6668 BLAKE2B a0ba11f4cd5e078f72510998092497b5c1eaa9abb509e0f24a5680a4c3c99ec3f502ae3b0cd47df658742ebc968fddc55a12bb3f36db153f2e7939e296eebc90 SHA512 56ca6c12fe532608e005f0db11a2abad4f01ca1fef7d029ef6a0828e2255b983ee37782ed5c9df3ff4b305059ed17bdbcf1272e688e10b255b1a786539f38d6f
+DIST redmine-4.0.5.tar.gz 2519900 BLAKE2B ddc465f12030f3f672ea9bf6b825fd40344dcffd3b60907a42c4dbe57f209c54a12bbd3d59f886ff000ccbd43f6d1b9c1aacfbab653f2d81bb06d8d7189bd624 SHA512 a6aa3e2418fd83ed3783fc6644c339c54ebb1952b8c2c0be4b718fb296fdff64fb4116faa2c88f3e5c3c25d7c5b3c21cd7822ff9f99f6f67270e0b8b64053678
+EBUILD redmine-4.0.5-r1.ebuild 6583 BLAKE2B 8fcca6848479f73705b676aca54fe0f3e5a634cb863c675c709255b90757f06f1eff2e38230f32a6192d50876ea680868dcf6cce89f00900721a4d27e798b723 SHA512 6b8cbb2ff81f9f7120b8c1025e6ba9760a045779a4183fadbf41c183a7b571539d6d48be5ac1be1ce0b18e4ec8fedbd2bb69938bdf8b19aad9fdb307b320cca0
+EBUILD redmine-4.0.5.ebuild 6512 BLAKE2B e2cfbe2896f392dfd4206e3f126ee87ae170a504ae28ed59f5a29e4dcd8539ea56193f1d7d0253a819a611d522c3a6d577a1c016212485cf6da4e4f578993da3 SHA512 99b6f3791b3231447adabbf7203bafb1a95a80aa8548887f3aaeec65087de4bc6fa34c1c324dad0e42993699edffa4a467ead92b5085adc6716933ef60a57f9e
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
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]
diff --git a/www-apps/redmine/redmine-3.4.5.ebuild b/www-apps/redmine/redmine-4.0.5-r1.ebuild
index 5b6112dc9338..b73f9df2d521 100644
--- a/www-apps/redmine/redmine-3.4.5.ebuild
+++ b/www-apps/redmine/redmine-4.0.5-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
-inherit eutils depend.apache ruby-ng user
+
+USE_RUBY="ruby24"
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
 HOMEPAGE="https://www.redmine.org/"
@@ -14,42 +15,38 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
-ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
+DEPS="
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( dev-ruby/rmagick:0 )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.4.0 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.12 )
+	dev-ruby/actionpack-xml_parser:*
 	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:3
+	>=dev-ruby/mail-2.7.1
 	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.10.0
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.19.6
 	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	mysql? ( dev-ruby/mysql2:0.4 )
-	passenger? ( www-apache/passenger )
-	postgres? ( dev-ruby/pg:0 )
-	sqlite? ( dev-ruby/sqlite3 )
-	"
+	>=dev-ruby/roadie-rails-1.3.0
+	>=dev-ruby/rouge-3.6.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
 
-REDMINE_DIR="/var/lib/${PN}"
+ruby_add_rdepend "${DEPS}"
+ruby_add_bdepend "${DEPS}"
 
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
+
+REDMINE_DIR="/var/lib/${PN}"
 
 all_ruby_prepare() {
 	rm -r log files/delete.me .github || die
@@ -57,14 +54,12 @@ all_ruby_prepare() {
 	# bug #406605
 	rm .{git,hg}ignore || die
 
+	# newenvd not working here
 	cat > "${T}/50${PN}" <<-EOF || die
 		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
 		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
 	EOF
 
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
 	# Fixing versions in Gemfile
 	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
 
@@ -75,6 +70,8 @@ all_ruby_prepare() {
 		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
 	fi
 	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
 		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
 	fi
 	if ! use markdown ; then
@@ -88,6 +85,11 @@ all_ruby_install() {
 
 	keepdir /var/log/${PN}
 
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem \"fcgi\"" > Gemfile.local
+	fi
+
 	insinto "${REDMINE_DIR}"
 	doins -r .
 	insinto "${REDMINE_DIR}/config"
@@ -151,6 +153,9 @@ pkg_postinst() {
 }
 
 pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+
 	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
 		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
 		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
@@ -198,9 +203,8 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
+		einfo "Clear the cache."
 		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
 	else
 		einfo
 		einfo "Initializing database."
@@ -212,7 +216,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
+		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."
diff --git a/www-apps/redmine/redmine-3.3.7.ebuild b/www-apps/redmine/redmine-4.0.5.ebuild
index be96b5703989..494fd300228b 100644
--- a/www-apps/redmine/redmine-3.3.7.ebuild
+++ b/www-apps/redmine/redmine-4.0.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
-inherit eutils depend.apache ruby-ng user
+
+USE_RUBY="ruby24"
+inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
 HOMEPAGE="https://www.redmine.org/"
@@ -15,56 +16,46 @@ SLOT="0"
 IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
-	dev-ruby/actionpack-action_caching
-	dev-ruby/actionpack-xml_parser:0
-	>=dev-ruby/builder-3.2.2:3.2
-	>=dev-ruby/coderay-1.1.0
+	imagemagick? ( dev-ruby/rmagick:0 )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	markdown? ( >=dev-ruby/redcarpet-3.4.0 )
+	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1.4:1 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.12 )
+	dev-ruby/actionpack-xml_parser:*
 	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
+	>=dev-ruby/mail-2.7.1
 	dev-ruby/mimemagic
-	>=dev-ruby/nokogiri-1.6.8
-	dev-ruby/protected_attributes
-	>=dev-ruby/rack-openid-0.2.1
-	>=dev-ruby/rails-4.2.5.2:4.2
-	>=dev-ruby/rails-html-sanitizer-1.0.3
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.10.0
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.19.6
 	dev-ruby/request_store:1.0.5
-	>=dev-ruby/roadie-rails-1.1.0
-	>=dev-ruby/rbpdf-1.19.2
-	>=dev-ruby/ruby-openid-2.3.0
-	dev-ruby/rubygems
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( >=dev-ruby/rmagick-2.14.0 )
-	ldap? ( >=dev-ruby/ruby-net-ldap-0.12.0 )
-	markdown? ( >=dev-ruby/redcarpet-3.3.2 )
-	mysql? ( dev-ruby/mysql2:0.4 )
-	passenger? ( www-apache/passenger )
-	postgres? ( dev-ruby/pg:0 )
-	sqlite? ( dev-ruby/sqlite3 )
-	"
+	>=dev-ruby/roadie-rails-1.3.0
+	>=dev-ruby/rouge-3.6.0
+	>=dev-ruby/ruby-openid-2.9.2
+	dev-ruby/rack-openid
+"
 
-REDMINE_DIR="/var/lib/${PN}"
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
 
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
+REDMINE_DIR="/var/lib/${PN}"
 
 all_ruby_prepare() {
-	rm -r log files/delete.me || die
+	rm -r log files/delete.me .github || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
 
+	# newenvd not working here
 	cat > "${T}/50${PN}" <<-EOF || die
 		CONFIG_PROTECT="${EROOT%/}${REDMINE_DIR}/config"
 		CONFIG_PROTECT_MASK="${EROOT%/}${REDMINE_DIR}/config/locales ${EROOT%/}${REDMINE_DIR}/config/settings.yml"
 	EOF
 
-	# remove ldap staff module if disabled to avoid #413779
-	use ldap || rm app/models/auth_source_ldap.rb || die
-
 	# Fixing versions in Gemfile
 	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
 
@@ -75,6 +66,8 @@ all_ruby_prepare() {
 		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
 	fi
 	if ! use ldap ; then
+		# remove ldap stuff module if disabled to avoid #413779
+		use ldap || rm app/models/auth_source_ldap.rb || die
 		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
 	fi
 	if ! use markdown ; then
@@ -88,6 +81,11 @@ all_ruby_install() {
 
 	keepdir /var/log/${PN}
 
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem \"fcgi\"" > Gemfile.local
+	fi
+
 	insinto "${REDMINE_DIR}"
 	doins -r .
 	insinto "${REDMINE_DIR}/config"
@@ -151,6 +149,9 @@ pkg_postinst() {
 }
 
 pkg_config() {
+	# Remove old lock file
+	rm -f "${EROOT%/}${REDMINE_DIR}/Gemfile.lock"
+
 	if [[ ! -e "${EROOT%/}${REDMINE_DIR}/config/database.yml" ]]; then
 		eerror "Copy ${EROOT%/}${REDMINE_DIR}/config/database.yml.example to"
 		eerror "${EROOT%/}${REDMINE_DIR}/config/database.yml then edit this"
@@ -198,9 +199,8 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
-		einfo "Clear the cache and the existing sessions."
+		einfo "Clear the cache."
 		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
 	else
 		einfo
 		einfo "Initializing database."
@@ -212,7 +212,7 @@ pkg_config() {
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration data."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:load_default_data || die
-		chown redmine:redmine -R "${EROOT%/}var/log/redmine/" || die
+		chown redmine:redmine -R "${EROOT%/}/var/log/redmine/" || die
 		einfo
 		einfo "If you use sqlite3, please do not forget to change the ownership"
 		einfo "of the sqlite files."