15 files changed, 516 insertions, 5 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 12bcb1c2174a..eb39787d5da0 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 64b34721de50..1da2c24526d7 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,16 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
+DIST grafana-bin-7.5.10.tar.gz 52219967 BLAKE2B d8ba713423a5b58539db91174a681d1bfb0980738fa9d88cdf3d232aba70272898fa277e1d4b203e4b604e751699fb8cc97384141b227a7edd763d11ecd695de SHA512 127944f1d0adf670ecbbe22982526a906acbf5e4954c1ab1f3cf158bdbc24052c11eb3cb3561421cf0e120c4e64b092b7d1efe5eca56b04b6b3d5f290329a3c3
 DIST grafana-bin-7.5.7.tar.gz 52194760 BLAKE2B 4cc60188bb750c0d36d8b50336f51f8410cca5a730a93cd1536479dabefba79c955cddec554e7fabed782bdcbdf751c33794f893b4e0981214f3fc1041ee976a SHA512 ea5e9eef7a013e770abe827029bbb2b8b3ccfe28db985541597677671510e4c76b42009ceddfc687d23c249be792b99f1e8d5d518a271f36c4497d38380f0b54
 DIST grafana-bin-7.5.9.tar.gz 52215297 BLAKE2B 06fa63811f950081a581d402527a14660a7eac3cb00455357329b0da27874244e38265f78b2dbfd41d9ce8f7551f1dc9fc297138600e6d7430c70e3c82423178 SHA512 0e6e9504f6767d5d226954a3c61544353c4442ad56ed86124e3520c2bb35e4a401c3fc5fb462dbdacb5c31f80de3478d7db9c06f2a85131346185426b67e0837
 DIST grafana-bin-8.0.2.tar.gz 55512802 BLAKE2B fd535c8e1fca3136913ef1008c6e5ef8efa2871accc7a035354afd4b79a6e4d6340749c460c8c3d15e9edc07c426640b349c688a64ab678d61809f88f81b913a SHA512 d2421ba74b3eaaff3091fcf5015e6ca5cc050e205276b4d873a8d1fb3071cddd20fa846d9a03044752079564a458172e084ef69db4609fb520897a4f1d6fa4f2
 DIST grafana-bin-8.0.5.tar.gz 55588076 BLAKE2B 85845c7492a4dd76b47d959cadbcfb1bffa1f00b295296e4e8ae3033e4a52f654551a66f781f34d4ab4666bf05681bf3ced870fab6c59f758f9814fe67e5b1d7 SHA512 c0df8ee147c4876e29fd8b4f7943550b4c615787ecd50e7a40eee68d8f64bd4e9958e2473e00fc4244e4440f01750cf7b349a4baa769d69ee61c043538679a56
