Merge updates from master

11 files changed, 306 insertions, 57 deletions

diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index 3db8622143e9..c3418b036578 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -1,4 +1,2 @@
-DIST xwem-1.22-pkg.tar.gz 649363 BLAKE2B 732ea3fa3810a5a2aff923ed1e9e6d5aa8d95a6b27ba888f2a9ea6590c1e61e37a4c2df1e4af35e7bed1886bc85a3118deb56b2071eee8ffb78be56583f0b22a SHA512 5de50db9a9b0e3fe33aeae0f01cf5f4df61c57760c0cb66ec37288f03f3c3da1c45805b9d37b2ab6e375ac308f7074fb2cf12d9f6174742a9075cb64c82f68f5
-DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b8965380d23ebbb3d021cfa86b3fee7fc3c232d000c27b4c0eec2ea5e34a27c80af283f14decc0ea72acca4685dd305 SHA512 f070ca895b6b1144444e2d17198b07e3584fd72410b0663fb86fe3048635b8a795ee9b575c8f583108bddaae37de44864080a0402ae6312dd1d7172882473063
 DIST xwem-1.26-pkg.tar.gz 649043 BLAKE2B b644127e233b0c93816687d992f54a2c3cbbb822100d4e56ca088ee9d05306a1a14ff602ddfdf5ea1ed822813df4df6bd6dc802d5f27b670bae86ea61eca742a SHA512 00783faa899bd2f3da8128339c54b677843bafb30b8c1a5fca29709de31448aa29a91bf62affbbe42981a97a8ec7ab807b8ee0b64642c73e6a2fda412213eb0a
 DIST xwem-1.27-pkg.tar.gz 648980 BLAKE2B e4170d56e52f5cf46b314ace4c53fde5b38c64e385411b0011b6168e6ebc26fbde1e616349eb499cc5ff816862f4cf30e9663f9dffbdb01910a0fcd4eb44cc9c SHA512 0b6029f659ae1150c74b93d654e1ab01823386336796fe18eb4f542e9de0ceb2a171a6ed32cf941b2a872a6422e9842f44ae2767550bcc3bbd19f08fa4bbdabe
diff --git a/app-xemacs/xwem/xwem-1.22.ebuild b/app-xemacs/xwem/xwem-1.22.ebuild
deleted file mode 100644
index a1cac1881167..000000000000
--- a/app-xemacs/xwem/xwem-1.22.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="X Emacs Window Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xlib
-app-xemacs/strokes
-app-xemacs/edit-utils
-app-xemacs/text-modes
-app-xemacs/time
-app-xemacs/slider
-app-xemacs/elib
-app-xemacs/ilisp
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xwem/xwem-1.23.ebuild b/app-xemacs/xwem/xwem-1.23.ebuild
deleted file mode 100644
index a1cac1881167..000000000000
--- a/app-xemacs/xwem/xwem-1.23.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="X Emacs Window Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xlib
-app-xemacs/strokes
-app-xemacs/edit-utils
-app-xemacs/text-modes
-app-xemacs/time
-app-xemacs/slider
-app-xemacs/elib
-app-xemacs/ilisp
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/dev-ruby/rotp/Manifest b/dev-ruby/rotp/Manifest
new file mode 100644
index 000000000000..69bab31e7f7f
--- /dev/null
+++ b/dev-ruby/rotp/Manifest
@@ -0,0 +1 @@
+DIST rotp-6.2.0.tar.gz 60000 BLAKE2B dba270201593425c9282aca71efb33ecacda916996ebfffc703dd865a6c6ee3b3da4098497ce036a95157089d8d736e9413d0aa9fd0dc582d4b278ce811e05d0 SHA512 938cf9feffbe7e86f542c6dde4cd87b57e2ddd2696303e69cb76bc9fb04ffb40c9a5ef45288f23cb096d9f6706e0b48ad89907dc9322594df10c8c0521feffa1
diff --git a/dev-ruby/rotp/metadata.xml b/dev-ruby/rotp/metadata.xml
new file mode 100644
index 000000000000..e6795abd2b98
--- /dev/null
+++ b/dev-ruby/rotp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mdp/rotp</remote-id>
+		<remote-id type="rubygems">rotp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rotp/rotp-6.2.0.ebuild b/dev-ruby/rotp/rotp-6.2.0.ebuild
new file mode 100644
index 000000000000..1d586425b666
--- /dev/null
+++ b/dev-ruby/rotp/rotp-6.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby One Time Password Library"
+HOMEPAGE="https://github.com/mdp/rotp"
+SRC_URI="https://github.com/mdp/rotp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/openssl:0="
+
+ruby_add_bdepend "
+	test? (	>=dev-ruby/timecop-0.8 )
+"
+
+all_ruby_prepare() {
+	# Remove simplecov
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	# Don't require git
+	sed -i \
+		-e 's/git ls-files/find/' \
+		-e 's/{test,spec,features}/spec/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index bc2967a78189..429e25eb863d 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1 +1,2 @@
-DIST redmine-4.1.2.tar.gz 2719030 BLAKE2B a169d024a76dc0b592a71da55e785152ba1cdb2203a864cff905571f1eae350d77e6955d819c660379e3e7b539664bf77a21f0f91ed5c4299f173221e763859c SHA512 a7ed547e8907d98c16c9d7c775fa3fcdb322d3e4494a1e5467cbc37c9710f04b9d5121fbdd9d8444b2028f7c8a842237ccc9d1b62c066c26bdc150cf408afb3b
+DIST redmine-4.1.4.tar.gz 2720709 BLAKE2B 9e0c2b990248c9000fd6062e3928bf4bc8e8043e0d9ceff13d5000da824cde027090121ce3a8be2f5d92eedb97b91629fb8b681ae5e380459fdb97904abd9b98 SHA512 93e46f2ed220c05b83b7bab34327891a7f05a46a01c6cbfc1a5c9bf18613e308d94d84fc3158a8bb7af740b8792448d935bc9d29795ee341bca577c82ac0619b
+DIST redmine-4.2.2.tar.gz 3038398 BLAKE2B 995179b6a5f75548525912dc20b4c0ded8709a12d6eb84873d899b20cf3b83469af7f14713187cce8ec720be4d501a9e7e890e1f38cbe2b118041dc91f555f53 SHA512 71155358ca68d9eb5bf6b79e26202c29ba3355d499662bfe659ff1672625a25d91694d5f1e4bb8db18456642470244aca914efe4456adef2850b70ff7eb216b2
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
+}
diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index 86bc3273dd57..808203035bee 100644
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 -riscv x86"
 IUSE="vim-syntax"
 
 RDEPEND="