gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /www-apps
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
102 files changed, 1529 insertions, 670 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 1f701413a42b..fd684c255cd3 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index 551bb6cef07d..a28f61ec4243 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,3 +1,3 @@
 DIST cgp-1_p20181209.tar.gz 139556 BLAKE2B 0a79ff1974b0ae50db5582121c4fdcc2db0b89ef11ecb001dfa525dd753481f0a454e424d17f24b142fd116a9ea2eeb4ba1dade6f2ffadd63943e5c065323224 SHA512 fcbf81fca2bb14ed143ea414c2f11fe09f4594891507a1ad08482720b104ec62c9986ce25b127d45a7962a8b3db54293a6775dc2359bde41f19b5419606b51eb
-EBUILD cgp-1_p20181209.ebuild 1276 BLAKE2B eed898ba458d5c97556594a0cf370562206c122a0129d3fb903c907d389a108b30319ed092171bdff5bbb53bb98aec0e1f50cdffd4b004934e5465e3ecb95141 SHA512 33ab16b6889fc22012db798927ed126466a10ef16235430eaa5f45a3d1f174788cc4917a4e354affedbf35a74705451757620ab8c7fc33e337bd18841924a349
+EBUILD cgp-1_p20181209.ebuild 1275 BLAKE2B 9a7cc04056e575891108cc0086519c1f42fc95bdb7d4a06cd7c68e5383f2e611be7f1b47bc214ab54b73d2b34feb0b4081956b72fed3669bb9c831906c867606 SHA512 33602a3ae8b5ad2525a631bb796c64832b0595003a1caae3f282d38c769108751aed55e99916d4e9ee232a538a5073239aae88d43cfb7049560c7b48d293ce39
 MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
diff --git a/www-apps/cgp/cgp-1_p20181209.ebuild b/www-apps/cgp/cgp-1_p20181209.ebuild
index 60438618d2f6..6e65fd9a27e5 100644
--- a/www-apps/cgp/cgp-1_p20181209.ebuild
+++ b/www-apps/cgp/cgp-1_p20181209.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/pommi/CGP"
 SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-lang/php[json]
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 431abce190c7..624b67c43b11 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -10,4 +10,4 @@ EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b1
 EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
 EBUILD chromedriver-bin-2.40.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
 EBUILD chromedriver-bin-2.41.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
-MISC metadata.xml 495 BLAKE2B 948c22b9ea0ea0241c882ce7327ec546ba4ed50ed5b6aa270a9bfd8b0e6ca0126e0efec8e7ec5faa22fed25d7ded5f3878e7be8e6de20fba41e543f1baec4dbb SHA512 3dd4709b42bbb654cd29d041e1310b4c06ad8f9cfd867e0b59b753dbed85b7e4389b009cf89982ec931482405e8d926280fdf3f75f8948b9a4c3d0c4af7a8a22
+MISC metadata.xml 406 BLAKE2B 933f42ee0836f8225625b890b8febba5f3d5b9db7e78d164c2ec5297cbf4173aff768704b533c7c1b95518d860d44996e2706fad19ddad3192252362572507c6 SHA512 1ce3c0ae86098f1ccc70d3b8ad5ca49eb8218949650237513929315692df2acb43e3df7b95ae9bdfd0f13e6d432f118318340852b8b555cd6b3b49554d299870
diff --git a/www-apps/chromedriver-bin/metadata.xml b/www-apps/chromedriver-bin/metadata.xml
index bc54c240e76b..4d37cb172d25 100644
--- a/www-apps/chromedriver-bin/metadata.xml
+++ b/www-apps/chromedriver-bin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     ChromeDriver is an open source tool for automated testing of webapps across many browsers.
     It provides capabilities for navigating to web pages, user input, JavaScript execution, and more.
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index b9b7dce09900..37f8805bc223 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,8 +1,8 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.65.tar.gz 3298607 BLAKE2B f3a728c3e464b8d94719ed7a79359c5fa2b8b0216ee90029d05e873377566a398d80f188f9dc36f2504057c0000a7bcd364d5c4f50652f25e73e1aa0e7d5d7b1 SHA512 a79ff93e13456b35160ee17f986dce9cffefa265d0034dab6223a3097eaf45c11ea3548904ff6c125be0817dc71a8ac7320aca91a11eefeaad03d45527725e79
-DIST drupal-8.5.14.tar.gz 15828327 BLAKE2B aa638ac4643541d9ec2b2168633c8ab4fe6b64f3c2b9fec46a6a45903ccaaa26ba671c62d57c51a5698ad2558c6ed3ee491dff739f1eed05ea2a0fefba5ace31 SHA512 2be4878cbb27389d11f3686fdc911468a8481d7cbade168c70e733615f2ed699bcc8eb1798079d0b354c81caec0cf74fb232b310e9ab7e059c00fba4b3ee2796
-DIST drupal-8.6.13.tar.gz 17137449 BLAKE2B f52b082bdccbeb3600da723483bbdef8645babc84a433c82e38b7029332764361a3ca6996b6ac9c20e96c27b4412c7d14a9b0b454c234594f13ba4fdeba39029 SHA512 ed9da8596ca5f4dee569b2beea561b75742aa801ef450258786c6d496e9205cd865af3a6cca56bc276df48841b95bcaaaae46ffcda6bbf8183866ec3c991fff2
-EBUILD drupal-7.65.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
-EBUILD drupal-8.5.14.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.6.13.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+DIST drupal-7.66.tar.gz 3300183 BLAKE2B 89d82c7018ecade0f798df92087d704ca9f5847780a1c3106e69afda62b43c414d57f01584e2869e72fc3687370b0bad84c2a7ffc0ca90537be55cb36ce6edac SHA512 c348eeeabfb5fef05b28aa87c9885231bd5e676b1ced64a2f51cc2aefa122b5ce142aae2ede5c1479608c893195450ae25168bae971b8e77cc741b18650f75c8
+DIST drupal-8.5.15.tar.gz 15828193 BLAKE2B 3a90ad525da3d81f555461e28decea7977cb51eda5f2e3be89dcd38f05b94cc6743967e19d21d89572babc05c38ab4d3585e4b7ffb52677b50b19844400fbcdf SHA512 aa09a28d7dcba51e193bba2a714eef091773d5e12a3a7388db8925c791a7153a4333db6150a8a68fe21b04009887dcf60f16f237a86d52bd2cc7d28ada301221
+DIST drupal-8.6.15.tar.gz 17137689 BLAKE2B 098847cc4a3a52a6c5d9af23c31e5dca43c2f9cbb4ac0f7d2724cf6b6ce98598b75750742c695e666000843f6fa855e2ba414ceb0d9b46f9baff244cc583ef64 SHA512 9a8d9c73f7812b6deca4bcfee0e04d485bfac5efa6e9112379fdacc727ecf0e40703ce9b141c7414357c296eb621a015aa1c97ab8e6bbe4d35c38b2f1c323337
+EBUILD drupal-7.66.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
+EBUILD drupal-8.5.15.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.6.15.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.65.ebuild b/www-apps/drupal/drupal-7.66.ebuild
index 2d1f90ebbd06..2d1f90ebbd06 100644
--- a/www-apps/drupal/drupal-7.65.ebuild
+++ b/www-apps/drupal/drupal-7.66.ebuild
diff --git a/www-apps/drupal/drupal-8.5.14.ebuild b/www-apps/drupal/drupal-8.5.15.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.5.14.ebuild
+++ b/www-apps/drupal/drupal-8.5.15.ebuild
diff --git a/www-apps/drupal/drupal-8.6.13.ebuild b/www-apps/drupal/drupal-8.6.15.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.6.13.ebuild
+++ b/www-apps/drupal/drupal-8.6.15.ebuild
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 1a2150de8c85..cfcc34d48698 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,7 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
-AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
-AUX gitea.initd-r1 757 BLAKE2B 7f55ec1e8a052e6789a9df92ffe5cd04b3c96bf67c35481b1364087a2f8580584a43b13838da3682decad92ee72ed403af67227469fc16adc2c0584658816c3b SHA512 c92a1853f3138882876d854293fa05d710d549af03423fe1c430fe465d005282328898860ff0f381297e10ec8ea00a782295cf47c82ba42b4424b7e453135f85
-AUX gitea.service 553 BLAKE2B d5081600bd7a9d8446029f7c40186b064ce6af29eb93e1e360e1523c460d8a8d3b409a54383434cf5b55fa77a0706b8e30f137fe734c6345ce59b996e8b2c195 SHA512 e2535cefaef4e890dc2a99ef204e6fb375f59c849df64f1be18d4dbf29abd7679c8cfc197c1124c9094f8b866d029b778f73a8d27554a0ab1870600f5d6420a5
-DIST gitea-1.7.4.tar.gz 20858340 BLAKE2B 81d896d313abe25bc1a5becd16249c2ce39ab45d9f40ccf3a565b6777847c7256d5b131f597be237df57513a207978e23480ad3c6087bbc588afe8bbcd46d5c9 SHA512 eede6d410529b1facf65061256e48fee7d459aa12d8c55346d3ad78004a45b7bf667536979fe92270a85901102fd9cddb8183490e16f912b742e799ca912e370
-EBUILD gitea-1.7.4.ebuild 2012 BLAKE2B 362f2e876cb489cef8f30bd6587f194be57c985159f53df4ea9273f9e764377b35c1173089a1f1b26dcc2eea6931b1fadb594717eda1980d93b88d5c4a2835a6 SHA512 c7ec4ba8b929327a7503ec47f95a3ee6ab4a802e04d545e6dfcfe2f56d8bcfd82bb9dc50e4c121833a97dc98b9f141243f857227e3dba8a79d80a95fe4cc8615
-MISC metadata.xml 246 BLAKE2B 291057fd61e77f8d99f9518e3f709d79ab79ac5ac5ce1387d27a26cec6272698fe6bda7cfacaeb203411413ed003c71cdaead8316cd9e5a2c1ce1056637eaee4 SHA512 9af718c7e0ca960324b9fc168e85824099a5434a322d7da78dabc90b8cd3be2201a3eb321facd0df575fa1d0865c1f80280d290589f0ff1d27bdef575297abb7
+AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
+AUX gitea.initd-r2 736 BLAKE2B abb2733808783b3654b51493451950c07237c005897c630f8ce095f0bacb7f1e59c61f0f1663c5daddcab08121c54eaba4de953d6e03ce1c7b405d0e7de597b6 SHA512 42321bbfaa844ef246b825d36bc1b8227b34d4cb7a5c4ced706203c40dd345e4c163e18bfdaa4899154d6c405f8e42b9b7ea0657e048c496ede1976d958d2228
+AUX gitea.service-r1 557 BLAKE2B 0d255654da33fb9155a6bc29896ab164597667c252b680e2b945109163c09feaa88c28776277a9c7f00d6b5b66cb24bda50e99dde354a5d18ed61597fb1ce917 SHA512 cabe0a1b5a5f435f4fa5b3c20fb76ad1b248463fa681e55a4ae66b027f00574c1fcb65f1841c0bc52b7188a02c0fc05bfa9b11931d26c5efce6b988d4b7a8f57
+DIST gitea-1.8.0.tar.gz 24268907 BLAKE2B b46a17733fc7bd0f228620bdfadf0d596ea56fca6e685afab7734e794c1f87c5e004529ca3d69e907d516bcb83563565b1d8c32501f1c2c0f9295ca028d96ad0 SHA512 eebbe2f77ed2e4c3562f48a6fa647e6f2a0492c5b6ea4f13542a5ef82e94a357a8d53897aa013107b5f735d2aff9d719893b5724de44831c43998c2e9c6e78d7
+EBUILD gitea-1.8.0.ebuild 2441 BLAKE2B 017544ba40e11c49b62ac5657c59c836cacbe8c57164c0549bc34609072d3bd3aae5834c0166f600d38cfebc7805a0ad63bac57b66daa7df1dfde5c74d047f9c SHA512 32792428fe7f93f597c22134a9d946b31eed9424c065c8fc0f74896a6c6c3283df0c7d29da93e23c70f841498f6d9dc5cf1740aeae247c6c5583aedcd128150e
+MISC metadata.xml 563 BLAKE2B 00090c9965433ee21c5ebb4cd7ff83f3c16a870acd9da92842a53349a4bf38dc1239be17ec7545e5b0a44c07e2c93d3dbff599b37fcd4366a2ff41952cb513cb SHA512 fbf0fca0af8b73494e20a965f99f101e7ed08927b8b303189f69586e59b57bdc07781353b9bbd9ba904a53efa85fa91e4a76341ca2083cf9f6769448de700222
diff --git a/www-apps/gitea/files/gitea.confd b/www-apps/gitea/files/gitea.confd
deleted file mode 100644
index 8b1710b06fbc..000000000000
--- a/www-apps/gitea/files/gitea.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for gitea
-command_args="--config /var/lib/gitea/conf/app.ini"
diff --git a/www-apps/gitea/files/gitea.confd-r1 b/www-apps/gitea/files/gitea.confd-r1
new file mode 100644
index 000000000000..19018c1c645a
--- /dev/null
+++ b/www-apps/gitea/files/gitea.confd-r1
@@ -0,0 +1,14 @@
+# Gitea configuration
+GITEA_CONF="/etc/gitea/app.ini"
+
+# Gitea user
+GITEA_USER="git"
+
+# Gitea group
+GITEA_GROUP="git"
+
+# Gitea working directory
+GITEA_WORK_DIR="/var/lib/gitea"
+
+# Gitea custom directory
+GITEA_CUSTOM="${GITEA_WORK_DIR}/custom"
diff --git a/www-apps/gitea/files/gitea.initd-r1 b/www-apps/gitea/files/gitea.initd-r1
deleted file mode 100644
index 6f957d426c08..000000000000
--- a/www-apps/gitea/files/gitea.initd-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-git}
-group=${group:-git}
-
-command="/usr/bin/gitea web"
-command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=${GITEA_WORK_DIR:-/var/lib/gitea} \
-	-e GITEA_CUSTOM=${GITEA_CUSTOM:-/var/lib/gitea} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}
diff --git a/www-apps/gitea/files/gitea.initd-r2 b/www-apps/gitea/files/gitea.initd-r2
new file mode 100644
index 000000000000..24cac0b41f23
--- /dev/null
+++ b/www-apps/gitea/files/gitea.initd-r2
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gitea, a self-hosted Git service"
+
+: ${GITEA_CONF:=/etc/gitea/app.ini}
+: ${GITEA_USER:=git}
+: ${GITEA_GROUP:=git}
+: ${GITEA_WORK_DIR:=/var/lib/gitea}
+: ${GITEA_CUSTOM:=${GITEA_WORK_DIR}/custom}
+
+command="/usr/bin/gitea web"
+command_args="--config ${GITEA_CONF}"
+command_background="true"
+command_user="${GITEA_USER}:${GITEA_GROUP}"
+error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err"
+output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${GITEA_CONF}"
+start_stop_daemon_args="-e GITEA_WORK_DIR=${GITEA_WORK_DIR} \
+	-e GITEA_CUSTOM=${GITEA_CUSTOM}"
diff --git a/www-apps/gitea/files/gitea.service b/www-apps/gitea/files/gitea.service-r1
index 733e05ea1ed3..73f924337fd6 100644
--- a/www-apps/gitea/files/gitea.service
+++ b/www-apps/gitea/files/gitea.service-r1
@@ -16,9 +16,9 @@ After=redis.service
 User=git
 Group=git
 