+DIST grafana-bin-8.0.6.tar.gz 55602674 BLAKE2B da782a59bf2ae363ac639b43540883985b0ba1a42b1ab8f5438157a22b91f129e22d54dc4e95e6b817ea6b1edb35350883129254b6235f1e6d02739bd494a4bd SHA512 f8a65c52c4e6d9f72d8828c09bab719b1cb81173be4d661dc40925618054f1ef924af06c20d36d901feb8b17a0b7dc1cf55ab9d65e9c3829e34967063f854413
+EBUILD grafana-bin-7.5.10.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 EBUILD grafana-bin-7.5.7.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 EBUILD grafana-bin-7.5.9.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 EBUILD grafana-bin-8.0.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 EBUILD grafana-bin-8.0.5.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
+EBUILD grafana-bin-8.0.6.ebuild 1769 BLAKE2B 3bd77424413b8d75af2c3e1f80320e4da3dcdd64a73a913bc11f967c27aa7aabc6f7d9c7d613bf2e979431f76ca4cac41ef45c3ab89081c1b8ae07533289f37d SHA512 89c164f2a54014d85e1cdaa46b52423c9880d581c7adda836afa787a6d7554f7dc8bd060141503cff1da5751be9cc166defe53aeb21b14fa38727fd6ab6e14dc
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-7.5.10.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.10.ebuild
new file mode 100644
index 000000000000..937332ec5f09
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.5.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+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
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd 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() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		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."
+	fi
+}
diff --git a/www-apps/grafana-bin/grafana-bin-8.0.6.ebuild b/www-apps/grafana-bin/grafana-bin-8.0.6.ebuild
new file mode 100644
index 000000000000..937332ec5f09
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-8.0.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+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
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd 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() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		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."
+	fi
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index c21be6be1c32..f8a3ddcdba78 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -940,11 +940,11 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
-DIST hugo-0.85.0.tar.gz 38968286 BLAKE2B 37f80c7ecea465b8fc7ee9b8a8467c90b22e3f88636ef6e10b09210c13c39c8d75983bedca4cbe6f0e0fae156129642669cc6e0e361712b23449520fb2aa419a SHA512 213ff0d1d87cca7ff87731216d0d0a80c2e5abbcca39a4222615a5a43f7f13f5456609ef47ab7d493a30af8ec65fb8dcfb21bcaacb43fc2d550178f5fe448966
 DIST hugo-0.86.0.tar.gz 39142083 BLAKE2B d260c908be3464f98bf49a61469c11eb0c76ef4aef1be4be171683796ae8d0b1eaae3785d1a542dab366395a1676baaae8c458c53213236d1787c92b15ec5954 SHA512 b6073ea67890b165e63fca48653f0ead03fe72cbdd557ecb98555ebbb22eb9133e36156d376ee9b2c9b739756efcc97c4f626a3a5c47cf520cfc02159f7949f2
+DIST hugo-0.86.1.tar.gz 39141633 BLAKE2B 2a19dbc88ce8405c00f202fc65187703b30ee91811992e2f43a3a45b8c7bcd4d567dedb6210a28da3a1af769f0ab15143989cc608fba17c1e6159a6a58b856e6 SHA512 cd97e7d3066d2c69f5bc5a16010ab7de3d4a92ed1e5a0093576d7210c8329eabdae045226f0d5f14d26fcdfa0c63c1aadf3ecbf10c494b2a675a377418c740f6
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
-EBUILD hugo-0.85.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
 EBUILD hugo-0.86.0.ebuild 51639 BLAKE2B af5ec52e7649a912e825e4e8b601d300b11fd991164d9413eef5239bfa55548cab2bf0944439b0b0d5bdd4a951e04bb94d179fca7d2b4bbdb4b56a9bf03d5dfc SHA512 aecedbcc535e61cc8fe5e83d3d58fd47614409d0905cd1b23ee5eaaf1d01b25590bc892291dfbc13575a6bc9bfa01e359d8617f4e20fd92de1d6bd9ced4c4e73
+EBUILD hugo-0.86.1.ebuild 51631 BLAKE2B 5986f878dede65aba53531e86b93bf581a5c853a6815071cc11cdf7adbd1102b871a62c18a667648cf6294a9acbe4b708aaf16fbbfea68aaa70584d591b3912e SHA512 e9da87cb9a596b6efa2f105ffebd6f562887cdf558491f111bb8d8cc333a1f98fb99c7fd721a8a04ea09cd0108ef227132ba1ea43309e0df65c2cc98593d963f
 MISC metadata.xml 726 BLAKE2B dedf419edaeb32c30b19c00dc42027ee4621ee836b44df94a6a35d63396074f379088d48c5f8a99a68a23166d4e595e3cc81f03b281fe9118693931e22d7ea63 SHA512 d7d396fc8f553322e50809f42977da39e82a7b51c56e47b4b23c1ef99bb2e5b2928232a518cecf3059d48fbd2f8a83bbc54f3a23c7f614802f38db413924349c
diff --git a/www-apps/hugo/hugo-0.85.0.ebuild b/www-apps/hugo/hugo-0.86.1.ebuild
index 6fd2f589ad8e..5100663eae61 100644
--- a/www-apps/hugo/hugo-0.85.0.ebuild
+++ b/www-apps/hugo/hugo-0.86.1.ebuild
@@ -963,7 +963,7 @@ SRC_URI="
 	${EGO_SUM_SRC_URI}
 "
 
