gentoo resync : 03.03.2019

29 files changed, 384 insertions, 487 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f00fa87eb995..152de011f5e5 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index e0512c2cc26b..91b3363ad094 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,8 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
-DIST drupal-7.63.tar.gz 3298415 BLAKE2B 28b136911b7faf4cf9ac790dbb5260de1004e34c77dcc08fabee7ae464a5f30645a4377f3c9f1ca4df45a357864bd1b5f6deb09a20db41bfbe9ef7621bf404a7 SHA512 e601732590a0b6d63d15d4d73e9531576592092dda986d965ff4d466069f21fc0adcd004798547b14dc528546ddcb5bb089a7cb1919b89f94339888858f12dd1
 DIST drupal-7.64.tar.gz 3297822 BLAKE2B 8f1e9fa72086ae41a4d5bc2b261d23b5302400263cea28eb4e7b70ffb56d16c70dde31f7759eec9493a485e4527ba6e1085321362e835110d9b672bb520331dd SHA512 90d4b863df5597ac7e88dc09317e3ab8b2beacd6051ef267de52d1fe599a8704f25ede708d2a106c18d76f19c2c9de1e5003086ab9116bae5624acd418e8a014
-DIST drupal-8.6.7.tar.gz 16478439 BLAKE2B d1649f792e79ece2c17842478f23fbed8ef331ad6fcf7509f5cdd4fd5875fc6a00e1820fe39a66dd5404945658260436b9438c8d25a725517bc13f44d1407290 SHA512 0150f42066fe1a2e5c96eea1fd3d59221d2d3102cde8e629de79f4f248496c506cd2f76165a1baee3c36ca2d3d266658949a7927743c9e1859a525aa34ae80a6
-DIST drupal-8.6.9.tar.gz 16857833 BLAKE2B f2d47f834aab8ee5c3ae0dfb371fe73470be97754e7ffdd21d152da8405a35895cd72f019063ee091253b731e5ca53dfa4cde1e9d1f435f8a4ed39d9b4ce5ec0 SHA512 844acb03335e0e017f4f2b7c53ad5f3f25c32feb361e9f45bb073bba0689009b3a53da40999a7edae83fe8118865ac4d18f428feda08692ef7dd50db0b46c95a
-EBUILD drupal-7.63.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
+DIST drupal-8.5.11.tar.gz 15817672 BLAKE2B da944b432cacf070f47c3c16966c0a0a8950258f067bf2da50ae00281cee6a72f53940ad227ca2864f342c25a7bd6a500140f8070c932aa1a07a96b98016f1ff SHA512 16695af590d048882fa2c3b4aae071d6cbbad6eb4d0dd02763b7c95c782ef4cec70e3825cebbaecf2d5a6f18e2744017accb7bf9e7caf17b1b497eabfef3a348
+DIST drupal-8.6.10.tar.gz 16858107 BLAKE2B 1a86d907fea4ec77d88bc7a8d937baa093972b4823e347ce151040a8f7a53330433cea73273097a8960c41b9655094451f38160bcf2f6197fa7e7fcf82c52060 SHA512 acd37fd87a15ca5056b1b1341cd24481073b21dca279536f4065c817230b83dd41a01fc82867781ee2d70cd7e5ccd333b6bdda0cfe4966ce79bf5b1435ad5192
 EBUILD drupal-7.64.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
