gentoo resync : 18.08.2019

30 files changed, 172 insertions, 624 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0ef1247ca2bd..edc0f1668154 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 3b1dcc0aaceb..95b3e0cb2f1b 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,16 +1,10 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
 DIST drupal-7.67.tar.gz 3312764 BLAKE2B bb7f21e80ca192ff3e37f917c1fa43dcd8d3cd8b60ff012d1fe22e279ffd674e08be6aef6328d0c5b7c50a106592bde299300fe9ccb0c4c1ffc1aca57c3ca6ad SHA512 0e4f60010b1395183cea19424e8c2849f93fb7285a081bf7d0c774b8e82f403083533059f58c3831950cc06dfa8117d443db52b66a521301ceac10b1b333aa28
 DIST drupal-8.6.16.tar.gz 17151378 BLAKE2B 2bdd14ff7a5f898af2d322a6b2862643899dfbe2ad05c99b85f036161612cccfc2c25105c8eef37311634a2aa03ed792db8de3e625aed5adb94cd8f644557fcb SHA512 34f260d780bce286a0a61b710c340d2622cb857aa92a2bdaad63737303ef2f4f1751edc3f415daaa14b9cb483757e367e639136d03f571cba5165129bba31e12
-DIST drupal-8.7.1.tar.gz 17811529 BLAKE2B 5bdb92a8f6c5675dd311417db526be81149240a053bdb94f4294cb571193ed03f2edbc83b51cbcce9e0e322b45981d0949714659f5db2dff211815232cd447e5 SHA512 a386f7991465eade203aba4b20bb894041c76abda97e93afd772a02b215ac496d57a9aed50820a7bd78604c9e6602180fcda933c5121b8536a7d610a3bc3f2e8
-DIST drupal-8.7.2.tar.gz 17824323 BLAKE2B 355a4cdbcefe98afd53235bd8546e50efe911a36536aa07e9cb8a86f00dc6b068d0c276e26aee975790ef80ca5030d7464d4b705fa4da9391ce051994a7b850d SHA512 9dc8ca6c431f1d9e50d1c9139efe537815b59bf17b433cdeeb2df5f60ae9a77812f5ca096b5a0aa67bf71344efe60728e46b209609d41fc25065ae58a6bca6af
-DIST drupal-8.7.3.tar.gz 17825116 BLAKE2B 961d92526d8d53d1823b01696bacf6bcca7c10ea0057c561a9126d43f0e18ab1b37a5e85b733927793348b8241014b78b4efdf8aaedbf9e6e82caed51df76b64 SHA512 f7b1c0360091f7b14109b6a328663d0006138d3a39855838bfa9ec70d17aa835ffe8fb393e3b54a378bdfd3011f6cfe9e2eae9be5e79c8fc2586bc48b0bd7df2
-DIST drupal-8.7.4.tar.gz 17843961 BLAKE2B a07d6acfe41f2f347c8a335f88daa0b19c8016d0d5e533e3038585c59ad9a11cbb68f2352d59cee47c71422a261a3286053784e70cb15614ec061fb6af5d2572 SHA512 85c9e890d34bd5c725a4361030ba7a2ca71e7ff3fd89d92972bd8fcf657047d74760a897e0083dd3f0fc1c4309e87489a8730727804ae20c1be204dfa1c14428
 DIST drupal-8.7.5.tar.gz 17843250 BLAKE2B e68895ae3d097c1bb4269bd77a2180723caa3601322443eaced9e6e157511468b2fe877ee72dafb735c6d7d077c1f3d29e3de6b3624bbcc0f080ec4deb305065 SHA512 f0f34f8314e86b9fa104992fe8f96dfada335f58c5e25c174f44e484c27dd4a2c9f4fb19505ac29636fc7f9548c898fbf497c119ac8dd588e881e7aa373aefde
-EBUILD drupal-7.67.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
-EBUILD drupal-8.6.16.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.7.1.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.7.2.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.7.3.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.7.4.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.7.5.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+DIST drupal-8.7.6.tar.gz 17866782 BLAKE2B 19a616fd685078bdffa9f9e20234aa0aca8f24bc040068f7496cfb7163216977c4bfaf63f564b5fea08351f1899bb97bc50f48ae21250213ed8b93bbb15ab54f SHA512 eec8c5d5646371cb8382806c93e925d65b725878b2a4e53f4ad5559f14523c31e62cbba7ec813292b79cf1a332f64098e41720472171f233ce0bc1c0d24c395e
+EBUILD drupal-7.67.ebuild 1758 BLAKE2B 52959ae6dc48617ec80e22ce74324e138897f01ed9e2c489d481554188825ce917a9461b79d07a7c77049cd4458d51329f19feb68a18949afd4517a0da40040f SHA512 2aabe685ca2fd5ff1f29c8e575f22b7c1030b830afadeefe3a591b3316410a97b3e7640690bc28fca4e22f6b816f8b898c2e15c22c2cb3557032f46ce2320609
+EBUILD drupal-8.6.16.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
+EBUILD drupal-8.7.5.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
+EBUILD drupal-8.7.6.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.67.ebuild b/www-apps/drupal/drupal-7.67.ebuild
index 2d1f90ebbd06..d4e239ac142c 100644
--- a/www-apps/drupal/drupal-7.67.ebuild
+++ b/www-apps/drupal/drupal-7.67.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.drupal.org/"
 SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
 
 RDEPEND="
