gentoo resync : 15.09.2018

15 files changed, 81 insertions, 91 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e081f3df1a45..140831f2bb0b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index fff7351cb46b..ea9a7b30c90a 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
 DIST drupal-7.59.tar.gz 3282260 BLAKE2B bf7d74926fe4e94149ef7ff622cf7889f45f3e35b9bfd19fed12aa688c8131f2f8daa2a261796896d5386966603e837b6dec3b6c02221f9b0c527c4a6f5ff9da SHA512 68f02b39d1a4658adc0f0046c22cc1059b68f952f9cd753f5a3e379cf93705be308b4727519e90d77a42437442daebaa78d76745954be4d40e1a5105c319069c
-DIST drupal-8.6.0.tar.gz 16233161 BLAKE2B ad7a1eb65555b37799bb30aa7364c413bc8edb2a12eeee2e82beb78b40ac041123964b5eae68fc28340e965a061bd3337ad2b01e23c00af0f91338838926c6a0 SHA512 ed94168bf3eb8dca506b8da4d9607c40ed4b2d588a683d3316d16c51d919300a506f596880aba2cd2aab19649b2c18c2843f4bae93b33b4f08e93d013a2c5e64
+DIST drupal-8.6.1.tar.gz 16236559 BLAKE2B 6c7b2d396b285290e0ef537777054cfe1d50b6188d3400bb0f0c6c35f3ae677b6d7f9ba53e28f95c4a89aeadd2dc7fc1b7c659048332a21d0ffc543bf8c4df41 SHA512 f42eab1f7110219d11f398c5099cd0abf50883819fbe6a879d08f1117e3cc413937772a269d28ffe09ba59b24f79516d03601ccfd2abfb37ed18064f34368b5a
 EBUILD drupal-7.59.ebuild 1773 BLAKE2B 7ac284fc9078c37f97510f8e2c474cbd155b910204b73365a531bc9b27df891d99cdc5d0e695a510e931ddf9e13ffdf177367b6c10e6b75af009e69910d0686e SHA512 59be44f0d0b52ce977061a4f3e35ec542519ee077e9c7dba931160ffda1cc8551ca05b6652b4e3efe75327e6698b1552d1dad45d8e5bb763d4ee07e1e0334762
-EBUILD drupal-8.6.0.ebuild 2428 BLAKE2B fa031355fd6bc3268fe3fdf735859d8a2b4a171a9dc27ba0b1c7495fd2dcf45c0a26c950c5dacd1c113e29a229cd25928c7ceb9aa09c7434ce6df6112e31e52d SHA512 349ff3f6752752012254cd816db0320ffc40420c01fad22af466ca366d769db99c6f7ec0648042a4cb30b21a16789c63f95d67138952aa977ed03a9820be9a47
+EBUILD drupal-8.6.1.ebuild 2428 BLAKE2B fa031355fd6bc3268fe3fdf735859d8a2b4a171a9dc27ba0b1c7495fd2dcf45c0a26c950c5dacd1c113e29a229cd25928c7ceb9aa09c7434ce6df6112e31e52d SHA512 349ff3f6752752012254cd816db0320ffc40420c01fad22af466ca366d769db99c6f7ec0648042a4cb30b21a16789c63f95d67138952aa977ed03a9820be9a47
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.6.0.ebuild b/www-apps/drupal/drupal-8.6.1.ebuild
index ec2dacba2d14..ec2dacba2d14 100644
--- a/www-apps/drupal/drupal-8.6.0.ebuild
+++ b/www-apps/drupal/drupal-8.6.1.ebuild
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 0d0c4ab3f789..46c230fe42fe 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,8 +1,8 @@
 AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-5.1.3.tar.gz 52436314 BLAKE2B e5ff613a6d65018b6c205a88a520b5f07ea32955cb8f4b75d1eef05946d93c50272edecf80c8a4a6b8b4a70fbae7c90c71f1b833a31ff56ed71c59dda3007b4c SHA512 3d0fcc2015d95a5334d571f4ea61fa1bb7ead1b4131342e3bf167c832c0f951ae6669049da73a8d954117d54b5422be9203505db19b370ec337c481900d7fea5
 DIST grafana-bin-5.2.3.tar.gz 54301168 BLAKE2B 42d86f74179040f36860f49b687a210247bf55728502279c77bd58b934edfe0d42ad81e4e924de9a0db952c2158ff16bcab094d992c1913a244028ceafe60544 SHA512 c7c8ed116a72a41cc4c2c8abe2c47b77ebd071d2112c4a88f3a9e76a524f21ef97386b3fa1364776c3f715ce0def75428e113226b1ce288f81896e2bd1dfebb4