-EBUILD drupal-8.6.7.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
-EBUILD drupal-8.6.9.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.5.11.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.6.10.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.63.ebuild b/www-apps/drupal/drupal-7.63.ebuild
deleted file mode 100644
index 2d1f90ebbd06..000000000000
--- a/www-apps/drupal/drupal-7.63.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
-	virtual/httpd-php
-	accelerator? ( ||
-		(
-			dev-php/xcache
-			(
-				>=dev-lang/php-5.5[opcache]
-				dev-php/pecl-apcu
-			)
-		)
-	)
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	sqlite? ( dev-lang/php[sqlite] )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-}
diff --git a/www-apps/drupal/drupal-8.6.7.ebuild b/www-apps/drupal/drupal-8.5.11.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.6.7.ebuild
+++ b/www-apps/drupal/drupal-8.5.11.ebuild
diff --git a/www-apps/drupal/drupal-8.6.9.ebuild b/www-apps/drupal/drupal-8.6.10.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.6.9.ebuild
+++ b/www-apps/drupal/drupal-8.6.10.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index b60b928f1cbc..23f0e04cdd3c 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,20 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-5.3.4.tar.gz 54609273 BLAKE2B 4a9197baaa6d6689d1e23630f49513a9b6b90ebb081ab8f82fff8e2f3f1c156b0fec5a30c6f6222a3225646b37305a535747e4a60157528a56f222cba56a8ada SHA512 97aa9325f9886a13844828d29395fb6a0752ccc0311119850c78425a0d0c8e82844b20b4c0dbacec0de479aaa26dddb5510485d0fd6a8a7e760f4b540bb3b270
-DIST grafana-bin-5.4.0.tar.gz 55200142 BLAKE2B f529b0fbb82aabf290f89ceb94d757725c5fef48a94a2ec54f26f20b332b0138fa54b122380d71205e03638c33d152bfac0e814c18b0f99bcdb8ef112ef9bba7 SHA512 e05793d23fead999868c7edf925fd90da099f50ecb03166471eebfc42aed1c30fcbd8edc3156b14e48309a34cbd9f87566d1901cc946ec45a4834b4ac7808e9d
-DIST grafana-bin-5.4.1.tar.gz 55202271 BLAKE2B 8b4ae8551e9fb9d5cb2d3bebf571fe0234bd6100f6dabf1aa2fdc32ab169f729ca38f4d28212456d13158a7dd51967d42ae387ca423a9c3548ee22ddaefac492 SHA512 0b6f8b1f71f39f6fd38ee8a6daa925818acd2be22c7ba98021a185dabbff5cf520cb8cc955498562344528649c4546f9b3fb331da2d88d5794a4a2cf4c5e7368
-DIST grafana-bin-5.4.2.tar.gz 55202302 BLAKE2B 6e6e5300128a17db4f2323a5c94528eaed67c6446f44180355d7bcbeb91ccf05c9f1ed0aa89c4f8a0cfc72e9d7342c8bb5617884ad3ba3046f44491cf625f88f SHA512 9944f47b489579eac692fe46f9b161f59416d50a38984d5dc07478988bda163c2b66e6715629ee92067fa4ce9e8b9205107f9e7b4a6697d1194227f80d09df2e
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
-DIST grafana-bin-6.0.0_beta1.tar.gz 56647687 BLAKE2B 911557c15cc1f0b50e69e5c80e57b91a2882ab1e0c2d62547cc626a90a8cf0f0b0a9b715f972bc4a925326012ecbb076d942356d8dd2c58bdc3f923e193b153d SHA512 e6c70bcbe27bdd2b83794eb0aad3813b77893623cea9d61f0bf7ee536860c62db34f87243160b4983f49062c8984b8cc0cbda6a639efa465e4ebd00a4acf80ec
-DIST grafana-bin-6.0.0_beta2.tar.gz 56167901 BLAKE2B fe30db62b01a1de1e8b4ecd87c9e7386fc4f83ad5d829866112e192713966b745336a78eb4ae1607a2722cde6c6fdd62f2f74a275d6416678f41887b4fddacfb SHA512 e4c470be2befb61f587b2a8935074ba4fd44efa7bf752fc37f43453d181be00f343e39ec56c782f9fdec8e770364c022bd64be634716397d9524854b31cc9313
-DIST grafana-bin-6.0.0_beta3.tar.gz 56189550 BLAKE2B 4012f3916dbab069db5aabb52ff4683e9b80c7905991f6c86ba21e7ccbec1402b67a00636c1fb8a31b1edbaf3d2a3ae467431c1aa5305ea95e7546f03707bf0b SHA512 199caf9123c37bdb313d02e19eaf2a9cf3b90fdbacea1cb006e7efd32cb12c7dfb012826f1388fd7b48dbf88be33e3a56c2beccbc69afeabe79586a1ec13fc36
-EBUILD grafana-bin-5.3.4.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
-EBUILD grafana-bin-5.4.0.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
-EBUILD grafana-bin-5.4.1.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
-EBUILD grafana-bin-5.4.2.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
+DIST grafana-bin-6.0.0.tar.gz 56196184 BLAKE2B c3b50e93816a747cfaf343a40589291ffd3ee8c11d90a29d220b8dc7fa0025efea5e4f915d26aff2b0725b377bf8f06ee9e6188916d174bfa6c9dc8c76a65837 SHA512 2b80f0cd5ea3386ce013c97e087ae44281bf9aac778ff5bb049a02e418dee42067098415ef902e964cefff8218b5d32e67df3b97f971f5b82bfb2b15e095a187
 EBUILD grafana-bin-5.4.3.ebuild 1776 BLAKE2B 23228bd5d950c6b1fbb3189e4a5cdbddb11790bfc7c1c396a6a7e86c1cfe5f454390c73cf1dbc9615455a776d36772c00193abd559a00f991b6a8ec07bd7fa8c SHA512 1b9b5f87d1ba801004ebd0aee3ae393224c98b7b1faf36657d32be88342a7f13164fa12c2e26e8d13fde947fe22557b65adcdf5064d7b60f6fb2a457bb39f582