diff --git a/www-apps/drupal/drupal-8.6.16.ebuild b/www-apps/drupal/drupal-8.6.16.ebuild
index a8514d07dfe0..364116f1197a 100644
--- a/www-apps/drupal/drupal-8.6.16.ebuild
+++ b/www-apps/drupal/drupal-8.6.16.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.drupal.org/"
 SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
 
 RDEPEND="
diff --git a/www-apps/drupal/drupal-8.7.2.ebuild b/www-apps/drupal/drupal-8.7.2.ebuild
deleted file mode 100644
index a8514d07dfe0..000000000000
--- a/www-apps/drupal/drupal-8.7.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.7.3.ebuild b/www-apps/drupal/drupal-8.7.3.ebuild
deleted file mode 100644
index a8514d07dfe0..000000000000
--- a/www-apps/drupal/drupal-8.7.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.7.4.ebuild b/www-apps/drupal/drupal-8.7.4.ebuild
deleted file mode 100644
index a8514d07dfe0..000000000000
--- a/www-apps/drupal/drupal-8.7.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.7.5.ebuild b/www-apps/drupal/drupal-8.7.5.ebuild
index a8514d07dfe0..364116f1197a 100644
--- a/www-apps/drupal/drupal-8.7.5.ebuild
+++ b/www-apps/drupal/drupal-8.7.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.drupal.org/"
 SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
 
 RDEPEND="
diff --git a/www-apps/drupal/drupal-8.7.1.ebuild b/www-apps/drupal/drupal-8.7.6.ebuild
index a8514d07dfe0..364116f1197a 100644
--- a/www-apps/drupal/drupal-8.7.1.ebuild
+++ b/www-apps/drupal/drupal-8.7.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.drupal.org/"
 SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
 
 RDEPEND="
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 1ec2531d8e7a..ffe063ee460c 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -4,15 +4,13 @@ AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
 DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
-DIST grafana-bin-6.2.1.tar.gz 58508207 BLAKE2B 5f543b105768f5151fe868b43927984a9dac4a0987192c2d7d6b2b1b0a1d636fbc4beb898d55a707f5d220785a7c56b0163f834e27293f67b55acaf7c54811a0 SHA512 9a35e953686f8ad0d75d3e2fdfb713fe6cac95ffc56ec4ee78bbbc6d753611675b5bf48e45652cc8a76af38e2358754a415a5b09f660e3a5508a2434b882ec91
-DIST grafana-bin-6.2.2.tar.gz 58512782 BLAKE2B 3c837f1477890995e93d15d86c744e1158b6167b8cde7b101ee579befb0c8577a70fd0fb722999ef30e823f21d89ee525eb20d147327bbc4bbbffc774b67157f SHA512 24a1f685a76b8bdf4876f498daf43ae316a8e6fc89dcc9d3aed67cfd360baff1cb48c1118753afcb845ddebbbebfa195d369036786e09b8ca00d78cb1f60e6f2
-DIST grafana-bin-6.2.4.tar.gz 58513773 BLAKE2B 1f8e82de6f57ba35f96eb71220634a024574abe30d7389d5f39fadf5c9938b9f7ccf21b48787b068cc187c244cd9707538c5958a3292b683f8cb855898abdb12 SHA512 bf3ecf454057fc902df5bafcc227c917b1a16fffde4bf6d5c47e2a6f815bfbe21b5956acdb46549db77e2a0497c268544c87a69df88ec0971ca6b188d6cac77c
 DIST grafana-bin-6.2.5.tar.gz 58512371 BLAKE2B 6b56930c620e25948a6f1d662c7fb5632d3ca0a6476b605e9623d9b96e1c29e400bb3e17613e32aaf79bda5f6e7451867d0a14b7f9c1f4d47e8f92c13a226311 SHA512 b260616f0df47ce97084648d392a405b78ada4ff3aa8c8414da463ad865549e3118ab084cbba6edb7e427109dc19a5ab1ecc723d28a564e98d654df4dbb92b64
