www-apps/redmine: version bump and fixes

Bump to 3.3.7 and 3.4.5. Branch 3.2 support officialy discontinued,
removed. Fixes dependencies conflict that prevents launch application
with installed but unsupported gems (#645178 and #652880). Fixes bug
when fresh installation cannot be configured.

Closes: https://bugs.gentoo.org/645178
Closes: https://bugs.gentoo.org/652880
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/8539

7 files changed, 130 insertions, 327 deletions

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index dcdd6872f69a..1aa30ff383b0 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,3 +1,2 @@
-DIST redmine-3.2.9.tar.gz 2323496 BLAKE2B 16aea04eb8ddbe4e97c95f32ad62c6d4332001d7e8afd0b842cc76f9f1dc492b48e1dc11c8017d635520fbccda6e1044ced8be51435f76db24482bf11b5a70d9 SHA512 0bf52f245a08cfd66acd07fe849cfac7a460623cdd223806ee4c7c9c3d17753c1b2914b7bcdc950ac8401ba54c004e399f685d38946b1fbe2259943de5a18f29
-DIST redmine-3.3.6.tar.gz 2371226 BLAKE2B 4465ebf3d89e05a8c53f59b11190eb290a152e6a11fa08a210c471f31e857c3c21ce226e056be00dec7bb5b78172a929969e1cae410ce9fa4c03280c427e99c2 SHA512 124a74ccbe9e66460551fc0fb9feb5b72237c5b711463b467d665fd973c3f0a06f63c708629716401f9997cefc1c3060d64c73917d3791750b4340eda69c8848
-DIST redmine-3.4.4.tar.gz 2447358 BLAKE2B 1f5aa3c24e06029405c59e25c40c98975c98033658ee0a931b1fa95aac54187c7304f1fc0af4805226c4ef274f85d89856ffd39b0ae71b34337865d3e8f4a5ff SHA512 12bf58aade53c02df35b33ba62dd97091a5ac20fb6ef0f16f046226c62dfd06fc6cea5451f433e00f7d9374c158035dc5457d65eafdbc35a90199c5a407c7752
+DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
+DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad
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
new file mode 100644
index 000000000000..c338a385a969
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.3.7_gemfile_versions.patch
@@ -0,0 +1,44 @@
+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.3_requires.patch b/www-apps/redmine/files/redmine-3.4.3_requires.patch
deleted file mode 100644
index 338f627adb1b..000000000000
--- a/www-apps/redmine/files/redmine-3.4.3_requires.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nuar redmine-3.4.3-orig/app/controllers/application_controller.rb redmine-3.4.3/app/controllers/application_controller.rb
---- redmine-3.4.3-orig/app/controllers/application_controller.rb	2017-12-11 20:55:04.942299001 +0500
-+++ redmine-3.4.3/app/controllers/application_controller.rb	2017-12-11 20:55:17.285298402 +0500
-@@ -15,6 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'request_store'
- require 'uri'
- require 'cgi'
- 
-diff -Nuar redmine-3.4.3-orig/app/controllers/welcome_controller.rb redmine-3.4.3/app/controllers/welcome_controller.rb
---- redmine-3.4.3-orig/app/controllers/welcome_controller.rb	2017-12-11 20:55:04.942299001 +0500
-+++ redmine-3.4.3/app/controllers/welcome_controller.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -15,6 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'action_controller'
-+require 'action_controller/action_caching'
-+
- class WelcomeController < ApplicationController
-   self.main_menu = false
- 
-diff -Nuar redmine-3.4.3-orig/app/models/custom_field.rb redmine-3.4.3/app/models/custom_field.rb
---- redmine-3.4.3-orig/app/models/custom_field.rb	2017-12-11 20:55:04.926299002 +0500
-+++ redmine-3.4.3/app/models/custom_field.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -15,6 +15,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
-+require 'protected_attributes'
-+
- class CustomField < ActiveRecord::Base
-   include Redmine::SafeAttributes
-   include Redmine::SubclassFactory
-diff -Nuar redmine-3.4.3-orig/app/models/mailer.rb redmine-3.4.3/app/models/mailer.rb
---- redmine-3.4.3-orig/app/models/mailer.rb	2017-12-11 20:55:04.926299002 +0500
-+++ redmine-3.4.3/app/models/mailer.rb	2017-12-11 20:55:17.286298402 +0500
-@@ -16,6 +16,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- require 'roadie'
-+require 'roadie-rails'
- 
- class Mailer < ActionMailer::Base
-   layout 'mailer'
-diff -Nuar redmine-3.4.3-orig/bin/rails redmine-3.4.3/bin/rails
---- redmine-3.4.3-orig/bin/rails	2017-12-11 20:55:04.986298999 +0500
-+++ redmine-3.4.3/bin/rails	2017-12-11 20:58:40.247288555 +0500
-@@ -1,4 +1,6 @@
- #!/usr/bin/env ruby
- APP_PATH = File.expand_path('../../config/application',  __FILE__)
- require_relative '../config/boot'
-+
-+gem 'rails', '~> 4.2'
- require 'rails/commands'
-diff -Nuar redmine-3.4.3-orig/config/application.rb redmine-3.4.3/config/application.rb
---- redmine-3.4.3-orig/config/application.rb	2017-12-11 20:55:04.971298999 +0500
-+++ redmine-3.4.3/config/application.rb	2017-12-11 20:58:20.477289514 +0500
-@@ -1,8 +1,11 @@
- require File.expand_path('../boot', __FILE__)
- 
-+gem 'rails', '~> 4.2'
-+gem 'actionpack-xml_parser', '~> 1.0'
-+
- require 'rails/all'
-+require 'action_dispatch/xml_params_parser'
- 
--Bundler.require(*Rails.groups)
- 
- module RedmineApp
-   class Application < Rails::Application
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
new file mode 100644
index 000000000000..df49ccbe1dc9
--- /dev/null
+++ b/www-apps/redmine/files/redmine-3.4.5_gemfile_versions.patch
@@ -0,0 +1,41 @@
+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/redmine-3.3.6.ebuild b/www-apps/redmine/redmine-3.3.6.ebuild
deleted file mode 100644
index c3b226cd21c4..000000000000
--- a/www-apps/redmine/redmine-3.3.6.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
-inherit eutils depend.apache ruby-ng user
-
-DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
-HOMEPAGE="https://www.redmine.org/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
-
-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
-	dev-ruby/i18n:0.7
-	>=dev-ruby/jquery-rails-3.1.4:3
-	dev-ruby/loofah
-	dev-ruby/mime-types:*
-	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/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 )
-	passenger? ( www-apache/passenger )
-	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-pkg_setup() {
-	enewgroup redmine
-	enewuser redmine -1 -1 "${REDMINE_DIR}" redmine
-}
-
-all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
-
-	# bug #406605
-	rm .{git,hg}ignore || die
-
-	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
-
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	keepdir /var/log/${PN}
-
-	insinto "${REDMINE_DIR}"
-	doins -r .
-	insinto "${REDMINE_DIR}/config"
-	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
-
-	fowners -R redmine:redmine \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/public/plugin_assets" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	fowners redmine:redmine "${REDMINE_DIR}"
-
-	# protect sensitive data, see bug #406605
-	fperms -R go-rwx \
-		"${REDMINE_DIR}/config" \
-		"${REDMINE_DIR}/files" \
-		"${REDMINE_DIR}/tmp" \
-		/var/log/${PN}
-
-	if use passenger; then
-		has_apache
-		insinto "${APACHE_VHOSTS_CONFDIR}"
-		doins "${FILESDIR}/10_redmine_vhost.conf"
-	fi
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/redmine.logrotate redmine
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	doenvd "${T}/50${PN}"
-}
-
-pkg_postinst() {
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" \
-	|| -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		elog "Execute the following command to upgrade environment:"
-		elog
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "For upgrade instructions take a look at:"
-		elog "http://www.redmine.org/wiki/redmine/RedmineUpgrade"
-	else
-		elog "Execute the following command to initialize environment:"
-		elog
-		elog "# cd ${EROOT%/}${REDMINE_DIR}"
-		elog "# cp config/database.yml.example config/database.yml"
-		elog "# \${EDITOR} config/database.yml"
-		elog "# chown redmine:redmine config/database.yml"
-		elog "# emerge --config \"=${CATEGORY}/${PF}\""
-		elog
-		elog "Installation notes are at official site"
-		elog "http://www.redmine.org/wiki/redmine/RedmineInstall"
-	fi
-}
-
-pkg_config() {
-	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"
-		eerror "file in order to configure your database settings for"
-		eerror "\"production\" environment."
-		die
-	fi
-
-	local RAILS_ENV=${RAILS_ENV:-production}
-	if [[ ! -L /usr/bin/ruby ]]; then
-		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	if [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]
-	then
-		eerror "/usr/bin/ruby is currently not included in redmine's ruby targets:"
-		eerror "${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-	local RUBY=${RUBY:-ruby}
-
-	cd "${EROOT%/}${REDMINE_DIR}" || die
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/session_store.rb" ]]
-	then
-		einfo
-		einfo "Generating secret token."
-		einfo
-		rm config/initializers/session_store.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-	fi
-	if [[ -e "${EROOT%/}${REDMINE_DIR}/config/initializers/secret_token.rb" ]]
-	then
-		einfo
-		einfo "Upgrading database."
-		einfo
-
-		einfo "Generating secret token."
-		# Migration from Redmine 2.x
-		rm config/initializers/secret_token.rb || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
-
-		einfo "Migrating database."
-		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."
-		${RUBY} -S rake tmp:cache:clear || die
-		${RUBY} -S rake tmp:sessions:clear || die
-	else
-		einfo
-		einfo "Initializing database."
-		einfo
-
-		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_secret_token || die
-		einfo "Creating the database structure."
-		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 "${EROOT%/}var/log/redmine/*.log" || die
-		einfo
-		einfo "If you use sqlite3, please do not forget to change the ownership"
-		einfo "of the sqlite files."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-3.4.4.ebuild b/www-apps/redmine/redmine-3.3.7.ebuild
index c914e4add206..be96b5703989 100644
--- a/www-apps/redmine/redmine-3.4.4.ebuild
+++ b/www-apps/redmine/redmine-3.3.7.ebuild
@@ -12,10 +12,7 @@ SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
@@ -41,16 +38,11 @@ ruby_add_rdepend "
 	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 )
 	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
 
 REDMINE_DIR="/var/lib/${PN}"
 
