gentoo resync : 30.06.2018

19 files changed, 51 insertions, 152 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 93eef0100555..60fbd1c2eae7 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 85fd99fefd58..b342648d99a2 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -3,7 +3,9 @@ DIST chromedriver-bin-2.24.linux64.zip 3116161 BLAKE2B b32b8f5191b65fde09cd6fb6f
 DIST chromedriver-bin-2.30.linux32.zip 3891104 BLAKE2B 653365b57013549c3190d4fe2cc427b1f98bd04cd28d64be64993a99e90e33c487fcf8f3a35830659ad2f98a97a15345f24fb278c724eea4cf2ead41a19cb3b3 SHA512 341a652a4dba85a4990b6366fe1a6b392d83c32f70ec04ec69afbc90932d223f16b1944b2709b80dc4399c9377523fd494aba0e70fa7c9e22fda1e5142778a4b
 DIST chromedriver-bin-2.30.linux64.zip 3864914 BLAKE2B d31a1ff9f0eba3384bb3e1598b448c3893d65be98876ad302891657e0eaa8684733303eca618e43226a3e6eb1fd212248188d20cfc97b5aefc91186009999420 SHA512 451d120fceda3a08bba77fbae8d99c87c0902e608006a7895882a06cdcb1614afe0b563fd1b2b2bdc3ac3fbc426b5d3141245ee4d00a0c4dad6911d9a94f5d1a
 DIST chromedriver-bin-2.35.linux64.zip 3721349 BLAKE2B 37abd16d3d2aea57dfff871f2cdcf3ea0c34ad50dd8ba98f2e166e541ebf6ea2ede641a10f7b3d6ff2114740f9aad3cda6e0fc19ab3708fca89b3ce96cb3639e SHA512 0da15aee65c7f13552a57cc77212206fcd9a76b3cb912d85807760d6fb44b122e850c72e36fa7f53355c5bfff038afeeec2181089d1507c59cd5e176fd415ae7