+DIST grafana-bin-6.3.2.tar.gz 58757623 BLAKE2B 91fc5a6af7076d121673d76ca13e47884dd498cdc6c9a53dfdf068f4710a8f802a64a5f81dc0c311f696285cd50d0490b5baf123a9f43eb2e5ea2e2387113852 SHA512 d758b57755a30af3eee86e8c3e302c9288473c947edbedace7dabbfa125faeb9453aa3e37ae983cd6c6954edb97235a4d4df26ea5ff65cdc903c3ef6b8c62958
+DIST grafana-bin-6.3.3.tar.gz 58755664 BLAKE2B 59c542ac033fde899e6a3fa042378ce245bf31c1ba832c3b0913256a5771316a234b98a53fdb433d0368f6169d16a1d0cb9138de4476c43b4a51e22a49b3cad4 SHA512 dc24695d77755e51718eaadfbba61627637146b3110ac8f06b76812a37e6fe16a97934d512d632fee7b61c9410454f9c867dc2c6e1206881fe1808064a6ff576
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
 EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
-EBUILD grafana-bin-6.2.1.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.2.2.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.2.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 EBUILD grafana-bin-6.2.5.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-6.3.2.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-6.3.3.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.4.ebuild b/www-apps/grafana-bin/grafana-bin-6.2.4.ebuild
deleted file mode 100644
index ed520bacd97a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.2.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 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.2.1.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.2.1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.2.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 73fd7c3d1d70..5f850dc1d72c 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,10 @@
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 DIST icingaweb2-2.7.0.tar.gz 8332315 BLAKE2B 7295208ef1805bd42fd7e173b238c3e939d499e79f674b7b4e4111e33f76bc5dac303216755997808fa7ad043ece3c5c17a158b5531647187135748c0fdcf846 SHA512 37bb15eebfc68bbdf4a20131d279d9696587d265084fcfb9b1c52d52d4f91a2cc04ff1b9ab1a2db5177250ad4baf9e9fbcfafc069645d9aaf297b9667b471994
+DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d SHA512 0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
 EBUILD icingaweb2-2.6.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-2.7.0.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
+EBUILD icingaweb2-2.7.1.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
new file mode 100644
index 000000000000..45655f2ebdb1
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+		)"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+
+	enewgroup icingaweb2
+	enewgroup icingacmd
+	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/karma-bin/Manifest b/www-apps/karma-bin/Manifest
index 6438a20a034f..65cf29199735 100644
--- a/www-apps/karma-bin/Manifest
+++ b/www-apps/karma-bin/Manifest
@@ -6,10 +6,12 @@ DIST karma-bin-0.33-amd64.tar.gz 14113120 BLAKE2B a37dc699d7ff26dcbb9188afc48639
 DIST karma-bin-0.39-amd64.tar.gz 15071130 BLAKE2B 71edfac70d02eee3b9406fc57e335c2f9c4f68a16f32da591e70c753f1498c182f36da7c018458b54f39b00968908e56367cdf30f26815ed53e78e6710d56e76 SHA512 6ed03b3c25745fc631ca04b3659239efdce78b221eb1c9c43fb9c8f8e7d6aadc153962388b54b0209e8896f9c9cf33f1fa5a23b6ed2bfbd4c4b48c7a24ab0637
 DIST karma-bin-0.40-amd64.tar.gz 14309083 BLAKE2B bdb0dff3ed308102eff8a4d7e4363901619045c39c2e154cda629aa0bd65ff6a0afee8885d3b014e6fcd448d25df1b881de4b4281efa525a73f54fbb9c425d5b SHA512 5148164b78da3e9a79eda8f203f52fd78c233993f657887d3d64fe0eaf00c90610058b3f0e8509a5d4f9f05f77b5c39461cbfa9d4ccbc9d984ba07944955756d
 DIST karma-bin-0.41-amd64.tar.gz 14311961 BLAKE2B 6e16ba96c0e4c612e4b6e93397d21469a154285e14c5dce547cac02a1a04dc37ef3cb4d6070e32c322dbdc3e30c1bd4997e2c0c0ad358a238ecaf7028e65f28e SHA512 ff0ff076e5273d6b813886cdc4a8476b9bc2c9afea29f591ba0ba6f7049ea79610dfb986f532b571ffb6b90b24da1a82e770546de9ca750985055e37cc7805e3
