From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 20 Oct 2021 10:22:14 +0100
Subject: gentoo resync : 20.10.2021

---
 www-apps/Manifest.gz                               | Bin 12294 -> 12301 bytes
 www-apps/chromedriver-bin/Manifest                 |   4 +-
 .../chromedriver-bin-94.0.4606.61.ebuild           |  26 ---
 .../chromedriver-bin-95.0.4638.17.ebuild           |  26 +++
 www-apps/element/Manifest                          |   2 +
 www-apps/element/element-1.9.2.ebuild              |  35 +++
 www-apps/icingaweb2/Manifest                       |   4 -
 www-apps/icingaweb2/icingaweb2-2.8.3.ebuild        |  77 -------
 www-apps/icingaweb2/icingaweb2-2.8.4.ebuild        |  77 -------
 www-apps/phpBB/Manifest                            |   4 +-
 www-apps/phpBB/phpBB-3.3.4.ebuild                  |  57 -----
 www-apps/phpBB/phpBB-3.3.5.ebuild                  |  57 +++++
 www-apps/redmine/Manifest                          |   8 +-
 www-apps/redmine/redmine-4.1.4.ebuild              | 233 --------------------
 www-apps/redmine/redmine-4.1.5.ebuild              | 233 ++++++++++++++++++++
 www-apps/redmine/redmine-4.2.2.ebuild              | 240 ---------------------
 www-apps/redmine/redmine-4.2.3.ebuild              | 240 +++++++++++++++++++++
 17 files changed, 601 insertions(+), 722 deletions(-)
 delete mode 100644 www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild
 create mode 100644 www-apps/chromedriver-bin/chromedriver-bin-95.0.4638.17.ebuild
 create mode 100644 www-apps/element/element-1.9.2.ebuild
 delete mode 100644 www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
 delete mode 100644 www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
 delete mode 100644 www-apps/phpBB/phpBB-3.3.4.ebuild
 create mode 100644 www-apps/phpBB/phpBB-3.3.5.ebuild
 delete mode 100644 www-apps/redmine/redmine-4.1.4.ebuild
 create mode 100644 www-apps/redmine/redmine-4.1.5.ebuild
 delete mode 100644 www-apps/redmine/redmine-4.2.2.ebuild
 create mode 100644 www-apps/redmine/redmine-4.2.3.ebuild