-EBUILD grafana-bin-6.0.0_beta1.ebuild 1807 BLAKE2B da1a9b558d15d36b344b9670fa49993a8a6ad502abfba6964ae2404068b91b76983073a9c59a277da111edc26ef3810129a705289f4354c8e4831af60364e68a SHA512 6a1b7fb34f2d06a7c49e5621137a4b2582e28e9a55f6f8cc464a3a18c0eca411080884fb9ded7dc1642ce601c14f992a659d27031382671e74af186b3b1726c2
-EBUILD grafana-bin-6.0.0_beta2.ebuild 1807 BLAKE2B da1a9b558d15d36b344b9670fa49993a8a6ad502abfba6964ae2404068b91b76983073a9c59a277da111edc26ef3810129a705289f4354c8e4831af60364e68a SHA512 6a1b7fb34f2d06a7c49e5621137a4b2582e28e9a55f6f8cc464a3a18c0eca411080884fb9ded7dc1642ce601c14f992a659d27031382671e74af186b3b1726c2
-EBUILD grafana-bin-6.0.0_beta3.ebuild 1807 BLAKE2B da1a9b558d15d36b344b9670fa49993a8a6ad502abfba6964ae2404068b91b76983073a9c59a277da111edc26ef3810129a705289f4354c8e4831af60364e68a SHA512 6a1b7fb34f2d06a7c49e5621137a4b2582e28e9a55f6f8cc464a3a18c0eca411080884fb9ded7dc1642ce601c14f992a659d27031382671e74af186b3b1726c2
+EBUILD grafana-bin-6.0.0.ebuild 1807 BLAKE2B da1a9b558d15d36b344b9670fa49993a8a6ad502abfba6964ae2404068b91b76983073a9c59a277da111edc26ef3810129a705289f4354c8e4831af60364e68a SHA512 6a1b7fb34f2d06a7c49e5621137a4b2582e28e9a55f6f8cc464a3a18c0eca411080884fb9ded7dc1642ce601c14f992a659d27031382671e74af186b3b1726c2
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.3.4.ebuild b/www-apps/grafana-bin/grafana-bin-5.3.4.ebuild
deleted file mode 100644
index 211fc9468af4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.3.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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
-
-	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-5.4.0.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.0.ebuild
deleted file mode 100644
index 211fc9468af4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.4.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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
-
-	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-5.4.1.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.1.ebuild
deleted file mode 100644
index 211fc9468af4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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
-
-	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-5.4.2.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.2.ebuild
deleted file mode 100644
index 211fc9468af4..000000000000
--- a/www-apps/grafana-bin/grafana-bin-5.4.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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
-
-	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.0.0_beta1.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0.ebuild
index b252435ffde3..b252435ffde3 100644
--- a/www-apps/grafana-bin/grafana-bin-6.0.0_beta1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.0.0.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-6.0.0_beta2.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0_beta2.ebuild
deleted file mode 100644
index b252435ffde3..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.0.0_beta2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://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}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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
-
-	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.0.0_beta3.ebuild b/www-apps/grafana-bin/grafana-bin-6.0.0_beta3.ebuild
deleted file mode 100644
index b252435ffde3..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.0.0_beta3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://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}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-*"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-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
-
-	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/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 9d923e3eff47..e5a67b4e18f1 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -5,5 +5,5 @@ DIST mediawiki-1.31.1.tar.gz 35260876 BLAKE2B 4a1b5f2c47535a1099b105f35158c2e15c
 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 2415 BLAKE2B 18a0256b98a3e476060b1e17100c112bee2bb1a065e1dc8119c7b0035b83ef5b2e69b81f329f9790c79343402a9909b1f3bde479d5cbbd5d392b951c839b4a3c SHA512 fd10189db8efc069f0592fc6f414c39ca51ab171408063b689dfac346b9a451d43bcacf77a21052fd63392c4a17462b7db60be3ebef8272b543def5288bf2633
