gentoo resync : 01.10.2021

4 files changed, 255 insertions, 10 deletions

diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index d86909dafa5c..b33189b1059a 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -3,6 +3,8 @@ AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d26
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-4.1.2.tar.gz 2719030 BLAKE2B a169d024a76dc0b592a71da55e785152ba1cdb2203a864cff905571f1eae350d77e6955d819c660379e3e7b539664bf77a21f0f91ed5c4299f173221e763859c SHA512 a7ed547e8907d98c16c9d7c775fa3fcdb322d3e4494a1e5467cbc37c9710f04b9d5121fbdd9d8444b2028f7c8a842237ccc9d1b62c066c26bdc150cf408afb3b
-EBUILD redmine-4.1.2.ebuild 6721 BLAKE2B 31b6199982251014d96d7b9b74662cae2b68d735fd6515d587d5276ac56f05c269072e4c75159b9539bfb4ab96ba584274d55aebfcc361b7b79fefa2b5f770d8 SHA512 982db3106881601cfadecb6ef559f62a70d77dafa539e00af17474f7c3332cfd7b58caaad6425a2ac8413af48a474fc0c42f58b18ddcd0c4534d07a87faa564a
-MISC metadata.xml 558 BLAKE2B c68b2cea6f6c996441fc2f1cae3dc7a3c42bdaf156ff223465a4664053ecc0c2e0906cedf9d4b7700dd7d41e758dda31834abc5d8378358360974213063fda33 SHA512 571325be9e8a47f79575f6205109bdedfeafbd31a8aa0d1129491a3909ba2d7c040b0e6062c1c8e016f2f4f6c3724b108d8eeed597861c9a99a97b12a10ba3e4
+DIST redmine-4.1.4.tar.gz 2720709 BLAKE2B 9e0c2b990248c9000fd6062e3928bf4bc8e8043e0d9ceff13d5000da824cde027090121ce3a8be2f5d92eedb97b91629fb8b681ae5e380459fdb97904abd9b98 SHA512 93e46f2ed220c05b83b7bab34327891a7f05a46a01c6cbfc1a5c9bf18613e308d94d84fc3158a8bb7af740b8792448d935bc9d29795ee341bca577c82ac0619b
+DIST redmine-4.2.2.tar.gz 3038398 BLAKE2B 995179b6a5f75548525912dc20b4c0ded8709a12d6eb84873d899b20cf3b83469af7f14713187cce8ec720be4d501a9e7e890e1f38cbe2b118041dc91f555f53 SHA512 71155358ca68d9eb5bf6b79e26202c29ba3355d499662bfe659ff1672625a25d91694d5f1e4bb8db18456642470244aca914efe4456adef2850b70ff7eb216b2
+EBUILD redmine-4.1.4.ebuild 6783 BLAKE2B f38a88860cfb25cb1d8b353feea94b2022508fded695d82b0c3ab1044c539b4929ccb1a9e8b8dcdd29e793c75b78ec76ecd2f839f30fd8726a6259a0441749e4 SHA512 2df24ff810aa0513edd620c8dbe9e222381b896eb63f14abf027aba4f2350691de665b8333efaa53502cfcd026ecd0ca9e433b98bd84440b53b1d6b33658f50a
+EBUILD redmine-4.2.2.ebuild 6974 BLAKE2B 1c0617a830ddfba65b86811fec00d65b90db586b060df715954a1fb25ae069ee9a46a88e836b670a781b6694bee5e972bba304bb46d4e430bb412d9728a912ba SHA512 22439e771ac9fe6c6c943eea48829bd54078c558450165bc292f1d732b0453523d794307715868905753b39331ca151559750564ff8702f0b36c53eaeee98fc5
+MISC metadata.xml 659 BLAKE2B 1598079638eae3152ded1c8129eac0386737c2eb827e3e0d4d16cfa5506acebbb12e51c2084e43d43ff5c3ff220bfde3e7e0d84c4b03502b2f1b593543442d50 SHA512 ac1674ad83f39871d410c338915fba222c6cddf310b62abd7eb3725dba294b1595c291cb8f87debf7e350e67703c7b30ccba223c3b8a7692e916d2a17adb4434
diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index c957cd80dda1..c1fdc250a8e9 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -11,6 +11,7 @@
 </maintainer>
 <use>
   <flag name="markdown">Enable support for Markdown</flag>
+  <flag name="minimagick">Enable image processing support via <pkg>dev-ruby/mini_magick</pkg></flag>
   <flag name="passenger">Enable support for <pkg>www-apache/passenger</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/www-apps/redmine/redmine-4.1.2.ebuild b/www-apps/redmine/redmine-4.1.4.ebuild