-EBUILD grafana-bin-5.1.3.ebuild 1744 BLAKE2B bc770fec942dd9cb491ebe4a6fea5dd1b344a24ba70c36c8180c419720b0c749c4cefd43d408d7b0d0cfc64fe835af5e7a443ce3f20dcb185cc937fec063d6d7 SHA512 2b2958db3539457935e235f4271aff86100868203cf840512d2d9916067fbb899f95765bbda14f9fca60063d618e09de4c1c96de3045e864090a676715a5231a
+DIST grafana-bin-5.2.4.tar.gz 54300847 BLAKE2B defb1b32fafe95c17ab4201665df053d8cb1cf7154a366d2b0bbf3936ffa4baf6f5a3ae3e5fe9fa96334fc0bfcc557106c38d4dcab5d5b5ca64b588726274034 SHA512 75c0ca8735ab0e8c2b340322cc5b0d5adec90a7159761cd9fa2c346a5a4e9fcceb904d160e55be2e4c9b5fa582356aa20430f9d4577e2df3195825d83de897d2
 EBUILD grafana-bin-5.2.3.ebuild 1746 BLAKE2B 913e4249c53721a7a5ac44f2047fa815b4a8900c67811b2b46677dd9afdea6ec5d352150acef9fd2d7459fb659a23afa455b836a1db68c55501cc1d7494eb5d8 SHA512 e3e61b3821699073253cc6cb6f6b910792e6e6e9bf8f256c6d1447dc689d47dc8e7c0ab098cebdf4af399cae1111b17fa82c439ca69952a65d52f6103229eaf3