+EBUILD mediawiki-1.32.0.ebuild 2442 BLAKE2B 1e2ccc9ca8133a9a6c06a08587646b36ead094d35598a31c39c401b66c564fed1bb3d404dd3b94feec527242b2b75de18b0f854a68bf2aafcd46b100cf83d24a SHA512 a41a895d3c7310acb7869840c87ce4353a300b5313edb65dd7ea4fe70fbbc4bfe9157da75e3986c7b5bfa75e9dfdfa821da698bb7d8a99a11f544081702aa318
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.32.0.ebuild b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
index e027bd58c353..b211b54dfd99 100644
--- a/www-apps/mediawiki/mediawiki-1.32.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
@@ -14,7 +14,7 @@ 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]
+RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
 	imagemagick? ( virtual/imagemagick-tools )
 	!imagemagick? ( dev-lang/php[gd] )
 	mysql? (
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 0182ed755efd..a6256a1d8c9b 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,7 @@
 DIST owncloud-10.0.10.tar.bz2 44943557 BLAKE2B a2cdfbef7affc306b7653f1841b0bb2e781d849bbd62d9b8a0f3a019cca5be8a02ca27b5fa5cbb39ddb9a440aa917b279c937ebdae034504d5c1b9ed3eeee603 SHA512 77f9567395ee5319afc397ed7b9bd93687ddfb90022445be06adfb58ae49557223227a656b638b1cdac19b730509292e7ba260846c9f67540418267ac7b518f7
 DIST owncloud-10.0.9.tar.bz2 40769945 BLAKE2B c2187838488e87a85a964a9f1cd181e203fef6475c8797f8fc7204ae91d00522193cf730340dcf3e08b85cb03992d8d922a1d72db0acfc3d77374f0f10f4cbea SHA512 756903ba98ca7612987e51d4f0d38452b8c38a3970ae6ac7ec0d30e469cd7cb7cf1a4a95dbe1a782c3ebddfdf3c2194193853b9f55cb75a9f0ef4c5a437c420b
 DIST owncloud-10.1.0.tar.bz2 20345340 BLAKE2B 0d5d6b1ea5ce6071ccd447737ab897e3ade60178497af538866ea60fdfad9b15a8971fcf921e1297d4b9b14a596c1397d7ae517cf8f0b9e9eb186511fe4e3210 SHA512 2e93510cc6a3668c4d1b9ad072aab05b44e531cadbc7e740a2d4c5822a221878fa2f3804cb2436461e3c2df46b59374bd641464c786a89582b01fcf816bb203d
-EBUILD owncloud-10.0.10.ebuild 1265 BLAKE2B 1d93200492663e339f5c1bb0e2d12ab9297383cc141be30bca20066b9406116846bb41744b01a99ce2d1c776c38c78d0d10aad5f74a30f02899a64f9b9334628 SHA512 556d8b2b53540509932218d1a94f90eb6065fe73f04656c12f61ea6a47c84f44b1f7d34e0e6fe40365cb3a96186b3c2c20f08274edb528f38a6286e9b7f01f70
-EBUILD owncloud-10.0.9.ebuild 1268 BLAKE2B b4f40061310548894fd841d488669ee1ee46dccc49a43cf0bd2a9e3389bdfb2fb60d60a5af194d440b6803b46db3b214503fe7e9612172b6343050626aeaa93f SHA512 fe26f3984d504eb3695fbcd6b91e4592e1d6b2e5eb69de1798885a3f2da308f232a02c58890efce827207ec022d4262f5945271fb2826c1ec8134efc40e221cd
-EBUILD owncloud-10.1.0.ebuild 1265 BLAKE2B 8211eee8eef98e33779e0666481803c24c220da0786223ad9d788b94236831ac2f8d73712f2e0aadf797800f006e5332e086ab846f7eb3fc4327f1673cd685a6 SHA512 986ad383753ebad9bf588637e71a67ffcd3f2663e6a4162aee5896965447acc6817cd6062127266a66d555f6828fd0d3ffb9516a22a2808c410ed35c4aec4ac1
+EBUILD owncloud-10.0.10.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
+EBUILD owncloud-10.0.9.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
+EBUILD owncloud-10.1.0.ebuild 1267 BLAKE2B 3a1a4f21b2ca2a46975f2e60516eafdf6c96cde7205867aba7a54e995a1ea424d0d203e49405418c1c3be2ae8cc55bbcd2527c01e631dc66ddc5a1f21b227926 SHA512 1a94a56f9879e9fe2abc25d146539ce38a875d56a51f170d0305897b4e9dd9410bd7f010da89bcd10aa811610438568b6abee3da54a3755ac4dade2ebe8be36d
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.0.10.ebuild b/www-apps/owncloud/owncloud-10.0.10.ebuild
index 39879f966061..f493a0c561af 100644
--- a/www-apps/owncloud/owncloud-10.0.10.ebuild
+++ b/www-apps/owncloud/owncloud-10.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils webapp
 
 DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/www-apps/owncloud/owncloud-10.0.9.ebuild b/www-apps/owncloud/owncloud-10.0.9.ebuild
index 5f42e8285829..f493a0c561af 100644
--- a/www-apps/owncloud/owncloud-10.0.9.ebuild
+++ b/www-apps/owncloud/owncloud-10.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils webapp
 
 DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/www-apps/owncloud/owncloud-10.1.0.ebuild b/www-apps/owncloud/owncloud-10.1.0.ebuild
index d38aecf9bd7d..f493a0c561af 100644
--- a/www-apps/owncloud/owncloud-10.1.0.ebuild
+++ b/www-apps/owncloud/owncloud-10.1.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils webapp
 
 DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="http://owncloud.org"
-SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
 LICENSE="AGPL-3"
 
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index df14816c2064..e9e602b28da5 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en-2.3.txt 1827 BLAKE2B 49402566ddf6981cf0226f6a963fdd2c482957903583807f5c42731dfd5b4aea56de7d1ebd47ab6909f12492bd5e7a788322e0b2d80e15d883483a080f8fe11c SHA512 59e304d63830227b1619ed1299e9b61f5b6e534cb03da4d3a0e35a0fe727ccf2d994a034bd12d515bba4f8a6a8ca513cf2131c031fa63f85906639aca159993a
 DIST postfixadmin-3.1.tar.gz 1279224 BLAKE2B f37fd9e34e5eb88a82c10a0b80d5593a7451f407948454a064209ba9150192b7026645774b97b0482488814d6abeb25b6a800c2f7fe12a7a768e711919b94852 SHA512 a3e1ecb3ac4ff4d604533bce532694bcc304b9b3d3e1b1ec840be6d007027705113f067393486f58908dd3846332ecf59c9c3c1a5123d03aa088f47593a75812
+DIST postfixadmin-3.2.tar.gz 1324335 BLAKE2B 39fe9174f9085b35a58cacac1e99cc1a9209dbb029c903dbbab4fc68f041687e94327ea379e11c6967810d786bae0758f77f5cc2359d82720bb8edada61717d5 SHA512 eca4903dc3a22e56585c6f1b028a0f93d2422574faf9458b369b071880af55b36cd52c5ff9b0438c2c129a561404414b5d1f926043b40700fb5e31bffffe6ec7
 EBUILD postfixadmin-3.1.ebuild 2770 BLAKE2B 0515ec76d9cabdf0861c568ea3a2b2490a4dd385834638942fdda279f7a5a28868663e9936c6b6a9d5df006ddb78dd9e0a552eff51f8cc333f348d0e6b87b7e8 SHA512 7190fe45e795bf803a7ad1ba5ab5f45af065a1b6e3680476e0bcc13df2426b1040a014958fedc57a68b972c367f9145161d40e63d015bb94d783f8fc8518db1c
+EBUILD postfixadmin-3.2.ebuild 2735 BLAKE2B 20355240a654ec71d14a7595b0e11f3449e2ac0c95acab3f7d888b75dec70c7bb400ae6f6b2e200e99e44de85f0e853f361af937e53db50a81b05051b2c02e73 SHA512 aa0d855a181eb5b7f7fa660ba882a5773b6ffdc1bd7ee7af35a5f25ac350b5f90b603597747589ebb18d841f683bad3dc2e86c41128927826813b898fc03ce55
 MISC metadata.xml 536 BLAKE2B 0ec01f47f106656e1b98ca14d8b531597a34cfb2fd261c93c775d7dd3b0a08155e9e912a20a2330946697418898ed08d9be6f8409edb5e1ef6009cafddde2437 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a
diff --git a/www-apps/postfixadmin/postfixadmin-3.2.ebuild b/www-apps/postfixadmin/postfixadmin-3.2.ebuild
new file mode 100644
index 000000000000..45f2da12339d
--- /dev/null
+++ b/www-apps/postfixadmin/postfixadmin-3.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user webapp
+
+DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
+HOMEPAGE="http://postfixadmin.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres +vacation"
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="
+	dev-lang/php:*[unicode,imap,postgres?]
+	vacation? (
+		dev-perl/DBI
+		dev-perl/Email-Sender
+		dev-perl/Email-Valid
+		dev-perl/Log-Dispatch
+		dev-perl/Log-Log4perl
+		dev-perl/MIME-Charset
+		dev-perl/MIME-EncWords
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+	 )
+"
+
+RDEPEND="${DEPEND}
+	virtual/httpd-php
+	mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) )"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use vacation; then
+		enewgroup vacation
+		enewuser vacation -1 -1 -1 vacation
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	if use vacation; then
+		insinto /var/spool/vacation
+		newins VIRTUAL_VACATION/vacation.pl vacation.pl-${SLOT}
+		fowners vacation:vacation /var/spool/vacation/vacation.pl-${SLOT}
+		fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
+		dodoc VIRTUAL_VACATION/FILTER_README
+		newdoc VIRTUAL_VACATION/INSTALL.md VIRTUAL_VACATION_INSTALL.md
+		rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.md,tests,FILTER_README} || die
+	fi
+
+	insinto /usr/share/doc/${PF}/
+	doins -r ADDITIONS
+
+	local docs="DOCUMENTS/*.txt INSTALL.TXT CHANGELOG.TXT"
+	dodoc ${docs}
+
+	rm -rf ${docs} DOCUMENTS/ GPL-LICENSE.TXT LICENSE.TXT debian/ tests/ ADDITIONS/
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.3.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	if use vacation; then
+		# portage does not update owners of directories (feature :)
+		chown vacation:vacation "${ROOT}"/var/spool/vacation/
+		einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
+		einfo "/var/spool/vacation/vacation.pl-${SLOT}"
+		ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
+	fi
+}
+
+pkg_postrm() {
+	# Make sure we don't leave broken vacation.pl symlink
+	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
+		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
+		ewarn "recent verion, but please, do your own checks"
+	fi
+}
diff --git a/www-apps/trickster-bin/Manifest b/www-apps/trickster-bin/Manifest
new file mode 100644
index 000000000000..d76a303aa93a
--- /dev/null
+++ b/www-apps/trickster-bin/Manifest
@@ -0,0 +1,6 @@
+AUX trickster.conf 4756 BLAKE2B 54694dca2c99568eeef5499dc48315d320c0dd07bcdb516bde64672897eca44f501ab098e015018728e58239c13e7e56d59ee1a0ba8a862bc80350216c26ff5c SHA512 18eb8df59ae41f5f982432f4b13e77b27494817fcba5c2e716e810265854ccaaf2790d0262c41ef72cef439b0b88ad68aff475bca6cd53a79d3555a2ff11d3e0
+AUX trickster.initd 467 BLAKE2B 0e9d67543d054db9b196b0be25bce8f92d3f76f63acaa747c8110b2119194da8d3d1d329b3f53266b102786559a1bf18f5001bb9f3618d73616a38a0ea26f917 SHA512 253729023241ab7de6d2703ccd6701942b303ec7e07461eaecc401623ab6e3c603c4dd449f8c255199c40bed431255dcda2942c2047e471ed382e0a95afbab65
+AUX trickster.service 361 BLAKE2B 25c7d6f167efcc8a435b38115d8aafb990807e020d25e86a227ffec25603bdea66907976f9832b94b5902dce6ab317b47a304fefca3f776fcc3c548a69a80db0 SHA512 0032d84483419da66c984b17d9e686953497c39dfb405f7c0719e57650acf538693c48dcdbb3a27906b380a073f550fd30f0fc89b78d57f1eb00aed9f63f5e9d
+DIST trickster-0.1.7.linux-amd64.gz 6440487 BLAKE2B 70884e04852aadf1c0a723dfdb8c39ea081e7ee15a69062e43c80bf0a75e80791e93825ddb691cc1323bdc2ae8efbef57e66871e2ed33397b29dce8d1320b12f SHA512 f8099108ad0b11d3dddd6043ceaef3451131e30aeb1973231e86c0b3b4ff378dd0e559c56903c3f2b35a5e83f2a06e8c72e95a4c1408aedb8ea6ddfb3525b67c
+EBUILD trickster-bin-0.1.7.ebuild 982 BLAKE2B 2b369ffb22aee8c947e864043c16b2b017f2d39376f4ef71a77ae25efce488770a2f9b271ee5c6e5911db00e57de5a64c64915a8f538fe12de4b0332318beeb1 SHA512 04e271ffaa4365c0eed45bde572c8d365f4ce4c61eb6737afb00c8eac0752a1d496edd6ac0eea31d7d14ad881e61ae5f62c8ad0709446d18fb5f01d8e9c11583
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/trickster-bin/files/trickster.conf b/www-apps/trickster-bin/files/trickster.conf
new file mode 100644
index 000000000000..004a3e906423
--- /dev/null
+++ b/www-apps/trickster-bin/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 = '/some/path/to/trickster.log'
diff --git a/www-apps/trickster-bin/files/trickster.initd b/www-apps/trickster-bin/files/trickster.initd
new file mode 100755
index 000000000000..e443653fcbc2
--- /dev/null
+++ b/www-apps/trickster-bin/files/trickster.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+command=/usr/bin/trickster
+command_background=yes
+command_group=trickster
+command_user=trickster
+description="Dashboard Accelerator for Prometheus"
+error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+extra_started_commands=reload
+pidfile=/var/run/trickster.pid
+
+depend() {
+after net
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+	EEND $?
+}
diff --git a/www-apps/trickster-bin/files/trickster.service b/www-apps/trickster-bin/files/trickster.service
new file mode 100644
index 000000000000..02363a906786
--- /dev/null
+++ b/www-apps/trickster-bin/files/trickster.service
@@ -0,0 +1,17 @@
+# -*- mode: conf -*-
+
+[Unit]
+Description=Dashboard Accelerator for Prometheus
+Documentation=https://github.com/Comcast/trickster
+After=network.target
+
+[Service]
+EnvironmentFile=-/etc/default/trickster
+User=trickster
+ExecStart=/usr/bin/trickster \
+          $TRICKSTER_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/trickster-bin/metadata.xml b/www-apps/trickster-bin/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/www-apps/trickster-bin/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-bin/trickster-bin-0.1.7.ebuild b/www-apps/trickster-bin/trickster-bin-0.1.7.ebuild
new file mode 100644
index 000000000000..44a02e42fe8e
--- /dev/null
+++ b/www-apps/trickster-bin/trickster-bin-0.1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN%-bin}
+MY_P=${MY_PN}-${PV}
+
+inherit user systemd
+
+DESCRIPTION="Dashboard Accelerator for Prometheus"
+HOMEPAGE="https://github.com/Comcast/trickster"
+SRC_URI="https://github.com/Comcast/trickster/releases/download/v${PV}/${MY_P}.linux-amd64.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 ${MY_P}.linux-amd64
+dosym ${MY_P}.linux-amd64 /usr/bin/${MY_PN}
+insinto /etc/trickster
+doins "${FILESDIR}"/trickster.conf
+newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+systemd_dounit "${FILESDIR}"/trickster.service
+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/trickster/trickster.conf for your setup."
+	fi
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index f95a7729d0c2..d98b6fc47411 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -4,8 +4,10 @@ DIST wordpress-4.9.6.tar.gz 8740389 BLAKE2B 827f4cf4e1c664ee04588e189bb744b10ab0
 DIST wordpress-4.9.7.tar.gz 8742203 BLAKE2B 3cb3a5379e96bffa11efcb4c51f948332179334f50ee49860618c7ec7cc485af8dd497c9566bc6dbd4a7a3c8c0f38cd333f2b90c57fef1604af946113cd96564 SHA512 0a9a132d48081ef253122bd207dbf859babfd021ef3db90d486c92cde03727a74c5170a9faf80d46e8899472a703cfe91b24c04c1ea21f261dbd156bd691ad12
 DIST wordpress-4.9.8.tar.gz 8743850 BLAKE2B 6a0a93857e70d70ae144114a071859ccad2aea598cffba67aef24549c200e02198ac962c8a611f8f02ad67ed4d0aec9ef846795bd2fdb88264a6d30aa8ea8c79 SHA512 052b4436d8b5e5970ff6827b9f08f7f321301d187a9655e82ee1358f0012cc84a007f4ae04fecc4aaeb10a9e7eb9de7bc6643e6f0db57bb5983e7647e4230c41
 DIST wordpress-5.0.2.tar.gz 10512407 BLAKE2B 422ebc20071ec04444c908eda5ba2b7505dab763b39e8799c3b823dce9a2c3217624149dbe66c457ddaa4631156287ef9fff78d10266d6b4df0b6d484db55f1f SHA512 38ce459a208f14e54d2010f83a14de595a2aa70099c474da064010ea9a66b9c890758145a5fc987750369b5473fd74a677d9da96b23f924b326011efeb15b668
