Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
commit: 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree: 753b6b08624c34d1ed8414bbe22c45409f7741b9 /www-apps
parent: be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent: deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)
43 files changed, 264 insertions, 1292 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index c7205db24a87..9a496394c373 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index a659ac3c19e0..9c6953b388ca 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
 DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
 DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
-EBUILD blohg-0.13-r4.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
+EBUILD blohg-0.13-r4.ebuild 1782 BLAKE2B 5012b63c40993659b6c4f53143d9a2cf0a36bf57af4034f5716e7651589fa26f5051296906b8d698874c4fa78d94a6a97c4bd627b6a1dd40500cc5dc4892c44f SHA512 203b20ceee6b75cc284a69e82355ace43cb7ac7d5048ffb91e825e1a928738cf83faa1a04025a0ee5fa58db84d7474975b2891afa802d213e6bafed3138d2642
 EBUILD blohg-9999.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
 MISC metadata.xml 983 BLAKE2B b57921e5e260e283cc261200cefcba516918e21ab44ff009a5fb08c58036cd39263de239e65e20714bac823bd7d0c6889dbd0737904109af635809cd16ce2f55 SHA512 39e0799c5a6e685ea188c12b8e2ddd34178fce3630a0cb84308a66c710730e8aeaeaf23444e4f8091ec2adf6eb1da3ea7bf74e1df1adb3d5caa2205da99cc6f8
diff --git a/www-apps/blohg/blohg-0.13-r4.ebuild b/www-apps/blohg/blohg-0.13-r4.ebuild
index 6a4abc9a54f5..fcd783f4f398 100644
--- a/www-apps/blohg/blohg-0.13-r4.ebuild
+++ b/www-apps/blohg/blohg-0.13-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index b9f0b420efb3..76bba6468d34 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -3,6 +3,8 @@ AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
 DIST gitea-1.10.6.tar.gz 30147860 BLAKE2B e41e226be820eb0a436783f49bf90a1149eef4e0dde00edc09bc76bb086ea53ff2856563e31ab261e1529a03753785e04c1fe8a02f72eef01a6de173df82098d SHA512 be64f73eb0819c28e444b9dae8d4baecd910aad790efeb515a981542125679257f48a5f4ab1c8453b5372a0c8b1e9b84275e61c89dcd2137d7f7cfe8c71f917b
+DIST gitea-src-1.11.5.tar.gz 68923871 BLAKE2B 99e189b4a95e9ef6079a5e8455c05209da742499ff1b18e9f5edab2620ff8deb64ca3b7cb59d456b6fe25558602be8e1f8376ec234229c6af7baf24cc6d15023 SHA512 b12bfb2fc13bd0ca5799d52c37b5d2988879041892aa1e160546f7c80e2faef086f76cd753de90f2468fe9f87af6eca64ca21df394db160fc347137fc9a0fd52
 EBUILD gitea-1.10.6.ebuild 3427 BLAKE2B bbbeac7a2b28d7cd601d9a3a2c8ef88165238933544ab95a9e7acf915b86164afc7f97b93a8e1f3f94b8bf526bf318e1d19eead4ca81c5e779e50c4b074b9d4f SHA512 8d09ae65094ab6403b61e7ef3fb045ac54d7f5e27184ea98b1a8da1618ef546bfec0787949faeb3b8c598d8868bcc08a62c3ed2a7288aaa696832478dec1c0ea