-Environment="GITEA_WORK_DIR=/var/lib/gitea GITEA_CUSTOM=/var/lib/gitea"
+Environment="GITEA_WORK_DIR=/var/lib/gitea GITEA_CUSTOM=/var/lib/gitea/custom"
 WorkingDirectory=/var/lib/gitea
-ExecStart=/usr/bin/gitea web -c /var/lib/gitea/conf/app.ini
+ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
 
 Restart=always
 PrivateTmp=true
diff --git a/www-apps/gitea/gitea-1.7.4.ebuild b/www-apps/gitea/gitea-1.7.4.ebuild
deleted file mode 100644
index 6508562a68bb..000000000000
--- a/www-apps/gitea/gitea-1.7.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit golang-build golang-vcs-snapshot systemd user
-
-EGO_PN="code.gitea.io/gitea"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="
-	dev-go/go-bindata
-	sys-libs/pam
-"
-RDEPEND="
-	dev-vcs/git
-	sys-libs/pam
-"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/\"main.Version.*$/\"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	diropts -m0750 -o git -g git
-	keepdir /var/log/gitea /var/lib/gitea /var/lib/gitea/data
-	pushd src/${EGO_PN} >/dev/null || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins custom/conf/app.ini.sample app.ini.example
-	popd >/dev/null || die
-	newinitd "${FILESDIR}"/gitea.initd-r1 gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	systemd_dounit "${FILESDIR}/gitea.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
-		elog "No app.ini found, copying initial config over"
-		cp "${FILESDIR}"/app.ini "${EROOT}"/var/lib/gitea/conf/ || die
-		chown git:git /var/lib/gitea/conf/app.ini
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitea)."
-	else
-		elog "app.ini found, please check example file for possible changes"
-		ewarn "Please note that environment variables have been changed:"
-		ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)"
-		ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.8.0.ebuild b/www-apps/gitea/gitea-1.8.0.ebuild
new file mode 100644
index 000000000000..7905bbf3153a
--- /dev/null
+++ b/www-apps/gitea/gitea-1.8.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit golang-vcs-snapshot systemd user
+
+EGO_PN="code.gitea.io/gitea"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="pam sqlite"
+
+COMMON_DEPEND="pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-bindata"
+RDEPEND="${COMMON_DEPEND}
+	dev-vcs/git"
+
+DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+gitea_make() {
+	local my_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local my_makeopt=(
+		DRONE_TAG=${PV}
+		TAGS="${my_tags[@]}"
+	)
+	GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) emake "${my_makeopt[@]}" "$1"
+}
+
+src_compile() {
+	gitea_make generate
+	gitea_make build
+}
+
+src_test() {
+	gitea_make test
+}
+
+src_install() {
+	einstalldocs
+	dobin gitea
+	newconfd "${FILESDIR}"/gitea.confd-r1 gitea
+	newinitd "${FILESDIR}"/gitea.initd-r2 gitea
+	systemd_newunit "${FILESDIR}"/gitea.service-r1 gitea.service
+	diropts -m0750 -o git -g git
+	keepdir /etc/gitea
+	keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+	keepdir /var/log/gitea
+}
+
+pkg_postinst() {
+	ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini."
+	ewarn "Please adapt the gitea-repositories hooks and ssh authorized_keys."
+	ewarn "Depending on your configuration you should run something like:"
+	ewarn "sed -i -e 's#/var/lib/gitea/conf/app.ini#/etc/gitea/app.ini#' \\"
+	ewarn "  /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\"
+	ewarn "  /var/lib/gitea/.ssh/authorized_keys"
+
+	if [[ ! -e "${EROOT}/etc/gitea/app.ini" ]]; then
+		elog "No app.ini found, copying initial config over"
+		cp "${FILESDIR}"/app.ini "${EROOT}"/etc/gitea/ || die
+		chown git:git "${EROOT}"/etc/gitea/app.ini || die
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitea)."
+	else
+		elog "app.ini found, please check the sample file for possible changes"
+		ewarn "Please note that environment variables have been changed:"
+		ewarn "GITEA_WORK_DIR is set to /var/lib/gitea (previous value: unset)"
+		ewarn "GITEA_CUSTOM is set to '\$GITEA_WORK_DIR/custom' (previous: /var/lib/gitea)"
+	fi
+}
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index 7dc0896c7b07..df58a68c26f0 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>xdch47@posteo.de</email>
+		<name>Felix Neumärker</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">go-gitea/gitea</remote-id>
 	</upstream>
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index e7ec4fd4ecbd..7ed907d341d5 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -7,10 +7,16 @@ DIST grafana-bin-6.0.1.tar.gz 56203033 BLAKE2B 190c838d08b95e0a38dafbaa64f77eae8
 DIST grafana-bin-6.0.2.tar.gz 56207202 BLAKE2B 805dde25c102c9ca6b1698c06a61d6b153343897fcd43258b3cd2f97613b6e914d60a59c467124bb6c248a30e6624345161f2032f622eddac5366b1744443f38 SHA512 6fda6342aea0281627ad368f39943e54540e6d672d0e026d04f3061840802ab9a0c51f819f16a53d329f15fd50ab4ff54e0afe984fd4fb6f0be6629c7f2629ef
 DIST grafana-bin-6.1.0.tar.gz 56560533 BLAKE2B 4cd15ab713fecf46c554335ec520dce998a8a277e0cdb92d41bad08f8b8a58ac6ce48b6218bc56d39cdd43ef64113ed0725a12f7edec6ed35d6aff0c99477151 SHA512 a7528497cf09e3d00218a3205038377efb84d6d2d5a238067aed7a5ae34ef46051d29f0d35575e37d67f4681dd56136a91af28414f4f87aaba302301eabe0b04
 DIST grafana-bin-6.1.1.tar.gz 56562242 BLAKE2B 0917594ed5b219bf230bc043c5b0726d85de6764019cf2b2353293a13d5f1343071dff09f0741b32bd9973a6270ef57ba9dc14b08f74e745d1fa3330fe8d2040 SHA512 60b72f93242528808912083f75d9454d449f9371492492ced3c1ae87374fa5ae81d5c25a05abe793862b5b92f112f30a3e05c93fc73a14e6d93ba56129c9b991
+DIST grafana-bin-6.1.2.tar.gz 56563484 BLAKE2B bc04657c3ce40256b3840848c63a4d864a037733c94689ab6f26eb23fed977ee8926a0e14d2dd233cd94ec97f0ecc5075ce46275b4838234316721063fb6c295 SHA512 701df226db9550802dd72f482e3cb3ce6b753cb9769cea5acca961867adb6ac0cc0b7e161f727689f0a6bea6c872f11745a872eeca1302ce23abc5b02ab1c402
+DIST grafana-bin-6.1.3.tar.gz 56563318 BLAKE2B a2063e4308fe2d2b97e6f6aed80506d2ac39b4b0879d0c4a02a3e75e7d5c5fb8e0a03e9c3d09ee2e638ce3f85bb953f34b5808e4a0be1234a066f451d7f98eb8 SHA512 2d42f578780b37cf0fa31ab2f0f4ecec3c7960d9deae4e3de0543f4015446656746f9ac5f25534b8ee7063b539752df06864e28fd800ee1f12f5060fb5aa53e5
+DIST grafana-bin-6.1.4.tar.gz 56564647 BLAKE2B 277a51f056faee911adb46f80673bde05dd872cc2d1387e67066806c8b749e434cb0bf2cd0e55338081814c19edf025927dd2379064aca2acb1e718dc89140af SHA512 7d27dfcc689c4e96f4ea9276c75581ac0762556759c8a70a5f87199a9cdd49493b40b7e44bbcf069b0cb2b4ca60d4b8157c7d977673253db9a80c9c785b4b344
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-6.0.0-r1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.0.1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.0.2.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.0.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 EBUILD grafana-bin-6.1.1.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.2.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.3.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
+EBUILD grafana-bin-6.1.4.ebuild 2000 BLAKE2B a2aded1295055013836375d7dcc73efa0c198030ec7653e07d3288792e284bba24db7e01b575c89421bd21155529c8f6e99add702929bbb45a5ff7ba16254161 SHA512 1790f63faba64a441f2527f1cbdab6ed3685b23f0b5032f3d3208851d491e077dc01edff00dc60ce81e25ce7b0b59b3e70ab480b065295fc6c05c4d0710216e4
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-6.1.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.2.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.1.2.ebuild
@@ -0,0 +1,71 @@
+# 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://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_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.1.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.3.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.1.3.ebuild
@@ -0,0 +1,71 @@
+# 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://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_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.1.4.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.4.ebuild
new file mode 100644
index 000000000000..f5baddc3529b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-6.1.4.ebuild
@@ -0,0 +1,71 @@
+# 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://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${MY_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/hugo/Manifest b/www-apps/hugo/Manifest
index 20db0e1d6c32..2609bd6e3fd3 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -96,4 +96,4 @@ EBUILD hugo-0.45.1.ebuild 5684 BLAKE2B eed2d5f3d069e4511a31119df191216dcefaefe0a
 EBUILD hugo-0.45.ebuild 5684 BLAKE2B d36f40703e38a82d5e190a5abc2f7c23a207e9d649c766a7c809c3c84a49085e04152e9cccb1a6efaefa58f396f7efd7afe509890944870dbb678c06bfc3e5f4 SHA512 d0495030323010154513d265eb8941ed956f282c96abcf72df084b0fe0c6e5097dd6ed12a3dc34f4024518d07c7e431c1762a485ff5cc483b882712139698659
 EBUILD hugo-0.46.ebuild 5684 BLAKE2B ca0fb858d24cd936fdba63bdd541bdd203e6304ab8bff5dae9863c690bacb8e71076f267f313b655d124a4be0795e09e7f2060a3024fe6f172a3af7610beccf1 SHA512 4e7ade7a40d7253dfe564251a095f648aad8b7388bd573a4008418362f82d0106be0f352ad25b7ec693857a1ebe45f7dfd4ac89fa06a3d8b55443104fc6fab94
 EBUILD hugo-0.48.ebuild 5684 BLAKE2B be7d61810d287494faee29df883322e0cbf2463d7a43ed6d9f1bd251cc07081207a996ec7e403658fa537ba4a37350df85b5be7b7361137086725c575dad22ac SHA512 b026bc55404246a7d371d0da072c9f72990bcbc5dd7a936af221cf88e4c5c7815dee03882875267a8c3b1ec211f29ef864afb9cd42d2bcf2485b3e7da9c33e5c
-MISC metadata.xml 312 BLAKE2B 461bb90ec180d1a09d780aee57523196d50b176b6bdd6645c75b878a72ecbe76f7e7a323d6c0ec300762e57be5ac4342c6f67a11f73088f55fb2b1bde17b5b25 SHA512 c7ab34fd5a378c5b82484b7637ab0fb598a64f61649d9b68726bc7cb9d5d51b7bd1f199f3f298d49dc7bbadfae9c3d692f45e878daa3e22ebfe4601b0d0f0c9f
+MISC metadata.xml 234 BLAKE2B ddbfdbd20d0bd2045f8b97d1d72165aceb073433979a8f8d2c9faef620751cf7d62e7714a72674ba87016a6e7264fa7f30d5c4e04491b378623431b07cd6f042 SHA512 2acec09a935e20d0e13c57d60e2d88456b522d3977a76b7b730232a58dc0d6f1152f348f5db56d8d3f2051a70baf40d35b643a34ecf9081adb328ccc6abdcacd
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index dc988c842339..f4cbc23a0c5d 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="sass">Enable SASS/SCSS support</flag>
 	</use>
diff --git a/www-apps/icingaweb2-module-director/Manifest b/www-apps/icingaweb2-module-director/Manifest
index 5824bacc694a..bda5e94d3ef4 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,8 +1,4 @@
-DIST icingaweb2-module-director-1.1.0.tar.gz 1287302 BLAKE2B f056a59fc05b7024e2c1fd16830010a4d73d038d2995350449e36a0899729292ae5ca60f70aff6c8c403a7861f7afe9e0b5fdebcb5a8c81aeb30f28fe80eee46 SHA512 a1253c1c803f05b238e12d86e7a367c56e10998293f99beb645ba3ca4d7165407a34dd4f53ef84ee1338464013201adb4fcee09cf3ca78d8850513c366a7a038
-DIST icingaweb2-module-director-1.4.3.tar.gz 2561910 BLAKE2B 3f33aac474f557a24c162fb22987be85984f35eff2b01bed3bdff4b486d2aea633beeb7b4821e8ee430d98898213e1f3ee99b103121371cc10611a4130eb0dd9 SHA512 2802de2f1d8ebac04be39cb2c3478ad1b6dac2ebdbcb39165d0316f684321eb4f0f3b2d851201641540a2b6f2fd714c8d78aea98b43259e413c14e2aa7b8f57c
 DIST icingaweb2-module-director-1.6.2.tar.gz 2772722 BLAKE2B 3d51f68469cd4ddf45f6bc62f76ad1f4c8d7d7bec36cc33022f1e0761334707bb345c87bc9f0e1276010e4a643867f1e1a6ea7c53a6fa28dd33e810089b7840b SHA512 693a2aca10e25f99fcf9ada4babb031d682b577b82098185259991214ac7d7662c494b58cf52284569dbca90c8eafa522177b6c64dd817912dafd20b4d7109cb
-EBUILD icingaweb2-module-director-1.1.0.ebuild 805 BLAKE2B 0ab56cc32f27d72b9c92b95bc0692df2cbc8c5a097ef1a74ee8bce33d48a1f13f0a8f499bd619d7b29066ada689a776a214919ccba76324e76aed2b1613b831e SHA512 782d14bc88f2959d18031b4f13e74b35841e94c9727961b7afdafdbf457ca6dd9a91dd9fe569fe30f882c1134b958da3537c75800d569d9d1e326253a9124ad6
-EBUILD icingaweb2-module-director-1.4.3.ebuild 805 BLAKE2B 977c664fadd36f53b55e6d5e9fd1db4c58c74d396ac43644c6dac01ab7f1ccddfe322c8ddb7b3fc3197e18f1546610f5069f61512e56480db5bb886e5e16be0e SHA512 b78ace5f0bb590ba7faeee4856d19960e840593e3608d01a57bb1f163fa5ead40dc2080114e18ed832c9225c0e3a9c23bf4e42f10f9f91e19ab42ed4242b58d4
-EBUILD icingaweb2-module-director-1.6.2.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
+EBUILD icingaweb2-module-director-1.6.2.ebuild 850 BLAKE2B f803f56f1f577ab0912792d406ece4fdde9497d78ad4a61ddc3e7c6f8f14fb2f8ebe70250a8a8bb077a08af5a0056e1daf93bdece40fd67d3de49fecea9da2cc SHA512 7f8fb69603207dc61ff73ffc81c4e7f605db6f1c5664a6a0e494ba3765caef5b87cfa297d5190e3d84110047b6c73f0b9b8f419576c28552aa906865d293e876
 EBUILD icingaweb2-module-director-9999.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.1.0.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.1.0.ebuild