+EBUILD grafana-bin-5.2.4.ebuild 1780 BLAKE2B 603d8212864953f010df6846f9ab863a3a0256d912a0d53d4d5b0b1239c3d60252ae9a2781d210daddbaff0970095740f6cd900b6863aaa1cb38da9debf1b75c SHA512 0674a4fee1ae83ff36ca4506c534b7c02f2bc47e930f67ab76dd2ac9eae979022cb9d23a85c45c4ccc395ce3245125930878cf6513d61c65afed90dd233f034d
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.1.3.ebuild b/www-apps/grafana-bin/grafana-bin-5.2.4.ebuild
index 579ce394738a..8db7c5ac1d9f 100644
--- a/www-apps/grafana-bin/grafana-bin-5.1.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-5.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit user systemd
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
 HOMEPAGE="https://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -20,6 +20,7 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-*"
 QA_PRESTRIPPED=${QA_EXECSTACK}
 
 pkg_setup() {
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 9a48978780c9..36ffc08cbc9b 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,12 +3,11 @@ AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b78
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-5.6.10-linux-x86_64.tar.gz 52586941 BLAKE2B cb4e1716c640c80be980541e5496a96fc6baa04152e11f754b46dc71a9995809038b8a82c3404d9d86d1bd0381e9fc55fca44c66f046cb41e005c760aa077092 SHA512 c56c600c79bf2f5d2991d6c1442db300c78dd4135bf8dec5b9f500d609e2f041d09649195cfdae2f6d30cf8de2c2c865ac607283f865c4aa8ec1d400af84c270
-DIST kibana-6.2.4-linux-x86_64.tar.gz 85348919 BLAKE2B ce062a5a7d96c0266143f1091f7dbe5ade6236068a73f6fedbe253957f7ddf2d00b441d985f72e9936aa3bfa7ecd9e7b7672b301b726a7d78c3e2b71d52c3b24 SHA512 125c2002e1a3b197f9f0d6200f2979f2e5974a902bfec2baa4b34a0c8d55babccafdb87b8a7b69c61ca4c02b8ae97e69b9b2743f7d445f0e53e31c69288296d5
 DIST kibana-6.3.2-linux-x86_64.tar.gz 205331616 BLAKE2B 17273e641a9f146943cc4aebbce1114706dcf5d4c5f4d865a79d5b576a845c40268ea4389c358d555ca278c0bed4a68baef661472f80f7957dd013f0ce2e9835 SHA512 35eb97ca2f8d0bd80dc7dcdc5bc03f8ab21d1280d11d892f12eda5a173a951dfe88718d45c94ff0a748bb324e44f243cda0ba314c6dcd249cd960928f7c7b7ea
-DIST kibana-oss-6.3.1-linux-x86_64.tar.gz 89617065 BLAKE2B bdadf0ddecb060d64ed07f4f3f62934b4ae686f00d1dafbe8030acf95431b13049f53ffe7a6f8eb695d9cb1dc45151110f430c1953e1c0e1edd3656819ee0cb8 SHA512 6be02af23878dae1d48b81e8a46704f35a0bc136dd0952d997ba1f00d080868960fc3fc86d37e1e1fad5acb74dc2345e09ccc7d27862575d5783708d058c6831
+DIST kibana-6.4.0-linux-x86_64.tar.gz 187936225 BLAKE2B 826962a18522b81311f26bb70f0a4591493676cd3bc750045476780f5c8ea7f5c8e78fe06b55cc8c330654278363c9f8fa98a6905eda59cc76a1b04b3b435d9b SHA512 ae0f6ede637bf373e44eb5711b5a07ce726bb72009d792c8e9a16d7eb32b2361cdda556a19c3f5fd50207320e86950217cf5e9a1a06607004d4b7f30d3dbb344
 DIST kibana-oss-6.3.2-linux-x86_64.tar.gz 89561513 BLAKE2B 37031653e171d683a18f25c957545b6b143c2f0d8c07da6c02ea61c8296657d190540f4ffee2c6a62a9146800971041d7e4e30767892ba2bbff0486aef31cda5 SHA512 87236fa1a45a5c5e0ecdc033f864e9a1f74cb148e350b83c6c024b37eb71e3c16236fe52525898532f286f816cb6d03de23cba3d97e0cc0c4d622cdd18c7defb
+DIST kibana-oss-6.4.0-linux-x86_64.tar.gz 75103937 BLAKE2B 6fa7b731a15f2fb2088740a59706bf4085b049cd880f63b10cdcc0cd9e3e7d197384731360c285adab2a6838454761f6fa95bddbc470b4895728f87b14b946ff SHA512 eec78bb1935fdc126f7c69ea08c0997abc74f435f5ca24aa6fa370ad201dd1ebe9ab1d177f64ec66652a3c9c0dd3f13a8fa7866697d3f201f8bc124c051ebeba
 EBUILD kibana-bin-5.6.10.ebuild 1612 BLAKE2B fba7f593b8a2bbed90cf316f4c7f118fb65204efb9be4ebd81480f0ddc0333648a6478bb4fe0d2c1bda61e7ed355f084647d55c62685852daab3c0182b1f7476 SHA512 eb15aae68dec70c34af29140039ec0e16ccc8721817df07ff191eb18ea81bd1d4872b37ade34b74ca5470847b158d90d81c4e0b123073c5bee89854ad41f3c76
-EBUILD kibana-bin-6.2.4.ebuild 1745 BLAKE2B d95296e03ddf57600d331095322c847d7bed1d078da13ba77ecfaf4d45ee6e3a6b148beb086eceaa998ee7f0b7bd0628b093d8eb5a819e470868a31fb0c75df8 SHA512 aad7d437c13a237f86a743f90f71cb8bfedf705eba09f53271c888cd191364e4c51f682b854a5515f9cc10623631f37b11d05cd8e85bd55384c02d1d9321d718
-EBUILD kibana-bin-6.3.1.ebuild 1756 BLAKE2B 270ab6f83343ac29f3cf73d58f4366e8d0ca47db163eea15c50609ff4b572a0b80e243d3e66c53f34c4f640158f841b8c2c53a5ac84c2e164a8b31418ecc0be9 SHA512 32c3779f96f42220a720ffd4d3107be8304f6cc80145b473d3cdd64fb6b9fd5eabf9ed73a5f440af963361db08efca21defb5a6056b4812480e695efd64f3fc3
 EBUILD kibana-bin-6.3.2.ebuild 1892 BLAKE2B 29ed1dfb8f3b986e6b0d1cc2d2e5c1d87e903108963acd4ebac21f44252f8daa1c76165fe6bb49dfb1e079d47c8378d7285b9650170db4c2a03da01d371a79cd SHA512 8b269eab38464251f02d9e25882543d520efb2eadde3b0164977f808dfb5d70b943f995c573f00210e3367462cda985b034a0a6bf5d54bd0c48a5b5d8d126071
+EBUILD kibana-bin-6.4.0.ebuild 1882 BLAKE2B 1275be8817fc3a1fc6d039fb90e38f9e2bcffc65bc96a1de5296e63231a669f93df712b0e9a8de3f67d2ed85d9168d0966bd295bc4d7e4bb071cf54bc73b1b73 SHA512 de9a09a3c293382e9e9c97d9d38d33dcdb8e044407538d724369a43fa159d64acc792db1279252a403454ad3998752fefc6243a92f841ec740b775d1eea2646e
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
deleted file mode 100644
index 96789c5c5562..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="net-libs/nodejs"
-
-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 bundled nodejs
-	rm -r node || die
-
-	# remove empty unused directory
-	rmdir data || 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 .
-
-	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/log/${MY_PN}
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 6. 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-6.3.1.ebuild b/www-apps/kibana-bin/kibana-bin-6.4.0.ebuild
index 964f443c817e..ad544d11f39b 100644
--- a/www-apps/kibana-bin/kibana-bin-6.3.1.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.4.0.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eapi7-ver systemd user
+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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz"
+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"
+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"
 
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 314e0fce3ff6..89a391657d57 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.1.13.tgz 38042777 BLAKE2B 5454680057c83792340d553da198a0e4a607129cb951b0f00d298ff3838ddca4b3681d9d9d96f6f954c31df16aa47c80a564c56a7b4f271cff97cb8aaf1eb3d2 SHA512 f969842b7067ee24b34d4328f728da75ab8518916b2562f337405c34f3756e2b53f2710aab6e6623b3cd3487594116f3c0b85e33320d32361eb253801f347393
-DIST moodle-3.3.7.tgz 44868352 BLAKE2B efb6ff909996d58df055db437df02029246df7239649f728283c7a50a5a085e7c8902a2935f06baab09b8675ce6d5b399007c6dea737539d47e24465211c78d2 SHA512 b6844b4a4f13263cc56dd94137beb1ab314f3cbf6549061c4c48227710e6be4c838562651a41ed161f5ebebd611bfc7b3c29af49cf2501d0e568c5ae20e88867
-DIST moodle-3.4.4.tgz 45538017 BLAKE2B 720b9b26ae5140a975619ce638050f60ba4ae77e0a9370d2843d3d15b1c882019dfc0187d570f440e9d4f7261d29fa5b1853086270bca2ed0b5e980e14bcf12e SHA512 14af33e41276c070faf6b4ae38915826dd3c80ef9f248a8d00bcabaeb32740383939c9097d8ae1ceabf4f86e27d70548fa7a9e5a75275384a2eb6c17670bda1a
-DIST moodle-3.5.1.tgz 46387467 BLAKE2B cc05d51be7d8da8f3c3126c46094fe6c57f4c3f8664348e7e5d915cb5a297fe605b81422e226171edbf6bfc11cc9afaca9831fc9b24a7acf1893ab0cc9d7c9a8 SHA512 4e6dbf2140a40351ff3285e54f58f711d018f812a5885a3219d9e18abdc3232aeae71ac4bec9a26f78bbe8dbf78c121b6850c2254e9371dc34ed576e985eceb4
-EBUILD moodle-3.1.13.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
-EBUILD moodle-3.3.7.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
-EBUILD moodle-3.4.4.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
-EBUILD moodle-3.5.1.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+DIST moodle-3.1.14.tgz 38045267 BLAKE2B f98c2dd5b1e85e533c531b18271d94eb0e01b630fb2097aa025ae45152e1f343d95b393214b5313b48630eff3fefb4b5436fd38a60dfe1ddbbefa0309653bd8d SHA512 f5b137fece92bc16ba03e31f4eef448e5ea2744b663d4da7aa9b6b045ff874fad73f73576690322dd6f8efbbfc3c3be09b7c74e2cfa659a12b04c3aa26828be3
+DIST moodle-3.3.8.tgz 45067185 BLAKE2B 4833164e7afe8ef3bb9c08db2db7045caa2f7b7c39c08a564d159113a8d3e1ec6e73774c5d56e2c203c4c010632022b0130cd1141f58c83d2916ce43d8e77c09 SHA512 250df5d5a29f70cd108c84f4d3d58eb0f6486c72a9c3e4274426d6c911876612082bfe718e16e40463dab83b47be3de606742c66073974ba5f151056b4c3ea5b
+DIST moodle-3.4.5.tgz 45763211 BLAKE2B a83823153e497e3c327aa6bcad041a9272d8a1cd1855f1f9692aa5690cac7ddab6a9028c09e38c0bcb8f98a0cb02de70b2265f2be57ddd74cc359cefceae9eea SHA512 ee852cd0ebb7c501adf8698423602165501440d9411baae516f322be8cad759b950d03df0e138aeb815c20d9834e57cb6c19e95a428595e21cef87d8de7a7f5b
+DIST moodle-3.5.2.tgz 46446558 BLAKE2B ad64f9c56da55902bf3de16a2a34445c3f3be30be1ef0de9f0a84e7aa5dd751d286a4e45fd8e0e3e32f1f37ff664473eb29cae275b4904b2ba2befe746459fda SHA512 a96dc88a8963bd1f117ca9b58e0959cc29fef0c4ea8375d6c8993aeabd8d606ddf639dc52b0c995f22dfb575df5ef602897cb1e457e9f786f10f805a55883088
+EBUILD moodle-3.1.14.ebuild 2940 BLAKE2B fd1e914e7f7e855cb50447fb213259116d4ad418253db19e4d05bb7dda22178df4c302eecc5b258c728a581088493c11bd70ea302049069ef38f90c6828900b9 SHA512 47d2571d4e7a8e6217edbb2a491427ec39067649d61aed699bb41ce4a7912ea2bdcc773d3e6ab75426f8c3c163339f1b49a54a6e18dfaa6715d230495d69fbac
+EBUILD moodle-3.3.8.ebuild 2954 BLAKE2B 537ddca9825bc9113b92ac1e32dd25bf045f0d9d7937a964260752d1d9114e68fe45cbde22a7d8c800ae2e89dd31db2e2b338fd3c363b765637178a735a8f3fe SHA512 190fea32bf4412a827f7e603bdc1c6a55433f19fa2181edba843527e95fec71d4133ee4e43e2fb4ea80688240905046920510851cc68bf61bebc4951af6b3ac2
+EBUILD moodle-3.4.5.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
+EBUILD moodle-3.5.2.ebuild 2952 BLAKE2B d41d38833dac8c16aa78d7ff71750cfa500a5398a505fdf3825b26a20609630eebf22209bdb054c1751ea3cc49b12f9b9663746467ce9224ade7d9c40236c8e2 SHA512 bf2475f92a8d07c49c89d0dcd0653a078f7569c25028271ed8691dd14cb375adb73c21300e773c54fb26979ce1f4e1bc0079716b27e8d172c200967c2a4eb47c
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.13.ebuild b/www-apps/moodle/moodle-3.1.14.ebuild
index 0c8f962ab4a7..0c8f962ab4a7 100644
--- a/www-apps/moodle/moodle-3.1.13.ebuild
+++ b/www-apps/moodle/moodle-3.1.14.ebuild
diff --git a/www-apps/moodle/moodle-3.3.7.ebuild b/www-apps/moodle/moodle-3.3.8.ebuild
index 2a3db73f4d01..2a3db73f4d01 100644
--- a/www-apps/moodle/moodle-3.3.7.ebuild
+++ b/www-apps/moodle/moodle-3.3.8.ebuild
diff --git a/www-apps/moodle/moodle-3.4.4.ebuild b/www-apps/moodle/moodle-3.4.5.ebuild
index 201f542fb5c2..201f542fb5c2 100644
--- a/www-apps/moodle/moodle-3.4.4.ebuild
+++ b/www-apps/moodle/moodle-3.4.5.ebuild
diff --git a/www-apps/moodle/moodle-3.5.1.ebuild b/www-apps/moodle/moodle-3.5.2.ebuild
index 201f542fb5c2..201f542fb5c2 100644
--- a/www-apps/moodle/moodle-3.5.1.ebuild
+++ b/www-apps/moodle/moodle-3.5.2.ebuild
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 569b3055a5d6..880af7f01690 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -2,6 +2,8 @@ AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b
 AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
 DIST wordpress-4.9.6.tar.gz 8740389 BLAKE2B 827f4cf4e1c664ee04588e189bb744b10ab0abbee0434d64c2ed65cb0ec289869b26f5ef6ae067a67f308e8f3a5b139c2d905897c0ed5be40eb2166ec3939a61 SHA512 93b5c6373968925f4773b79990ee73508c4994dc5ef4387c8d88dc7d39ae3688d4e066887870731e0b4e1d84a1c027cdc62239b3e042c133eb32a03229d48335
 DIST wordpress-4.9.7.tar.gz 8742203 BLAKE2B 3cb3a5379e96bffa11efcb4c51f948332179334f50ee49860618c7ec7cc485af8dd497c9566bc6dbd4a7a3c8c0f38cd333f2b90c57fef1604af946113cd96564 SHA512 0a9a132d48081ef253122bd207dbf859babfd021ef3db90d486c92cde03727a74c5170a9faf80d46e8899472a703cfe91b24c04c1ea21f261dbd156bd691ad12
+DIST wordpress-4.9.8.tar.gz 8743850 BLAKE2B 6a0a93857e70d70ae144114a071859ccad2aea598cffba67aef24549c200e02198ac962c8a611f8f02ad67ed4d0aec9ef846795bd2fdb88264a6d30aa8ea8c79 SHA512 052b4436d8b5e5970ff6827b9f08f7f321301d187a9655e82ee1358f0012cc84a007f4ae04fecc4aaeb10a9e7eb9de7bc6643e6f0db57bb5983e7647e4230c41
 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
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-4.9.8.ebuild b/www-apps/wordpress/wordpress-4.9.8.ebuild
new file mode 100644
index 000000000000..19231ee76d17
--- /dev/null
+++ b/www-apps/wordpress/wordpress-4.9.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}