(limited to 'www-apps')

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e9045c97d6a5..4aebfa0d2d93 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index b0255290dbc7..906c618af984 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-94.0.4606.61.linux64.zip 9880569 BLAKE2B 878f2361cd952853f14836e7f09f741860476796be29e3654d06ec44cdef9d99c8cb08bc589adece85e8f4a63b784c92454d9f43e5a58f7a6eb52c04fa28d393 SHA512 be0c96b91c521b097ff0b3c44b72499f30f874305c367830f996b09903910fecdf5ad945ca6ca8f1cc5af85fde1e3dd3a89b4086f2e6c0dd6a7955d867a9d279
-EBUILD chromedriver-bin-94.0.4606.61.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
+DIST chromedriver-bin-95.0.4638.17.linux64.zip 9979977 BLAKE2B f1e9076e2fb92cbf0b51ee464066602bd287c64d1099f84127fdf6e7f40a68a91dbb73d63ed21b8e95e58e2ab0cada56b0c6e83aa16d4416b830b120de876342 SHA512 ed59620a73229fed2b4e85098e8efff4e20c7a104ef34e40f6878f5c757657b7c712ab7aea4813fd493ff8e9c75fc0b4295d0bcd65ec24c0a22e4d436d431b97
+EBUILD chromedriver-bin-95.0.4638.17.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild
deleted file mode 100644
index 7c2aac12ffeb..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
-	www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install() {
-	dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-95.0.4638.17.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-95.0.4638.17.ebuild
new file mode 100644
index 000000000000..7c2aac12ffeb
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-95.0.4638.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install() {
+	dobin chromedriver
+}
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 5b0e561cb9d0..942ca4e76f35 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,5 +1,7 @@
 DIST element-v1.8.5.tar.gz 15979411 BLAKE2B 865f36b5b01d43c9f5b912834ed9c357b8ffb8001bb86c00a941c7093902d6ca54ab21c44bb1ed535e039e787735e3e3e3cbb5e7c210d978f666a60dbc1f2bff SHA512 90adfa42829cedd30180e235b4293a040eb008e990845211b07807b64c1e7bdc8ef0c609a3ec5150d821de528be8a4cb01565950356c134ac6fc7390255e8d66
 DIST element-v1.9.0.tar.gz 15631650 BLAKE2B aeecf81dc0f5f99df23c8a2d931dc9172b3dd6b627bc8c149d22ac0862066bc0dda02774919ff7509c9ae99e420730f9b0eabbaaf0399f9ba5927362bde7dfd6 SHA512 e0a3a8696e493ccca6abcb5dee178e934cdae62a92e92d4c1b8718eeded45cab26ba3d08353c8a4701a94d537a0da072aac3e34e268c9d8541b26111c90eef27
+DIST element-v1.9.2.tar.gz 15333289 BLAKE2B 28bb3e1175e20081f0227df95e9d8e7af031196103792c25681846fe7c20365075a16abdd7685018c159f767985566d473a8e616810f8d9015b68ac352befbd2 SHA512 e2354b09de6dfea0c33ab01de1c1d31199947b7406c0fd85d150198105f49b4cd5fda8319f259a5778ea7a012083082898fb1a06a2566c67cd86f854aa3494de
 EBUILD element-1.8.5.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
 EBUILD element-1.9.0.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
+EBUILD element-1.9.2.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.9.2.ebuild b/www-apps/element/element-1.9.2.ebuild
new file mode 100644
index 000000000000..0d6f2e6d2cb4
--- /dev/null
+++ b/www-apps/element/element-1.9.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index e288951e1479..69b675e25348 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,4 @@
-DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
-DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
 DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377 SHA512 46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
-EBUILD icingaweb2-2.8.3.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
-EBUILD icingaweb2-2.8.4.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 EBUILD icingaweb2-2.9.3-r2.ebuild 2471 BLAKE2B 7227d7ffbce7e968ef3d32d227dcf4647b2b93dc42bf2f0d2106dea11ef0a2545ca9f7263f2d355e54fe1f37f0c0f04ac90a8776a30605598c5c26ca27215c50 SHA512 85387719edf85adc983d9108434a5fa44abccfb13cda9dc95b32bd42151850b70f1f1c33ae7c08f10880d72e9c7ac187db98f054438addffd5e29e955e1c8892
 EBUILD icingaweb2-9999.ebuild 2374 BLAKE2B f63044faae6d69d55aac95b9388f8c576ad57224638768a9e1245162f337d57f63c6c484184a09b68531251b5c567a541cb193b3d8583153144476777c597c1c SHA512 1901a407660a0eef7e82ca0097a232e4434d7e8b3951f2b7052b63607e0890e2bc8e3bca105dd4ad455671ffe9fedf8294e521db844ea73cb2cd4eef800daa2b
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
deleted file mode 100644
index 8ce454622665..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
deleted file mode 100644
index c5f119e375d9..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index 9f8569e629fc..e96e2abfde31 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,5 +1,5 @@
 AUX permissions 600 BLAKE2B ae5ced85bf5ce72bc6bca533e68ae55499ace30590de37be55c4267efacf03fe752c9c3d96ff1f6ba54beda0df238fa663281195a7c874eb3cea422fb16b5a82 SHA512 ea8f2796a43c825fbe160606dc4a3cdabd6ed8fd6692c841cadb87b06803f448df48446a83366a3af3cfba65a50bb9ed3361c0495bb5058c542b6cac9c7b2a1b
 AUX postinstall-en.txt 554 BLAKE2B 6560cb0c3a95cbbba91932af13790eae010193e6bcca4d46c640eb05b18bcae23645d5962a6be08f28aa721a10668bd128d19f505b9d463119d1a7aff845e732 SHA512 d1d61b525b2746d558f9fa1bd56e92e182d44bb406302f1646a40b0b1f06fc900ae46c3e600e27495edce1fa4188915dcf8f96b4762938ec0f324bdbb8d91759
-DIST phpBB-3.3.4.tar.bz2 4707921 BLAKE2B d70797c88514b1b0409194784e510401e1af910e4577e5b679d5b18b0664fe8eb011567fd9a2894f18ce4f78bf5e694305def7dc7d0c3000b23753dc9ca6a67d SHA512 d021530a2e89eb3fea818c5c13cc1e66dc5b5bb3f9db838243be0fb167d21f0d1f1311c2a2fe4f9ac2b81621a949c1c1db139bd32fc3007d6deade4e9f7386d8
-EBUILD phpBB-3.3.4.ebuild 1620 BLAKE2B 09849f298aa42a32957d8286c0010078aa47c7d27fe9ff744a7afc6043c342fedeb10c520245802a24bfa1d2848db5696f156d5b5aeda9dea8c5792913e03bac SHA512 ea29b23ace1dfc439f8775358e130b8cab9167527420d13078741215dc8d76e72e9bde36ddc62edec065e146e4849e2cb4186d6e9bb0dcea786366292a85fcbe
+DIST phpBB-3.3.5.tar.bz2 4027687 BLAKE2B 1834493e58f54c0968d732686403cc8ec71e0d8943514850df7408bcd8da34ee9d887a0c1e58ca6f9fa46c3f73a886b2bbf487589a1109be4ec157c81d57ae5c SHA512 62a458c37704da850e2e14339671350ba5346dd527aa2020da402df2f078b55ba19254be02d6c03693db5c653b5eff687cde79fb3e18468eb87af4f77d7b1afc
+EBUILD phpBB-3.3.5.ebuild 1620 BLAKE2B 09849f298aa42a32957d8286c0010078aa47c7d27fe9ff744a7afc6043c342fedeb10c520245802a24bfa1d2848db5696f156d5b5aeda9dea8c5792913e03bac SHA512 ea29b23ace1dfc439f8775358e130b8cab9167527420d13078741215dc8d76e72e9bde36ddc62edec065e146e4849e2cb4186d6e9bb0dcea786366292a85fcbe
 MISC metadata.xml 900 BLAKE2B 94b42ae69db2f3ac1be4e25ec23597b44614faf3b122ac7892e9fb3b55c5ef706a13be0521c85251f7f4a3c9434c155fb3a0bcaf6589ae92f84ec9a95e90ad1d SHA512 42dd9eabe9890be0b2b245ca33596ba9804d9023ef1f8e2d9d7261dfee45e41d6f32217f5666916265e9fabf9e21ead6c1d7e53d7a210b620d1c6f8c99a72c9b
diff --git a/www-apps/phpBB/phpBB-3.3.4.ebuild b/www-apps/phpBB/phpBB-3.3.4.ebuild
deleted file mode 100644
index 70b57df522aa..000000000000
--- a/www-apps/phpBB/phpBB-3.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="An open-source PHP-based bulletin board package"
-HOMEPAGE="https://www.phpbb.com/"
-SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-IUSE="ftp gd mssql mysqli postgres sqlite zlib"
-REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
-
-PHP_RDEPEND="(
-	virtual/httpd-php:@SLOT@
-	dev-lang/php:@SLOT@[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
-)"
-
-RDEPEND="|| (
-	${PHP_RDEPEND//@SLOT@/8.0}
-	${PHP_RDEPEND//@SLOT@/7.4}
-	${PHP_RDEPEND//@SLOT@/7.3}
-)"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${PN}${PV%%.*}"
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
-	webapp_hook_script "${FILESDIR}"/permissions
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	# phpBB needs docs together with the other files.
-	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
-	einfo "example configuration is provided via .htaccess files. For lighttpd and"
-	einfo "NGINX, example configuration files can be found in the documentation."
-
-	if use vhosts; then
-		echo
-		ewarn "When installing with webapp-config, specify a group that includes your"
-		ewarn "PHP user with the -g option. It will default to the web server group"
-		ewarn "when running webapp-config as root."
-	fi
-}
diff --git a/www-apps/phpBB/phpBB-3.3.5.ebuild b/www-apps/phpBB/phpBB-3.3.5.ebuild
new file mode 100644
index 000000000000..70b57df522aa
--- /dev/null
+++ b/www-apps/phpBB/phpBB-3.3.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="An open-source PHP-based bulletin board package"
+HOMEPAGE="https://www.phpbb.com/"
+SRC_URI="https://download.phpbb.com/pub/release/$(ver_cut 1-2)/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+IUSE="ftp gd mssql mysqli postgres sqlite zlib"
+REQUIRED_USE="|| ( mssql mysqli postgres sqlite )"
+
+PHP_RDEPEND="(
+	virtual/httpd-php:@SLOT@
+	dev-lang/php:@SLOT@[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?]
+)"
+
+RDEPEND="|| (
+	${PHP_RDEPEND//@SLOT@/8.0}
+	${PHP_RDEPEND//@SLOT@/7.4}
+	${PHP_RDEPEND//@SLOT@/7.3}
+)"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${PN}${PV%%.*}"
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/config.php
+	webapp_hook_script "${FILESDIR}"/permissions
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	# phpBB needs docs together with the other files.
+	dosym ../webapps/${PN}/${SLOT}/htdocs/docs /usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "phpBB needs a specific web server configuration. For Apache httpd, an"
+	einfo "example configuration is provided via .htaccess files. For lighttpd and"
+	einfo "NGINX, example configuration files can be found in the documentation."
+
+	if use vhosts; then
+		echo
+		ewarn "When installing with webapp-config, specify a group that includes your"
+		ewarn "PHP user with the -g option. It will default to the web server group"
+		ewarn "when running webapp-config as root."
+	fi
+}
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index b33189b1059a..69d82e2fb84a 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -3,8 +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.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
+DIST redmine-4.1.5.tar.gz 2722929 BLAKE2B 83c9c974bbfecfcb796833640ed9b3cb4b2e2550714e702d9b024a41f676c2c71f8e6f4119b2519654556451313a0276a4dbe307f41747466b0034f415cde662 SHA512 cf4020bff11b13986989e312db1e7ee459f4391ec7326f59a4f493fb0c95be87d19196377da60ac083801b7c792dc012769350b684e20dd887c431c0c18cc851
+DIST redmine-4.2.3.tar.gz 3039136 BLAKE2B 68656da4a9a43139ab78b70e7e7364cbc776a75ea3069962086c49ea2ca965739efc47d6709b0068d94a884eaa6b56a641826ffbb16276cc8d686374a88d9e75 SHA512 456117b0d5d72ee58c87def84327e29f79937fa71098b48a80103e3e6653648c0df46afcc4f533803384ba7413e690538deeee33e263d86dd9e4e5dec65144e3
+EBUILD redmine-4.1.5.ebuild 6783 BLAKE2B f38a88860cfb25cb1d8b353feea94b2022508fded695d82b0c3ab1044c539b4929ccb1a9e8b8dcdd29e793c75b78ec76ecd2f839f30fd8726a6259a0441749e4 SHA512 2df24ff810aa0513edd620c8dbe9e222381b896eb63f14abf027aba4f2350691de665b8333efaa53502cfcd026ecd0ca9e433b98bd84440b53b1d6b33658f50a
+EBUILD redmine-4.2.3.ebuild 6974 BLAKE2B 1c0617a830ddfba65b86811fec00d65b90db586b060df715954a1fb25ae069ee9a46a88e836b670a781b6694bee5e972bba304bb46d4e430bb412d9728a912ba SHA512 22439e771ac9fe6c6c943eea48829bd54078c558450165bc292f1d732b0453523d794307715868905753b39331ca151559750564ff8702f0b36c53eaeee98fc5
 MISC metadata.xml 659 BLAKE2B 1598079638eae3152ded1c8129eac0386737c2eb827e3e0d4d16cfa5506acebbb12e51c2084e43d43ff5c3ff220bfde3e7e0d84c4b03502b2f1b593543442d50 SHA512 ac1674ad83f39871d410c338915fba222c6cddf310b62abd7eb3725dba294b1595c291cb8f87debf7e350e67703c7b30ccba223c3b8a7692e916d2a17adb4434
diff --git a/www-apps/redmine/redmine-4.1.4.ebuild b/www-apps/redmine/redmine-4.1.4.ebuild
deleted file mode 100644
index f331ffe6d232..000000000000
--- a/www-apps/redmine/redmine-4.1.4.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# 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="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
-
-DEPS="
-	fastcgi? ( dev-ruby/fcgi )
-	imagemagick? ( dev-ruby/mini_magick )
-	ldap? ( dev-ruby/ruby-net-ldap )
-	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/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.1
-	dev-ruby/rails:5.2
-	>=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_bdepend "${DEPS}"
-
-RDEPEND="
-	acct-group/redmine
-	acct-user/redmine
-"
-
-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/www-apps/redmine/redmine-4.1.5.ebuild b/www-apps/redmine/redmine-4.1.5.ebuild
new file mode 100644
index 000000000000..f331ffe6d232
--- /dev/null
+++ b/www-apps/redmine/redmine-4.1.5.ebuild
@@ -0,0 +1,233 @@
+# 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="imagemagick fastcgi ldap markdown mysql passenger postgres sqlite"
+
+DEPS="
+	fastcgi? ( dev-ruby/fcgi )
+	imagemagick? ( dev-ruby/mini_magick )
+	ldap? ( dev-ruby/ruby-net-ldap )
+	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/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.1
+	dev-ruby/rails:5.2
+	>=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_bdepend "${DEPS}"
+
+RDEPEND="
+	acct-group/redmine
+	acct-user/redmine
+"
+
+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/www-apps/redmine/redmine-4.2.2.ebuild b/www-apps/redmine/redmine-4.2.2.ebuild
deleted file mode 100644
index bd3fc3e7a87c..000000000000
--- a/www-apps/redmine/redmine-4.2.2.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# 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/www-apps/redmine/redmine-4.2.3.ebuild b/www-apps/redmine/redmine-4.2.3.ebuild
new file mode 100644
index 000000000000..bd3fc3e7a87c
--- /dev/null
+++ b/www-apps/redmine/redmine-4.2.3.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
+}
-- 
cgit v1.2.3