-EBUILD chromedriver-bin-2.24.ebuild 622 BLAKE2B 40308e1be4ae40c46ffcf34186ff1a4f22b7cd86af828d7b3c719e5c3b7bbaa927f3d6347c495098465a59e0c6d9ff30f0d0770cb7a2b7318c07fb7cba43bef7 SHA512 7058c5f0ef53bed0ba8707b8c8587a09c4f0233eedbfae104172180bd0fb5231ce833e362848c4dae344318e4ba77814b648cb5155c5f4cd84431ae0e59af096
-EBUILD chromedriver-bin-2.30.ebuild 622 BLAKE2B 40308e1be4ae40c46ffcf34186ff1a4f22b7cd86af828d7b3c719e5c3b7bbaa927f3d6347c495098465a59e0c6d9ff30f0d0770cb7a2b7318c07fb7cba43bef7 SHA512 7058c5f0ef53bed0ba8707b8c8587a09c4f0233eedbfae104172180bd0fb5231ce833e362848c4dae344318e4ba77814b648cb5155c5f4cd84431ae0e59af096
-EBUILD chromedriver-bin-2.35.ebuild 517 BLAKE2B d3591db5a8ab6f436946a5d92b083ee9351c0f2c24911f4cede6a0d2ef8d3e23fb34ca35a25e66f7a79c206e10fed01876165cebaca686afabad750333b313f3 SHA512 a21770916d5dd8d4eba6a7db49a683efe771f928be7d090794f5712e7c5e6f930b6d17c06d61863932ac017613ac7eaf9aa018817ef3eda72aef2c833c59b4f4
+DIST chromedriver-bin-2.40.linux64.zip 3860375 BLAKE2B b91d4cd05b390f5b0d175ab396838ed3d2ab0dd0a961c4d51268a85c1ffc0be077615126b9373dd7cf69add57f9eb56b5b494ecf55086a4b86cdbc50f1307275 SHA512 5d4fd5723b6245bb7ee722f0e206391b1baa5f1c558f7e79f54289ea3adab385537f569f84b6de2b4f02e38105416f3361b439349a180e3a764126ed2ad525a4
+EBUILD chromedriver-bin-2.24-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
+EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
+EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
+EBUILD chromedriver-bin-2.40.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
 MISC metadata.xml 495 BLAKE2B 948c22b9ea0ea0241c882ce7327ec546ba4ed50ed5b6aa270a9bfd8b0e6ca0126e0efec8e7ec5faa22fed25d7ded5f3878e7be8e6de20fba41e543f1baec4dbb SHA512 3dd4709b42bbb654cd29d041e1310b4c06ad8f9cfd867e0b59b753dbed85b7e4389b009cf89982ec931482405e8d926280fdf3f75f8948b9a4c3d0c4af7a8a22
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
index 3163f506be03..20c77c77d886 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.24.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="www-client/google-chrome"
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
 
 S="${WORKDIR}"
 QA_PREBUILT="usr/bin/chromedriver"
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild
index 3163f506be03..20c77c77d886 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.30.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="www-client/google-chrome"
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
 
 S="${WORKDIR}"
 QA_PREBUILT="usr/bin/chromedriver"
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.35.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
index 07d1ad1d1905..2ddd7f88b05a 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.35.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
@@ -12,7 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="www-client/google-chrome"
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
 
 S="${WORKDIR}"
 QA_PREBUILT="usr/bin/chromedriver"
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild
new file mode 100644
index 000000000000..2ddd7f88b05a
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 3b7cf1e025fc..3e911112c39b 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-5.0.4.tar.gz 51600575 BLAKE2B 13fc3943fc55424674ae173c9c16ae3f1de0d1c331dbee807e69cef9d9743c83d348185edc33af541ae77766849e74a5cb0c742a316677ac9582db40ae051d08 SHA512 c0a05e6661af615676f3bee99c7865bda599a47de464d4bb322232224305191879cdb6ac4149a8963b2a7102d6a34349059cdb3b0e069cf830d341889df1c745
 DIST grafana-bin-5.1.3.tar.gz 52436314 BLAKE2B e5ff613a6d65018b6c205a88a520b5f07ea32955cb8f4b75d1eef05946d93c50272edecf80c8a4a6b8b4a70fbae7c90c71f1b833a31ff56ed71c59dda3007b4c SHA512 3d0fcc2015d95a5334d571f4ea61fa1bb7ead1b4131342e3bf167c832c0f951ae6669049da73a8d954117d54b5422be9203505db19b370ec337c481900d7fea5
-EBUILD grafana-bin-5.0.4.ebuild 1744 BLAKE2B bc770fec942dd9cb491ebe4a6fea5dd1b344a24ba70c36c8180c419720b0c749c4cefd43d408d7b0d0cfc64fe835af5e7a443ce3f20dcb185cc937fec063d6d7 SHA512 2b2958db3539457935e235f4271aff86100868203cf840512d2d9916067fbb899f95765bbda14f9fca60063d618e09de4c1c96de3045e864090a676715a5231a
+DIST grafana-bin-5.2.0.tar.gz 54295475 BLAKE2B 30d17fa3bf1c5f802fdbc6e0fc651afe793f30e81fce137baac3ab1d979cb9d656e97a49636b4a59b4388534115680b16d7c0979ceca59f1c61891c9a512ad4d SHA512 d87bb727f3e90aa89ba46d50ab1a9293292270fc5633caa2932418ca8fe28355863e71f5550e279be4a916a4d0d22c34e39bdab1cce4908d968de859952cd9fa
 EBUILD grafana-bin-5.1.3.ebuild 1744 BLAKE2B bc770fec942dd9cb491ebe4a6fea5dd1b344a24ba70c36c8180c419720b0c749c4cefd43d408d7b0d0cfc64fe835af5e7a443ce3f20dcb185cc937fec063d6d7 SHA512 2b2958db3539457935e235f4271aff86100868203cf840512d2d9916067fbb899f95765bbda14f9fca60063d618e09de4c1c96de3045e864090a676715a5231a