deleted file mode 100644
index bb2346eec3e3..000000000000
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Icinga Web 2 plugin for configuration"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	MY_PN="icingaweb2-module-director"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.4.3
-	>=www-apps/icingaweb2-2.2.0
-	|| (
-		dev-lang/php:5.6[curl]
-		dev-lang/php:7.0[curl]
-	)"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "/usr/share/icingaweb2/modules/director/"
-	doins -r "${S}"/*
-}
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.4.3.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.4.3.ebuild
deleted file mode 100644
index d1c572dd843e..000000000000
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Icinga Web 2 plugin for configuration"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	MY_PN="icingaweb2-module-director"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.4.3
-	>=www-apps/icingaweb2-2.2.0
-	|| (
-		dev-lang/php:5.6[curl]
-		dev-lang/php:7.0[curl]
-	)"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "/usr/share/icingaweb2/modules/director/"
-	doins -r "${S}"/*
-}
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
index eab3c4caccb8..2f84950d9e81 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	MY_PN="icingaweb2-module-director"
 	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 56988cb743db..6fe912bbf341 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,7 +1,9 @@
 DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
+DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
 EBUILD icingaweb2-2.6.2-r1.ebuild 2331 BLAKE2B 1363042c58ee67b76b6f82d89919c7a92edf289ca99ef6e1c157592c9a449ac1afc6459a42b4a1ed89168ee9ef1dc6c6f6012e1090a0b0f98115ec56b04823bf SHA512 73bc873c58b89adc43eed160788406ea9299e66d9388b681e31cd91ef300547c20ec27c8ed09309db12c813ce507e73e88b3850d9e6d87194f9a11758a90683c
 EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
-EBUILD icingaweb2-9999.ebuild 2387 BLAKE2B 15090aba537ae7e6c1a5d3bb87bf21c018c526ab03c7d22f34275095cf4b1621d2475110c6ad5fd2bffec2590236307f1c317c91f9a8723d2c6f00d3511d1d74 SHA512 da41c35db047516cb3e03951e845801f26704786cf289bbfd1bc691b1fcec4c6c30ba5338b43fe94f816a017cc370606bfb538e370942c37be7090b14d1e0239
+EBUILD icingaweb2-2.6.3.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.6.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
new file mode 100644
index 000000000000..45655f2ebdb1
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.6.3.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/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 03a2c2bd75d6..45655f2ebdb1 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -3,18 +3,24 @@
 
 EAPI="6"
 
-inherit depend.apache eutils git-r3 multilib user
+inherit depend.apache eutils multilib user
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 HOMEPAGE="http://www.icinga.org/"
-EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-EGIT_BRANCH="master"
+
+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 )"
-KEYWORDS=""
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
@@ -23,9 +29,9 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
 		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.0[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}"
 
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index 0c97430bf370..e3423ca234b8 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,5 +1,7 @@
 DIST ikiwiki_3.20170111.tar.xz 2614240 BLAKE2B b37d2e9095b38b2642bd4f2bd6114a8b313837bd409abd5c111d61a9abd2e65cc534e7efbcfdb72b148a567cc6391e576d61daf530c62b5e14269f2f25bbabf8 SHA512 78c2a624684bb1c34878ff008558a3967f6e7f5648878e931961695e582a40e4351b6e467c64ca42ba99cb403fd275265bd5d96ecd860ad8263043514d207ad4
 DIST ikiwiki_3.20171001.tar.xz 2638780 BLAKE2B 537008233f4c9612b3d1236eb15fe85a76a1bbbd1db9648197c032ec83c79ee3810dbd44f0a99576ac30e34e049662a1ae6525707cd1c786cc11081692ec57f7 SHA512 1f5c5a48aa95e6e3898fdb40826f90d554ff328c367133e69a2a2da4c9286e0e54ba2f2dcd57ff452fa3105c92b4d72297d771688661fb8ecf22b7a0cf78bd97
+DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
 EBUILD ikiwiki-3.20170111.ebuild 2086 BLAKE2B fad60188d2fa890350c9b2308409c9259dcc60c629f003ce2ee281c4c059d20d1c0369bbaf6290fd24f541e2b02227fa3ca87091ee49815bbbaacba5937ddc0e SHA512 7efdda5c7beb52be7f3de65a0090be7295f97350e69091d1069908d36f3165293e1ae399dbaa25bea68f5b433d2aa7c48918d7f7f4c1559a303c7f8d71336b52
 EBUILD ikiwiki-3.20171001.ebuild 2087 BLAKE2B 97788b721fcb8c552b9cddf1edbaf86d7815263efd072e0deafdce10ec1a4ef9f8a6879eeee43554f74b2873e15bf22d567e0023627e8834a9308736e065ce6c SHA512 66e0690357126199f0350be0f1fb04b87159480a14ee8e6d7d6b9db37b3b89cc5b2cd3bf3bb09dd828d17350e512f8af4b85033038a7b46f6891d57283bbc304
+EBUILD ikiwiki-3.20190228.ebuild 2091 BLAKE2B bdeec0b4bb1c064c2f00cd58b19c83db4f0e8dfc7820299b3feb69e84f09d15ce78edf0cd39b7541c3eabad667e85b33c7959a8d30adfe2d1a82588629d76a34 SHA512 d45422d03ced2e8bc89ae4b06fe19036dacfba70af9183645288de1114e9013a3e532ebfd53d26ec85e6aea749d088da726388eea896c84fb4d3a422faef17bd
 MISC metadata.xml 336 BLAKE2B 659eb5913c4c6c05924f811fac31deea3cea40dd30b32b498ea5b55341f20cf9405065dfdf5d19e82f8ba93ff3ec4d5c5adbedfa51271d6762cff10c4a5088f4 SHA512 7d31f6078d1d49aef54bd46c5e8005d4247eb1cadfd4fdec36592deef15c4450a213d29c353dd43255a10918c2146c335efdbf7b626da2cd4ea98f815e0c5141
diff --git a/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
new file mode 100644
index 000000000000..d89cc5295019
--- /dev/null
+++ b/www-apps/ikiwiki/ikiwiki-3.20190228.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A wiki compiler"
+HOMEPAGE="http://ikiwiki.info/"
+SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="extras minimal test"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/IkiWiki-${PV}
+
+#Authen::Passphrase
+#Search::Xapian
+#Locale::gettext
+#Crypt::SSLeay
+#Text::CSV
+#Text::Typography
+#Text::Textile
+#Text::WikiFormat
+#Net::Amazon::S3
+
+EXTRA_RDEPEND="
+	dev-python/docutils
+	dev-perl/Digest-SHA1
+	dev-perl/File-MimeInfo
+	dev-perl/RPC-XML
+	dev-perl/XML-Feed
+	dev-perl/LWPx-ParanoidAgent
+	dev-perl/Net-OpenID-Consumer
+"
+
+SUGGESTED_RDEPEND="
+	dev-perl/CGI
+	>=dev-perl/CGI-FormBuilder-3.0202
+	>=dev-perl/CGI-Session-4.14
+	dev-perl/Mail-Sendmail
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/XML-Simple
+	media-gfx/imagemagick[perl]
+"
+
+TEST_DEPEND="
+	dev-perl/File-chdir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-MimeInfo
+	dev-perl/HTML-LinkExtractor
+	dev-perl/HTML-Tree
+	dev-perl/Net-OpenID-Consumer
+	dev-perl/RPC-XML
+	dev-perl/XML-Feed
+	dev-perl/XML-Twig
+	dev-vcs/cvs[server]
+	dev-vcs/cvsps"
+
+DEPEND="
+	>=dev-lang/perl-5.10
+	app-text/po4a
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Scrubber
+	dev-perl/HTML-Template
+	dev-perl/URI
+	dev-perl/Text-Markdown
+	dev-perl/TimeDate
+	dev-perl/YAML-LibYAML
+"
+
+RDEPEND="${DEPEND}
+	!minimal? (
+		${SUGGESTED_RDEPEND}
+		extras? (
+			${EXTRA_RDEPEND}
+		)
+	)
+"
+
+DEPEND="${DEPEND}
+	test? ( ${TEST_DEPEND} )"
+
+SRC_TEST=do
+
+src_prepare() {
+	#bug 498444 /usr/lib/plan9/lib/fortunes.index
+	addpredict "/usr/lib/plan9/lib/fortunes"
+
+	sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
+		"${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
+#	if use w3m ; then
+		sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
+#	else
+#		sed -i '/w3m/d' "${S}"/Makefile.PL || die
+#	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" pure_install
+	insinto /etc/ikiwiki
+	doins wikilist
+
+	#insinto /usr/share/doc/${PF}/examples
+	#doins -r doc/examples/*
+	dohtml -r -A setup html/*
+	dodoc debian/{NEWS,changelog}
+}
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index ee9a0401f220..057bc1c2c8c2 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-coffeescript-1.1.1.tar.gz 5350 BLAKE2B cbcb98f831b937458938e541e3b4d79bbdc1bf12444c5fbccf9f295744ca34fda019956ca5b7d011c8b88582d043157f7abf584af447e061f973b39da82227aa SHA512 6b748fb521a33be6dcf944bba35db2f2924d8ee403ba035f4e0e1411d91f1a7eb527af42237994c4f9839a3e6babfbd8b5441ecd5ef5c42db7afbdf4bfc643d2
+DIST jekyll-coffeescript-1.2.2.tar.gz 5963 BLAKE2B d71d343786f855d480694aa9bac99497b21498ed730198d5fef3f309b96bf5924ecefbf0dee9a6e2ecc9272941c58206508dc47ce0b5bd88afab500bdf07b7e3 SHA512 4b531fd69553036bae22c6f9bae2552da13eb6957e122592ebfa9253b260718a6ec66c34dda8fea83d6d2a0e01eea16c65a4915d6c730dbc6ed53632d2eae198
 EBUILD jekyll-coffeescript-1.1.1.ebuild 848 BLAKE2B defd171fe2a7aaa5459e04c997cd7af9eb99567d536796d9f5782dfdf31ae4dd34d968ed267273d56ef608570e5ad2c00b469e16a2b37cf2eb2981c60ce07afa SHA512 da3438228d8b05e9f977bc9fdefc6848383706c1d3127d81753c0f75e789c4cde091687a174491e05de826db3b44fc60aa682200e1429f3087211bd5c010903e
+EBUILD jekyll-coffeescript-1.2.2.ebuild 843 BLAKE2B 26ff2f0fb6bd6e3f86784eb89103b2eaa5d447221e835bb3a6b3454ca113ba80cf6be009eb1c3e08c668b0043e17873ab000c08b0220f51d331569dd5b32aa93 SHA512 e809a9239462376d826e1b7d20c28446d6545c10523410f6318252e4bde476de9006c306bdc65fedeb1c40dd9e6ba72e9db0ded463cb5c520671fa478c84c6ac
 MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.2.2.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.2.2.ebuild
new file mode 100644
index 000000000000..df9a1ecfa151
--- /dev/null
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-1.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/jekyll/jekyll-coffeescript/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A CoffeeScript Converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+	sed -i -e "/^RSpec/i \
+		require 'jekyll'"\
+		-e "/^RSpec/i \
+		require 'jekyll-coffeescript'" spec/spec_helper.rb || die
+}
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2
+	>=dev-ruby/coffee-script-source-1.12"
+ruby_add_bdepend "test? ( www-apps/jekyll )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 70f63fbff95d..2694964bfed2 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,3 +1,5 @@
 DIST jekyll-sass-converter-1.5.0.tar.gz 8516 BLAKE2B 78b4c49f2d49f28f1c7f02fe808ab98644cb9143038c179bbdb872bf8b8d45cbba84bd73da924a61e661d7d22ba26f2715531146ec8169089729046f196be403 SHA512 ece83d8c13e93a90c66ed899accc77746d56067f6841ca0d29050168c52d9eea6de3d78760b0f468be2dbc9b0b9df5ac02d5066a26809a33cdadd591fbbc9b52
+DIST jekyll-sass-converter-1.5.2.tar.gz 9004 BLAKE2B a5c0e9a3aa51e47efcc7af90682c3fdb5ab23ba8142768afb175c1edaf2edd4feb8a867aebc72d3c89cc39fe40ed1ec7d1334a473d6023c95478411178e33758 SHA512 370ac6bd150a51afc766e4eb065b55d8965e7c39070fd133ea5422db1c559d4bf84d59bd601a3565792fd90a99c32ea1ccb5ecbed0cc8e1a3a343e7923250cb2
 EBUILD jekyll-sass-converter-1.5.0.ebuild 688 BLAKE2B 7d3b78d33e59f71ca66639703993d5ef196e4dcc17c7f54f1f9108f0cbe4059bcd31f65bb133b00f2ef73abbfaad0f0db20fdcaad4afa7e34af46b5a0395b874 SHA512 129b02986be29745f21b3f84035985c9a0da7a1bacdfe3650bffca6ec9506cd352023fc2edf82a8246903ea8d9b60e3787c42583e385356017e656eb1b961419
+EBUILD jekyll-sass-converter-1.5.2.ebuild 709 BLAKE2B 773a9d2288c32fae6494eebd531e83ab41f4aed9c16783545a516eed2dec66104e92bc564fac950587f70c57f2d1ee376e17b8e45fa91662e8399dfb721a03ed SHA512 8a499a2490eba86e0429ab233c1475c1e06a1073a398b57f55e25e1697756a83fb2022f0c49bb137b5d50eb9a8ed2f7d186f5530b546c953218db792e3a5ed64
 MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.2.ebuild
index 9c4ccade8b48..7ae638410e1d 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.11.0.ebuild
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby23 ruby24"
+EAPI=6
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -10,8 +10,8 @@ RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
 
 inherit ruby-fakegem
 
-DESCRIPTION="Automatically generate a sitemap.xml for your Jekyll site"
-HOMEPAGE="https://github.com/jekyll/jekyll-sitemap"
+DESCRIPTION="A basic Sass converter for Jekyll"
+HOMEPAGE="https://github.com/jekyll/jekyll-sass-converter"
 SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -19,5 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+ruby_add_rdepend ">=dev-ruby/sass-3.4:* =dev-ruby/sass-3*:*"
 ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-ruby_add_rdepend ">=dev-ruby/addressable-2.4.0"
+
+all_ruby_prepare() {
+	sed -i -e "1irequire 'tmpdir'" spec/scss_converter_spec.rb || die
+}
diff --git a/www-apps/jekyll-sitemap/Manifest b/www-apps/jekyll-sitemap/Manifest
index 3be46d7a4fba..cca83382e988 100644
--- a/www-apps/jekyll-sitemap/Manifest
+++ b/www-apps/jekyll-sitemap/Manifest
@@ -1,5 +1,3 @@
-DIST jekyll-sitemap-0.11.0.tar.gz 64238 BLAKE2B eb3226d344972c82d328faf4149886d760bf240da1be36b878c9e9334a30b4b75954c0ea35acfe1d3fc0e638630376287ffe4c37dcbdbdd198632f280ff2959e SHA512 ba1bb162586b8383b1ede68e86cec73db023400586e373572aa8e7c3e26ef1024d313ce59aa1f7711b2b34ba08220be99d5bfeb0ea804e1a1091c0953f8de095
 DIST jekyll-sitemap-0.13.0.tar.gz 65036 BLAKE2B 88477a9c1ee57975927e9b2a6044322d2c838eb3beded1263158ce4574fbc524453763c55026f88039746e77cbb7ff169dc2601fd0cb65f67d60a4a4252ec040 SHA512 97966c37c7126ac8d9d51069c8d5c448523fa06a7b2136baa1742495e21c76d0264a145e72896b4843111f519a9ddb4d7eab35bc1ea0130a3a77c3ff59066364
-EBUILD jekyll-sitemap-0.11.0.ebuild 625 BLAKE2B b6e7f94a0c292dca3ecc21330a0d94bb79881deda883a4ea92c2fe68e4b2ff45bf4a3ac88426824c8de637ecd6d041e850f972e8e0f96c27d399e430b0e1d5cc SHA512 6bb77f9b43470be7191b153d2d301207b154572540cb81567366be6391f6d2bee4d93a5be4313cf3cd0ada4735f9ebb3d4f197e2795506e8e889f6080f8722a7
-EBUILD jekyll-sitemap-0.13.0.ebuild 625 BLAKE2B b6e7f94a0c292dca3ecc21330a0d94bb79881deda883a4ea92c2fe68e4b2ff45bf4a3ac88426824c8de637ecd6d041e850f972e8e0f96c27d399e430b0e1d5cc SHA512 6bb77f9b43470be7191b153d2d301207b154572540cb81567366be6391f6d2bee4d93a5be4313cf3cd0ada4735f9ebb3d4f197e2795506e8e889f6080f8722a7
+EBUILD jekyll-sitemap-0.13.0.ebuild 629 BLAKE2B 7ceea2492dfcbbc151202631bab09230cdd750f6e81f02497d7ceeda073b46b97fca3ca0b0688d900b7122326f78eceddba7c982feee19dc3be8fff8c7563579 SHA512 be66e44c9aedce9b6296b3c51ac075e614c449857ca41d62f6df892a26fbfbcce3834ca5d7e445fbb3dc911ce28993f19f3d5036489f3daf8ec7df6e5a27b062
 MISC metadata.xml 253 BLAKE2B 04790d797238d114af848d448e7edfc2a4e14c62b472a24e1097cf831989b0042e4c6770e8a63d7285f4245dfce2787887f2db04d175923037a064c28b192490 SHA512 03899ba135dd5ebedf0c0157aeb74d2facdedbc4ea842a1f9133c0f20b8c49596dacc8f376810fe133ed8571adc0acee4dfd854bcf5f33b3f5c2a1d116250712
diff --git a/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild b/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
index 9c4ccade8b48..fefc68f4e8b2 100644
--- a/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
+++ b/www-apps/jekyll-sitemap/jekyll-sitemap-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 6d9166e42c3f..2b2a4a358ff4 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,5 +1,5 @@
-DIST jekyll-watch-1.5.1.tar.gz 14764 BLAKE2B fcb0e80060e65e85e0047d54f6277cf5e31ec8347c2c960e15c00d74b7dc255bb8cd1fea3671e2ecc7d380227bdae7cf62d835a5dc1b249aa68ca8f0ed9a1f34 SHA512 05e7f89f213adf6695a8bd1f8ff25d7aa6338cc378a934981f1112df556380cc40d2352ea4ce0a362c4d8e51ed8a6e36ca96c86385a6f179347031396db94a54
 DIST jekyll-watch-2.1.2.tar.gz 15966 BLAKE2B 877935b518f887aa58987942cf03b337f41f142947416386410c3924880738e64b4aa05a06eba2089635d417e329a72b0602112ff19070ea203cf07bb9988ce7 SHA512 a411f354e1971727d1fabe6fe1fc6e9f889a0cbc9cf253e8dbee87c66f7a8f3ca1e75cdad242c9235e93ce45983939ded2a439d2a8339bfc70bc55b5b2eaff4a
-EBUILD jekyll-watch-1.5.1.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
+DIST jekyll-watch-2.2.1.tar.gz 16631 BLAKE2B 2311802227206b76d1f7b18ccc6360514164c6148f549490bd4df69e56e4d7a8c944c828e950bb156929081ea8ac15bdc37099eba5af3e0f3e1c20b403828f60 SHA512 55867bedf0f453aad7df267d21cc2a49857916b51ed70e727718c9ed18dedd474bc45c446abcbc803ab4b8b26f8afb1f0e05e6655441186788fbace869c74b6d
 EBUILD jekyll-watch-2.1.2.ebuild 671 BLAKE2B 6e842e73c743ec350bcfc3ba3e2ebb6213d73ed6a8ecc99129916caf2a83b0281672c0edea34d7f1130c9213a757869e1aa1f77696a6cb090730f73944ae6031 SHA512 3b541b861dc860ec0ed6807479a2591313a0114399a9eeb4f7ae0746227e76ea619b13110a8d0e54568e6c6d12f64444d4d1878162ac6f5d96834d9a06e0b54c
+EBUILD jekyll-watch-2.2.1.ebuild 664 BLAKE2B 45a2edaf72906280d1b751c85ba89226d3de0b85a2e60a8498af452997acc8c86522a1e582a4fe618c2d4bc67f21a207cd0bf1182329ce63ceb8d66eec8deba2 SHA512 9a9a0e396d2531df76d0e2507d36f951e07467fa14efa8ce8862b7040606504fa5ec531b1c57ea7fc66d400d0d189a43ebaa285855c99602daccefa4b9745dfd
 MISC metadata.xml 436 BLAKE2B 72dd2e30ff3976205bc604cf6a5be914ad2a1e79b72a96b6bee54dba91d5a8f19b857d70510483ad10a093ef0786da8a2c71a4d4c8ed800d3756e4a6136d4d03 SHA512 965327c1e3256487e17066618b4f27ae8e60d4d705988da4409fc62b52fe4e3a7d31d9bc13ef794b7544e2a4fb3b76e8d8cee075075c56817128b749fc22f419
diff --git a/www-apps/jekyll-watch/jekyll-watch-1.5.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
index 3468c5c4a5e8..30d6fea1b99a 100644
--- a/www-apps/jekyll-watch/jekyll-watch-1.5.1.ebuild
+++ b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/listen-3.0"
+ruby_add_rdepend "dev-ruby/listen:3"
 ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
 
 all_ruby_prepare() {
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index ca82846398bc..3c8b39e7815f 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -2,5 +2,5 @@ AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f4
 DIST jekyll-3.6.2.tar.gz 740389 BLAKE2B c51e8b1545bfd1bab64c890fdf8d53087e27b3ba2fac07d286d009f1c4b6efb81d3528d239f73a73afa68d1f2d320e816c7015bf385dc9e27cad13d1b4279a50 SHA512 3af17f32098bf1012393d0ad47269ef305138553735ede9c65e461c8f1e1033008a01805c8c96f9aa0f4682f7e68a9cff3eda83a70660a334161ec3d04ce9c72
 DIST jekyll-3.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
 EBUILD jekyll-3.6.2.ebuild 2061 BLAKE2B fdc85cfc7fa1beffe671f5d54bed57ace5ac9f2023e438b02e889ebf9b49e7c66a432e8adbc8b0575fdf296bc181886d05987c8eb39b169c6062b6b3dff3c81a SHA512 9fe2223b9cf6e1c95657b1312232794eb416b7902551a9a4573c134ce0fef348667b3ee5de688bc525aa44d6b4c474b2d5b2da3a0739f99f60f908c589d8f2bb
-EBUILD jekyll-3.8.5.ebuild 2116 BLAKE2B 08cce5c39040f258b6c4594fa6923faf2ed1da1f1c9969115adeb2705cd8dc84d0055c0e538c10728f137781858f9bf53cd2025629053ef8b9bc4b48a4c95ed8 SHA512 6341fd4808d3b7b39e82636379c96bf9a3d2fe0a7dc920c58505e4e7e7de9d2cdb3436790aea17f652daf3280560912c7a3b3e043aa0f16a3ff2fd56ddf33c62
+EBUILD jekyll-3.8.5.ebuild 2144 BLAKE2B cb825e8834f8c0feefedd7f2cef69dbf46a3656a5a9281698b65f668cac2897c098d625fdf227460ab2f6d5e7663ff42e0f4ab985daa7fba6615148ed5f2358c SHA512 2ce9ac22ab20aed5b3861d0bbc1035bfbf8b87317935d97981ee87e469cd11764ab1a99715ffb9b99dc2743f616840da44a57f0c4766ef90c71fd018ed49aee0
 MISC metadata.xml 429 BLAKE2B 9a3bc0c4945b7be24fae6e0b8bfe18b33ea06d32232200b42050c18f9bd9786c3737cedec0e850312df0599d78cd9db66a4d302395017cb9d27a1cba184c4df3 SHA512 0755fd020670ebb1fbb922a1765cb2d6a4fdb4c39886ef010aee9ff4035d7e6157721060da917567d6ccac0910d1e3872896490b35eedf7c293a16bab44e3645
diff --git a/www-apps/jekyll/jekyll-3.8.5.ebuild b/www-apps/jekyll/jekyll-3.8.5.ebuild
index fdab590b1702..37240e5d51b3 100644
--- a/www-apps/jekyll/jekyll-3.8.5.ebuild
+++ b/www-apps/jekyll/jekyll-3.8.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit ruby-fakegem
 
@@ -32,7 +32,7 @@ ruby_add_rdepend "
 	>=dev-ruby/mercenary-0.3.3
 	>=dev-ruby/pathutil-0.9
 	>=dev-ruby/safe_yaml-1.0
-	>=dev-ruby/rouge-1.7:0
+	|| ( dev-ruby/rouge:2 >=dev-ruby/rouge-1.7:0 )
 	>=www-apps/jekyll-sass-converter-1.0
 	>=www-apps/jekyll-watch-2.0
 "
diff --git a/www-apps/karma-bin/Manifest b/www-apps/karma-bin/Manifest
index a4610a708b63..b5dd2cd3e337 100644
--- a/www-apps/karma-bin/Manifest
+++ b/www-apps/karma-bin/Manifest
@@ -1,7 +1,9 @@
 AUX karma-0.24.yaml 946 BLAKE2B 9cee1af92d690892b6160d43e086ee20b24b525cb821848e500f0280304c10a0a2c0e7c7f64ee101f0b437529be7640eec8c37ecffdfae67b991117272605911 SHA512 82f3d5e3213bae5258364bdae8d4463d5010314ab2ba737335c395f00c690e740d5a672dc345169057d15b1ffbd4cb34ce6132e1a99fcdd5f19f906b5bf3a466
-AUX karma.initd 374 BLAKE2B 0b0e81fd0738b9b440a7fc6505a7575303016cf9297652223fd403f5256706b483719d4a7674ac29cdc0566a7edeab47d488ba52286019904edb0b4e6fe056ef SHA512 a0344542591276fe29ec489eb6cbf00f1b959438cdcbb936d6b2d751c54f8ee39190713a45a30f21215107f187e972cd8d46e7915503f44e0e6655b65e2b1a43
+AUX karma.initd 410 BLAKE2B 0aecc0b88a1b89bda32bea7a15571826fd6598d74258a12aeed1a0549776e9eebc7c11ef216db00ed107146e32df0915569e326f85694cea1429640becb411f7 SHA512 bdd469311aabc663ce59ed14044c0e201ba32d7c9e54df73b0b92a5b5dbef7ed1b5b229fbcdd0a048aa5d3f42223a58e4a3da01fe43ff59db91b54017130fc53
 DIST karma-bin-0.24-amd64.tar.gz 11511588 BLAKE2B 4de38f4925e039ae28e160d2f541cb8b92388b42c68b3f00ca1a4aced635078a5f8bfabe63fe20dcb05a5a75188b2a866b627a26fd68d43de5f0c21a97a28160 SHA512 2864eac54be7f156f4b8feb144825615576e7f18f61f58d3e3834e9968a59a0373d0b156a0f00c5c019b922b251f8a7f35a41f139fbf42c27c562a74af33f14d
 DIST karma-bin-0.27-amd64.tar.gz 13932963 BLAKE2B e99093ec5a7d72fbca136d63789352e001974e4bf0a90ee45d6ff8a8814df9dfdf695af4fb1b17cf1c6a29fce2be65965f048daa9070484b2fcc53dc6e33122a SHA512 844301cb8bdd08452d02ab33c39dd5d8307e538f87d18fff58bfd888ddd207bb6557d40c053613d2e3991cf915b032119ed08ebe5a32a98d12cac06a25872887
+DIST karma-bin-0.33-amd64.tar.gz 14113120 BLAKE2B a37dc699d7ff26dcbb9188afc48639309c2f44490f2f59dd41d15e6c00035b4fb9bc9bd86abd8e999862a4a71bca76beb70bbb06f97e761fdb80b046dc742ed5 SHA512 a2bec5381648a680af842d5b61c23883655b508ed9803cec2e2e65bffba136076636651dbf8eedb7e220a746629902d4b29956fbebe902a1ff14924bb9a8ba27
 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
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/karma-bin/files/karma.initd b/www-apps/karma-bin/files/karma.initd
index 08dbc3bd5c96..027090ad930e 100644
--- a/www-apps/karma-bin/files/karma.initd
+++ b/www-apps/karma-bin/files/karma.initd
@@ -5,8 +5,8 @@
 command=/usr/bin/karma
 command_args="--config.file /etc/karma/karma.yaml ${command_args}"
 command_background=yes
-command_group=karma
-command_user=karma
+command_group=${group:-karma}
+command_user=${user:-karma}:${command_group}
 error_log=/var/log/karma/karma.log
 output_log=/var/log/karma/karma.log
 pidfile=/var/run/karma.pid
diff --git a/www-apps/karma-bin/karma-bin-0.33.ebuild b/www-apps/karma-bin/karma-bin-0.33.ebuild
new file mode 100644
index 000000000000..809fafaf8788
--- /dev/null
+++ b/www-apps/karma-bin/karma-bin-0.33.ebuild
@@ -0,0 +1,39 @@
+# 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/*"
+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/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 0ceaccb215eb..786ad285ba65 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,9 +2,15 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
 AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b787b8e66fa59a353fcc49364db31016bdec50e0c465b48c18f07236e828268e9a0b76ad3741bb3ec SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-5.6.15-linux-x86_64.tar.gz 53411172 BLAKE2B a5c961f14614f242e269375040f1f1f05cd510248bc4196409ed53fcf64edf26233268ba86ea8eb7332094504bf779076a12603c3be51efd0716d0f3637b110b SHA512 eede5afbd11bdc84f435567a5d48f53f1a72d6c94522597cb87c2cd295103b3a0ef0e7e43aa33f2731b91ef23f2ae6ccb3d6cbeb86cf3aa89317b61343f5fa8e
+DIST kibana-5.6.16-linux-x86_64.tar.gz 53468981 BLAKE2B dda2aacad7043e4ed259c194de95da143cfc8f4fef624ff783eb8323f9053afe3a9857e358df7aa0b1fa26e9b452ff5afe7480b7befb5504af95d730c1deea53 SHA512 e3b8cd5911444be3c8f39d2060216d968456cae123a3ac47805bbf1e3d5ca581ecfd061988655926a5c6243df0ea2e127e5cf6fe35d336df570cd5b82cfd338f
 DIST kibana-6.6.1-linux-x86_64.tar.gz 180675854 BLAKE2B 7c911f6715f1bb526e09a47de55b10b197dd78bcd5c9a6e710890cd333d23c8556d8efb12d34b0c0cdf1e989bb456da8f79e54b1798c02ea57658d90fbb80f83 SHA512 df4547a0056b46d6351948e7f67439b5a7fe46c27f20c9cb7783046abea04d28aa85ba74751f54c7a1524dbca55ee9c9bfaec50be903f964dedc1ceeb5d823b0
+DIST kibana-6.7.1-linux-x86_64.tar.gz 186430753 BLAKE2B 10d3b4d7996ee88ea3fc7062585dd0b00618650779e779c2fc18dcb9e0c62d964abb2806997f0712c495fb54ad2399a8b55745c67b6ff77ec1fa8e6041e7a075 SHA512 5ad5af43c18f12312d8bf5b50e8550ed8a008fb36efddb1756498c6a44cbb40cfa3ae7d307f5cb88daee0690dfd3aacfbb7bd526f098c140886a821af4b28e9d
+DIST kibana-7.0.0-linux-x86_64.tar.gz 167679944 BLAKE2B 55e1e36134861a063e6a2e844e717fc1e90130403d1f08be87c27582b822e866d8703b7a16a9cf1371ec65e0ff1a314bf6e838ce4b1b5905911325a1a4850b5a SHA512 647dd3900d70dfcf7c8f97d8a020f204b4e2f11c2fc23b4733618ad931f7876b37bfd885809632bbd05fdac75fbc0e233d48367ddb34801e1450b452af8e3f4a
 DIST kibana-oss-6.6.1-linux-x86_64.tar.gz 59466869 BLAKE2B 593563976b4d1c89b6042dbd1a945c6fc7ae2a8c3ea18d142d9e7e5f8307d72e7b358059316130880c64c6879e5df41d80005a1dad82d8a5ae223bf292bdf392 SHA512 1131ce7cab882166478be89426a8885fb53e2b1154100b6fa5dd0a431b1d9aa20df73c687159c18e1b9703e42f953fb10b3ab7fbfe634ed253331238249bf574
-EBUILD kibana-bin-5.6.15.ebuild 1684 BLAKE2B 5acc3ec74845e30c985ebaf24be06a246ee1317d67ca0275718a5bac7ef8be4642ee2068f13d7377dc3ba453812a6b4bbaaa3c6056bda10ac832b4658271115c SHA512 218dbe3e59fa38cdfce7c50d33ddc9daf48a3b6f908590bee087ad181a21c835c7883bc1a9f2e03f979cce39ec8c1784c534efc882bca578317b9cfd30665189
+DIST kibana-oss-6.7.1-linux-x86_64.tar.gz 62807564 BLAKE2B 8fec550769f4a2a88a4fab72b0ecb49d81d25d2f13d365cfefce2f70ed5c088a72f750a0b5807d729621a78c7fe393a5f9875012b6559aa82bb049083eaff5bf SHA512 309c25a16d535b1c5f0853ea89b7b69b61e3472afdabdd6f60a86fabba4c76c034b620cbe3d7f988cc78d21e5ed058b4f97e4995d868876a55fcc30769822882
+DIST kibana-oss-7.0.0-linux-x86_64.tar.gz 70548795 BLAKE2B b41f6073548f1cf09fd1e49504775f4802a1e86ed561870b60507054583f73bc0c531fadb831c7145d5234832eabf94a1b7e23ba78c88481be154d4b24ee07c4 SHA512 091ab4fbf0aec782307b7313dec82e6437be4cb76efac49eed6434c393e9adda3f925d6a75be4b78c9768c943168881dc38aa7b1b23462af80d5d158b3806136
+EBUILD kibana-bin-5.6.16.ebuild 1684 BLAKE2B 7f2226c849036d14b3d9226902237a456251b1ed7d765394e4dc9cb969d98b9d12abb5a065858e46b074c588242e8612e5ed81b3e40e0fe92007b6106029d772 SHA512 35b7685abc2aac386fcfbad7f7685534967bc2d34c4aab7b39dbe0642428bf61ea3c5dd9aa49f82f6393f786b7389a60b7ddf4c543c5cfdd9689b15dced7cf04
 EBUILD kibana-bin-6.6.1.ebuild 1983 BLAKE2B bcb04b1069e796f06affb4b020ac3659d5ade023d947222db02423c1d222fa2f92f0e269e2bc430fb1b2b63901cee84bedd84c82a16d17c0d3780e6c505d5196 SHA512 5d59d675f38a990fba0c1c76e155a7a0f19444563e511dbdba425a639c59e9b9f4d7d3bc2c1ce0fe18775929d88682dc66b30a03211d4721794eb7e7aed922b8
+EBUILD kibana-bin-6.7.1.ebuild 2508 BLAKE2B f3fb5262c8c37518909ed910b33ac5407d2314b54ebe1411d47924571994e0488767781fa52e826680276c56217b2f641a7b7c948ccfc78ac703277e3cf7288b SHA512 4454a2cca319cd23a6ee6b5cbf2e9019163c61fc30df07eee83e98a0f02420e548a398e6dd624a3fbd2c51bb8c22898bd3f0eed47e5a9be94f6ceedf6130cdcb
+EBUILD kibana-bin-7.0.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189aebf640c20be06fcb9e5f64b54ec81ed601cfaa6b5121695e65ea282bbd030ec231d567aae346c6683123c18c6919 SHA512 c51939d86d84c6df489c8c9dfa5827dd64b3a484bdb71a0e6c996387cc0274e58f3701618f3c6c2e68f8f2fbc2141024315345d2040eba312bb71f82ee354aca
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.15.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild
index d27bc3b0781e..a5b43acbd70c 100644
--- a/www-apps/kibana-bin/kibana-bin-5.6.15.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND=">=net-libs/nodejs-6.16.0"
+RDEPEND=">=net-libs/nodejs-6.17.0"
 
 # Do not complain about CFLAGS etc since kibana does not use them.
 QA_FLAGS_IGNORED='.*'
diff --git a/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild b/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild
new file mode 100644
index 000000000000..5d00a180e54a
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND=">=net-libs/nodejs-10.15.2"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/kibana-bin-7.0.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.0.0.ebuild
new file mode 100644
index 000000000000..1e24c466ef11
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND=">=net-libs/nodejs-10.15.2"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index fa76bd681b97..0ee31ff8c26e 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
 DIST klaus-1.2.2.tar.gz 35308 BLAKE2B 4ac2cd77f5c95fd207a83e1688b65e286009a5830c96fce442e3e4a2989a320c0980ab96a03817be27d45d01ccb5e2db277ed535d62a781006b4747c797838d2 SHA512 2f054ca3d285dcf334188d72bbbc4ea99fe8778126d0d215cfd3508cb294d52e2944b3e251f903a863df018ec61d9dcd779f5c6cd284fb2f6cd90abb98783176
 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 847 BLAKE2B 41989d0d9c77e7f46c48723d27298f9e65b5b771d2363a7e6741bca525c88ebf0fc7294ce79cbb5338cafcecda9fd646796e53aec120077637b8f248dc6af6f9 SHA512 35e570f6fdd45a2b3153122e4c833c8b50b9e1a4160df1dc28ca9bc78a41e0cdd2d49027c5ef11867cdae6bd91914b93e22c30bcd79f807e85ca5cc5d668814b
+EBUILD klaus-1.2.2.ebuild 846 BLAKE2B ce62579f0ff24ff598da86669077907a4d29c7aad39a677a357c69f18430f020e0796da8bceca6b62bfa7aebbd202af74f92ebc4221b7eef1104ff6691c1321f SHA512 2dc006642ac991309ade7511508b752841db573f8520aa7b98391955501b5e3c8ade1cf0bc2e5fd4ff3bf2ae7574643499495aa8ae402e8e87478457e5822b45
+EBUILD klaus-1.3.0.ebuild 845 BLAKE2B 4ccaead04d938250fc8a845eef3f46ab203933b00d0dde34ac73b3479c3cc0bad61372d81c0082b45c87db1da3ad1b52142b1e9cd9aeb37eb20193f8cfc2884e SHA512 82295552e538bb0837b35b1468e1c2fb27f1cabf65cc1fd6bad202f81bc2bf2da1b881b25fcce57f9db621fac99d8079a560335b8740e092a95cf650ac821308
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.2.2.ebuild b/www-apps/klaus/klaus-1.2.2.ebuild
index b5377c3de06f..c7fba3e90a36 100644
--- a/www-apps/klaus/klaus-1.2.2.ebuild
+++ b/www-apps/klaus/klaus-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/klaus/klaus-1.3.0.ebuild b/www-apps/klaus/klaus-1.3.0.ebuild
index 97d0bc760bac..012d6a339be2 100644
--- a/www-apps/klaus/klaus-1.3.0.ebuild
+++ b/www-apps/klaus/klaus-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index e5a67b4e18f1..5b99cb32e1fe 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,9 +1,5 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1514 BLAKE2B f2a7284a49638a2e1ca694a84b490f4a3348cab1afe1b022f617fc7df74c958be29e36e3c777514765b7a01758f11cfb653092e2190a5e7dc572884f5942196c SHA512 58d11cdf8daaa2ee62ca64dfeddad3ef2d10feac5b93b51f96e5802dd2915c3d969b8e99d059e79a9b62386ae70a7690db3c4e4d248501e839769bc7f24d2dd5
-DIST mediawiki-1.27.3.tar.gz 31509270 BLAKE2B e48feef42bd1bc32019df338975851df737eb032a48703a07d074b5efa6fa9acade2f412017c55990288beaf0267cef3fb49248002e41a61a700911cc023d549 SHA512 bc6228342b589a3acb0f5623b9ef45982d7aab032ff322aaf7bda7ac3ee16a7732b8013698d8f509da4310bbb65c12a73b7bbe4612d5e0e3d93965199efdc8eb
-DIST mediawiki-1.31.1.tar.gz 35260876 BLAKE2B 4a1b5f2c47535a1099b105f35158c2e15cef028e752b1a195de4f924ba2a1d02bce64f713d2bde608882228e82cbea91ee2f5fb2f1f64f267334550b7cd33cdb SHA512 ee49649cc37d0a7d45a7c6d90c822c2a595df290be2b5bf085affbec3318768700a458a6e5b5b7e437651400b9641424429d6d304f870c22ec63fae86ffc5152
 DIST mediawiki-1.32.0.tar.gz 36168475 BLAKE2B 33613bf6274abe3d58f66319afaea8ea091d5b07c1d1b1148721856c8d38b84cb96e9a9c041a93ef27a6700e36a10bba9dffc7cbc245dba2a10a6ce0d46a49fe SHA512 5e198844bba12f5a3a73a05dd7d855d3e883914c6e7c23676921a169dc1c7089ed31adfb7369c24cbaf10b43171dd2a12929284b65edde44d7b9721385ff1cc3
-EBUILD mediawiki-1.27.3.ebuild 2364 BLAKE2B 5026e3364ae048e973a6f11d898ae52831e541f3b682420bc41c4936504ec778826a1f5be34546bc2c9aa97a84c4a39a32fa571a5b73db1a2618679fdfe6bbdc SHA512 0adfcc39cfcb96f80e33d3d428e3d2cd243a36caf51a4505aed59456fde85c677b38252a383eff32d0d5946b19cd7a57516e0691961aaeab2fdcce701f204056
-EBUILD mediawiki-1.31.1.ebuild 2437 BLAKE2B 8334f4316ac8bbb91f33d2fc6c702ca55186d5f6cfdef85e50c573b11e4a04b991f03bc498c5ec8781b73c34c92120ba8631db538aec5420ed079cb0e8a3a104 SHA512 49f663aa4941524ea38fd092814200d3e880bfdb3b68cf5af327a4a47b8904d3042a13eb4d86010814cfb74991222b8d7f42b513c4151a9203ab8ab2d4aba635
-EBUILD mediawiki-1.32.0.ebuild 2442 BLAKE2B 1e2ccc9ca8133a9a6c06a08587646b36ead094d35598a31c39c401b66c564fed1bb3d404dd3b94feec527242b2b75de18b0f854a68bf2aafcd46b100cf83d24a SHA512 a41a895d3c7310acb7869840c87ce4353a300b5313edb65dd7ea4fe70fbbc4bfe9157da75e3986c7b5bfa75e9dfdfa821da698bb7d8a99a11f544081702aa318
+EBUILD mediawiki-1.32.0.ebuild 2439 BLAKE2B 734d7d537bd429c67d48de191ae3a5a3541eab6215011ca506373ebfd655ec4027d7c800aac3799d70a46c87d0cf812b0cdef070c4c97a0a213161e037da5cbe SHA512 2dbc7bca92d6cf21efc3e787fd7315ec10f5648461e8b7bbc754e3eb6bea65f89e8ad484aaedd22327cc83ecf70d86e1b1ba64574542059bee512bd1d6113405
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.27.3.ebuild b/www-apps/mediawiki/mediawiki-1.27.3.ebuild
deleted file mode 100644
index ce9c6e247e96..000000000000
--- a/www-apps/mediawiki/mediawiki-1.27.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit webapp versionator
-
-MY_BRANCH=$(get_version_component_range 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
-IUSE="imagemagick mysql postgres sqlite"
-
-RDEPEND=">=dev-lang/php-5.5.9[json,mysql?,postgres?,session,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	sqlite? (
-		dev-db/sqlite:3[fts3(+)]
-		>=dev-lang/php-5.5.9[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-apps/mediawiki/mediawiki-1.31.1.ebuild b/www-apps/mediawiki/mediawiki-1.31.1.ebuild
deleted file mode 100644
index 635e4d5a95a4..000000000000
--- a/www-apps/mediawiki/mediawiki-1.31.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit webapp versionator
-
-MY_BRANCH=$(get_version_component_range 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="imagemagick mysql postgres sqlite"
-
-RDEPEND=">=dev-lang/php-7.0.0[json,mysql?,postgres?,session,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	mysql? (
-		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
-		)
-	sqlite? (
-		>=dev-db/sqlite-3.3.7[fts3(+)]
-		>=dev-lang/php-7.0.0[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-apps/mediawiki/mediawiki-1.32.0.ebuild b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
index b211b54dfd99..f347fc044169 100644
--- a/www-apps/mediawiki/mediawiki-1.32.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres sqlite"
 
 RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
new file mode 100644
index 000000000000..6a70802fe849
--- /dev/null
+++ b/www-apps/nanoc-core/Manifest
@@ -0,0 +1,3 @@
+DIST nanoc-core-4.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
+EBUILD nanoc-core-4.11.2.ebuild 1585 BLAKE2B 4a1eb99f64d312ab51c2a48fec3516063cb9560ecf4a13538e5be3ef8ee47b4a8b7cbeda19edf5d3e5d439c0e70d0d7a6187cfa933513a37ec23842207396f05 SHA512 6865c45dad0d83bafb37c1c62a5f39b221f0a040a079caa36dbb98ff50d4d675b1e69d19cb1b1cfb46261d3cae28672573684686821f09a23154284f6634f6ed
+MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-core/metadata.xml b/www-apps/nanoc-core/metadata.xml
new file mode 100644
index 000000000000..9abf9c6b8ec2
--- /dev/null
+++ b/www-apps/nanoc-core/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>graaff@gentoo.org</email></maintainer>
+<maintainer type="project">
+<email>ruby@gentoo.org</email>
+<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
new file mode 100644
index 000000000000..65bb6bb41593
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
@@ -0,0 +1,65 @@
+# 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"
+
+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/Manifest b/www-apps/nanoc/Manifest
index fc889d9290b7..c7b1145dd923 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,7 +1,7 @@
 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.9.6.tar.gz 282811 BLAKE2B 109b73e4908b45c055912f6e3b2d18675ee00dd848cf7b84197d1a53c30d5862183dcdbd917f1f6f235f97dc5d33b36ba423f34b72bb83ca6f9f2fda4f0081b3 SHA512 67b2df683c4becfbb9a64462b053544c68117c2459fce8e5941f8415c79f1ec73e9c386622dfdb201cf5473f6b83ff1b1444b6492d247036e696d3761e4589ce
+DIST nanoc-4.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
 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.9.6.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
+EBUILD nanoc-4.11.2.ebuild 2446 BLAKE2B 6422042144f1749a3c5821295de682ceea1a682076b7edd5b45a6e9278324829c709609d89a3e689dda6d94069b6db817a3a8afb56c3a3587f94b36cb79dd2a2 SHA512 8bdf7d4686765c1b5d3a6484d48e1310f702d8d3e800e6293b090a0962978b970df863705af6f56d8371acaaf38dbb466b02032f3153613bc6a9e5afb089d156
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.9.6.ebuild b/www-apps/nanoc/nanoc-4.11.2.ebuild
index 9e6642788b8f..02aaf44b073f 100644
--- a/www-apps/nanoc/nanoc-4.9.6.ebuild
+++ b/www-apps/nanoc/nanoc-4.11.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -29,13 +29,9 @@ ruby_add_rdepend "!minimal? (
 	www-servers/adsf
 )
 	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.13:0
-	dev-ruby/ddmemoize:1
-	dev-ruby/ddmetrics:1
-	dev-ruby/ddplugin:1
-	=dev-ruby/hamster-3*
+	>=dev-ruby/cri-2.15:0
+	~www-apps/nanoc-core-${PV}
 	>=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"
 
@@ -43,12 +39,15 @@ 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
@@ -65,7 +64,7 @@ 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
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
 	sed -i -e '/coverall/I s:^:#:' \
 		-e '/rubocop/ s:^:#:' Rakefile || die
 
@@ -79,13 +78,11 @@ all_ruby_prepare() {
 	   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() {
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
new file mode 100644
index 000000000000..6901c6c5e11c
--- /dev/null
+++ b/www-apps/netbox/Manifest
@@ -0,0 +1,8 @@
+AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
+AUX netbox-2.5.10-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
+AUX netbox-rqworker.initd 370 BLAKE2B f80cfa9d1007f4f1a9add484b6cee5d0e07698658fbbf797b9bb479270104bcbb445127e628349338f1ec5e9c3a41dc3962c949b4759fd1b5b2d190c505149b6 SHA512 081236868f3666e2b689702fd1b7aa5c1727de67e97f0990d158ba00210e1b84f412b0882c8cbf6662c5999424dd79a210c06db00e531727319abdec5d5de227
+AUX netbox.initd 339 BLAKE2B fc5d0818a741c683125e1519312760dcfd415eb11e287d3087420f51041486654d4244619629b712054d0768c91285debfa01e46245196454a6b732262200a7f SHA512 578c708941c1d767fc58c471a383130005227123f24350073d4f4f33770e577dc53ad4c47964c023fbfb94ed2533b06012a60990cf7dad00b9495f791faf877d
+DIST netbox-2.5.10.tar.gz 2363340 BLAKE2B 9bc946398ac75b585f2bc6fdb01bfb7545c92ccbb239e9ac0309b66be435134a87cde5fcf876cec4c3354e7aedf5af1d9e1976574689dfb0af34404e9c9f907f SHA512 ed71b0efaffd8bad6e53f7b281d1933234161f031110fa901e1b789a964f000f2ff13897685e79193cbee9294c1f50b8c6edef7d0ef6f829a7357640c8034525
+EBUILD netbox-2.5.10-r1.ebuild 3653 BLAKE2B 19e70c408e871ed171d3bbdbf82a95ccd06c8e70dc3117502150077faa4293dc440bfa1a8b520a12fdf4fbf40400d7cd95b78afe5c72eda13e0fb8babd727166 SHA512 05bcec74c1984235b2c6bc7785cbfd9255108eea141a079091e553fe3ab32c726dbb7ae2fe847063a6458ee6f23e1d27108500fd38fc56b2ffe483884aeb9ee8
+EBUILD netbox-2.5.10.ebuild 3454 BLAKE2B 904ae9677b4226e0ee7d9df94249c702d49b7c4d97aacad2cd11a04adcacc52a450ea2c3ecb1de66ff0d67e052fe5299877cad8794f628f30b47ad00d6ad74cc SHA512 b132f15e1ed9cdb0de0f9ef813716df2ed69896e0bf4fec21e2f2180b3d8553894f7390b48ae207c4dd08a6bd4c0d8f25368590e0cf5650ea56adae02c439575
+MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/files/gunicorn_config.py b/www-apps/netbox/files/gunicorn_config.py
new file mode 100644
index 000000000000..4cb7111fac44
--- /dev/null
+++ b/www-apps/netbox/files/gunicorn_config.py
@@ -0,0 +1,5 @@
+command = '/usr/bin/gunicorn'
+pythonpath = '/opt/netbox/netbox'
+bind = '127.0.0.1:8001'
+workers = 3
+user = 'netbox'
diff --git a/www-apps/netbox/files/netbox-2.5.10-no-pip.patch b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
new file mode 100644
index 000000000000..5d1fa595f4e6
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.5.10-no-pip.patch
@@ -0,0 +1,27 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index 24e79f5b..248e1cb5 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -8,22 +8,6 @@
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# TODO: Remove this in v2.6 as it is no longer needed under Python 3
+-# Delete stale bytecode
+-COMMAND="find . -name \"*.pyc\" -delete"
+-echo "Cleaning up stale Python bytecode ($COMMAND)..."
+-eval $COMMAND
+-
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-rqworker.initd b/www-apps/netbox/files/netbox-rqworker.initd
new file mode 100644
index 000000000000..2973e471e038
--- /dev/null
+++ b/www-apps/netbox/files/netbox-rqworker.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+name="netbox-rqworker daemon"
+description="nnetbox-rqworker daemon"
+command=/usr/bin/python3
+command_args="/opt/netbox/netbox/manage.py rqworker"
+command_user=netbox:netbox
+directory=/opt/netbox/netbox
+supervisor=supervise-daemon
diff --git a/www-apps/netbox/files/netbox.initd b/www-apps/netbox/files/netbox.initd
new file mode 100644
index 000000000000..d0457a8372f2
--- /dev/null
+++ b/www-apps/netbox/files/netbox.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+description="netbox daemon"
+command=/usr/bin/gunicorn
+command_args="-c /etc/netbox/gunicorn_config.py netbox.wsgi"
+command_user=netbox:netbox
+directory=/opt/netbox/netbox
+supervisor=supervise-daemon
diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
new file mode 100644
index 000000000000..f53806a22836
--- /dev/null
+++ b/www-apps/netbox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+		<use>
+					<flag name="webhooks">Enable webhooks via django-rq</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/netbox/netbox-2.5.10-r1.ebuild b/www-apps/netbox/netbox-2.5.10-r1.ebuild
new file mode 100644
index 000000000000..c12e3feb2dc2
--- /dev/null
+++ b/www-apps/netbox/netbox-2.5.10-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=dev-python/django-2.1.5[${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}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( dev-python/django-rq )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete.
+
+If this is a new installation, please follow these instructions:
+
+From the installation instructions [1], you need to configure postgres
+ldap and webhooks if you want to use them.  Then, you need to
+configure and install a web server. Gunicorn is already installed, so
+skip that step.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+	to the default runlevel and start it.
+
+The files you need to edit are located in /etc/netbox, not /opt/netbox,
+as shown in the installation instructions.
+
+If this is an upgrade, you just need to stop the netbox service,
+	run the /opt/netbox/upgrade.sh script, check for new configuration
+	options in the installation documentation [1] then restart the
+	service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}
diff --git a/www-apps/netbox/netbox-2.5.10.ebuild b/www-apps/netbox/netbox-2.5.10.ebuild
new file mode 100644
index 000000000000..efa1ca65e925
--- /dev/null
+++ b/www-apps/netbox/netbox-2.5.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/digitalocean/netbox"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+
+RDEPEND=">=dev-python/django-2.1.5[${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}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( dev-python/django-rq )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete.
+
+If this is a new installation, please follow these instructions:
+
+From the installation instructions [1], you need to configure postgres
+ldap and webhooks if you want to use them.  Then, you need to
+configure and install a web server. Gunicorn is already installed, so
+skip that step.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+	to the default runlevel and start it.
+
+The files you need to edit are located in /etc/netbox, not /opt/netbox,
+as shown in the installation instructions.
+
+If this is an upgrade, you just need to stop the netbox service,
+	run the /opt/netbox/upgrade.sh script, check for new configuration
+	options in the installation documentation [1] then restart the
+	service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /opt/${PN} ${PN}
+}
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index c628178ef5e4..8734d93f6f1a 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,19 +1,9 @@
-DIST nextcloud-13.0.10.tar.bz2 30033121 BLAKE2B 1549340f7b2b3f3bacbbc4be7c0894cf6b9caa1de1fef27aad3753e022ab3eef36787f075356ebd1ac0b2757e212e769eef79ff761c23cdf0cfaf841dd124894 SHA512 169f3f974944322d3a606f9b9e35c438b40b73e4c75c6dd9cc8b153713bbf411430f0d68603f24287a81eb9108589e6129d00e2ee3c0c57397ce03305bdbc9b6
-DIST nextcloud-13.0.11.tar.bz2 40812176 BLAKE2B 541875dd136fddf34abc61a89850c736891e01377d57a9d3b23d6f18a45578c31845667ecddd79f03261c7cb2f5c9c00a5d1c6f5958515e3330010c5a1e335b4 SHA512 18f785dfc10b4ca7afbdb7134a7ee3c23f302b9ad4c43f245c3d80d37d4ac7f651e23a032d27cb678b21a2d895069ed44ba846b6ea07445134bb26acbae20495
-DIST nextcloud-13.0.12.tar.bz2 45382327 BLAKE2B 624996f2c76924d61991f733198f5e2bb67bdf8607b2a7f26361c7080db005c4436a837f77c0463333638389ff10e5b4c7c4fc614573db488aeb03eeb9006997 SHA512 c01e31812775883b4e9bf31d4a1c9b1b76eeebe8c6409e504e79c4846708a35069e2265148469c6a7bc0e8b1031d1517b5c0c221e622e531a045a47d7bb785e1
-DIST nextcloud-14.0.4.tar.bz2 49827498 BLAKE2B 5bcf873f9e0f5b35450a4d381ea1e2fec0e1ef63e9424c83d18add4a6b19631d44191ae207ed60b25209e2b7b45ddec951d3441d8876ce0a057883d21a5e5864 SHA512 a53eb90645619d6558c93304c43ca86cf00cacf8a0f783e699f5041c7b5eb1c9ee8719d4bde5cc16bd1c7b90529d9b100c79e1ce14cc8f8192158c705c8db09e
-DIST nextcloud-14.0.7.tar.bz2 45913292 BLAKE2B 69494b7e618f564e063e217d357903992e2ea5f9200c67c079476eb7e110c0a623f7dd3eb19336967a8f3cff061e90d24215619c294d130b020802d5a813f982 SHA512 9fbd9e669eb77285336ab7dfbe0b92ecee6d99a92eecac0c8eaac8a3c42e1154c0e5d77ec808b56b90080859584027b295d3014fdf89ff92730b39571caee3b9
+DIST nextcloud-14.0.10.tar.bz2 54634419 BLAKE2B f589b9f292d770b86fbc7207440da71375723ce59b5e7f229fa15dc3347bd1b1f22a65a592c4c9af1238d3c1da3891ae22ac1505ccb7fe9f0988bd038f5ff760 SHA512 f8ec66af3dbac0052a54ac8d74e44baf648b5cee8ec9cbce2f498a675e2fb2241c8725391f21e500bd65ca8ce61fe9a16febf8419b1c5af8ac3da1dc4b869fbf
 DIST nextcloud-14.0.8.tar.bz2 54751640 BLAKE2B 0b017eeccbeb83f51388a965c48d44d7b03c95ff091e937d44705e4611ffe14134e67092a21b8e93be4455e806f1fbf13c5d1fac4d7e8f5e200b8f3afd8a0a95 SHA512 97434ee8ceb7d728c0a3ac013abcbfe7b52edf64347a762639871c54df8b2fd98e281aa53a553bd53efcbf2bd49342bbeb0cbfe1bed970673a8a5dfabf8fe1f2
-DIST nextcloud-15.0.2.tar.bz2 36224830 BLAKE2B 59393b5da69a80a92d71e3c9276087fef8758d07d599de2b1f185b97fdd09fc9893325b62b676dcb86f7fd864ef81304e10021bee73e025a9104f747699d0355 SHA512 ab9bf8db9fb231dd965188d2226d34e86128edfad5b5db259fe445cecd4f74e573e4cba3e151bd705dce6ced31d421e3986f5733ebe9f06804807c4bb7e21349
-DIST nextcloud-15.0.4.tar.bz2 47648166 BLAKE2B 2c645857b0d75b38bf76ca78e91899d780ed272919cf71b68a8908167d7ede3c26cd8d258dc61f041cbe2f03adf206b2c71d1879a01aee25c2265ad4bced962d SHA512 0942e1e5f0fb2038b27a697452b037b835d5a3614ec9660bde379a290b672b506b9dab3510e89b64916d995bb20c7165cf2bca628800d73f95067ff25dabcbc6
 DIST nextcloud-15.0.5.tar.bz2 56489515 BLAKE2B c60a4f01e9bc0d31b2fe1d440c8f0adb512966220bb149cd299a1e7c277b7a4713c96a57a0042f55ea26d3b83598091dc4cea6d3e9565414f3c57fd8f267ae05 SHA512 e31f3dbfec288f87fca220dd509999d0cc221c27e2b923418fce4bd598288881e2ce1c10dca929710a332380fee4f04e43e7302b3406785f23727acf5735d64c
-EBUILD nextcloud-13.0.10.ebuild 960 BLAKE2B 3547350ff45ce7149df5459a0c511d6e45c5e05ebdebf3935f6353cafa1f7700b890d03ab8cd4fb63a391234859f83a30cff10378787463f9d8a4d5de15e4351 SHA512 008d81f8dd97a2c0509aae80cb7a77ab1f6656b6e6d1b3c54db1ddc1fc5c8d7d3c1b71ffffe5eb2bd3a9a061bc25a1aa023c0e531d707138cdd29d762ac68ac9
-EBUILD nextcloud-13.0.11.ebuild 960 BLAKE2B 3547350ff45ce7149df5459a0c511d6e45c5e05ebdebf3935f6353cafa1f7700b890d03ab8cd4fb63a391234859f83a30cff10378787463f9d8a4d5de15e4351 SHA512 008d81f8dd97a2c0509aae80cb7a77ab1f6656b6e6d1b3c54db1ddc1fc5c8d7d3c1b71ffffe5eb2bd3a9a061bc25a1aa023c0e531d707138cdd29d762ac68ac9
-EBUILD nextcloud-13.0.12.ebuild 960 BLAKE2B 3547350ff45ce7149df5459a0c511d6e45c5e05ebdebf3935f6353cafa1f7700b890d03ab8cd4fb63a391234859f83a30cff10378787463f9d8a4d5de15e4351 SHA512 008d81f8dd97a2c0509aae80cb7a77ab1f6656b6e6d1b3c54db1ddc1fc5c8d7d3c1b71ffffe5eb2bd3a9a061bc25a1aa023c0e531d707138cdd29d762ac68ac9
-EBUILD nextcloud-14.0.4.ebuild 965 BLAKE2B d7fe81d87b280314655c36f6ee0987b875effe88f6845e16b3567862478a41d2833b552ce6a08638ab080797a26bf64c9ec3dc3559efa95e311151577ee05b51 SHA512 50026d383b7b9961d64ab808a787ce023be59a925514ff0e541394f3be00c89fed527700dae75219ab2e2ece0cb5c327cd8f2cd9e245674d6ac0f0253333c071
-EBUILD nextcloud-14.0.7.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
+DIST nextcloud-15.0.7.tar.bz2 56417492 BLAKE2B 048dd8ef79b3dcdbd69b68e9bd43d7ade14fa6d830e5918d12fd3d22db6feba914e620c7610e5b57e9802a9e00c7297ee43559cc03f264e704f10a6cbd5f2de5 SHA512 3868f9e1574d9d094ace7e1662da5df75d3f4399d8e160158a5eb251fb3f06c700fcc5dd312bf20d18bc70f7e37533ce0b7c4acd4e2affa893b84e6fb98bfb1e
+EBUILD nextcloud-14.0.10.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
 EBUILD nextcloud-14.0.8.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
-EBUILD nextcloud-15.0.2.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
-EBUILD nextcloud-15.0.4.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
 EBUILD nextcloud-15.0.5.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
+EBUILD nextcloud-15.0.7.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-13.0.10.ebuild b/www-apps/nextcloud/nextcloud-13.0.10.ebuild
deleted file mode 100644
index a9c1d18899d9..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-13.0.11.ebuild b/www-apps/nextcloud/nextcloud-13.0.11.ebuild
deleted file mode 100644
index a9c1d18899d9..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-13.0.12.ebuild b/www-apps/nextcloud/nextcloud-13.0.12.ebuild
deleted file mode 100644
index a9c1d18899d9..000000000000
--- a/www-apps/nextcloud/nextcloud-13.0.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-14.0.7.ebuild b/www-apps/nextcloud/nextcloud-14.0.10.ebuild
index e4392ac62888..e4392ac62888 100644
--- a/www-apps/nextcloud/nextcloud-14.0.7.ebuild
+++ b/www-apps/nextcloud/nextcloud-14.0.10.ebuild
diff --git a/www-apps/nextcloud/nextcloud-14.0.4.ebuild b/www-apps/nextcloud/nextcloud-14.0.4.ebuild
deleted file mode 100644
index 040f3eed112d..000000000000
--- a/www-apps/nextcloud/nextcloud-14.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-15.0.4.ebuild b/www-apps/nextcloud/nextcloud-15.0.4.ebuild
deleted file mode 100644
index d0d144714efc..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash,intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-15.0.2.ebuild b/www-apps/nextcloud/nextcloud-15.0.7.ebuild
index d0d144714efc..d0d144714efc 100644
--- a/www-apps/nextcloud/nextcloud-15.0.2.ebuild
+++ b/www-apps/nextcloud/nextcloud-15.0.7.ebuild
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 504c655366cd..e900e74a105e 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -4,12 +4,12 @@ DIST Nikola-7.8.13.tar.gz 4131250 BLAKE2B 6fdb12e59d7e977bc1ab9e2dd458de4a8a6110
 DIST Nikola-7.8.14.tar.gz 4130538 BLAKE2B dc8cd3a484bf203291ff8ca2b25233814e68bf916081f692a73c87af953cd57ea732dfdedfb8508187fb27566204f9442eb87847c98018fa0e5ef4ab4eb5295f SHA512 1a930e0cebbc9d54437ce438622eb2a6ad01988aaa9706f58cc0add17e483c3510d3a8ba120b8aa3b475c0e030cca471173f2520fd36e9528144cdee40fb1a9c
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
 DIST Nikola-7.8.8.tar.gz 3870991 BLAKE2B df6b3784acb339faccbcf1d269a2a9e315861be25e3880fab1c18754df1121b7081e9d1ad08d5a08d6b6913eacfdf184d9a19e5e1218a038913a6c7d2f78dcde SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687
-EBUILD nikola-7.8.11.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
-EBUILD nikola-7.8.12.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
-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-r1.ebuild 2349 BLAKE2B c4a72df9b91f52f8a64a54f81b75736f6d8faee0936feb978f6ceb4e3c31f85a927374fcbde0374541a745d2c7fd4010c812a40ad5f792b991d1aa1c36287c57 SHA512 ce0f585fc877930cf9a2024618463d88c56ee20b22871546408229ed805fe7cd69c8213fb9e3268e336fc49d916a70a5ce4ee0ff4fd695ab7b22f32a748d9cfc
-EBUILD nikola-7.8.15.ebuild 2348 BLAKE2B 49ad18b960da0afecd8f70dfab05dd66dd7e6a319f7ef46f199d398e2aa681aff58f43e8e0f2c01b899cf018633f194a742cc7a5f709fb1379b8e3286ee8a0eb SHA512 71c6e2cdeefde3bcb94519a3803cdef399ea70c90c3c73dcd88499080738ebf89824c97e9ac63856f1600e53b1550a2e8988165b2ea16bb2e6c5249d7a925857
-EBUILD nikola-7.8.8.ebuild 2337 BLAKE2B df493ca81b4c03608e1aa10647c2edb436b9e2a7ec42bd7cbf85c523cc19fead482637456957a0dc5c59c36e94a30eeb70c9ed5485b0d9ba79f5aa2ad405a03a SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b
+EBUILD nikola-7.8.11.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
+EBUILD nikola-7.8.12.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
+EBUILD nikola-7.8.13.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
+EBUILD nikola-7.8.14-r1.ebuild 2342 BLAKE2B 8559ab8b8597077864cbeb59847cc860474baff86d7aad2a2cdbb55fcc005bbe942d7cd41336a717c0f522cad3a855227e01300ee95aef9cd2b19ebf84e678ec SHA512 e24b1e54e31b41a0af7a3cf55837c02b00f7c0d2f09aa065141b9115472ac7afdd299c7ad5f17ca1a137921e271cbea9e2cd299b39405994fcfe867f89100dcb
+EBUILD nikola-7.8.14.ebuild 2346 BLAKE2B b7103299479bb1be59f26b20781c3af1ca8ddd51865a42ca8435813100523e940cb17f2b4cda6f9d15dc6ebd6269dfa2eb934c209ff6b96c564d6e0fcfa60af0 SHA512 4257c93e3317399c46c436325726908db4d998b9550674b08bcbe3d0b32c9cb57ec44e878e2c7ab1a97f0d858cd3fea10d40e2f5b03b0ab29b472f347072c245
+EBUILD nikola-7.8.15-r1.ebuild 2342 BLAKE2B 1b07256f3a69d002e45cbf720f1540374aa22e4e76bb3621404aa2fa7c9876fb8247b78e2dd52d4ae06a193f3c6837d481f5536d4be4b1ff4d412d0ed97f0a51 SHA512 4bda732817fd23e2bac698aabde65bd3346f1a31b5b1bf174ccfe270099cd8debfe8cca8e4d52ec51d133573d57b441a87d7b2c6327e9044f1238ee20b3fc93f
+EBUILD nikola-7.8.15.ebuild 2341 BLAKE2B 4101e2cbf26dffc69dd5b8a9afce8b1c1462b0b2d75ca533528ee8d56db0dba8f3f40daa490c8a7d003f46ae0506bef1d70032d6ade4768e0be071a453c04298 SHA512 90a06d57f562af135aabb68785bcc9c4dfd939d98ee48e5e7542ebcb0bb150d5f2530f63c788437947d25e1b31dc6f8dd8dd9b3972ba107f26967c29327d745a
+EBUILD nikola-7.8.8.ebuild 2330 BLAKE2B 3010ed5a670c93978bf2f09fc816a0a36f46788bde965422fe5a73711b6f0185d628ceed1f1c3b1840adf89817084e4abee336f088b40d11e493fb8d20102d3c SHA512 be5d0bbc720ef8f05e0f6fae30c997093a9d42231640345e57d0d32bb21fb0ba2d11a7fef0f096255b7b85aa59f3bb161f563c000d3bfdbd0e2f1eb22c753d00
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.11.ebuild b/www-apps/nikola/nikola-7.8.11.ebuild
index b01df582f294..d57d5fb59b08 100644
--- a/www-apps/nikola/nikola-7.8.11.ebuild
+++ b/www-apps/nikola/nikola-7.8.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.12.ebuild b/www-apps/nikola/nikola-7.8.12.ebuild
index b01df582f294..d57d5fb59b08 100644
--- a/www-apps/nikola/nikola-7.8.12.ebuild
+++ b/www-apps/nikola/nikola-7.8.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.13.ebuild b/www-apps/nikola/nikola-7.8.13.ebuild
index b01df582f294..d57d5fb59b08 100644
--- a/www-apps/nikola/nikola-7.8.13.ebuild
+++ b/www-apps/nikola/nikola-7.8.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.14-r1.ebuild b/www-apps/nikola/nikola-7.8.14-r1.ebuild
index 05f442bd330a..9706ef6e630d 100644
--- a/www-apps/nikola/nikola-7.8.14-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.14-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.14.ebuild b/www-apps/nikola/nikola-7.8.14.ebuild
index c0a87b751c1e..34d9a48daf5a 100644
--- a/www-apps/nikola/nikola-7.8.14.ebuild
+++ b/www-apps/nikola/nikola-7.8.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index eb51df3ce20d..c58fbd3a0807 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index 0c2bd110643a..0b6076257213 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/nikola/nikola-7.8.8.ebuild b/www-apps/nikola/nikola-7.8.8.ebuild
index a893c02361be..2d6dccca94be 100644
--- a/www-apps/nikola/nikola-7.8.8.ebuild
+++ b/www-apps/nikola/nikola-7.8.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) # 3.6 waiting for deps
+PYTHON_COMPAT=( python{2_7,3_5} ) # 3.6 waiting for deps
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index a549752b2ffc..808089b14fe4 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -2,8 +2,8 @@ AUX noVNC.confd 104 BLAKE2B da90c8f2ae649e65bbbcd8c894581d0dd187bfbb8bbb20393eb6
 AUX noVNC.initd 697 BLAKE2B 18032906a808e14944dfae2eddc6bbdb22dbbf620ec307a892e077e818a2e4e4c056c05c7cf8bae6d8ce0818dc8c48a6ccc4c42972a5b47862b96933d8536c7a SHA512 8b131686c5add6e7ea859ba433a325ff7f0b9a5c9a11199f0d4025229e56e2c5e725ebfa2cde146f5df4b8bd4b71cdde1f08e87d0217d61bb18b683221b4595a
 DIST novnc-0.6.2.tar.gz 600675 BLAKE2B f9779a9f03ba653f77090639112cd0c967ff5925d2f9897da6508fd077fb79a2f543467e32210572935a642e06fbbcac4a44c34b4342474f54ef7ec7a9bdbf4f SHA512 245d205f8935c82722a55d6cfcd2cea1825176c0cd695fd0eec34aa19cdc3b766fed62e741ff41b0a8c4a3b3cbabc5a39dfa6ad8ffa6169f5b88420a4a845a7c
 DIST novnc-1.0.0.tar.gz 1551574 BLAKE2B 58bd63eb0480b3f20ed16907725e0abcf8c699671614dc195f46a363d6ab9cdb5b0b033ba0ba16bbe39b16437fb94f64a741acd69d1c3c3957a0e60353d78a89 SHA512 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
-EBUILD novnc-0.6.2-r1.ebuild 1010 BLAKE2B 41bc455c0da894246f19cf3776ff5e24abbc41ebd1d657f9b4a2a0e075eac3223e6d3d3e81b435c7951f30341c324cc440ff99985e0d491447b4036675b2b11f SHA512 f7974c2196b85f17bc9b63bcf7fb659cc78e62df7a13d2c11e739392b29862e2681377fda7dc7ff374a447d69c5158a2d80fac1e4c90f5bba313c16a100cf667
-EBUILD novnc-0.6.2.ebuild 1300 BLAKE2B f0bbb9840eeb00a946bee242730c94ded11d6b729709fa3d2c6057751f565d0c744a08c4479878cd984eec899d98f5c8eb559f0dfb07479181dc9a31b4968a6a SHA512 139a9338f51163848c34d9fab57d1fb9d1e4fd4f654a307a6356cd01b9b549eb2bf9be1330ae2fc6f3fadbb7d02c68ce299cd17d9988b12ffca4f59ff761ff61
-EBUILD novnc-1.0.0.ebuild 1055 BLAKE2B f1ed5bc78c864d46c71ffb9822d65b51a56565ae705250e6a54a0a3440350e5a3f30b193bd176b58e400c29c495e8041551076855131f437c93b4a193c921928 SHA512 079c9b5aeb002ff7bc99678f9de49911e5e69e8dd1f5319d1512af21e6d9f0444057f1e8a82797ae4eed458dd5d550cbe977ab2b1c1161de3d8b2ffaae4d7d77
-EBUILD novnc-9999.ebuild 1055 BLAKE2B f1ed5bc78c864d46c71ffb9822d65b51a56565ae705250e6a54a0a3440350e5a3f30b193bd176b58e400c29c495e8041551076855131f437c93b4a193c921928 SHA512 079c9b5aeb002ff7bc99678f9de49911e5e69e8dd1f5319d1512af21e6d9f0444057f1e8a82797ae4eed458dd5d550cbe977ab2b1c1161de3d8b2ffaae4d7d77
+EBUILD novnc-0.6.2-r1.ebuild 1005 BLAKE2B ffac0e2bbf87cce2ad41afad246385ffb33afc27e76fd52cef7fbc5b13e97153eee1b1062262504977ea8abe9c452ce1258f4058032a2d8b91ad7dc455fa112c SHA512 d2aa3f0687c1561b4f4f2082fa45f96c8cf17dd27ca2e769a4c42f08e56183f516341d1eaf80fdbd0df337fddb8df4ccd68cc9c6d02582b6c881c1b440cd3294
+EBUILD novnc-0.6.2.ebuild 1295 BLAKE2B 5a268147618fad0fe7991e81e491fbdfa9cd38d4e020a93d300999189251a19c8d214a556f08f51146ee136e523cdc8e1dd0b71f37da357486b75f29505c6ce7 SHA512 efe2273627600f82f38bb7bf33a5815fa2a97249cffb04d0ef2a32d1d8a7e323c487c69b28125e5e6cc9eaa98a09d9b9a69a5aa868d793fb3d0f0e44cc3f0d86
+EBUILD novnc-1.0.0.ebuild 1050 BLAKE2B 1960789e5c151c1d7f01719586dfb802903a3ed6116b3b410dab6808a95a22788b8df9b0ef8766a0d156dde0055a74caadb9f27b87624d8ec04827f9e3503ea6 SHA512 a58c1961a5fe18c7a6c1af580f1f09d447fb24cc5e627f52e3bf961b2da12db2a4d28df3f866c3d94021b4f4a2460978eb60cc050da3f3b796de116f22f1ab54
+EBUILD novnc-9999.ebuild 1022 BLAKE2B 6a04bc03d38f3f979de226d9802225225f451e08913cb3b47931941a391ddd6fbe55ca8357708b6f23b2731d8a82ca0362dd43c7c65d73a296e90f49ee361b6b SHA512 bb76bccfee688e20639b6b6f95e1fd253a021f4eb0ba886bd5de68ecd77fc01f5e4bfab0156171b2c50a2c37ec892c485d786285f3496e17aa66ebe9d25e8777
 MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
diff --git a/www-apps/novnc/novnc-0.6.2-r1.ebuild b/www-apps/novnc/novnc-0.6.2-r1.ebuild
index 3c55dc86c583..c5b78549582c 100644
--- a/www-apps/novnc/novnc-0.6.2-r1.ebuild
+++ b/www-apps/novnc/novnc-0.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/novnc-0.6.2.ebuild b/www-apps/novnc/novnc-0.6.2.ebuild
index 2696a4f7c66f..d5c59a640c6a 100644
--- a/www-apps/novnc/novnc-0.6.2.ebuild
+++ b/www-apps/novnc/novnc-0.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/novnc-1.0.0.ebuild b/www-apps/novnc/novnc-1.0.0.ebuild
index c876ebff1f79..fd0bebd11d30 100644
--- a/www-apps/novnc/novnc-1.0.0.ebuild
+++ b/www-apps/novnc/novnc-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index c876ebff1f79..f2f5e348f93d 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
@@ -18,8 +18,6 @@ else
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-S="${WORKDIR}/noVNC-${PV}"
-
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE=""
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index 24c347fd8452..18e6e42ffab1 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,3 +1,5 @@
 DIST piwigo-2.9.4.zip 7846445 BLAKE2B 8c8eb7ab0e153ad9665ab3b18b70f5090b2d6545b312b19fcbca6f80b3e017b16bf94271ae071e02c2b8978802adb4e69a287a4e6dedaa728a41d6479765fc57 SHA512 b558700f041402f1fa399d1599ceaca4bb381ba818f189b5dca68a5b09d65416b5cbf2c4f48c8390381cffe98c840d4279c0b57c698ca5a81c0304ecc4a9a80c
+DIST piwigo-2.9.5.zip 7870527 BLAKE2B 6a61f97125d3594d1672d3e9dec29716dff62417c07f0803c576c2cd9636273425342791e97abd7abc8f50dac56ebc4b7843435d75cbb3fd8c29e9723f9a32c7 SHA512 d211a86b40f3a20f406a4bbce87c094bc155b664fe7fb5ec5ab4de6e0bb0228c0c0aa30a04437469ea2360bc72b9e76b265b2811d77aad857fd85eeccb4d30c2
 EBUILD piwigo-2.9.4.ebuild 1124 BLAKE2B a76eab874b4da2523c2fa640c1328cb62face4558ff3b56963be5ecc1e0474b83d7c29f30b8ef20c1d6a4c0442351a4f3385a01d730870f971c3e6b8dd8e9df5 SHA512 d563490c915c81bb820bf91bfc328f98becdd839279e9b780a29555ebb5a27858abb08f2c635ab42e216c666871c8c8e8e04cb116ae30055d67777bad46f3193
+EBUILD piwigo-2.9.5.ebuild 1121 BLAKE2B 1f64b9af80585ae554f6298d155f68c52c9892d251ad2fd8d8353ab1f7bfba3c953e4743d40a1ae5e7f47379c7097c1afa09f556b8e69d4385fc41206c64a1e6 SHA512 55a8f58f161d29f2c53e520147f13dd6d3b25e4f0dbafc42c8e6f3c57a8498ff6084e59bdb3594fd282e6d1567f3375fee3ad90cd2384707a29990904b75df08
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-2.9.5.ebuild b/www-apps/piwigo/piwigo-2.9.5.ebuild
new file mode 100644
index 000000000000..56866abb3045
--- /dev/null
+++ b/www-apps/piwigo/piwigo-2.9.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 8e3134f8e03d..7dbbb4b93f4e 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -4,6 +4,6 @@ AUX radicale.init.d 564 BLAKE2B 370d68329a2507c4b96766597851f1c5de13df492422212d
 AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
 DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
 DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
-EBUILD radicale-1.1.6.ebuild 1684 BLAKE2B a52aa9b6d283de410e7013e6a700782e77041078fce0cddd067ab603078db78d728cbac4d4cf9320473ae9a66c801a791d3ac4d21b352e954df33077e1c8e4e3 SHA512 d1600fdaea50a3b811516350b6380a05c28d82de18e02d2b3fe630eaeadf0c7e3fe06df26df80f392100ff3d31175eb57a8b6c31b481cc26a7f844fbe4cfaa0c
-EBUILD radicale-2.1.11-r1.ebuild 2753 BLAKE2B 359faabe6cc7af9642d3707396a933b746814eee9f1abca3d15fb8d209fb4d1a691a6a0b95849a054816cf7c1b42b3fc39da76f98ca960910aa9ea6f4939af8e SHA512 faa4bfb2e86ea84f600f4691f8bd6feba509710f3ce836bdcbd236da1a4b2586756a216cab69fb66ee1231ed326aaa05227bf0973839b17a9d3c4d979f4eb3ba
+EBUILD radicale-1.1.6.ebuild 1677 BLAKE2B fced589ac78477c3f90aea11ea8fba51030d71873dbfbce79fce2dab6010d9606931e314684a6dfb218bbc4e3a48675b062cdac714e1d4e757698b9f14d12313 SHA512 e00842709f8f6f5e298ff23c56c8f1fa8a30756e4dd9446c7da88fb92cbf0a2a8f8f88c707755922467e4c57e3f13123e7206524783aa49e185017a482211a02
+EBUILD radicale-2.1.11-r1.ebuild 2749 BLAKE2B 220d06b187c22e258144bf4dbf26bdb414a43814a255d520d1644a3faa27103a12bb8b648fd2728504c2706808fc6b4b25a0694ce63265eb875b112fd735f8db SHA512 1d3203a101d3158b22b8db9c6abaa16decdf230b0c000b1876ad9562e7b2e12cbbf405b48da76bc96bc3f7737c4484aa6f7f079c515266938ba673faf815b0c2
 MISC metadata.xml 472 BLAKE2B dad26ff5abb5fb50a0016f23a03f33bf2e6dc536ed92fe30a587824f8b85789ae16a44d362df683c2b62c9db73175f0cbb06b26a6a6d4b3d544fdefb30613690 SHA512 309c2abddb4150357ffbfd35d8dd153592b4e7426b61728a25f7a2a8eb6a97ab8c3e4042eb5e333d4524977ec7f30e6793b33a6a2a70eff1f1c555d7f9f706e2
diff --git a/www-apps/radicale/radicale-1.1.6.ebuild b/www-apps/radicale/radicale-1.1.6.ebuild
index 82d0fd597d96..406bded924ba 100644
--- a/www-apps/radicale/radicale-1.1.6.ebuild
+++ b/www-apps/radicale/radicale-1.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit eutils distutils-r1 user
 
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index 853fccb8ac1f..0c6b68c8229d 100644
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 eutils user systemd
 
diff --git a/www-apps/trickster/Manifest b/www-apps/trickster/Manifest
new file mode 100644
index 000000000000..d6d371d197d8
--- /dev/null
+++ b/www-apps/trickster/Manifest
@@ -0,0 +1,6 @@
+AUX trickster.conf 4759 BLAKE2B 223e0061992a9d3c0aad85d344cac0af00eb19e527a82e974840fdd5bc8cd7971083727697e038e7be7e9783bebd87ecf32ad4aecf2ef890cb53afd350982b88 SHA512 31975d8f20d5000b9400cda03469f6becb26e20f24c0213e80356b5e92b46c47efe2e820b1c448c6bc83b23de5c34442f13be8b9c66cfc169f99c85e5a7b6abc
+AUX trickster.initd 495 BLAKE2B 3ae2f752269665ce0a855a3b937625db4c7d3d077ecc59bb8a9acff4e78d38531fd392ec3cb1a05ab204f83ac50e25d1aa27344dac405eb37dd0a71c732a463c SHA512 2c7fade0e6e91ac10e1c9a9ab312e2fb794f5fd86332b780a2d5b076ca00e460dac11cc3486bf43dceda7be1baa29b57a298fe257229012cf48b9f92861c7c8f
+DIST trickster-0.1.9-vendor.tar.gz 1748976 BLAKE2B 77ad4a91a889a8241399fe6b4199d25c0ba52e818fbe1df8186dadea0f69c1d04f9c268fc376820592465ed36104a6195ce9a9985f8a9c02636ee1b8f80114b7 SHA512 6427cb3417ae7d62e5e144cb5a1962f2175ab063c2267abd838560db00acc4c161666df4ea2065a02172b50240f17a6ad09d76973e59d9bea91ecf4a9327466f
+DIST trickster-0.1.9.tar.gz 1739869 BLAKE2B dc50d12acfe27f68054bbafdeada0bd1847ebb1e03847f9173c7e9b772218ce2e7ceffe25db282912f88c005c0d590e3effece6483bdd80830438a8d114f859f SHA512 82fa837d2b18143a65e22a06d2821d7a1da298fb3e9389854f8e6ad4de68f35d40d6aec2d23cca877032227d12818063953244a01b42f09bd724677d1080e84f
+EBUILD trickster-0.1.9.ebuild 972 BLAKE2B 521c084c46620e73387650a325656669e8d8f4dcf03267d2f527983a8cd2e881b484b334860b9b98a6b9e735d2e39a7d3d44fd3efde3c560155bb801a1e8c345 SHA512 62d81e7c88370c30c9acea89452188244884cf9dddb24434fb4864edc81ce43075f94ee047449f8601fb5fc7adf7fb66aaa6d1fcf7ea1ec0868547ec83ca29db
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/trickster/files/trickster.conf b/www-apps/trickster/files/trickster.conf
new file mode 100644
index 000000000000..9fb255e19c5b
--- /dev/null
+++ b/www-apps/trickster/files/trickster.conf
@@ -0,0 +1,113 @@
+[main]
+# instance_id allows you to run multiple trickster processes on the same host and log to separate files
+# Useful for baremetal, not so much for elastic deployments, so only uncomment if you really need it
+#instance_id = 1
+
+# Configuration options for the Proxy Server
+[proxy_server]
+# listen_port defines the port on which Trickster's Proxy server listens.
+# since this is a proxy for Prometheus, we use 9090 by default, just like Prometheus does
+# listen_port = 9090
+# listen_address defines the ip on which Trickster's Proxy server listens.
+# empty by default, listening on all interfaces
+# listen_address =
+
+[cache]
+# cache_type defines what kind of cache Trickster uses
+# options are 'boltdb', 'filesystem', 'memory', and 'redis'.
+# The default is 'memory'.
+cache_type = 'memory'
+
+# record_ttl_secs defines the relative expiration of cached queries. default is 6 hours (21600 seconds)
+# record_ttl_secs = 21600
+
+# reap_sleep_ms defines how long the cache reaper waits between reap cycles. Default is 1000 (1s)
+# reap_sleep_ms = 1000
+
+# compression determines whether the cache should be compressed. default is true
+# compression = true
+
+    ### Configuration options when using a Redis Cache
+    # [cache.redis]
+    # protocol defines the protocol for connecting to redis ('unix' or 'tcp') 'tcp' is default
+    # protocol = 'tcp'
+    # endpoint defines the fqdn+port or path to a unix socket file for connecting to redis
+    # default is 'redis:6379' 
+    # endpoint = 'redis:6379'
+
+    ### Configuration options when using a Filesystem Cache
+    # [cache.filesystem]
+    # cache_path defines the directory location under which the Trickster cache will be maintained
+    # default is '/tmp/trickster'
+    # cache_path = '/tmp/trickster'
+
+    # Configuration options when using a BoltDb Cache
+    #[cache.boltdb]
+
+    # filename defines the file where the Trickster cache will be maintained
+    # default is 'trickster.db'
+    # filename = 'trickster.db'
+
+    # bucket defines the name of the BotlDb bucket (similar to a namespace) under which our key value store lives
+    # default is 'trickster'
+    # bucket = 'trickster'
+
+# Configuration options for mapping Origin(s)
+[origins]
+    ### The default origin
+    [origins.default]
+
+    # origin_url defines the URL of the origin. Default is http://prometheus:9090
+    origin_url = 'http://prometheus:9090'
+
+    # timeout_secs defines how many seconds Trickster will wait before aborting and upstream http request. Default: 180s
+    # timeout_secs = 180
+
+    # api path defines the path of the Prometheus API (usually '/api/v1')
+    api_path = '/api/v1'
+
+    # ignore_no_cache_header disables a client's ability to send a no-cache to refresh a cached query. Default is false 
+    # ignore_no_cache_header = false
+
+    # max_value_age_secs defines the maximum age of specific datapoints in seconds. Default is 86400 (24 hours)
+    max_value_age_secs = 86400
+
+    # fast_forward_disable, when set to true, will turn off the 'fast forward' feature for any requests proxied to this origin
+    # fast_forward_disable = false
+
+    # For multi-origin support, origins are named, and the name is the second word of the configuration section name.
+    # In this example, an origin is named "foo". Clients can indicate this origin in their path (http://trickster.example.com:9090/foo/query_range?.....)
+    # there are other ways for clients to indicate which origin to use in a multi-origin setup. See the documentation for more information
+
+    # [origins.foo]
+    # origin_url = 'http://prometheus-foo:9090'
+    # api_path = '/api/v1'
+    # default_step = 300
+    # ignore_no_cache_header = false
+    # max_value_age_secs = 86400
+    # timeout_secs = 180
+
+# Configuration Options for Metrics Instrumentation
+[metrics]
+# listen_port defines the port that Trickster's metrics server listens on at /metrics
+listen_port = 8082
+# listen_address defines the ip that Trickster's metrics server listens on at /metrics
+# empty by default, listening on all interfaces
+# listen_address =
+
+# Configruation Options for Profiler
+[profiler]
+# enabled indicates whether to start the profiler server when Trickster starts up. Default: false 
+# enabled = false
+# listen_port defines the port that Trickster's profiler server listens on at /debug/pprof. Default: 6060
+# listen_port = 6060
+
+# Configuration Options for Logging Instrumentation
+[logging]
+# log_level defines the verbosity of the logger. Possible values are 'debug', 'info', 'warn', 'error'
+# default is info
+log_level = 'info'
+
+# log_file defines the file location to store logs. These will be auto-rolled and maintained for you.
+# not specifying a log_file (this is the default behavior) will print logs to STDOUT
+log_file = '/var/log/trickster/trickster.log'
diff --git a/www-apps/trickster/files/trickster.initd b/www-apps/trickster/files/trickster.initd
new file mode 100644
index 000000000000..bdee1f57e2e6
--- /dev/null
+++ b/www-apps/trickster/files/trickster.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+description="Dashboard Accelerator for Prometheus"
+command=/usr/bin/trickster
+command_background=yes
+command_user=${user:-trickster}:${group:-trickster}
+extra_started_commands=reload
+pidfile=/var/run/${RC_SVCNAME}.pid
+
+depend() {
+	after net
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	case "${supervisor}" in
+	supervise-daemon)
+		supervise-daemon --signal HUP --pidfile "${pidfile}"
+		;;
+	*)
+		start-stop-daemon --signal HUP --pidfile "${pidfile}"
+		;;
+	esac
+	eend $?
+}
diff --git a/www-apps/trickster/metadata.xml b/www-apps/trickster/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/www-apps/trickster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apps/trickster/trickster-0.1.9.ebuild b/www-apps/trickster/trickster-0.1.9.ebuild
new file mode 100644
index 000000000000..d147b62d604c
--- /dev/null
+++ b/www-apps/trickster/trickster-0.1.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Dashboard Accelerator for Prometheus"
+HOMEPAGE="https://github.com/Comcast/trickster"
+VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
+SRC_URI="https://github.com/Comcast/trickster/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go:="
+
+RESTRICT="strip"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	mv ../vendor .
+}
+
+src_compile() {
+	set -- env GOCACHE="${T}"/go-cache go build -a -mod vendor -v
+	echo $@
+	"$@" || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+dodoc -r conf docs/*
+	systemd_dounit conf/trickster.service
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	insinto /etc/trickster
+	doins "${FILESDIR}"/${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /www-apps
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)