+DIST karma-bin-0.43-amd64.tar.gz 14854945 BLAKE2B f9db45563f58d615370514fa206ec45b41126c1701f4b586e7a70564e4ea65123753532c086f8f1bf3cf77160a041d87fe09c33bfe9cd8ca6263154867ee3e2b SHA512 d82beeec70d3e05301ce8b788b8e54b28e9540c9e652ee5e61188334672f5f5341ada1f63c20161c7f67216b0f74402070c849a14039de4e7eb863e688b15444
 EBUILD karma-bin-0.24.ebuild 950 BLAKE2B d966dc1b996ed5e2d95b2b12007c45cf0522862a48782e05c4fe1b62407ceee9e7cf015259291e6c6999df9d59409e9bb5b880feba66e0ad70489726641de462 SHA512 d83f53417628d3274b338e3bfe36ac7d1472fef3f7cd51525dea1a5f0f64fdb825cf26f235128353c4e2ad7b63e5b8d8560e5cc78d3124eb83c4f8ec4787d3c1
 EBUILD karma-bin-0.27.ebuild 949 BLAKE2B f5d10a7fbf43d99d5a11e27e6da6c1b9a98517bb329c9c326929897c04c44f3c2d1a318990e34863ce23faac6cd84293183848835b69a69cbedeee36ee6e8331 SHA512 d1cc2163379e50331f3b6110b6187445651309ce54206efa6a6fb84ccd65f65a3bfb9103756b39059bfeb3445fe571eab901ba63fb4b8eff10b4ce2a81ff9e18
 EBUILD karma-bin-0.33.ebuild 949 BLAKE2B f5d10a7fbf43d99d5a11e27e6da6c1b9a98517bb329c9c326929897c04c44f3c2d1a318990e34863ce23faac6cd84293183848835b69a69cbedeee36ee6e8331 SHA512 d1cc2163379e50331f3b6110b6187445651309ce54206efa6a6fb84ccd65f65a3bfb9103756b39059bfeb3445fe571eab901ba63fb4b8eff10b4ce2a81ff9e18
 EBUILD karma-bin-0.39.ebuild 949 BLAKE2B f5d10a7fbf43d99d5a11e27e6da6c1b9a98517bb329c9c326929897c04c44f3c2d1a318990e34863ce23faac6cd84293183848835b69a69cbedeee36ee6e8331 SHA512 d1cc2163379e50331f3b6110b6187445651309ce54206efa6a6fb84ccd65f65a3bfb9103756b39059bfeb3445fe571eab901ba63fb4b8eff10b4ce2a81ff9e18
 EBUILD karma-bin-0.40.ebuild 966 BLAKE2B 4f0fd169372d09d4d68459f1906f316303b5bea776ee18a0d8352a41ec189793452c44f39ab172d838059e4d9eac880c802d0d7a2dcecec7514d6d228b76429f SHA512 587799ed1755a1c8ddd343a05641c231de7dbc888c0606333cb1a9df866d20384187dc61a4cdc007846942eaecb9f006ddf9e1c40093a0f863d24763e827256c
 EBUILD karma-bin-0.41.ebuild 966 BLAKE2B 4f0fd169372d09d4d68459f1906f316303b5bea776ee18a0d8352a41ec189793452c44f39ab172d838059e4d9eac880c802d0d7a2dcecec7514d6d228b76429f SHA512 587799ed1755a1c8ddd343a05641c231de7dbc888c0606333cb1a9df866d20384187dc61a4cdc007846942eaecb9f006ddf9e1c40093a0f863d24763e827256c