+EBUILD grafana-bin-5.2.0.ebuild 1746 BLAKE2B 913e4249c53721a7a5ac44f2047fa815b4a8900c67811b2b46677dd9afdea6ec5d352150acef9fd2d7459fb659a23afa455b836a1db68c55501cc1d7494eb5d8 SHA512 e3e61b3821699073253cc6cb6f6b910792e6e6e9bf8f256c6d1447dc689d47dc8e7c0ab098cebdf4af399cae1111b17fa82c439ca69952a65d52f6103229eaf3
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.0.4.ebuild b/www-apps/grafana-bin/grafana-bin-5.2.0.ebuild
index 579ce394738a..c398e8e88585 100644
--- a/www-apps/grafana-bin/grafana-bin-5.0.4.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.2.0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
 HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
index 8bbc23ea5a26..e26057c7ea55 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,4 +1,4 @@
 DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac SHA512 1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
-EBUILD icingaweb2-module-graphite-1.0.1-r1.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
+EBUILD icingaweb2-module-graphite-1.0.1-r1.ebuild 653 BLAKE2B 3778e56284628d38ff027223be38ac404a1988dd9500103e71f53ce12a334100f3c8c988d9e9b52b120e1240f77e50d32df379393743a3c94bcea634e135cda6 SHA512 7a77e5f7fe1a8d4abb38ca2defba9b4800d7b07681238695a430c2905aecd8f3acc7398a4d70976b9b42f3f7e66534076407f8677d833ef148de7018e2181554
 EBUILD icingaweb2-module-graphite-9999.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
 MISC metadata.xml 433 BLAKE2B e4b486abac016ae60b7cc2f9f8893bd55f4de4b126ae87a3497d689ffe269cc42d1f6b873febe506aad55ec5a5dc780fdec51dc638aea2152e32e51c65bfd60c SHA512 86d44590ce1d15251e1fc03ff7fc769651fadd0769eb709b0607f61d253de7513fbe4616c4d6a0dd5498f089882d6c362c7e4a768ba4c86e7a6f86368f688591
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
index 312bc419e294..3fa010ff83bc 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 7b7efe9f48c0..f8ffd6203502 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-watch-1.5.0.tar.gz 15076 BLAKE2B 1270f309fed8e4aff6712fdad1554b9ed6e4d0936512c8c80a6b1d77977411fd74c099d361a7c7a3ce785e794beeca7d865e17f9fa25f0b4d889e861614b5c8b SHA512 98c9df7f92c214b0047cf266e06c48350615836af3b7ea69e1f77b10d26e4ed441fdbbdc16e557ef2293fe5ab1314ed71bb3e0e65e3f1ad4c4224f71e1255c95
 DIST jekyll-watch-1.5.1.tar.gz 14764 BLAKE2B fcb0e80060e65e85e0047d54f6277cf5e31ec8347c2c960e15c00d74b7dc255bb8cd1fea3671e2ecc7d380227bdae7cf62d835a5dc1b249aa68ca8f0ed9a1f34 SHA512 05e7f89f213adf6695a8bd1f8ff25d7aa6338cc378a934981f1112df556380cc40d2352ea4ce0a362c4d8e51ed8a6e36ca96c86385a6f179347031396db94a54
