gentoo resync : 14.05.2020

4 files changed, 19 insertions, 320 deletions

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index cf496fbf6e78..d6d13daa0e42 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,10 +1,8 @@
 AUX 10_redmine_vhost.conf 343 BLAKE2B ef74d3feefb81ea29a85860e94ced42cc565058a9e57a1bdb7bc3581842c9543315852d47b9bed80ffbb94280f5f0264c05a552819f89bcc409118ccffd68865 SHA512 839a01abedd2977f79bde2a55041d4e3e3a72de1e04e2bdc4aa5169b3ec22adce12b2b39d4b991d6e034fcd13fbcd030cba5ecc69ae71a76f7f37d2cdde09edc
 AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d266c4cdf46e077018bbbac34a5c818fccb19508c76dd56f53bc31d3e469e61302d36825ba36a5d851cfa73b0a0ef SHA512 1a4b649bc036372a47782a089c2b3db244ea4dd5437f2d931b6c7c4578f5aa104c8b8493da4a3f2874aac0380527604807ec2062525dcd392425b9b22c84f9bf
 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-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
+DIST redmine-4.1.1.tar.gz 2712056 BLAKE2B 767964ca455fdea081d3d409e91903367190ccce08474dd6c3bba8a3a89b7efd3846dbe1dd09039620591807dc44926744218f5db28a59ddb2da326a3f3f5b1d SHA512 fe691318fe8464de197a49ac172ecfcd65047ca62273226f63549620475557cd27cf8e193355a665abef64fc0c9e59556b4732cdcaa8061746918b06a7afcf81
+EBUILD redmine-4.1.1.ebuild 6624 BLAKE2B f2a591fec1dcee4f988b63d5e22359c9a9da5a8c307a98687e92c5abcbb6eb57cfbb9370e68e87a825fc5011e9ecbf8985242420a37726941564038e7753c650 SHA512 ac6dbfeabf0c9b83a336693cb9e9dfab9b99ad06ff0be2f0d33ff2412f95751abfd418b311ff66cc3c53088152cc8d6e8e2d07a3ba7b137907597d5092513e10
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
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
deleted file mode 100644
index 46aebf2b8254..000000000000
--- a/www-apps/redmine/files/redmine-4.0.5_gemfile_versions.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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-4.0.5.ebuild b/www-apps/redmine/redmine-4.0.5.ebuild
deleted file mode 100644
index 494fd300228b..000000000000
--- a/www-apps/redmine/redmine-4.0.5.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/"
-SRC_URI="https://www.redmine.org/releases/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
-
-ruby_add_rdepend "
-	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/mail-2.7.1
-	dev-ruby/mimemagic
-	>=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.3.0
-	>=dev-ruby/rouge-3.6.0
-	>=dev-ruby/ruby-openid-2.9.2
-	dev-ruby/rack-openid
-"
-
-RDEPEND="
-	acct-group/redmine
-	acct-user/redmine
-"
-
-REDMINE_DIR="/var/lib/${PN}"
-
-all_ruby_prepare() {
-	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
-
-	# 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
-		# 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
-		sed -i -e "/group :markdown do/,/end$/d" Gemfile || die
-	fi
-}
-
-all_ruby_install() {
-	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
-
-	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"
-	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() {
-	# 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"
-		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."
-		${RUBY} -S rake tmp:cache: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 -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."
-		einfo
-		einfo "# cd \"${EROOT%/}${REDMINE_DIR}\""
-		einfo "# chown redmine:redmine db/ db/*.sqlite3"
-		einfo
-	fi
-}
diff --git a/www-apps/redmine/redmine-4.0.5-r1.ebuild b/www-apps/redmine/redmine-4.1.1.ebuild
index b73f9df2d521..c6939a0daed1 100644
--- a/www-apps/redmine/redmine-4.0.5-r1.ebuild
+++ b/www-apps/redmine/redmine-4.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby24"
-inherit eutils depend.apache ruby-ng
+USE_RUBY="ruby25 ruby26"
+inherit depend.apache ruby-ng
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
 HOMEPAGE="https://www.redmine.org/"
@@ -17,28 +17,28 @@ IUSE="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
 
 DEPS="
 	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( dev-ruby/rmagick:0 )
+	imagemagick? ( dev-ruby/mini_magick )
 	ldap? ( dev-ruby/ruby-net-ldap )
-	markdown? ( >=dev-ruby/redcarpet-3.4.0 )
+	markdown? ( >=dev-ruby/redcarpet-3.5.0 )
 	mysql? ( >=dev-ruby/mysql2-0.5.0:0.5 )
+	passenger? ( www-apache/passenger )
 	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
+	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
+	dev-ruby/actionpack-xml_parser:2
+	>=dev-ruby/i18n-1.6.0:1
 	>=dev-ruby/mail-2.7.1
 	dev-ruby/mimemagic
 	>=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.3.0
-	>=dev-ruby/rouge-3.6.0
+	>=dev-ruby/rbpdf-1.20.0
+	dev-ruby/request_store:0
+	>=dev-ruby/roadie-rails-2.1.0
+	>=dev-ruby/rouge-3.12.0
 	>=dev-ruby/ruby-openid-2.9.2
 	dev-ruby/rack-openid
 "
 
-ruby_add_rdepend "${DEPS}"
 ruby_add_bdepend "${DEPS}"
 
 RDEPEND="
@@ -49,7 +49,7 @@ RDEPEND="
 REDMINE_DIR="/var/lib/${PN}"
 
 all_ruby_prepare() {
-	rm -r log files/delete.me .github || die
+	rm -fr log files/delete.me .github || die
 
 	# bug #406605
 	rm .{git,hg}ignore || die
@@ -61,13 +61,14 @@ all_ruby_prepare() {
 	EOF
 
 	# Fixing versions in Gemfile
-	eapply "${FILESDIR}/${P}_gemfile_versions.patch"
+	sed -i -e "s/~>/>=/g" Gemfile || die
 
+	sed -i -e "/csv/d" Gemfile || die
 	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
+		sed -i -e "/group :minimagick do/,/end$/d" Gemfile || die
 	fi
 	if ! use ldap ; then
 		# remove ldap stuff module if disabled to avoid #413779