index 6225d28927ac..f331ffe6d232 100644
--- a/www-apps/redmine/redmine-4.1.2.ebuild
+++ b/www-apps/redmine/redmine-4.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 inherit depend.apache ruby-ng
 
 DESCRIPTION="Flexible project management web application using the Ruby on Rails framework"
@@ -25,11 +25,13 @@ DEPS="
 	postgres? ( >=dev-ruby/pg-1.1.4:1 )
 	sqlite? ( >=dev-ruby/sqlite3-1.4.0 )
 	dev-ruby/actionpack-xml_parser:2
+	dev-ruby/csv:3
 	>=dev-ruby/i18n-1.6.0:1
 	>=dev-ruby/mail-2.7.1
+	dev-ruby/marcel
 	dev-ruby/mimemagic
 	>=dev-ruby/mini_mime-1.0.1
-	>=dev-ruby/nokogiri-1.11.0
+	>=dev-ruby/nokogiri-1.11.1
 	dev-ruby/rails:5.2
 	>=dev-ruby/rbpdf-1.20.0
 	dev-ruby/request_store:0
@@ -62,10 +64,10 @@ all_ruby_prepare() {
 
 	# Fixing versions in Gemfile
 	sed -i -e "s/~>/>=/g" Gemfile || die
+
 	# bug #724464
-	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.4'/" Gemfile || die
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.6'/" 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
 
@@ -88,7 +90,7 @@ all_ruby_prepare() {
 
 all_ruby_install() {
 	dodoc doc/* README.rdoc
-	rm -r doc appveyor.yml CONTRIBUTING.md README.rdoc || die
+	rm -r doc test appveyor.yml CONTRIBUTING.md README.rdoc || die
 
 	keepdir /var/log/${PN}
 
@@ -96,8 +98,8 @@ all_ruby_install() {
 	doins -r .
 	insinto "${REDMINE_DIR}/config"
 	doins "${FILESDIR}/additional_environment.rb"
-	keepdir "${REDMINE_DIR}/files"
-	keepdir "${REDMINE_DIR}/public/plugin_assets"
+	keepdir "${REDMINE_DIR}"/{app/views/previews,files,public/plugin_assets,vendor}
+	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
 
 	fowners -R redmine:redmine \
 		"${REDMINE_DIR}/config.ru" \
diff --git a/www-apps/redmine/redmine-4.2.2.ebuild b/www-apps/redmine/redmine-4.2.2.ebuild
new file mode 100644
index 000000000000..bd3fc3e7a87c
--- /dev/null
+++ b/www-apps/redmine/redmine-4.2.2.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26"
+inherit 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="fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite"
+
+ruby_add_bdepend "
+	fastcgi? ( dev-ruby/fcgi )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	minimagick? ( dev-ruby/mini_magick )
+	markdown? ( >=dev-ruby/redcarpet-3.5.1 )
+	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.4.0 )
+	dev-ruby/actionpack-xml_parser:2
+	dev-ruby/addressable
+	dev-ruby/csv:3
+	>=dev-ruby/i18n-1.8.2:1
+	>=dev-ruby/mail-2.7.1
+	dev-ruby/marcel
+	dev-ruby/mimemagic
+	>=dev-ruby/mini_mime-1.0.1
+	>=dev-ruby/nokogiri-1.11.1
+	dev-ruby/rack-openid
+	dev-ruby/rails:5.2
+	>=dev-ruby/rbpdf-1.20.0
+	>=dev-ruby/request_store-1.5.0:0
+	>=dev-ruby/roadie-rails-2.2.0
+	dev-ruby/rotp
+	>=dev-ruby/rouge-3.26.0
+	dev-ruby/rqrcode
+	>=dev-ruby/ruby-openid-2.9.2
+	>=dev-ruby/rubyzip-2.3.0:2
+"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+	imagemagick? ( media-gfx/imagemagick )
+	pdf? (
+		app-text/ghostscript-gpl
+		media-gfx/imagemagick
+	)
+"
+
+REDMINE_DIR="/var/lib/${PN}"
+
+all_ruby_prepare() {
+	rm -fr 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
+	sed -i -e "s/~>/>=/g" Gemfile || die
+
+	# bug #724464
+	sed -i -e "s/gem 'rails',.*/gem 'rails', '~>5.2.6'/" 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 :minimagick 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
+	# Additional dependency for Gemfile (#657156)
+	if use fastcgi; then
+		echo "gem 'fcgi'" > Gemfile.local
+	fi
+}
+
+all_ruby_install() {
+	dodoc doc/* README.rdoc
+	rm -r doc test 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}"/{app/views/previews,files,public/plugin_assets,vendor}
+	keepdir "${REDMINE_DIR}"/tmp/{cache,imports,sessions,sockets}
+
+	fowners -R redmine:redmine \
+		"${REDMINE_DIR}/config.ru" \
+		"${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
+}