-EBUILD jekyll-watch-1.5.0.ebuild 671 BLAKE2B 9705a331e0de3c2e660284195c9703a45fab18217a1a35dd5356702a279e2d8e9cfe4728566613f1b0d48a9793de919a79c216079200d6c146ba29caf61d40ae SHA512 38a1e258fa088e7e09ae02fb8342cdb3c9820d5a4b48c5a7071fbb8d5e2afae1de7f54bfe4de9b581c9ca128a1ba1cea619a2acec4c7d42c127c682681ff8fd7
 EBUILD jekyll-watch-1.5.1.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
 MISC metadata.xml 331 BLAKE2B c43bc1213adee987e9bd55089f8f5fa00f5de2461fe584b8715332d7ace822a5b0ffc47a2af7001e5c134ff20d9a3580d2225dacee73e4fbdadc1735cbe806a6 SHA512 53a2e135c948ee84fdf2f7ad1583d658636ea1077b80b6e2ab52c10615ceb5a30ac4a400c213e5fff5f4effdee0acd4afc8653adbca80178815f1fdfd3620004
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.5.0.ebuild b/www-apps/jekyll-watch/jekyll-watch-1.5.0.ebuild
deleted file mode 100644
index f6c5cbbadba3..000000000000
--- a/www-apps/jekyll-watch/jekyll-watch-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
-HOMEPAGE="https://github.com/jekyll/jekyll-watch"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/listen-3.0"
-ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
-	rm Rakefile || die
-}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index c75944d55f69..80fe94c31e74 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,7 +1,5 @@
-DIST klaus-1.1.0.tar.gz 34937 BLAKE2B af69857da7d37bc0761caaa2c77f6f8bb2d0df013e2722c79e57d377793bf14f7a3aca6366e9d1598cb4a55b768dad280081f0464d502eb01dbb45fc3a650be3 SHA512 41c4af2ed4cbd0789b4c73e0b5a9b9e4da276b470c3dbf3a80020d27796e9469278586d0a1b6b99bdac2f26fd612749a772a0198744515683997d205ab69794f
-DIST klaus-1.2.1.tar.gz 35339 BLAKE2B b2ef93683e742c44fb5eb34a57d8f8102fe398058818489afda4e0a085fcfc0da6ece97bc45ebd5736dafd9b26215185bd3adf81e81535b45b46526cf19e476e SHA512 9126ba7cf2b1d64c333ab3d935c797a85997c11f036e6821dda1276c3c8ba7d66004050ac78e796b9fe1beeed8698107b91f77196c282a34bfcc01f945235ba8
 DIST klaus-1.2.2.tar.gz 35308 BLAKE2B 4ac2cd77f5c95fd207a83e1688b65e286009a5830c96fce442e3e4a2989a320c0980ab96a03817be27d45d01ccb5e2db277ed535d62a781006b4747c797838d2 SHA512 2f054ca3d285dcf334188d72bbbc4ea99fe8778126d0d215cfd3508cb294d52e2944b3e251f903a863df018ec61d9dcd779f5c6cd284fb2f6cd90abb98783176
-EBUILD klaus-1.1.0.ebuild 743 BLAKE2B 34efa93743dd205bee8c99794232cc274911b48f94f4ad5c1e9247bcc83ae6510d424234d8ac09669ef57449df85d7bec16f43b789cff92b2d2c3c151e1f0b91 SHA512 e6c55e91a3fbe46f2eaae112eb571dd04da78453d6d4273802fac25a0e619376414d0b4e3e6960aa6f3703ae122992b2c23f72426d064079b437129851425f82
-EBUILD klaus-1.2.1.ebuild 853 BLAKE2B 19001785cf6c63f22dd9b8ebdc5c9b59e646c8f0b259c1fd72dc1c99f3fde4ab118108090b5b7b8485b252a15c7bac7b48df7a361d4c5af413d05ed3cba1ed8d SHA512 6b405f5f1533cda8fe77ae794317baa2416ea650586d5d79da6a5001f2e82c9f5f48dc95646fa299f8878f1825ca2ce453fe46eca9fe64ef6acfcc4272a2809a
+DIST klaus-1.3.0.tar.gz 35363 BLAKE2B 881f9bd1a80d4a580a0dc84a7b8528a5703777817495639bb3ea8f608c2495287a37fe43839d0c64002e1d36453d37f116c73c9a7ef93651bc8a2d010d4d2e2c SHA512 c159d8195b1bde43f46d013f0337e998d905b1f3a9a23caf5f71180d19192c3c391cc5143545bd3d05a2aef45451a43e873ca3828c8f9f69ae3eaaa0d00560cb
 EBUILD klaus-1.2.2.ebuild 853 BLAKE2B f7bb566cf8e489e138196d63388d1276702be34767c975aa2feb835cfbe878d9e565c43937c4f914d962f0ee710985463a78cdd87ab0eca7e269486b285e94e1 SHA512 9e40e69e71f8ee761afb602e2f51b9962180a9fa7b7bb597b7eb1c0b040e3e833e25041add734ebd7dde09197e7d26a15eff21fed64c1956e1b3c98f4088d756