@@ -60,7 +52,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
+	rm -r log files/delete.me || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -73,7 +65,21 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
 }
 
 all_ruby_install() {
@@ -206,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 "${EROOT%/}var/log/redmine/*.log" || 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.2.9.ebuild b/www-apps/redmine/redmine-3.4.5.ebuild
index c3b226cd21c4..d78641a9295b 100644
--- a/www-apps/redmine/redmine-3.2.9.ebuild
+++ b/www-apps/redmine/redmine-3.4.5.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# ruby24 don't have required deps
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 inherit eutils depend.apache ruby-ng user
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
@@ -13,10 +12,7 @@ SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-# All db-related USEs are ineffective since we depend on rails
-# which depends on activerecord which depends on all ruby's db bindings
-#IUSE="ldap openid imagemagick postgres sqlite mysql fastcgi passenger"
-IUSE="imagemagick fastcgi ldap markdown passenger"
+IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 ruby_add_rdepend "
 	dev-ruby/actionpack-action_caching
@@ -42,16 +38,11 @@ ruby_add_rdepend "
 	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 )
 	"
-# TODO add USE doc and test
-#ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
-#	dev-ruby/yard
-#	test? (
-#		>=dev-ruby/shoulda-3.3.2
-#		>=dev-ruby/mocha-0.13.3
-#		>=dev-ruby/capybara-2.0.0
-#	)"
 
 REDMINE_DIR="/var/lib/${PN}"
 
@@ -61,7 +52,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	rm -r log files/delete.me Gemfile || die
+	rm -r log files/delete.me .github || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -74,7 +65,21 @@ all_ruby_prepare() {
 	# remove ldap staff module if disabled to avoid #413779
 	use ldap || rm app/models/auth_source_ldap.rb || die
 
-	eapply "${FILESDIR}/${PN}-3.4.3_requires.patch"
+	# Fixing versions in Gemfile
+	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+
+	sed -i -e "/group :development do/,/end$/d" Gemfile || die
+	sed -i -e "/group :test do/,/end$/d" Gemfile || die
+
+	if ! use imagemagick ; then
+		sed -i -e "/group :rmagick do/,/end$/d" Gemfile || die
+	fi
+	if ! use ldap ; then
+		sed -i -e "/group :ldap do/,/end$/d" Gemfile || die
+	fi
+	if ! use markdown ; then
+		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
+	fi
 }
 
 all_ruby_install() {
@@ -207,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 "${EROOT%/}var/log/redmine/*.log" || 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."