-EBUILD gitea-9999.ebuild 3379 BLAKE2B 02f80718715f55e172ac372e3d15aea4112c7043ace30d8441bdc9822f8c617e1a3d0109ed640904b9baf8d80a085c390ec2d008aaca03cd14b6d62b1a72bddf SHA512 d3c7b02a3000c23ce3ed491e63737e3bdd59b5008019b7459927b042a926a72f2a4756714d8347d15cce6b5a26d0c91839166a54bd1440a00cd33f3061f80eb1
-MISC metadata.xml 546 BLAKE2B 7b28ca7beb4fec57e6d4fc942b30afe505dc3b1f7c9034509bb9980d15429565220421d5edfcab76608386fb8cfbc086486beffcf53c814cfb0c09bf29e753ee SHA512 aaaca41cb5e43f8d382087760352e09e7fe0c18c6474399c4d6cd228ea0e2982b876f2f3d9c1c1bd11de1495679d3458bfb2a092c1f35df7ab8d5950bdfeadb2
+EBUILD gitea-1.11.5.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
+EBUILD gitea-9999.ebuild 3579 BLAKE2B 8bd251e0fe851dc894dbb49aa476f20760f74c245de2df7d9bd026da36115a3f5fabaf7af00f0137ffb363566a2f35b93c2276f1bf6b9c69a2d821f439c79500 SHA512 75836046d9d6e04a438e9128bf5b2cb997ec12edb1f3be9591ceea89374b550317b185e8d5b4bf125de824b25a1e5dbde136521f4b17531f1e97084b0eaf8451
+MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/gitea-1.11.5.ebuild b/www-apps/gitea/gitea-1.11.5.ebuild
new file mode 100644
index 000000000000..44802e089f92
--- /dev/null
+++ b/www-apps/gitea/gitea-1.11.5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != 9999* ]] ; then
+	SCM="golang-vcs-snapshot"
+else
+	SCM="git-r3"
+fi
+
+inherit fcaps golang-base tmpfiles systemd ${SCM}
+unset SCM
+
+EGO_PN="code.gitea.io/gitea"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+else
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct build-client pam sqlite"
+
+BDEPEND="dev-lang/go
+	build-client? ( >=net-libs/nodejs-10[npm] )"
+DEPEND="pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	acct? (
+		acct-group/git
+		acct-user/git[gitea]
+	)
+	dev-vcs/git"
+
+DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+FILECAPS=( cap_net_bind_service+ep usr/bin/gitea )
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
+
+gitea_make() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
+
+	env "${makeenv[@]}" emake -j1 "$@"
+}
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+		-e "s#^APP_ID =#;APP_ID =#"
+		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+	fi
+
+	# Remove already build assets (like frontend part)
+	use build-client && gitea_make clean-all
+}
+
+src_compile() {
+	if use build-client ; then
+		gitea_make build
+	else
+		gitea_make backend
+	fi
+}
+
+src_test() {
+	if has network-sandbox ${FEATURES}; then
+		einfo "Remove tests which are known to fail with network-sandbox enabled."
+		rm ./modules/migrations/github_test.go || die
+	fi
+
+	if [[ ${PV} != 9999* ]] ; then
+		einfo "Remove tests which depend on gitea git-repo."
+		rm ./modules/git/blob_test.go || die
+		rm ./modules/git/repo_test.go || die
+	fi
+
+	default
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.ini.sample app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index 9e8bcf9c6054..0d1559ca4a39 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ else
 	SCM="git-r3"
 fi
 
-inherit golang-base tmpfiles systemd ${SCM}
+inherit fcaps golang-base tmpfiles systemd ${SCM}
 unset SCM
 
 EGO_PN="code.gitea.io/gitea"
@@ -18,7 +18,7 @@ DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io"
 
 if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64"
 else
 	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
@@ -30,7 +30,8 @@ LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="+acct pam sqlite"
 
-BDEPEND="dev-lang/go"
+BDEPEND="dev-lang/go
+	>=net-libs/nodejs-10[npm]"
 DEPEND="pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}
 	acct? (
@@ -40,8 +41,11 @@ RDEPEND="${DEPEND}
 	dev-vcs/git"
 
 DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+FILECAPS=( cap_net_bind_service+ep usr/bin/gitea )
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
+PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
+
 gitea_make() {
 	local gitea_tags=(
 		bindata
@@ -60,7 +64,7 @@ gitea_make() {
 	)
 	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
 
-	env "${makeenv[@]}" emake "$@"
+	env "${makeenv[@]}" emake -j1 "$@"
 }
 
 src_prepare() {
@@ -85,7 +89,8 @@ src_prepare() {
 		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
 	fi
 
-	gitea_make generate
+	# Remove already build assets (like frontend part)
+	gitea_make clean-all
 }
 
 src_compile() {
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index f492ced05e45..666bf0ff6e3e 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -14,5 +14,6 @@
 	</upstream>
 	<use>
 		<flag name="acct">User and group management via acct-*/git packages</flag>
+		<flag name="build-client">Build the client code, instead of using a precompiled one</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 8cb92cc41e65..b68f50edc07b 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,6 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-6.5.3.tar.gz 61041681 BLAKE2B 624abf5fa31271eb81182bd36377eef0e643a4fda2c6ecc00545d941318ecf4b526fa4753ab6e3cc820fb22b1bf3768cdec946fd13483ef7137f1672aa7b63b6 SHA512 4f672c0fc4a74fff904bd3b297e40c06c616157bb9d3e2783950339d20c551f580dea7a59fb0ff58480010047d34088c51c3ec3175039b9510acb0a18ef52546
-DIST grafana-bin-6.7.2.tar.gz 65075053 BLAKE2B 80a92ec55820363dfd56048db81a5be448ccdba6e0396e22b7b68dff3eb11d4d0c11c35d540c607eef7ef7ddba74a9ac147b6e7edce5fc34894b090a3042a5cd SHA512 ec46a5f9ce39c807f50ee93eda0ddb19bf58d5fb3d3dc188250dfe09323bf10108088cd79ee7787c77e88244b239b5dbb6e50f5e4c69c6d099d5f20dc6bafa7c
-EBUILD grafana-bin-6.5.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
-EBUILD grafana-bin-6.7.2.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
+DIST grafana-bin-6.7.3.tar.gz 65083849 BLAKE2B b567885d58f4e28d2873feb4bdbfd364697d3c742039441d12df0f7a76ed8703ef2a08450125feeb576c539e7e2a84d193da92436cbd82601b65a5d42862a7a3 SHA512 15d02ed101088d845ed94fb88c629428f2a899a23dff509ec82cb148689bda07b56883765be145d5a5769ed0e3d3b9d98e50fc940c95a1074f5b5e3adac19f30
+EBUILD grafana-bin-6.7.3.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild
deleted file mode 100644
index 58b22b14471e..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild
index 58b22b14471e..58b22b14471e 100644
--- a/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.7.3.ebuild
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 3a3fbc6fb63b..28a630d5200c 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,26 +3,11 @@ AUX kibana.initd 1022 BLAKE2B 8eb81203f713e75d3eead4eb25a7670c7fab8af67d1fbe7498
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-5.6.16-linux-x86_64.tar.gz 53468981 BLAKE2B dda2aacad7043e4ed259c194de95da143cfc8f4fef624ff783eb8323f9053afe3a9857e358df7aa0b1fa26e9b452ff5afe7480b7befb5504af95d730c1deea53 SHA512 e3b8cd5911444be3c8f39d2060216d968456cae123a3ac47805bbf1e3d5ca581ecfd061988655926a5c6243df0ea2e127e5cf6fe35d336df570cd5b82cfd338f
-DIST kibana-6.7.1-linux-x86_64.tar.gz 186430753 BLAKE2B 10d3b4d7996ee88ea3fc7062585dd0b00618650779e779c2fc18dcb9e0c62d964abb2806997f0712c495fb54ad2399a8b55745c67b6ff77ec1fa8e6041e7a075 SHA512 5ad5af43c18f12312d8bf5b50e8550ed8a008fb36efddb1756498c6a44cbb40cfa3ae7d307f5cb88daee0690dfd3aacfbb7bd526f098c140886a821af4b28e9d
-DIST kibana-6.8.4-linux-x86_64.tar.gz 188306376 BLAKE2B 6b94b5c3c3c557d7e23a2a4e87d85ca34d2a3b277ee6562a7f12a798a29942737403349e7f9fab83de52c04adf0d8a72ec4e3f29e85cf45953b3541e75b6edc8 SHA512 75793b5c8b0eedd3a2fd0a24928e75da6f9099875ef74ae0927eb3efa6c45985ea71ebe2fc0696bf6bd960a65ca5ba450134e13302bd07fbb275ab731f713809
-DIST kibana-7.2.0-linux-x86_64.tar.gz 213198521 BLAKE2B 64ce95baa14107c3789d4aff748310cacd41cdabe227cb3fedab4bdd5d65d86d4bc8883dd7f8fbced3fda2ed25ed294ce49a8f28311fcbcfcae3c7bdc960c4ac SHA512 78368be3c55ef09cfed6903cc6556edb1a77f9e548614535b261d13c3190052ee9571cbb686470662f5563c564f1256e3a31ca233a26e8b734f3df44ab5a97f0
-DIST kibana-7.3.2-linux-x86_64.tar.gz 236654252 BLAKE2B 0e851e372e628d72670f161569ac6dea09ee34dfe07dcb0c383709534f1495bb35c1853c1e3610c92aa320d62e784537597af7d8dba210f9e9eaf153de6568bc SHA512 23a496cf55cebeebdc67577c966f9f19de36fd7fe2d05597687047b0e7f6b52a41395a0e750e245b04f9881ea99381ff3104fd18bc19593a2db520100874bf0e
-DIST kibana-7.4.1-linux-x86_64.tar.gz 252517864 BLAKE2B 18337665a86d54cedda2f3a6e03294d69a8fe25a445ec07b2df838872fd66cc96d095d0b1d496426c7e4ae3c6dec8ff2b4f78ec98225c64192aeac779d9e907c SHA512 9fbb5b754cd94599ab50c794df7b8337c8fa9f11ba810e3edf1cd12c60de40f91dbf4dbbc7178b35495b67a588a9fbec4333ab73df41deaab8bc1d907565ac14
-DIST kibana-7.5.2-linux-x86_64.tar.gz 238726293 BLAKE2B 845a6df316c1fb03b70bdb01572167ca430990e13fa10a85db55f5708fb201cd32ddc37057f1ea6706c193d47c8268cfb3d922f6202f1c3ae3a4271ca654f2b4 SHA512 7717eabe15a2ccd50cdc2acce592fc60af303516af2337145ab59be901d781e6545503a969ff7147e71e7189404ecbc870898daa92292e42002390f65e7cae41
-DIST kibana-7.6.1-linux-x86_64.tar.gz 249498863 BLAKE2B ec2011e601dda84f8f6de63e89d73e6c9ef0da645218845fd0215084c2daf6c26312bc553c894b7bfcbe9b795208b43db7e40a6a10174dcb4e8168dd921a4232 SHA512 9739e9521f699dcade3c3ae548fe1b9325de0d94856b7c1ff1426bd58a70db8eb7d25b128d8b8ade68f9797b873c827263ea7678aba48eb384394302606db688
-DIST kibana-oss-6.7.1-linux-x86_64.tar.gz 62807564 BLAKE2B 8fec550769f4a2a88a4fab72b0ecb49d81d25d2f13d365cfefce2f70ed5c088a72f750a0b5807d729621a78c7fe393a5f9875012b6559aa82bb049083eaff5bf SHA512 309c25a16d535b1c5f0853ea89b7b69b61e3472afdabdd6f60a86fabba4c76c034b620cbe3d7f988cc78d21e5ed058b4f97e4995d868876a55fcc30769822882
-DIST kibana-oss-6.8.4-linux-x86_64.tar.gz 65407401 BLAKE2B a58bb44227a861c83342168b189cb133be93976a8f89ad7d29b0684d47621d6b4fe561a503abb896fb4d9325cbdf1a05bdc7da7063c4cadb62859563a4ff1398 SHA512 7d751eef44d669b8a989079a15e987535d6185f04ec8929c63cd2374aba9bd86a4f2301f13ee26308c769096b78f409b99b925f6125cef8f598dd7ffd587eedc
-DIST kibana-oss-7.2.0-linux-x86_64.tar.gz 82672623 BLAKE2B 770e35f8025fb65513e51cb6a582dfe456e348efc7493c3710f2fa8ee49207392494aa437d7fe2d7115e5f607926e185264b6f92dacdc202331aab3d8ab10254 SHA512 ea735ecd18fc4441f29adcd7fd5a08a61e8bf1e82170219f598edf4a7726a11166e16b36f125edbfecafb6ed2c7cf003880d428960765861868e22cf55542e6b
-DIST kibana-oss-7.3.2-linux-x86_64.tar.gz 87456219 BLAKE2B acfc04f9b4afc582d7959ba394487747b0e82f9e12c3b783add91b36155fe74620c067cad1a85898e74ba22b0ba7d66c124f1f8a1e29ae7291de74c048a8d8ef SHA512 a54d0ad3dafd69661762ee8d59021d955253389fb0d228f61f58b522d0644684f57ff96a4bda84d51cf39ecded4ade6c21923bc8e20d6ec9e61305fb6c0b2e32
-DIST kibana-oss-7.4.1-linux-x86_64.tar.gz 84250969 BLAKE2B 3975a3a4f3ccdbf360316e225d86a08cd90736660ffd7b149d16da59080e6c54ad9aadfb77ff5d6695b5133e865318df69575ce9f8a0a39cf8d98c83da83f9b5 SHA512 fd439967b50fd43cd0bb065b8d9eaf1591baa158317c06e200b50511a92cfaf4ccbadb708b5585b8f7ce14fd1982e4d20cf49546829d67880435a5e694e8dc9e
-DIST kibana-oss-7.5.2-linux-x86_64.tar.gz 84048258 BLAKE2B bbe82c125e530c28f531bd1d94eae106bc0622dea252eb77cbe7d4d4107098fbd0296f61ee3f6866567681a650c94bcd533e1465a92590798750f887d88bcd40 SHA512 cbab66b5dbede14566143ba2e4e51c9ae1f59355c1d0899a8f61e70e81415e3d284d205a98b7b7d27b829a89003902c3eb5ef4c0bf65278ceabfa34fc97ed8c4
-DIST kibana-oss-7.6.1-linux-x86_64.tar.gz 102240842 BLAKE2B a3a7ded76f06b2e3a1ef0e758770e82def85bad97fc7371cd1e8b2f38fb6c53b08d90ac3d93844783744e49ba17770bf0c2cda0c5dbcf8b6dbfbd35a11830b50 SHA512 13360740f0b0f4ee399d2b919e982c6004f31e412b488aaeb916bd9d6f36737d860ac5d6c0e0972926ed32010d7496d0ab8f815e2784be13048d10e681408f42
+DIST kibana-6.8.8-linux-x86_64.tar.gz 189162738 BLAKE2B 63ff29f7b2cf8bed931a473c0c33a9b9a82bbbd95ede171ad964e5855d56bd113981065ec12c0eb48f5e010d003229f3c91d9578a520e5909e04de5e5a635662 SHA512 f2104d1f83595cacf9ba3ce4225dc7044a251255afb62e494a7e3224cfbd280e5f51755c6a5c3452f8208fd8566ec6a11d51cd4453dc66cb8a8b158876fb4eae
+DIST kibana-7.6.2-linux-x86_64.tar.gz 249555386 BLAKE2B e3db49bbf87de5c20dd8ae91a3835d27d10bcfa914b6cf6501eeddb229f896cdfbd78fa712c0ed63498a80a87ae48b0d2bac4218d8e1328c4c228f61e4c9b5d4 SHA512 5a7187f7fd1af3d4009053b904948fca08e171ea5eea36f8120019721d84b1649bdaf1bc606577ebad179bd4d24b014a1733c8221f67b1b7da2c756c68819311
+DIST kibana-oss-6.8.8-linux-x86_64.tar.gz 66262509 BLAKE2B 76531791f024cf98c5ebe6840564f8f49cd3539370889f209ac0b89763ad71cfd23575789c7bdeb1ad0f6adff8ee555ece530e8fdcc6e51e0671e0a4ae0095c8 SHA512 64c839cf8c1bbddf776655f6674640bd01bbe97039b78f9fac0a95f425eea37825c5fa9a06b4e8bad4e8230db02424afa569a3adcd5d36164f3d6aada8b2f4e4
+DIST kibana-oss-7.6.2-linux-x86_64.tar.gz 102252121 BLAKE2B f0b6571733b7eb5379491b8a27ee3b0ab49c643c73fd9ba53b0446f70deb059f788abf789037b9988ff398013c46653570c5ed3e539e76dd424b3ea624280e1c SHA512 639119273e0184640cf25513dd29633939c4bdc173e6577d377d60503db68989980fe09829fad8ba0862695dd7f79fd7dbd0102c3c2f9eb5e762071579a3d424
 EBUILD kibana-bin-5.6.16.ebuild 1684 BLAKE2B 7f2226c849036d14b3d9226902237a456251b1ed7d765394e4dc9cb969d98b9d12abb5a065858e46b074c588242e8612e5ed81b3e40e0fe92007b6106029d772 SHA512 35b7685abc2aac386fcfbad7f7685534967bc2d34c4aab7b39dbe0642428bf61ea3c5dd9aa49f82f6393f786b7389a60b7ddf4c543c5cfdd9689b15dced7cf04
-EBUILD kibana-bin-6.7.1.ebuild 2508 BLAKE2B f3fb5262c8c37518909ed910b33ac5407d2314b54ebe1411d47924571994e0488767781fa52e826680276c56217b2f641a7b7c948ccfc78ac703277e3cf7288b SHA512 4454a2cca319cd23a6ee6b5cbf2e9019163c61fc30df07eee83e98a0f02420e548a398e6dd624a3fbd2c51bb8c22898bd3f0eed47e5a9be94f6ceedf6130cdcb
-EBUILD kibana-bin-6.8.4.ebuild 2503 BLAKE2B 8c91e450ba90a593e1f6f13b9a628d16f4735dfb0a301bd11a6bdc8006ffd7cb6783f02f6babd6c85c027379ca279d4a36241d9112b38239aae238a138a1cdbc SHA512 9f21a0332a7a7d4515d96480045d6ead3977ae80f01fbce2fb584ddb4f9fd54fc1d70c772aa5d5a2dd4ba811340d7e21f19787f2bd80bedba557d0fa211447fc
-EBUILD kibana-bin-7.2.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189aebf640c20be06fcb9e5f64b54ec81ed601cfaa6b5121695e65ea282bbd030ec231d567aae346c6683123c18c6919 SHA512 c51939d86d84c6df489c8c9dfa5827dd64b3a484bdb71a0e6c996387cc0274e58f3701618f3c6c2e68f8f2fbc2141024315345d2040eba312bb71f82ee354aca
-EBUILD kibana-bin-7.3.2.ebuild 2570 BLAKE2B 8d83a83d8f9c05a87540de774d2699b019e6cc40051fc8daca9e787a6479864314d1044ce5d146948a75e0c5eeea287f49024028b76c53c68fff44a8263f42b4 SHA512 8ab38932951a799d4635219e9f64fd6227b271e2ac07303ab7a3b0fc5cdb5337e3c238399fbbd2bc3135dfdd4e3863bdc5989db777b820ede2d26901e92cc01f
-EBUILD kibana-bin-7.4.1.ebuild 2570 BLAKE2B 8d83a83d8f9c05a87540de774d2699b019e6cc40051fc8daca9e787a6479864314d1044ce5d146948a75e0c5eeea287f49024028b76c53c68fff44a8263f42b4 SHA512 8ab38932951a799d4635219e9f64fd6227b271e2ac07303ab7a3b0fc5cdb5337e3c238399fbbd2bc3135dfdd4e3863bdc5989db777b820ede2d26901e92cc01f
-EBUILD kibana-bin-7.5.2.ebuild 2570 BLAKE2B 2cf2dbcea4c06739ad78b62ab5e3e57b951ff9e7c65b92f5bec0154915f937f33fbc6010d64ba4751a3eb86264b2206c55a8bbca7a3153ba373354caa609c832 SHA512 71080bb99fbd54f61f46712ecc596dd4a93ff5d6e8388088afb5c9f5dbfd372ef367df17f20bc3c8c888bb7574102b3f18506454e2d3dbc489ac7cd0b05bd76c
-EBUILD kibana-bin-7.6.1.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
-MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
+EBUILD kibana-bin-6.8.8.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
+EBUILD kibana-bin-7.6.2.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
+MISC metadata.xml 646 BLAKE2B 761ac91ba7a5c8a1ebdaa4b85a6db083eaca8e26dd00cf753c6cd80daadec79dbf1624a26a601e7e8c1605d9e7c267dcc75455d591c658ac1ab403ac8955786c SHA512 905abb24126c45f0b170bc4073ceb3860bdb21752a2a0315e25c1c5b3baac175e228694e0d51022928d0f05cc48e261a7b5da5792c4faa06ecef16ac105f67cf
diff --git a/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild b/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild
deleted file mode 100644
index 5d00a180e54a..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND=">=net-libs/nodejs-10.15.2"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	default
-
-	# remove empty unused directory
-	rmdir data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.4.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.8.ebuild
index 2cc05a870273..43ac4ff48dfc 100644
--- a/www-apps/kibana-bin/kibana-bin-6.8.4.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/kibana-bin/kibana-bin-7.2.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.2.0.ebuild
deleted file mode 100644
index 1e24c466ef11..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND=">=net-libs/nodejs-10.15.2"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	default
-
-	# remove empty unused directory
-	rmdir data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.3.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.3.2.ebuild
deleted file mode 100644
index 17b609c079cd..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.3.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.15.2
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove empty unused directory
-	rmdir data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.4.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.4.1.ebuild
deleted file mode 100644
index 17b609c079cd..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.15.2
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove empty unused directory
-	rmdir data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.5.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.5.2.ebuild
deleted file mode 100644
index d3b7a9b09cba..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.5.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.15.2
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove empty unused directory
-	rmdir data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.6.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.6.2.ebuild
index 0c312d1ff10f..0c312d1ff10f 100644
--- a/www-apps/kibana-bin/kibana-bin-7.6.1.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.6.2.ebuild
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index 8a7e9b80fe5a..f34744e2739b 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -5,6 +5,10 @@
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest
index 056cb8838308..c39f99e9155b 100644
--- a/www-apps/mirmon/Manifest
+++ b/www-apps/mirmon/Manifest
@@ -1,4 +1,5 @@
-AUX 0002-Add-ipv6-monitor-support-to-mirmon.patch 970 BLAKE2B 8a78bcf62e020d4e8e369173e548d721be0584acc91be47c9e1aec3c1308fb3ee47033a842e0e9ffe172fccb3e98d52916f5441022c1ef87aa798295eca9ffe9 SHA512 ea6f7f51e516b944f69b6c76ecb48e36a1127867fdbaf558c9b81253ee47793bb017dfb0df830343c21dc8c8023390c6b53ef9f16e798731ab0c3f4b201dc9ad
-DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d
-EBUILD mirmon-2.10.ebuild 905 BLAKE2B 26c5c8f7c23777c751ab4bf0f2e5640358dad7dc615b04e08001f24b9eccb9eba2a11dfb5463d3c2ac83f2fc6a4d64ac2283155ed92b2dc3ef298a77e7847a9c SHA512 c64a6d5121e7208667c4eebab50c6219ff40a62fe7764b067cfcce81504d2686980a5de91f0b52b7a9788987448fd1098b95ab6959c92894891a1db6aa174319
-MISC metadata.xml 301 BLAKE2B 5fe42bb4c75fe17ecef559afa5a288fe1f4529017ca04e4fd265045bc23371d1bbe5851c9a85ec3be57957ab05c2ea7dfc63412561e7e2b78340b97e2fb273f4 SHA512 7e3589110474bd73e8ce39b9056dd426d5d68eed8f6babaf90357e629feda96e4ec03e568a8042ff7dfe8521696150d794c3344f7773b4df060c0ee77d7dfb8e
+AUX 2.11-Add-ipv6-monitor-support-to-mirmon.patch 1238 BLAKE2B 4e7d12fcd88b44584dca161e675b1eda1655bb39b464b4e1c90ae0844d627b6d0d56c009582036054d7c44743f55f17f068857d48b09511a477a94fb9123dc81 SHA512 c2bed5deef5e16e7c28aa3f7f7da0c3026a45d67fced62aeb380f1ce98e1535d7598c98e68b7a95cf25b2369b5ed3bdfd617b1ca6140ce914a42f23850bc3b1c
+AUX 2.11-Fix-options.patch 1336 BLAKE2B 8f35a902025fde5af0acc59139333c4ed23e310b9e687e8dc4f9d8221b066b0ca149c178e0e0f5117a5662470add4246d2c9685beb5eb1ec9f897f256ad55b9c SHA512 3b59e285c05bca87db6583940219def9f73a46a9b9d58d786106dce1c1029f97f9cc97cbdb8dfefa814860d57bbb7ab1cc2defb28ee535687162792a18561e78
+DIST mirmon-2.11.tar.gz 67630 BLAKE2B 6b7ba87cf7705083f8199ef9e2cff1e63a73592cf1bb0852fa5bece7ce462f06c4be5c60570748e6d5b46e845cdb8c1af44b4b1f976dc2a34a9b7d5e08fd7811 SHA512 4fff47042b9768d10541c1b478a44277ab7610e635e09bcac404a94590b86b375e21098130d0b91c4f9a1bd883cef8967c74dae7b50cee7b51339999b0240580
+EBUILD mirmon-2.11-r2.ebuild 1046 BLAKE2B b77382d16482cf8f2caccdec00d604d10893df28836f82cecc902aa902ea0258ad70e303c0660efb95bd47a6127dce4057b3867591c68eaf8034b1e09336b0aa SHA512 8a8cef322d9ea90b64558fdd047467356333afaf897561ea8c27fc7cf36d430beb93327d4d6efcd93b952d97208519ed4968b361dc0bc652ca61fea6624ba16d
+MISC metadata.xml 450 BLAKE2B 1b83a7498d0025ff4dc255cbc8bac2c9ce6401c3a0f4ba3631e8b3eaf1ba81cca5f23223936ce5664ee28dc7bb9525d728f45bcc09f602172e50d79f92137a82 SHA512 71cbf05ea1221802576a331bcc7f6885d86261c8a95cd0a7cd4bf55b3b55a52074204114ca2e0676314de8345e27227cf3161d08d6cf617e2a067b0cef5d87b9
diff --git a/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
index 3742d30825b7..d21eb2c022a3 100644
--- a/www-apps/mirmon/files/0002-Add-ipv6-monitor-support-to-mirmon.patch
+++ b/www-apps/mirmon/files/2.11-Add-ipv6-monitor-support-to-mirmon.patch
@@ -1,3 +1,7 @@
+Note: import amended to just required symbols to satify Perl 5.30.
+  Subroutine Mirmon::pack_sockaddr_in6 redefined at /usr/lib64/perl5/5.30.1/Exporter.pm line 66.
+   at /usr/share/webapps/mirmon/2.10/hostroot/mirmon line 175.
+
 https://bugs.gentoo.org/show_bug.cgi?id=289943
 
 From ab302148275a973c3fccd164fa1ae4b4c4409d21 Mon Sep 17 00:00:00 2001
@@ -23,8 +27,8 @@ index 6c0aaa8..50d40ca 100755
  use IO::Select ;
 -use Net::hostent ;
 +
-+use Socket;
-+use Socket6;
++use Socket qw(AF_INET);
++use Socket6 qw(AF_INET6 gethostbyname2);
 +use Data::Dumper qw( Dumper );
 +
 +sub gethost($){
diff --git a/www-apps/mirmon/files/2.11-Fix-options.patch b/www-apps/mirmon/files/2.11-Fix-options.patch
new file mode 100644
index 000000000000..0e0924ea9ddc
--- /dev/null
+++ b/www-apps/mirmon/files/2.11-Fix-options.patch
@@ -0,0 +1,34 @@
+Fix option handling.
+
+Add debug option to getopt inputs.
+Add debug option to usage output.
+Add version option to usage output.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- mirmon-2.11.orig/mirmon	2020-04-30 13:32:52.803951845 -0700
++++ mirmon-2.11/mirmon	2020-04-30 13:33:58.051641169 -0700
+@@ -1900,12 +1900,14 @@
+ Usage: $prog [-v] [-q] [-t timeout] [-c conf] [-get all|update|url <url>]
+ option v   : be verbose
+ option q   : be quiet
++option d   : debug output
+ option t   : set timeout ; default $TIMEOUT
+ option get : get all       : probe all sites
+            : get update    : probe a selection of the sites (see doc)
+            : get url <url> : probe some <url> (in the mirror-list).
+ option c   : configuration file ; default search :
+              ( $DEF_CNF )
++option version : display version
+ -------------------------------------------------------------------
+ Mirmon normally only reports errors and changes in the mirror list.
+ This is $VERSION.
+@@ -1924,7 +1926,7 @@
+ use Getopt::Long ;
+ Getopt::Long::config ( 'no_ignore_case' ) ;
+ my %opt = () ;
+-Usage '' unless GetOptions ( \%opt, qw(v q t=i get=s c=s version) ) ;
++Usage '' unless GetOptions ( \%opt, qw(d v q t=i get=s c=s version) ) ;
+ Usage "Arg count\n" if @ARGV > 1 ;
+ Usage "Arg count\n" if $opt{get} and $opt{get} eq 'url' and ! @ARGV ;
+ 
diff --git a/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml
index d9b32066e754..f02d1e93aba4 100644
--- a/www-apps/mirmon/metadata.xml
+++ b/www-apps/mirmon/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
+	<!-- used by infra, please do not non-maintainer drop -->
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
 </pkgmetadata>
diff --git a/www-apps/mirmon/mirmon-2.10.ebuild b/www-apps/mirmon/mirmon-2.11-r2.ebuild
index 63863466bdfc..0d6ce1561b0e 100644
--- a/www-apps/mirmon/mirmon-2.10.ebuild
+++ b/www-apps/mirmon/mirmon-2.11-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit webapp eutils
 WEBAPP_MANUAL_SLOT="yes"
 
 DESCRIPTION="Simple webapp to monitor the status of mirrors"
-HOMEPAGE="https://www.staff.science.uu.nl/~penni101/mirmon/"
-SRC_URI="https://www.staff.science.uu.nl/~penni101/${PN}/${P}.tar.gz"
+# The author has passed away: https://www.apache.org/memorials/henk_penning.html
+HOMEPAGE="http://www2.projects.science.uu.nl/csg/mirmon/mirmon.html"
+SRC_URI="https://deb.debian.org/debian/pool/main/m/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,9 +21,10 @@ RDEPEND="${DEPEND}
 	dev-perl/File-Tempdir
 	dev-perl/Socket6"
 
-src_prepare() {
-	epatch "${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch"
-}
+PATCHES=(
+	"${FILESDIR}/2.11-Add-ipv6-monitor-support-to-mirmon.patch"
+	"${FILESDIR}/2.11-Fix-options.patch"
+)
 
 src_install() {
 	# Don't install empty dirs
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 3bef9ea6ebc4..6e087b297c4c 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.5.11.tgz 46764593 BLAKE2B 0b397b18747c4a1d817ae0664175a64041a28eb30d45ac423a7fb1c3befeab68ed9054dade2715b4b43cd811b9bde67a081fc802b15684417d49fb7e8d783299 SHA512 c85ec2567bff64b9d304d3de3ed92c24d3a83abb34b92ecdc5bb2ea31a4e3964c1739815322f5d5743e500e8f39ad455cb63b4de447557084e40e463a5cba9fd
-DIST moodle-3.6.9.tgz 47830473 BLAKE2B ddf50ae51eeec62837eee86871a74fe6fae7e26e427f68a555c1d1f9b0c3deeb496215a841e5ded374d2f3786b686591a19f1867fd8343928d18ca0acfe88b5f SHA512 4024cec6c98607544de5a2f7ffdf38e2e739b94056a50a695eed90ab84c7b7e9373d72b55db9081741ced902d5036f156367ddb279e5371a8dc77056157a1aac
-DIST moodle-3.7.5.tgz 45830443 BLAKE2B 8edd5a6de29b3d2a12837dc374c18c9f4678517f0707ff1d810928d771aedb157899dee0f7f8b1e1637a714d23afffe3985e364279a5a72c9feaf92ff4036b84 SHA512 9e54277da9a3da92195516c69b020f3dd32b27dd88eeb385d441d79c8415dd8863a831f679ebb8dc671c32a160bc84ab56c74c8cbd5b1a32da58fc65c8a137d2
-DIST moodle-3.8.2.tgz 53178996 BLAKE2B 440c93730ebe3a37c0d0deb8c4e53bf171c9a0d183fd5c6ddeb0a246fd7c941d351bdcded47e0c72c02004ac7b9341bdb429bc29f4c5195f6a2c7e66bde8fa39 SHA512 c6261195d086c2a6f04b1853bf70cd24ed4449976b11316eee19961bcf0c8fc8b7cac3497598e3606da48ec5286ca8c83bbef2074e90bda957a96672cf3c4599
-EBUILD moodle-3.5.11.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.6.9.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.7.5.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.8.2.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+DIST moodle-3.5.12.tgz 46771916 BLAKE2B cb22c3a1548d2e01b309375ef3e422faa1a1603cf0205318fc18553e6ad92842c9d38db51fa4739f0b7ba969ce535d91d6c7bc79af954da61bd628cab15701ff SHA512 22c47324a259b98fc28a5f7b8061952b46bd628f2d41f7c9a0952c5d31517584b580284218743da841a8bf17ceb03ad87e1a31495bbcff7cdaac563ac2ef56de
+DIST moodle-3.6.10.tgz 47830177 BLAKE2B f28ce1b32cc4cec2eb256a9a3ad37f224e637e5e4720af4914dff80eec07cdfe738546545e9fc3db7a88517b0c10fc16a942515b3aa011d4d7588fbc2c26fffe SHA512 1ac374b1805f3a2be253279384f81c11d717eb6d9598c42490254912fe3720cba22c31525f3435785d270eda5a4340c79db43070973ebac3059549a322cfdbce
+DIST moodle-3.7.6.tgz 45867618 BLAKE2B 901a0d953e1a3329c817c032610ad797a34458fa9716ab9dcb51775faebdd30593596694ed72cbb0b0a45bb19eeee69a373f4792edce3aa530b3aeeb3cb551a3 SHA512 eaf8eeed256e9a942a5003f24bdd56ec3378d02fd33a4807b06fe2df083c5fe343014bda19d49791d20d038dbc3bc2a86e20a2e2f9fc25b45b3c00d8728c6ff1
+DIST moodle-3.8.3.tgz 53221103 BLAKE2B 7bf36c7affbe71eab027954e6690eb45137a49bad136511efe90f843de00d31b94071cac37a8ddc3f22565df960454047b42f5839ef58177b18d2737317b9c84 SHA512 d68f99717e7283f95a050d39879bffec8fe210f83d970fd5b14655be6546bf0848b75fd44bca3376b1bb7aba274c05a58b0b01d430cfbffebc02355c4a2b3759
+EBUILD moodle-3.5.12.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
+EBUILD moodle-3.6.10.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
+EBUILD moodle-3.7.6.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+EBUILD moodle-3.8.3.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.11.ebuild b/www-apps/moodle/moodle-3.5.12.ebuild
index 8b94917f96cc..8b94917f96cc 100644
--- a/www-apps/moodle/moodle-3.5.11.ebuild
+++ b/www-apps/moodle/moodle-3.5.12.ebuild
diff --git a/www-apps/moodle/moodle-3.6.9.ebuild b/www-apps/moodle/moodle-3.6.10.ebuild
index 8b94917f96cc..8b94917f96cc 100644
--- a/www-apps/moodle/moodle-3.6.9.ebuild
+++ b/www-apps/moodle/moodle-3.6.10.ebuild
diff --git a/www-apps/moodle/moodle-3.7.5.ebuild b/www-apps/moodle/moodle-3.7.6.ebuild
index 53ac6f44ea4e..53ac6f44ea4e 100644
--- a/www-apps/moodle/moodle-3.7.5.ebuild
+++ b/www-apps/moodle/moodle-3.7.6.ebuild
diff --git a/www-apps/moodle/moodle-3.8.2.ebuild b/www-apps/moodle/moodle-3.8.3.ebuild
index 53ac6f44ea4e..53ac6f44ea4e 100644
--- a/www-apps/moodle/moodle-3.8.2.ebuild
+++ b/www-apps/moodle/moodle-3.8.3.ebuild
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index d6bf0f60337e..2aa8ddc23fb2 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,5 +1,3 @@
-AUX noVNC.confd 104 BLAKE2B da90c8f2ae649e65bbbcd8c894581d0dd187bfbb8bbb20393eb67ee1bef12c98890bce9ff3cf0731bed21bb844cc4f02ae363b75173d16d13e891d5512d45ac3 SHA512 9e784f668965b55b562b020fb32d4674267583647b950dd19aa297856b5a4509f2a7b9891e9575bc823a379aa237d4499dfeb1a2b2f537052e5ae471828e888f
-AUX noVNC.initd 697 BLAKE2B 18032906a808e14944dfae2eddc6bbdb22dbbf620ec307a892e077e818a2e4e4c056c05c7cf8bae6d8ce0818dc8c48a6ccc4c42972a5b47862b96933d8536c7a SHA512 8b131686c5add6e7ea859ba433a325ff7f0b9a5c9a11199f0d4025229e56e2c5e725ebfa2cde146f5df4b8bd4b71cdde1f08e87d0217d61bb18b683221b4595a
 DIST novnc-1.0.0.tar.gz 1551574 BLAKE2B 58bd63eb0480b3f20ed16907725e0abcf8c699671614dc195f46a363d6ab9cdb5b0b033ba0ba16bbe39b16437fb94f64a741acd69d1c3c3957a0e60353d78a89 SHA512 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
 DIST novnc-1.1.0.tar.gz 1034997 BLAKE2B 0cb920cac99c3567cbf1c6a58e12649d4bca211d552a472a73ac1089d7c8a18d9478dcfeb558b6302c0c74d321b62575c35a492b02717dc4721b6a9b42f54415 SHA512 9c736912f5a3051027efe779fc64b182f523b9378ff412d78202e52665772678846d97fe3cc5ac18f5c29dd83d5ff2a2dd915e5eadf9af3573fe871db2e7821e
 EBUILD novnc-1.0.0.ebuild 1034 BLAKE2B 50a1ff242ad4631de546c4467d8966ddb7101c596dcd3c73226fc20bb9f659d28d7e86e14e24533649567f90bf87c1f30a9a162598681037aa27c0666f2adbf3 SHA512 f685a561f3b4775528f1f3627457f2a4a58bf6ab8d61ae0a4312a0168982c2040e26cc76c47d2af8c1679fc4fea61eadfdb26846a0641b539fd91b78933a1c39
diff --git a/www-apps/novnc/files/noVNC.confd b/www-apps/novnc/files/noVNC.confd
deleted file mode 100644
index 50ddb5cc3e57..000000000000
--- a/www-apps/novnc/files/noVNC.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-FLAG_FILE=/etc/nova/nova.conf
-WEB_ROOT=/opt/noVNC
-LOG_PATH=/var/log/noVNC
-CERT_FILE=/opt/noVNC/self.pem
diff --git a/www-apps/novnc/files/noVNC.initd b/www-apps/novnc/files/noVNC.initd
deleted file mode 100644
index 93d87486ad4d..000000000000
--- a/www-apps/novnc/files/noVNC.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# Author: Cor Cornelisse <corcornelisse@gmail.com>
-
-pidfile="/var/run/${SVCNAME}.pid"
-command="/usr/bin/nova-novncproxy"
-command_args="--flagfile=${FLAG_FILE} --cert=${CERT_FILE} --web ${WEB_ROOT}"
-command_background="yes"
-start_stop_daemon_args="--stdout ${LOG_PATH}/${SVCNAME}.log --stderr ${LOG_PATH}/${SVCNAME}.err"
-
-
-depend() {
-	need net
-}
-
-checkconfig() {
-  checkpath -d -m 0750 /var/log/noVNC
-	if [ ! -r /etc/conf.d/${SVCNAME} ]; then
-		eerror "No config file found: /etc/conf.d/${SVCNAME}"
-		return 1
-	fi
-	return 0
-}
-
-
-start_pre() {
-	checkconfig || return $?
-}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 7c4e8c02510c..6f9700671af9 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,5 @@
-DIST owncloud-10.3.1.tar.bz2 19715056 BLAKE2B 5e6026dc1ca9d7e1469e4a592b05807e4cc6ed83293eb3ad94b13d8aefd8eaf2b79e3aa9fca2e28dbc5b6c8d93a19c50d358a4fa7e393e0aaa00307c1652545d SHA512 4f3e60409c199f8075987aa5716a8f2736e875c045349562b79d2c785b9e99bc7d01d17e110b9c768b410f261e7a81904feb1dccffd6da11d4daca82b7201e14
-DIST owncloud-10.3.2.tar.bz2 19828724 BLAKE2B 6619c83fd247889a83e6c7d574b9d0e4fc8e3e5782671e280a4f1b2500ac1b82c8514fb587114e08c4ed8fae47d70769fc0813593a5cf6bd6c6e4d1ec5ce7710 SHA512 d2a1903c52e26f4518e91035e940999ff7955f9f955c71c4e6457a267137df5f61ed02227e5dcc97c3d21d46a017206fb60e9b430a73006fd8fc503e2d20d2d7
 DIST owncloud-10.4.0.tar.bz2 20426453 BLAKE2B 7affb3b3ec0d4db810199ef40f96c897c3c0d5d4c1e6e66f6014294dff61226a0d062c1ac70c6d23f377179adebec9c8b9b8afaa5628c7776ea32826f25d373b SHA512 3d95cb0795a33238fc5e3a051699ae831b861a2a9d41111b10fa8347fd06f6f8a3f6b810a2896c81a4de7af4301c6cccda8cad41fcfedb9659ed1ae227e15b20
-EBUILD owncloud-10.3.1.ebuild 1259 BLAKE2B 3b4c68b1944852eeb1770db91466c12f697076057d58db461bce021757548f4d2daf1901dc444bb93ac536ac8942672b64a740f86a1239fd8dc87d5719ec5046 SHA512 e416a9d252fcb98e6af9faec401904afbcc4be00731b3e1ea431074785ba36e8f5732e96dc0bbd02cacebb3d18b9bc51f54d8babd854f6f67b25f174127bc59b
-EBUILD owncloud-10.3.2.ebuild 1252 BLAKE2B a715a1e52f6d2b4a77424b96cabca7ecf3b99f9e7193fd29afac0752a5307e8c99c48dfa3a5b7b85da0826434f9ce1e8073b4e62d8727775c09ef9c2a65e014a SHA512 8394a7272db2d38e34b204a38ae38951594066a5c03cf2f596e7fa4dff57027663d94f0754abd179fdd645522d6ed9957f78a3e489b930ef9add126a82be64f2
+DIST owncloud-10.4.1.tar.bz2 20439397 BLAKE2B 1a83d82a3657cb62a69d49293951f8355a156b08791c164c0971505e6be151cd415b0d88157171989162303bf942c6bfce3d22fab291ac18a635fee0e7057343 SHA512 381e31faba9a1853a4c087a218637a2a9c1596189f0867d86b1fa800d7d1488a65d27fdb058b792eed027d0c11a4d582b72044c0b5e751d8509cbd32233c2e85
 EBUILD owncloud-10.4.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
+EBUILD owncloud-10.4.1.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.3.1.ebuild b/www-apps/owncloud/owncloud-10.3.1.ebuild
deleted file mode 100644
index df2ef215759e..000000000000
--- a/www-apps/owncloud/owncloud-10.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.3.2.ebuild b/www-apps/owncloud/owncloud-10.4.1.ebuild
index d07f4325007c..97ad6449db05 100644
--- a/www-apps/owncloud/owncloud-10.3.2.ebuild
+++ b/www-apps/owncloud/owncloud-10.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
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
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 735b6563c004..8465d9524f0e 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -2,8 +2,6 @@ AUX config.layout-gentoo 741 BLAKE2B 9d817baa9be850f9da41cdbd9db49b2bc3fbfc394bb
 AUX postinstall-en.txt 620 BLAKE2B a57e1a705fa31a2c5abb080be8e9ddea41017132c51429eb89b2ccf6f39b2052cab9d3b04b99aa0eb403187db809c8c0b35d13aa72123a0e1ec7fb75cc308383 SHA512 473acd53f962299a96b012b6c6e044590feb347efed208158ac8a1d4722c673fcddde2487556cf40fb97d201608fe066a9c243cd3f1682bea5e4039a4b5fb8dd
 AUX reconfig 2133 BLAKE2B fb5fdf3d68c1ff06b0e1becd25594b4544515aea3399ef2a563cbc541aa8ccf18f0781cbd08f97504bba0980010a7756a657c5ca0d7caa227cebf15b0d0f3231 SHA512 bfeedd02918240fb1b79fe9a5f62b6bda85e3f9df2c55dd9a93deb490495bb269579a999a71bd135fe43f247774039e34947c39689461ef4083b482f02fa3c56
 AUX rt-makefile-serialize-install-prereqs.patch 596 BLAKE2B 65427cbc4425fe47bd4ee5a624df45f802ff1153fa778493a619120db0ce5082876e05d802c411e2cbeb6293fa7899e374c462f7e2c83225a8d423baec162316 SHA512 0ae2ad3ac5faf7ecc65545cfbba210034a2f532c4b1fa82b37956731b35d7e42e3d3ca4714834f2797ecec7292f19dca0be295ad92ed3931374d07af02ed10a1
-DIST rt-4.4.3.tar.gz 9584927 BLAKE2B 9667e37a0f161d41ac1230e8573d05716ac17325d06924acf036d6098116a31e6e271d3a37ef4a415d1ff8dc04e28011b5125eebf2ad00d0b29702dba96730e1 SHA512 0b0b67e4716467aa5361c2756cee4caf661ba7377f0abc84e915cc9a300e7f93c41569d28375c295c2604a1e5fbaca48267920f9d21c2eca76c29bf5b0a45a49
 DIST rt-4.4.4.tar.gz 9977845 BLAKE2B bc27a68c880d305e43069887bd4c2dbf09e82413ee9b7f1e0e19252ad5249430f17bd980c94a4c74386a8c7fefc79af50a0e572adbb0ef707e46a4be63e8d3e4 SHA512 95335cfa9e7107300670a5e8631ffb6f402895dae051201d051ac01885b0cb185f838a666acaec773e0f670e1b9d16b7cede72f37ce9832fd83a9da8514e6972
-EBUILD rt-4.4.3.ebuild 7782 BLAKE2B b46b159e9c3e737c721d4666ec93c6cb04fe541151f1c39b5e4830b09381a7e12d99956965168407f18728b127b83a17eb0410e655499aeb8ea87b404b8153dd SHA512 85ccef72045fe7b0decdb1d103224e1211f674a01bad6d1c3efc619af7b2cfad6203e75be8f7f09435382ced6a4f6895d3afe3bff8f24fea2a552678813fff28
 EBUILD rt-4.4.4.ebuild 7827 BLAKE2B 7af4e224f4bd3565cab036d0474a4050f56bf5302157c842d28eecf1134c302a2662d2edc56baef4c9db1c374cc32980d8122ff3515dfd0edbfb7521cba1dc91 SHA512 69edde29f0ab354f13cf6d1b3e2c4f1ea2e071b9a92203f80c16793793b5bda7866a3d93fca7ddbbe8949a308d62fcc5b7a6e14146deae399e1b5fe1ab46be01
 MISC metadata.xml 533 BLAKE2B 4079ad55dec8f19dee943bd9c70e023b4ddd3beb71b7d324ef19e5fc18a386c814f8cba39efbc68f359cde2822787011196b9c1b7850d1ea717940bb8f234c3e SHA512 8235050bdbd8d443e8765563f52b3bfc5424d16d295ff0427175c053f5d1b1ec8218f76c514cd9f2423d6b8e8f50655a58a55b80d2f45471de8d1622f82f4c39
diff --git a/www-apps/rt/rt-4.4.3.ebuild b/www-apps/rt/rt-4.4.3.ebuild
deleted file mode 100644
index a9e33ea5121b..000000000000
--- a/www-apps/rt/rt-4.4.3.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp eutils depend.apache user
-
-DESCRIPTION="RT is an enterprise-grade ticketing system"
-HOMEPAGE="http://www.bestpractical.com/rt/"
-SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-IUSE="mysql +postgres fastcgi lighttpd"
-REQUIRED_USE="^^ ( mysql postgres )"
-
-RESTRICT="test"
-
-DEPEND="
-	>=dev-lang/perl-5.10.1
-
-	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/CGI-4
-	>=dev-perl/CSS-Squish-0.06
-	>=dev-perl/Class-Accessor-0.34
-	>=dev-perl/Class-ReturnValue-0.550.0-r1
-	>=dev-perl/DBI-1.37
-	>=dev-perl/Date-Extract-0.02
-	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/Devel-StackTrace-1.19
-	>=dev-perl/Email-Address-1.908.0
-	>=dev-perl/HTML-FormatText-WithLinks-0.14
-	>=dev-perl/HTML-Mason-1.43
-	>=dev-perl/HTML-Scrubber-0.08
-	>=dev-perl/HTTP-Server-Simple-0.34
-	>=dev-perl/HTTP-Server-Simple-Mason-0.14
-	>=dev-perl/Locale-Maketext-Lexicon-0.32
-	>=dev-perl/Log-Dispatch-2.410.0
-	>=dev-perl/MIME-tools-5.425
-	>=dev-perl/MailTools-1.60
-	>=dev-perl/Module-Versions-Report-1.05
-	>=dev-perl/Role-Basic-0.12
-	>=dev-perl/Symbol-Global-Name-0.04
-	>=dev-perl/Text-Quoted-2.80.0
-	>=dev-perl/Text-WikiFormat-0.76
-	>=dev-perl/Tree-Simple-1.04
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/DBIx-SearchBuilder-1.660.0
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-Encode-2.730.0
-	>=virtual/perl-File-Spec-0.8
-	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Locale-Maketext-1.06
-	>=virtual/perl-Storable-2.08
-	dev-perl/Business-Hours
-	dev-perl/CGI-Emulate-PSGI
-	dev-perl/CGI-PSGI
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/Calendar-Simple
-	dev-perl/Convert-Color
-	dev-perl/Crypt-Eksblowfish
-	dev-perl/Crypt-SSLeay
-	dev-perl/Crypt-X509
-	dev-perl/CSS-Minifier-XS
-	dev-perl/Data-Page-Pageset
-	dev-perl/DBD-SQLite
-	dev-perl/Data-GUID
-	dev-perl/Data-ICal
-	dev-perl/Date-Manip
-	dev-perl/Devel-GlobalDestruction
-	dev-perl/Email-Address-List
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/GD[png,gif]
-	dev-perl/GnuPG-Interface
-	dev-perl/GraphViz
-	dev-perl/HTML-Formatter
-	dev-perl/HTML-FormatText-WithLinks-AndTables
-	dev-perl/HTML-Mason-PSGIHandler
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Quoted
-	dev-perl/HTML-RewriteAttributes
-	dev-perl/HTML-Tree
-	dev-perl/IPC-Run3
-	dev-perl/JSON
-	dev-perl/JavaScript-Minifier-XS
-	dev-perl/MIME-Types
-	dev-perl/Module-Refresh
-	dev-perl/Mozilla-CA
-	dev-perl/Net-CIDR
-	dev-perl/PerlIO-eol
-	dev-perl/Plack
-	dev-perl/Regexp-Common-net-CIDR
-	dev-perl/Regexp-IPv6
-	dev-perl/Scope-Upper
-	dev-perl/Starlet
-	dev-perl/String-ShellQuote
-	dev-perl/TermReadKey
-	dev-perl/Text-Autoformat
-	dev-perl/Text-Password-Pronounceable
-	dev-perl/Time-ParseDate
-	dev-perl/TimeDate
-	dev-perl/UNIVERSAL-require
-	dev-perl/libwww-perl
-	dev-perl/Locale-Maketext-Fuzzy
-	dev-perl/Net-IP
-	dev-perl/Net-Server
-	dev-perl/Regexp-Common
-	dev-perl/Text-Template
-	dev-perl/Text-Wrapper
-	virtual/perl-Digest
-	virtual/perl-File-Temp
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Time-HiRes
-	virtual/perl-libnet
-
-	fastcgi? (
-		dev-perl/FCGI
-		dev-perl/FCGI-ProcManager
-	)
-	!lighttpd? (
-		dev-perl/Apache-DBI
-		!fastcgi? ( >=www-apache/mod_perl-2 )
-	)
-	lighttpd? ( dev-perl/FCGI )
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-RDEPEND="${DEPEND}
-	virtual/mta
-	!lighttpd? ( ${APACHE2_DEPEND} )
-	lighttpd? (
-		>=www-servers/lighttpd-1.3.13
-		sys-apps/openrc
-	)
-"
-
-need_httpd_cgi
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt
-	return 0
-}
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	ewarn
-	ewarn "If you are upgrading from an existing RT installation"
-	ewarn "make sure to read the related upgrade documentation in"
-	ewarn "${ROOT}usr/share/doc/${PF}."
-	ewarn
-
-	enewgroup rt
-	add_user_rt || die "Could not add user"
-}
-
-src_prepare() {
-	# add Gentoo-specific layout
-	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
-	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
-		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
-		-e 's|/\+|/|g' \
-		-i ./config.layout || die 'config sed failed'
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
-		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
-
-	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
-}
-
-src_configure() {
-	local web
-	local myconf
-	local depsconf
-
-	if use mysql ; then
-		myconf="--with-db-type=mysql --with-db-dba=root"
-		depsconf="--with-MYSQL"
-	elif use postgres ; then
-		myconf="--with-db-type=Pg --with-db-dba=postgres"
-		depsconf="--with-PG"
-	else
-		die "Pick a database backend"
-	fi
-
-	if use fastcgi ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="apache"
-		depsconf+=" --with-FASTCGI"
-	elif use lighttpd ; then
-		myconf+=" --with-web-handler=fastcgi"
-		web="lighttpd"
-		depsconf+=" --with-FASTCGI"
-	else
-		myconf+=" --with-web-handler=modperl2"
-		web="apache"
-		depsconf+=" --with-MODPERL2"
-	fi
-	# Any loading Date::Manip from here on
-	# may fail if TZ=Factory as it is on gentoo install
-	# media ( affects install as well )
-	export TZ=UTC
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${myconf}
-
-	# check for missing deps and ask to report if something is broken
-	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
-	if grep -q "MISSING" "${T}"/t; then
-		ewarn "Missing Perl dependency!"
-		ewarn
-		cat "${T}"/t | grep MISSING
-		ewarn
-		ewarn "Please run perl-cleaner. If the problem persists,"
-		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
-		die "Missing dependencies."
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	webapp_src_preinst
-	emake install
-
-	dodoc -r docs/*
-	# Disable compression because `perldoc` doesn't decompress transparently
-	docompress -x /usr/share/doc
-
-	# make sure we don't clobber existing site configuration
-	rm -f "${ED}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# fix paths
-	find "${ED}" -type f -print0 | xargs -0 sed -i -e "s:${ED}::g"
-
-	# copy upgrade files
-	insinto "${MY_HOSTROOTDIR}/${PF}"
-	doins -r etc/upgrade
-
-	# require the web server's permissions
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
-	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var/mason_data/obj
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_hook_script "${FILESDIR}"/reconfig
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if use lighttpd ; then
-		elog "We no longer install initscripts as Best Practical's recommended"
-		elog "implementation is to let Lighttpd manage the FastCGI instance."
-		elog
-		elog "You may find the following helpful:"
-		elog "   perldoc /usr/share/doc/${P}/web_deployment.pod"
-	fi
-}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 512bd4b5b3db..e1f9f77cee3b 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.4.tar.gz 12230487 BLAKE2B bced3e3eec1179b4c52190b24626632b3d0899f3dc33112374f316421ec6287b58d6c8684c85e743f5c92c2278e3e1408091dede6bacbc9b9be093350ed061c8 SHA512 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8
-EBUILD wordpress-5.4.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
+DIST wordpress-5.4.1.tar.gz 12234700 BLAKE2B 0df1f1b1da22c5ad429ef59861dbcb80b5bd6c8720bc96b450d2b6599b903dda813e16f28fc2ee2afe1654b4047556a06bb409f6d0a3be3671b37e54fac52cf3 SHA512 5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd
+EBUILD wordpress-5.4.1.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.4.ebuild b/www-apps/wordpress/wordpress-5.4.1.ebuild
index 6fc0786bf3b1..6fc0786bf3b1 100644
--- a/www-apps/wordpress/wordpress-5.4.ebuild
+++ b/www-apps/wordpress/wordpress-5.4.1.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
commit	51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree	753b6b08624c34d1ed8414bbe22c45409f7741b9 /www-apps
parent	be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent	deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)