+EBUILD klaus-1.3.0.ebuild 853 BLAKE2B 83c4da269b41f460732704a09aa7e10362712eb1db10f3fa03c273bca271e53b8580c36df8725564df8b66836ce3a086685d84b7af8faea01c7886e77065f3b8 SHA512 8dd0503816b90a10de341a3fdf14deee2062396d70e8d9e7a2238032e9382e63e4a912beb8d606dc00ebff74d3a6684e1fc14c84e96cc02ca486ddbd8684d048
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.1.0.ebuild b/www-apps/klaus/klaus-1.1.0.ebuild
deleted file mode 100644
index 010c93f5d1d7..000000000000
--- a/www-apps/klaus/klaus-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, easy-to-set-up Git web viewer"
-HOMEPAGE="https://github.com/jonashaag/klaus/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ctags"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
-	dev-python/httpauth[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	ctags? (
-		dev-python/python-ctags[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/www-apps/klaus/klaus-1.2.1.ebuild b/www-apps/klaus/klaus-1.3.0.ebuild
index ed6095ec5a5f..564444a7884f 100644
--- a/www-apps/klaus/klaus-1.2.1.ebuild
+++ b/www-apps/klaus/klaus-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
@@ -17,12 +17,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ctags"
 
 RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
 	dev-python/httpauth[${PYTHON_USEDEP}]
 	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	ctags? (
 		dev-python/python-ctags[${PYTHON_USEDEP}]
 	)
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 287cef7c4607..06daceacde1e 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,8 +1,6 @@
-DIST nanoc-4.7.14.gem 256000 BLAKE2B 73b6e038052407f2f698d9d2490476c13f39bca5b9f84bc224cfee64bc7db33efef6da96e6520350c3af958fbe6cb203c3b70ad855acf1e3bb08873fef2d66b7 SHA512 e7413771794e9d2931e3be2a5b5575f7cd207d9b11167a1838496edf34bee4e631c362d9ac50fb0f9dddbe2fd5836b402506565c704838327116a18f0ea34088
 DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
 DIST nanoc-4.9.2.tar.gz 275891 BLAKE2B 6c2ca3b1f00f59762530ccf8dfb37599d89b67819e893fc49252afa0be334c64c0c2f771f7b05db14d24e264d355870a7308a117823750ba6edd68d82b113357 SHA512 593ed6def82e1c109983e37602a1def0bec0ea7a025d2badd3ddd3c564cb43ef619ea9173e563e32ae3891d4e3de85b5020e83292c5e16e1a6888399213c26cf
 DIST nanoc-4.9.3.tar.gz 276677 BLAKE2B d14ba8518a299fa9c4ac6ca638eb644dce9b1c0ab0895843a9bb8a916329916c9efaf4bd0bd397cb4dc10319081593dce167d966c2cc1d35247e5c0fd8368e72 SHA512 cc3946a8887f917cba4ef7d0fb5e5043eb8c6995a09de8e525562594fba2410d457643b27d158c89cb03b17b014624bc2844a85bbc6ae92dbf18723692c63a85
-EBUILD nanoc-4.7.14.ebuild 1527 BLAKE2B 4246e332e60334722e37db7ff9ca994f3af437859ed6fbe57375b11347e01c5b6bb179618c43854a46f55cdb02f06c5d1f14874ee9c73408131f82df093b0c67 SHA512 d8bed9a8d6bcb697bc2f6a406e56be084a2a60ff56580b4b6bda4e4e68081a9227c8ea793934332c891ff515ad54fbc83cf29f3d32352e416d994009878f0061
 EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
 EBUILD nanoc-4.9.2.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
 EBUILD nanoc-4.9.3.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
diff --git a/www-apps/nanoc/nanoc-4.7.14.ebuild b/www-apps/nanoc/nanoc-4.7.14.ebuild
deleted file mode 100644
index 0072b5e91737..000000000000
--- a/www-apps/nanoc/nanoc-4.7.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23"
-
-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/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="${IUSE} minimal"
-
-DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
-
-ruby_add_rdepend "!minimal? (
-	dev-ruby/mime-types:*
-	dev-ruby/rack:*
-	www-servers/adsf
-)
-	>=dev-ruby/cri-2.3:0
-	dev-ruby/ddplugin:1
-	=dev-ruby/hamster-3*
-	dev-ruby/ref:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/mocha-0.13
-	dev-ruby/minitest
-	dev-ruby/rdoc
-	dev-ruby/systemu
-	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:^:#:' spec/spec_helper.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 || die
-}
-
-each_ruby_test() {
-	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
-}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index fd667b88ee38..6e05d9aaec66 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -9,6 +9,6 @@ EBUILD nikola-7.8.12.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1
 EBUILD nikola-7.8.13.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.14-r1.ebuild 2349 BLAKE2B 3294119cb0343de4adfec3cdc0d90e7368d3beff46511f737c841dfb0d956dc9472f303f6b92ae91e162ce10ca6ff9d06d474ce8b4cd911d5493f5bd60e28b9f SHA512 6446b544f4a5369ba92d56f85d81b7422a728e1ff13dfb03971d0ce45ccef07d901c80e45732b0f1761228ac3e0ce5db9ce46ecf8f785bcdda93e2d0be1d390e
 EBUILD nikola-7.8.14.ebuild 2353 BLAKE2B 37b97644d8d6a698482ef6a0886c5e5705aa98273d822a44550e655936593754aed4417866d19a615d06ab9b377dfb3d3dbe79f345f2e1397d403756e7b6bfdd SHA512 1d8475c52977358e626a9aa44242174908908df283796a0d0d87ca8a249d061deac1e3cd164603c5c31ea4aef5667a061226e52008338f7485359e96380b3e4d
-EBUILD nikola-7.8.15.ebuild 2349 BLAKE2B 3294119cb0343de4adfec3cdc0d90e7368d3beff46511f737c841dfb0d956dc9472f303f6b92ae91e162ce10ca6ff9d06d474ce8b4cd911d5493f5bd60e28b9f SHA512 6446b544f4a5369ba92d56f85d81b7422a728e1ff13dfb03971d0ce45ccef07d901c80e45732b0f1761228ac3e0ce5db9ce46ecf8f785bcdda93e2d0be1d390e
+EBUILD nikola-7.8.15.ebuild 2348 BLAKE2B 49ad18b960da0afecd8f70dfab05dd66dd7e6a319f7ef46f199d398e2aa681aff58f43e8e0f2c01b899cf018633f194a742cc7a5f709fb1379b8e3286ee8a0eb SHA512 71c6e2cdeefde3bcb94519a3803cdef399ea70c90c3c73dcd88499080738ebf89824c97e9ac63856f1600e53b1550a2e8988165b2ea16bb2e6c5249d7a925857
 EBUILD nikola-7.8.8.ebuild 2337 BLAKE2B df493ca81b4c03608e1aa10647c2edb436b9e2a7ec42bd7cbf85c523cc19fead482637456957a0dc5c59c36e94a30eeb70c9ed5485b0d9ba79f5aa2ad405a03a SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index 05f442bd330a..0c2bd110643a 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
 RESTRICT="test" # needs coveralls