-LICENSE="Apache-2.0 Unlicense BSD BSD-2 MPL-2.0 MIT"
+LICENSE="Apache-2.0 Unlicense BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc +sass"
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 732d9ad57358..5ba6e8ef7265 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,12 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
 DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
+DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
 DIST icingaweb2-2.9.0.tar.gz 10895850 BLAKE2B cf0f1375e3eb29ddbbf6691afd1c240ae1431b7dd82bd591dd3fe135602d1eabc418c6279fe7bd8f8e519f264b69a9da8bb1d09d286f37aa2f7e5ed21ddacd5a SHA512 d8f2817c025160cd8f59f33d678ca6eea9b893b80ca5c45c719d8778269da46322e720a1c73d7bcd7be73a07f08dbe279ffb78220f2a6c00f7e07e9f0f88d4d4
+DIST icingaweb2-2.9.2.tar.gz 12304718 BLAKE2B ba5d0872318a504d25b614825008e90cabd4680b30686d90ad438408e4a248f9dc2ef9410c5405da7efac949c6c41d89c64604b18c6d86f9ba479c99a8daff9a SHA512 67268544db0c267f9522b2105db52d87967835279eb621b79827b7b1b80a327b69348c849e4d3716a9cd26dfaef31a06b5ba125d30a48c3f5686dcf4c7a7a959
 EBUILD icingaweb2-2.8.2-r1.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
 EBUILD icingaweb2-2.8.3.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