+DIST wordpress-5.1.tar.gz 10653910 BLAKE2B 26a4f42dd88d4c2616fb240b8b9a1f64a5380496600e3d132dbc162505907cda49e11b9f132d0f436e9426e77d42d6d78ed6b1e16f04d857429515d192761113 SHA512 e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99
 EBUILD wordpress-4.9.6.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
 EBUILD wordpress-4.9.7.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
 EBUILD wordpress-4.9.8.ebuild 1263 BLAKE2B 8dd8a3be63b647649417f0ad97f5c31039ddec6c200cb34679cebc74bcf35ba6c79a568e2d3f3a1e3a3f5abc2799b1ccb99f3f8eef88d6e9821b952794d40583 SHA512 9026b3ea5f9f341cd2c7cb531ed546b8e87c0520a9bc8e5207db83fb1457b220d7a62d3b46bbd9cf56f990f62965e20ab4f29f2e1cc9a4b4e0e61b880d2ad2c7
 EBUILD wordpress-5.0.2.ebuild 1260 BLAKE2B d5a61a09b77f2b53b95ebdc917cd223efef46edbe8216546b6e97391499f86a042bf942394331941776d5ce5a637e5df099f89aa37460532e8486b592ab7c922 SHA512 1ad31298e82e36edbf1c08942d78d1b7202d7c575aa3efd8b682a84fc0e6b326669dc8ed32d8cc99ef04d8649721e455d28496983dd32dfa8a8ccbcbe1c7667d
+EBUILD wordpress-5.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.1.ebuild b/www-apps/wordpress/wordpress-5.1.ebuild
new file mode 100644
index 000000000000..1d9e09808b2a
--- /dev/null
+++ b/www-apps/wordpress/wordpress-5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}