+EBUILD karma-bin-0.43.ebuild 966 BLAKE2B 4f0fd169372d09d4d68459f1906f316303b5bea776ee18a0d8352a41ec189793452c44f39ab172d838059e4d9eac880c802d0d7a2dcecec7514d6d228b76429f SHA512 587799ed1755a1c8ddd343a05641c231de7dbc888c0606333cb1a9df866d20384187dc61a4cdc007846942eaecb9f006ddf9e1c40093a0f863d24763e827256c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/karma-bin/karma-bin-0.43.ebuild b/www-apps/karma-bin/karma-bin-0.43.ebuild
new file mode 100644
index 000000000000..208ce387b321
--- /dev/null
+++ b/www-apps/karma-bin/karma-bin-0.43.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN%-bin}
+
+inherit user
+
+DESCRIPTION="Alerts dashboard for Prometheus Alertmanager"
+HOMEPAGE="https://github.com/prymitive/karma"
+SRC_URI="https://github.com/prymitive/${MY_PN}/releases/download/v${PV}/${MY_PN}-linux-amd64.tar.gz -> ${P}-amd64.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_PREBUILT="usr/bin/*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 -1 ${MY_PN}
+}
+
+src_install() {
+	dobin karma-linux-amd64
+	dosym karma-linux-amd64 /usr/bin/karma
+	insinto /etc/${MY_PN}
+	newins "${FILESDIR}"/${MY_PN}-0.24.yaml ${MY_PN}.yaml
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+keepdir /var/log/${MY_PN}
+fowners ${MY_PN}:${MY_PN} /var/log/${MY_PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Please edit ${EROOT}/etc/karma/karma.yaml to match your system."
+	fi
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 7b2e089a205f..85107fd40072 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,9 +1,7 @@
-DIST nanoc-core-4.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
-DIST nanoc-core-4.11.5.tar.gz 305078 BLAKE2B d86fc1991f7aa1d0459c0a8b30053a97065f23a7c088fe739db6362ad2692622fe08c715b05b156d44e5bcdc1283e2bce2deeb562e61dc0933e3444f421d9113 SHA512 65285a0ddd822d15b788e824fc114c4c5f89d94221b6c7379eb8037519afd85d5131c571e0fbae4a447723448f61cdd4cdb8543de98f3bfdb1ac669a59ad64b8
-DIST nanoc-core-4.11.6.tar.gz 306875 BLAKE2B dbb949572d22c6acb3ba7acf94712966a4105024f51f3e3df74f4ef010577d75be7859ad3eb2e877837c0fa38fbb384f00bd756466a23804d4b0e3167c22a12b SHA512 3735c374c302258ebc22f52e0044727de1fb283ed4c4f0075aad351b4645935d58aa04638f90c3e29e0c5270db148f83768aef41881c6fb5b53fe9efcf2b29a2
 DIST nanoc-core-4.11.7.tar.gz 307042 BLAKE2B b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3 SHA512 d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c
-EBUILD nanoc-core-4.11.2.ebuild 1592 BLAKE2B 296339b47fcf2130599ea5e09ee6cc39e2cc096b7f0f93353c5178d99f89fabcaee3aa4182d7ba9f264ad2eb1dfaa2fccf659368dd034eafeb8c91d28aa38523 SHA512 fd916642ab968c7cd67a2ff2c791c7ac67c52628d2afe299b8eec6d63b308ee4d89725a757a89a1c78321f1f3ae7279e576b5af286618c5bdac280804cd29311
-EBUILD nanoc-core-4.11.5.ebuild 1632 BLAKE2B d06dad58a34f38c7dfd1457e7d799db600d657d2ec80edd71a9489a3152a6a0ae2dcf4a2442fde6b0c50fda1a3a9f856bd121fe4f9703e6b0d776adb547a2f44 SHA512 10283e30908089080cd032a0548e6977728101d2568bc3205325ede4d67d92b6df49fb1ac985cbd67a5e89f112ee06c8b0173425852a16ef4ff733ee19de0d9d
-EBUILD nanoc-core-4.11.6.ebuild 1632 BLAKE2B d06dad58a34f38c7dfd1457e7d799db600d657d2ec80edd71a9489a3152a6a0ae2dcf4a2442fde6b0c50fda1a3a9f856bd121fe4f9703e6b0d776adb547a2f44 SHA512 10283e30908089080cd032a0548e6977728101d2568bc3205325ede4d67d92b6df49fb1ac985cbd67a5e89f112ee06c8b0173425852a16ef4ff733ee19de0d9d
+DIST nanoc-core-4.11.8.tar.gz 307102 BLAKE2B 615dfc1e2a6424343327888d4d5c577652d8480178769accc15f86ae8f64f7dc8aecbfd98b16791f98dc3f5fbf1a9e88ed6ca38354aa5277aea13dec42a6404b SHA512 939e54a55ffeca9ea392d2e4ad49564761dc7497052a8bc367a9df9d7dd2fbc1943bc363e7df82da988d6897ed24d9a5db1c869ce063dd7dd6ae03d0da8d19b5
+DIST nanoc-core-4.11.9.tar.gz 307441 BLAKE2B 9357a78412056eb62b8aac04ff2d02238bd02786bf6d3a1d0d4cc738b833f596122f55d325779760d2afa579b2864561701ccf107c9f0bd1a04e6aacd6d2b64d SHA512 34b6a52e16d04d69e3016ae9b77080d96860ab406ada8a597d5cf721761d82ec5e6d4dcc64193b6804315f3731618cc6286b5d6844f55c8d20dabed1a8251579
 EBUILD nanoc-core-4.11.7.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
+EBUILD nanoc-core-4.11.8.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
+EBUILD nanoc-core-4.11.9.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
deleted file mode 100644
index d1c733874894..000000000000
--- a/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
-HOMEPAGE="https://nanoc.ws/"
-SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="nanoc-${PV}/nanoc-core"
-
-ruby_add_rdepend "
-	dev-ruby/ddmemoize:1
-	dev-ruby/ddmetrics:1
-	dev-ruby/ddplugin:1
-	=dev-ruby/hamster-3*
-	>=dev-ruby/json_schema-0.19:0
-	dev-ruby/zeitwerk:1
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rspec:3
-	dev-ruby/rspec-its
-	dev-ruby/fuubar
-	dev-ruby/minitest
-	dev-ruby/timecop
-	dev-ruby/yard
-)
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Use useable tmp dir
-	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
-}
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.5.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.8.ebuild
index 5dfb3c57964a..ccc331cdd62d 100644
--- a/www-apps/nanoc-core/nanoc-core-4.11.5.ebuild
+++ b/www-apps/nanoc-core/nanoc-core-4.11.8.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.6.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.9.ebuild
index 5dfb3c57964a..ccc331cdd62d 100644
--- a/www-apps/nanoc-core/nanoc-core-4.11.6.ebuild
+++ b/www-apps/nanoc-core/nanoc-core-4.11.9.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 5aae05c05ab2..319fe40dd05a 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,13 +1,9 @@
 DIST nanoc-4.10.4.tar.gz 290367 BLAKE2B 0b5cf03938af1f971fccddb6bed4fa6b67da3aaf93cb7666c52e3ff8fc524f17ff10bf1a60ccf7f7b59f840d4c445ef57677349f5b83bc55e754e7078ac4b8d9 SHA512 5446e351906b5b6bbe5c9059dab86490d5deef5e1197adf5827fe201f2932d5cf79c65bfd9d9370ce57c35d965e013098d39d53fa96db8b4d1c6017977683ea2
-DIST nanoc-4.11.0.tar.gz 291654 BLAKE2B ab88bf36b472106f356ae67782dac61f691e0d64646f410ae0cceca7a9df11689dd7a011bf58a773d6b35956f0092deac4db43bb8663d66463b72e10da27c658 SHA512 357345c9247465bd470bf6c71ea2b16e3415680fad6a4d4ee755eeb3a1443664590753003a5de0a740ffcfbaf93049c2c12c1f22de052f4d6efc2382430a4e08
-DIST nanoc-4.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
-DIST nanoc-4.11.5.tar.gz 305078 BLAKE2B d86fc1991f7aa1d0459c0a8b30053a97065f23a7c088fe739db6362ad2692622fe08c715b05b156d44e5bcdc1283e2bce2deeb562e61dc0933e3444f421d9113 SHA512 65285a0ddd822d15b788e824fc114c4c5f89d94221b6c7379eb8037519afd85d5131c571e0fbae4a447723448f61cdd4cdb8543de98f3bfdb1ac669a59ad64b8
-DIST nanoc-4.11.6.tar.gz 306875 BLAKE2B dbb949572d22c6acb3ba7acf94712966a4105024f51f3e3df74f4ef010577d75be7859ad3eb2e877837c0fa38fbb384f00bd756466a23804d4b0e3167c22a12b SHA512 3735c374c302258ebc22f52e0044727de1fb283ed4c4f0075aad351b4645935d58aa04638f90c3e29e0c5270db148f83768aef41881c6fb5b53fe9efcf2b29a2
 DIST nanoc-4.11.7.tar.gz 307042 BLAKE2B b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3 SHA512 d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c
+DIST nanoc-4.11.8.tar.gz 307102 BLAKE2B 615dfc1e2a6424343327888d4d5c577652d8480178769accc15f86ae8f64f7dc8aecbfd98b16791f98dc3f5fbf1a9e88ed6ca38354aa5277aea13dec42a6404b SHA512 939e54a55ffeca9ea392d2e4ad49564761dc7497052a8bc367a9df9d7dd2fbc1943bc363e7df82da988d6897ed24d9a5db1c869ce063dd7dd6ae03d0da8d19b5
+DIST nanoc-4.11.9.tar.gz 307441 BLAKE2B 9357a78412056eb62b8aac04ff2d02238bd02786bf6d3a1d0d4cc738b833f596122f55d325779760d2afa579b2864561701ccf107c9f0bd1a04e6aacd6d2b64d SHA512 34b6a52e16d04d69e3016ae9b77080d96860ab406ada8a597d5cf721761d82ec5e6d4dcc64193b6804315f3731618cc6286b5d6844f55c8d20dabed1a8251579
 EBUILD nanoc-4.10.4.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
-EBUILD nanoc-4.11.0.ebuild 2626 BLAKE2B b4cdd5df85c200cca904dd6564d22e0b08ff6d76aee5110a0d2ae9cf7195884c6bf6c6e5e0b1af3c28bd5dee95931e6be2727047351dc42c0b53e736bd3fe0d7 SHA512 071fd944e68c277b9aa13bbcf22ce3bd7b4642974f43950dc75975e8255de90be402a60df2642b54f9ec6e6f731f771839e4701ccbb44e51ca2054647fe0e7a6
-EBUILD nanoc-4.11.2.ebuild 2446 BLAKE2B 6422042144f1749a3c5821295de682ceea1a682076b7edd5b45a6e9278324829c709609d89a3e689dda6d94069b6db817a3a8afb56c3a3587f94b36cb79dd2a2 SHA512 8bdf7d4686765c1b5d3a6484d48e1310f702d8d3e800e6293b090a0962978b970df863705af6f56d8371acaaf38dbb466b02032f3153613bc6a9e5afb089d156
-EBUILD nanoc-4.11.5.ebuild 2528 BLAKE2B 68387ce2f89aa9c3dcf403ae4a455145a76f2a47675b8750042d35d16e1954c4ad67f088affd5729ee43fe4001307092f5d74bbe32b199873ebdefbc67307543 SHA512 a421572284c30e0a957e83832a3aef80486bb8145f39e9e7b55ec2c1214e03e38bf99cf944cb5916f90750441e1d67538b3676953c1967a59dfc1d5f7f718608
-EBUILD nanoc-4.11.6.ebuild 2536 BLAKE2B c371d49228f52fb4645f5c4592cce3a53ea5a7d06f90db63f87e9cf460da59756325b932b12a0b44b930be03089a3d4f9589c27181d99b6733f9fcdbf36cddb4 SHA512 d852f521864ff2c0b4bf8d2c0da9a54f812aaa66ea70dd9bc4bf8776d6d70e8e5d9c7694515149a5f3830b63e04111a602ecde7fdb7d58da50954b08709590cf
 EBUILD nanoc-4.11.7.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+EBUILD nanoc-4.11.8.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+EBUILD nanoc-4.11.9.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.11.0.ebuild b/www-apps/nanoc/nanoc-4.11.0.ebuild
deleted file mode 100644
index 9de9c8a62776..000000000000
--- a/www-apps/nanoc/nanoc-4.11.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
-HOMEPAGE="https://nanoc.ws/"
-SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="${P}/nanoc"
-
-ruby_add_rdepend "!minimal? (
-	dev-ruby/mime-types:*
-	dev-ruby/rack:*
-	www-servers/adsf
-)
-	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.15:0
-	dev-ruby/ddmemoize:1
-	dev-ruby/ddmetrics:1
-	dev-ruby/ddplugin:1
-	=dev-ruby/hamster-3*
-	>=dev-ruby/json_schema-0.19:0
-	>=dev-ruby/parallel-1.12:1
-	dev-ruby/ref:2
-	>=dev-ruby/slow_enumerator_tools-1.1.0:1
-	>=dev-ruby/tomlrb-1.2:1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/asciidoctor
-	dev-ruby/fuubar
-	dev-ruby/maruku
-	>=dev-ruby/mocha-0.13
-	dev-ruby/minitest
-	dev-ruby/pry
-	dev-ruby/rdoc
-	dev-ruby/rouge:2
-	dev-ruby/rubypants
-	dev-ruby/systemu
-	dev-ruby/timecop
-	dev-ruby/vcr
-	dev-ruby/webmock
-	dev-ruby/yard
-)
-doc? (
-	dev-ruby/kramdown
-	dev-ruby/rdiscount
-	dev-ruby/yard
-)"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	# Avoid tests requiring a network connection
-	rm -f test/checking/checks/test_{css,html}.rb || die
-
-	# Avoid tests for unpackaged dependencies
-	rm spec/nanoc/deploying/fog_spec.rb \
-	   spec/nanoc/filters/less_spec.rb \
-	   test/filters/test_{markaby,rainpress}.rb || die
-
-	# Use useable tmp dir
-	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
-
-	# Avoid non-fatal failing tests due to specifics in the environment
-	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
-	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
-	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
-	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nanoc/nanoc-4.11.2.ebuild b/www-apps/nanoc/nanoc-4.11.2.ebuild
deleted file mode 100644
index 02aaf44b073f..000000000000
--- a/www-apps/nanoc/nanoc-4.11.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=6
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
-HOMEPAGE="https://nanoc.ws/"
-SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-RUBY_S="${P}/nanoc"
-
-ruby_add_rdepend "!minimal? (
-	dev-ruby/mime-types:*
-	dev-ruby/rack:*
-	www-servers/adsf
-)
-	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.15:0
-	~www-apps/nanoc-core-${PV}
-	>=dev-ruby/parallel-1.12:1
-	>=dev-ruby/slow_enumerator_tools-1.1.0:1
-	>=dev-ruby/tomlrb-1.2:1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/asciidoctor
-	dev-ruby/fuubar
-	dev-ruby/haml
-	dev-ruby/maruku
-	>=dev-ruby/mocha-0.13
-	dev-ruby/minitest
-	dev-ruby/mustache
-	dev-ruby/pry
-	dev-ruby/rdoc
-	dev-ruby/rouge:2
-	dev-ruby/rubypants
-	dev-ruby/systemu
-	dev-ruby/timecop
-	dev-ruby/vcr
-	dev-ruby/webmock
-	dev-ruby/yard
-)
-doc? (
-	dev-ruby/kramdown
-	dev-ruby/rdiscount
-	dev-ruby/yard
-)"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '/rubocop/ s:^:#:' Rakefile || die
-
-	echo "-r ./spec/spec_helper.rb" > .rspec || die
-
-	# Avoid tests requiring a network connection
-	rm -f test/checking/checks/test_{css,html}.rb || die
-
-	# Avoid tests for unpackaged dependencies
-	rm spec/nanoc/deploying/fog_spec.rb \
-	   spec/nanoc/filters/less_spec.rb \
-	   test/filters/test_{markaby,rainpress}.rb || die
-
-	# Avoid non-fatal failing tests due to specifics in the environment
-	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
-	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
-	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
-	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nanoc/nanoc-4.11.6.ebuild b/www-apps/nanoc/nanoc-4.11.8.ebuild
index 39188d42e3e4..de28a28b1206 100644
--- a/www-apps/nanoc/nanoc-4.11.6.ebuild
+++ b/www-apps/nanoc/nanoc-4.11.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
 
 inherit ruby-fakegem
 
@@ -75,6 +75,9 @@ all_ruby_prepare() {
 
 	echo "-r ./spec/spec_helper.rb" > .rspec || die
 
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid tests requiring a network connection or make assumptions
 	# about the local network environment.
 	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
diff --git a/www-apps/nanoc/nanoc-4.11.5.ebuild b/www-apps/nanoc/nanoc-4.11.9.ebuild
index d5f2df4948fb..de28a28b1206 100644
--- a/www-apps/nanoc/nanoc-4.11.5.ebuild
+++ b/www-apps/nanoc/nanoc-4.11.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
 
 inherit ruby-fakegem
 
@@ -51,7 +51,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/mustache
 	dev-ruby/pry
 	dev-ruby/rdoc
-	dev-ruby/rouge:2
+	>=dev-ruby/rouge-3.5.1:2
 	dev-ruby/rubypants
 	dev-ruby/systemu
 	dev-ruby/timecop
@@ -75,6 +75,9 @@ all_ruby_prepare() {
 
 	echo "-r ./spec/spec_helper.rb" > .rspec || die
 
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid tests requiring a network connection or make assumptions
 	# about the local network environment.
 	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 57947c3e6e81..9f6c538de21a 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -7,7 +7,7 @@ AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
 DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795
 DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768dc05c9280f94c23368336752034b8ede591ed4337f6b65ade1db7fac740533c3c2d932043172cf296ddd2e3f8a SHA512 8cfe4384ed4ad682ff5268e83d72716230683e86e858c857fd694838227a8b3eddfe02c1fc39b00cb36b33519d8cbb942dd4008544943e8b8f7f2d5904c10e5a
-EBUILD netbox-2.5.11.ebuild 4012 BLAKE2B ef05b1c95423e16c17277f77800c6f4d601f351ba9eec3bfb3ca38a4282315159b20bf928af09bbf52e59a036541d5a5f5e580023ed73b8bf8492e99ffb5c40d SHA512 f51d444450acfb09ebad9f9819a954f92629b04d7829ed3e4c1d53295754a6d048aeb3fef205ff8977fde00db0a651d8257ede3b1fb47e456a24fa42a561657b
-EBUILD netbox-2.5.12.ebuild 4012 BLAKE2B ef05b1c95423e16c17277f77800c6f4d601f351ba9eec3bfb3ca38a4282315159b20bf928af09bbf52e59a036541d5a5f5e580023ed73b8bf8492e99ffb5c40d SHA512 f51d444450acfb09ebad9f9819a954f92629b04d7829ed3e4c1d53295754a6d048aeb3fef205ff8977fde00db0a651d8257ede3b1fb47e456a24fa42a561657b
-EBUILD netbox-2.6.1.ebuild 4191 BLAKE2B 8ae51a8a4a4c12d61fe59f2b98f6a3664b1b0f488ff36ec5ad46e362e66ee19c76d0e58d1d369016622e40f312aa38300f4fd944b71343dc4598a2eb28ef4673 SHA512 720a325394ad59d4d6c1c40f401da6f4b590f69f00dd38df89685b60e914bd274b4c66816dc5b473be9931555e4152a29cff39be827e5b66f4d704b29e0799d3
+EBUILD netbox-2.5.11.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
+EBUILD netbox-2.5.12.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
+EBUILD netbox-2.6.1.ebuild 4245 BLAKE2B 8e04b1ee274fa82d7db31627c12c7fe7038dfd7f79640d2c737dd6a6c9cfed6c1c0eb67b355bd6e96f62a1c7840329adfe86c793efb2fd97a2c71f9e485914fd SHA512 a6d53f3b1fd03b6ee2a6e1eb7cf3da083922277350f21d20ff319d4ff09f8e5692e5f2dcc16e8ac85c198a52be1bba0cd6dc53779fa96241679e7ce1e3c36597
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
index 02a00a2c5537..12b9bd32830f 100644
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ b/www-apps/netbox/netbox-2.5.11.ebuild
@@ -13,8 +13,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="ldap webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
 	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
 	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
diff --git a/www-apps/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
index 02a00a2c5537..12b9bd32830f 100644
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ b/www-apps/netbox/netbox-2.5.12.ebuild
@@ -13,8 +13,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="ldap webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
 	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
 	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
index 0b6b0b9de554..f9a76d886c58 100644
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ b/www-apps/netbox/netbox-2.6.1.ebuild
@@ -13,8 +13,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="ldap webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
 	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
 	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]