+EBUILD icingaweb2-2.8.4.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 EBUILD icingaweb2-2.9.0.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
+EBUILD icingaweb2-2.9.2.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
 EBUILD icingaweb2-9999.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 MISC metadata.xml 443 BLAKE2B 408760755558425f54f2a06aace2d16f0dfb1f585b9226d5745e69dddd020116ffe8f64f475205ed5454f1cac25b3c3ade29aad2e404d39bccc0697be89287f1 SHA512 81020a9b2ca89e23526a3d46de4f845ab433c66989db2483a9cfdfb8ae998c00b24b7acb8211c3041d43685742bd6f2f58762d0ac93608263c0cdfe83bba4128
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
new file mode 100644
index 000000000000..c5f119e375d9
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
new file mode 100644
index 000000000000..84db9d6e0716
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit depend.apache multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
+
+DEPEND=">=net-analyzer/icinga2-2.1.1
+		dev-php/pecl-imagick
+		pdf? ( media-gfx/imagemagick[png] )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
+		nginx? ( >=www-servers/nginx-1.7.0:* )
+		|| (
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)
+		acct-group/icingacmd
+		acct-group/icingaweb2"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+}
+
+pkg_config() {
+	if [[ -d /etc/icingaweb2 ]] ; then
+		einfo "Updating existing installation ..."
+	else
+		einfo "Running first time setup ..."
+		einfo "Creating configuration directory ..."
+		/usr/share/${PN}/bin/icingacli setup config directory
+		einfo "Creating authentication token for web setup ..."
+		/usr/share/${PN}/bin/icingacli setup token create
+		if use apache2 ; then
+			einfo "The following might be useful for your Apache2 configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
+		fi
+		if use nginx ; then
+			einfo "The following might be useful for your NGinx configuration:"
+			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
+		fi
+	fi
+	einfo "All done."
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${S}"/*
+	fperms -R a+rX "/usr/share/${PN}/public/"
+	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 2aa4777c28c0..187614616965 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,17 +1,23 @@
 AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced9657980269906a0395ffd6287d8b89ce41fd437086173177a9727daa2cd03de8bda26045c013f7c6dc SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd
 AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f01064cd5bcec7449a968242368abc3144f6436d8765c1738e7786147cbc1ecabed9c734035daf4669 SHA512 e5fd56da7fc83466c26acdbd3e9aa341676ac9221495f6f83c46263838c15951164d31ac7e62b732fba1c0e63c6e5c2c97681b15ac5409b74a5c090f72ae6383
+AUX kibana.initd-r1 1126 BLAKE2B bf5fbfec39cc4961269900f2ef6b55b2c3cd2bf5134db12055eeaad4e6a2d71d8d2f8cb0a28e88f9733d142cad706839378b9c800ef6552f4d78305ee83b55f0 SHA512 6f36729960a80f7325a0bff3ca39d0ac9fa48d85a6b122d1ed869ca3470eb347301f22ed1b6604f1bb68daf24d789e898f4f95d02472294d5810c92ac4a83687
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-6.8.15-linux-x86_64.tar.gz 188083650 BLAKE2B ce12b1f564f9059952402d53a43c4e2b5a550b69b8835460f870fdf772ce8881325239165677659f6bfc295e148831b3e0459e7a059f73d03e218260c8e5139e SHA512 7afbcd42f332b281106fc58397d7229aa3e3ac38aa9ffcd5d7e3edf32b084f6bf812eac002166099b4e270019651a0d6cb3a9ea06f93f5927c4b4329eb36a14e
 DIST kibana-6.8.16-linux-x86_64.tar.gz 185438137 BLAKE2B 50870e1b15f190210502d9df498b2d2d88de8055f81dba5cc424963419a950710ce85aadf0f65c539322583f09aae70dce224eea8763061e745fb4f3ce02ad38 SHA512 55a9f615eaf0f67704f8704211f2bff06d6f085f789c75dde2df95061632b0be5ceb3614eb4e38a602531b4c482ed3f8f303b902e08422e0556a8b19aaccecf3
+DIST kibana-6.8.17-linux-x86_64.tar.gz 186139184 BLAKE2B 4b6bead148e9d222f5631ad24a81d6d5b84972c3c2dc4d8010fd4081179251365289858e8f60d8930c20653df6ee502a8833146613cb0195a0cd2bf6ccd5114d SHA512 50ae600ab3b6d69d11e86c84124eea6fd5c2f756c6c961c6f45f32ea3a65f0c29b249a4229dc9cfd6b7a64383efc21cd4bb53c44265ccd9109c6f8d990b3e14d
 DIST kibana-7.12.0-linux-x86_64.tar.gz 281022115 BLAKE2B 6400dc95f0d2eb357cce46679ab3eb1043f873dcc5904cb1d1169d44fefdc8ca5bcde8c8d3990f951754c2448c12514ac4d0a355f817e5b9b5ce7bf52fb41d00 SHA512 0b6a9596698c64a65d82cc146dad8e24118eb8991b9ed36e13f309d2e3d7af408c35358a8b39899bf2daf260ddd8d50678d437a3dba32923fe026da99a526006
 DIST kibana-7.12.1-linux-x86_64.tar.gz 281051589 BLAKE2B 041ac27f3d58ad419cf6410fcd452dad34a205699701088eeea11056974429e27a1c980ddc2609a592ee1c33f73bde39724603c17c604973a5c80bf1c36e3a70 SHA512 f215ae38c6976e0926b57a3dcb639ba532b724a8195e791a33a09540865a49e7180bed1692a6530b149e0bd6c4dd130c1d6c2dc6022b3ec5b8ec7ec4dc977b17
 DIST kibana-7.13.2-linux-x86_64.tar.gz 305904726 BLAKE2B 4d71432f10cfcc5b56ab007092334a46b1699eba2b3990381d4212b5053c6f6476d2434341907939e213226dd4d03000f8d73e0b32890a9c1194ab934a95efb6 SHA512 e4b88dd0e0266f82e893d1040689aaa88c4541ea355603680cb60d0757d5dbca8e628c65d9d74a1f898afa6926bb8d79f9008361c44c4f0cfc3284b07087ac37
+DIST kibana-7.13.4-linux-x86_64.tar.gz 306413260 BLAKE2B 3afe039b7be9809b395adb609e65785ccb8f3de07391b306804a79158cacb53c2d8b844b04468e932dc0113b9ecce34bc4bd8326231c9f2191fa5b12f2e00b4e SHA512 1accd5d6933f3f2f54174e53da626bc275b99b2f102d5f8cfee934d3520ee55a97c9c545cca32ddffec06a96114ce284e2e128cf334538214566c6530d1d673e
 DIST kibana-oss-6.8.15-linux-x86_64.tar.gz 70468224 BLAKE2B 5ad359cef5082035eaefe277128f8badce8539484f30399d504efe8fe645b1e925f22126a48bf3ef89efc466eff641241e109372ca84f34d2ac4014aeec1868a SHA512 ef67258e2f3d3f447a53ec23d519f13ea50a65f3fde7215352178a6efad9b20c9ce5ade14c4a185c2005b9ec29c997e40e435a0129dd4d03adeaaa21868c9a22
 DIST kibana-oss-6.8.16-linux-x86_64.tar.gz 67967956 BLAKE2B 3b1fcb88fb696c180b5e81219112598f4f156c6a9cb40535aa99cced65dbc8e441c31e9f0c43fd86d0a06cc154c1e5cafc2e8256303c0d65ed7c1c269edac7c2 SHA512 7b2962c78c33e535068ac11d050abcd4a3aa662c533d0ca2d918751ece6fcd84ef08862d1767dd9564d480dc200bd65b7a7199f543e3d5c3fc125ac3d3f4f902
+DIST kibana-oss-6.8.17-linux-x86_64.tar.gz 68076062 BLAKE2B b87a8067b0598e9291eb78b7666b69ac8babe774ad3f2ae1fcb37d12517ceed067fe0e022cb34e576727525c570863625237b91c6c5ad0b3901e8b6333a13c16 SHA512 28953bc77fd606a11c1f2522bb53b9fe38e7f711f71ac073c4d669a0078ba6fb050688ab06de49d4b5f7fdd0c76b8d040e05194bef814c872a00b9383b9a6d60
 EBUILD kibana-bin-6.8.15.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
 EBUILD kibana-bin-6.8.16.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
+EBUILD kibana-bin-6.8.17.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
 EBUILD kibana-bin-7.12.0-r1.ebuild 2635 BLAKE2B c5d247f7732c7fc8cd06c54c6f555d532536ad82faa36afb5a983e542e338974d5a92a96f52b5b82f193d90bffa8fb0dcdef921de5707214ad120c61615fbc64 SHA512 c4373a9b1a56c27c68ff2977d2412c87e6e1604d2d26a4403ca227912d2c6e5c499e3e2f40fd4bad586c7960fdce8930aa4fea70bf177d58ebfb9073b4dc9fca
 EBUILD kibana-bin-7.12.1.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
 EBUILD kibana-bin-7.13.2.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
+EBUILD kibana-bin-7.13.4.ebuild 2540 BLAKE2B 4b97a79688192c43ae54c840e6da8a48b0c40abc5f9809337c878cb8e857212121f8f671d95eb9b7e69bbb787d67ea0c9356b5faa9a0b3fc3ff6afc423ed7b12 SHA512 3c3a347f7e799f16501ccaf557b3076430e8b3f2dda793847c87f1fcd5ba90049a49f4a2109e2eebd4291f8f779734315951f1f1d8c20fcdd8fef81e0aea96b7
 MISC metadata.xml 690 BLAKE2B 760ed33239b72e0464be29979034d3ea1ab4e44b9645f76088a5aff5d8d1812a9eb3c42dc218d35139898592580d7fa80e19115249df96552201c05b37470be1 SHA512 4d6347db943b11b799884dcc266bc4b4cb8de6516d64a9eb689d952ea9202f4efbf8f5c950c3502d4e30793d012a080f34c653b8563ad63b1701ae7afe8de7c3
diff --git a/www-apps/kibana-bin/files/kibana.initd-r1 b/www-apps/kibana-bin/files/kibana.initd-r1
new file mode 100644
index 000000000000..124cb683c939
--- /dev/null
+++ b/www-apps/kibana-bin/files/kibana.initd-r1
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+KIBANA_USER="${KIBANA_USER:-kibana}"
+KIBANA_CONFIG="${KIBANA_CONFIG:-/etc/kibana/kibana.yml}"
+KIBANA_CACHE_DIR="${KIBANA_CACHE_DIR:-/var/cache/kibana}"
+KIBANA_BABEL_CACHE_PATH="${KIBANA_CACHE_DIR}/.babelcache.json"
+KIBANA_DATA_DIR="${KIBANA_DATA_DIR:-/var/lib/kibana}"
+KIBANA_LOG_DIR="${KIBANA_LOG_DIR:-/var/log/kibana}"
+
+command="/opt/kibana/bin/kibana"
+command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG} --path.data=${KIBANA_DATA_DIR}"
+command_user="${KIBANA_USER}"
+error_log="${KIBANA_LOG_DIR}/kibana.err"
+output_log="${KIBANA_LOG_DIR}/kibana.log"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command_background="true"
+start_stop_daemon_args="--env BABEL_CACHE_PATH=${KIBANA_BABEL_CACHE_PATH}"
+
+start_pre() {
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_CACHE_DIR}"
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_DATA_DIR}"
+	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_LOG_DIR}"
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+
+	pkill -P $(cat "${pidfile}")
+	pwait -F "${pidfile}"
+}
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild
new file mode 100644
index 000000000000..8b3812bc5d6b
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 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
+	<net-libs/nodejs-14
+	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
+
+	# 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.13.4.ebuild b/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild
new file mode 100644
index 000000000000..f04b3a03b6b0
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-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 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	dev-libs/expat
+	dev-libs/nss
+	>=net-libs/nodejs-14.16.0
+	<net-libs/nodejs-15
+"
+
+# Do not complain about CFLAGS etc since we don't use them
+QA_FLAGS_IGNORED='.*'
+QA_PRESTRIPPED="
+	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell
+	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so
+	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so
+	opt/kibana/node_modules/re2/build/Release/re2.node
+"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove unused directory
+	rm -r data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move plugins to /var/lib/kibana
+	rm -r plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d \
+		src/setup_node_env/index.js \
+		src/setup_node_env/no_transpilation.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-r1 ${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}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 14. 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/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index b4fde187b0fa..cbb83d1ece6e 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.3.9.tar.gz 1866167 BLAKE2B 28546631dce340d3c1128b525de1c33e9e3aa23cd557e6c8f7e9b26f97aedba67f2e5f3ea351e0db2d79e068e16cfa1672cbe3e6abbffd19e5009e2a9df84523 SHA512 791b05df34a4f2eec01fe6f6b9038a6630cd60c42e1f2e725fe3d033a692b77d2d688858b947c53d1ce48258c7c87a2e3fb31356e553632b88149d5a29bfa70e
-EBUILD postfixadmin-3.3.9-r1.ebuild 2932 BLAKE2B 267b42789f8946de5111ee783c18a6f3a291152c5bdcdd2203e7daa21ba4ce4b8026f458bc170858425cf115c131e9d473eb7742ff1199384b862d46e32cb694 SHA512 0c7cb2e541c93050b64a691120fd7dd87a990ce03c2e91acea114efb62472e4ae5b976de81b3ed0baa3e472851d2f9c8ab1fb1808d914f80dcf6593c11d6470a
+EBUILD postfixadmin-3.3.9-r2.ebuild 2901 BLAKE2B 19b5cb0f3397715224a29106f105bc5bf8c168e62880be57ed85693ff33b170c1ae6f32f1827b4392171f615509a00100067863b359499f951d461793032858a SHA512 4f7435f7b52b2f10ffd36e7abc3225921c39e4718ba4a8f4b163191a61ce8703e2a5d031168b2c19d80fa19d343aa11e24f592e39306e3a34f1688454dea1497
 MISC metadata.xml 560 BLAKE2B 2dccae38d76ef72520678dcc26582c6d99d2221c8cad753063e4948b75cd84b39f47b854a010217a6a52186a7308a3355c41ab6a7229af2417deb39ccb3eae84 SHA512 4ab5d3db2584f100b9f1d9729eb50487e40b27d16c436cbe09dd03d24c533d5d7c61b4b19eda03aa423fb34d9cf2b9f3ec55679196bb8e8da5ea3157c0bc567b
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.9-r2.ebuild
index fb3485975968..fae0d87352a6 100644
--- a/www-apps/postfixadmin/postfixadmin-3.3.9-r1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.3.9-r2.ebuild
@@ -57,7 +57,6 @@ src_install() {
 		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
 	fi
 
-	docinto /usr/share/doc/${PF}/
 	dodoc -r ADDITIONS
 
 	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"