gentoo resync : 18.05.2019

26 files changed, 274 insertions, 266 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 3d993354bfd7..34a21e7cdadd 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 624b67c43b11..ea9b27914c10 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -5,9 +5,11 @@ DIST chromedriver-bin-2.30.linux64.zip 3864914 BLAKE2B d31a1ff9f0eba3384bb3e1598
 DIST chromedriver-bin-2.35.linux64.zip 3721349 BLAKE2B 37abd16d3d2aea57dfff871f2cdcf3ea0c34ad50dd8ba98f2e166e541ebf6ea2ede641a10f7b3d6ff2114740f9aad3cda6e0fc19ab3708fca89b3ce96cb3639e SHA512 0da15aee65c7f13552a57cc77212206fcd9a76b3cb912d85807760d6fb44b122e850c72e36fa7f53355c5bfff038afeeec2181089d1507c59cd5e176fd415ae7
 DIST chromedriver-bin-2.40.linux64.zip 3860375 BLAKE2B b91d4cd05b390f5b0d175ab396838ed3d2ab0dd0a961c4d51268a85c1ffc0be077615126b9373dd7cf69add57f9eb56b5b494ecf55086a4b86cdbc50f1307275 SHA512 5d4fd5723b6245bb7ee722f0e206391b1baa5f1c558f7e79f54289ea3adab385537f569f84b6de2b4f02e38105416f3361b439349a180e3a764126ed2ad525a4
 DIST chromedriver-bin-2.41.linux64.zip 3944714 BLAKE2B 6f86f973c1768d549bbc57a6578459d5603424351240530a7bc3e20c201dd5a0323843e29201a6731f70cc9672c129ebcda7478539cf9875e6e9c14d7f30eca0 SHA512 328bd82d17f5d4238d3fd18b8848f4edc218014cba515972b75f1e4e866f1d729f6d56463b276f7afaf7965f0d36680c0238ae8ff8f9667bc6631e49ae9e7013
+DIST chromedriver-bin-74.0.3729.6.linux64.zip 5065988 BLAKE2B e4c6bc2530f2cf8d033677d18978d93fba9710ead098c5ed455584154b73e9d734db32d9b3fd7f5500f3f32d4403f34fa448b37d3b96d3aecfc11dd9ac7ce54a SHA512 1f61f4940b557c4d74e540ff11770b3182941a11cc34783c97beab1afb5eb53806c958721da1a8249cb6a88c6cf40e7064ac9f94e7da1970d9c23a1188873c5b
 EBUILD chromedriver-bin-2.24-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.30-r1.ebuild 644 BLAKE2B 1827f95c6dd8fe6bf87da9252d5b16a894626201a8eb2e62163970cad4abc048bac8e012043aa0e791cac28736dae680cce014b4177d85b4f6268ca4525ab8cb SHA512 5b5d5a6e5e333e8e36b8041247581aa687b756a01068f98052aa0d2898d662178530171fc58bd1e82cd32bdd742c7d8ec334f6adee2606ee156a7d22f7ef5604
 EBUILD chromedriver-bin-2.35-r1.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
 EBUILD chromedriver-bin-2.40.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
 EBUILD chromedriver-bin-2.41.ebuild 539 BLAKE2B d41fdf3b40b52c2904abdd9f98623a248456ba07e20297ab5e367fd316e26012a76cff0745971e80fbc7f9c93565f7d89be9371177fc8e40374eb1515f7d0ec4 SHA512 f23bdc20e88e733db2006b29c533636a3a3135ee2225e39e7f5d8b718444feb6cff5351b3b46a6dcc7a4b8328a3f269c0c3a87d8e7d8abe64756436afc1b2f6a
-MISC metadata.xml 406 BLAKE2B 933f42ee0836f8225625b890b8febba5f3d5b9db7e78d164c2ec5297cbf4173aff768704b533c7c1b95518d860d44996e2706fad19ddad3192252362572507c6 SHA512 1ce3c0ae86098f1ccc70d3b8ad5ca49eb8218949650237513929315692df2acb43e3df7b95ae9bdfd0f13e6d432f118318340852b8b555cd6b3b49554d299870
+EBUILD chromedriver-bin-74.0.3729.6.ebuild 536 BLAKE2B 33443cfcfae910fbe0fffcb92137fcc80e754883d180316acef1629b3508752dd5917e717d5fd26c94fd41591a7d817bf4ac4b99b592deb0977eb5290a921db3 SHA512 4a5ff3ae076a62a748d51f7418e1d26ee401ff2f3da81f7ec42cbb21f357269912b54fcb7276fce3556f02ac68d05b12726e0748b020de28474f585e17cfe12e
+MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild
new file mode 100644
index 000000000000..ebfd309b9915
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/chromedriver-bin/metadata.xml b/www-apps/chromedriver-bin/metadata.xml
index 4d37cb172d25..8c382284c9cc 100644
--- a/www-apps/chromedriver-bin/metadata.xml
+++ b/www-apps/chromedriver-bin/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
   <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 37f8805bc223..a7790b60e67e 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.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
+DIST drupal-7.67.tar.gz 3312764 BLAKE2B bb7f21e80ca192ff3e37f917c1fa43dcd8d3cd8b60ff012d1fe22e279ffd674e08be6aef6328d0c5b7c50a106592bde299300fe9ccb0c4c1ffc1aca57c3ca6ad SHA512 0e4f60010b1395183cea19424e8c2849f93fb7285a081bf7d0c774b8e82f403083533059f58c3831950cc06dfa8117d443db52b66a521301ceac10b1b333aa28
+DIST drupal-8.6.16.tar.gz 17151378 BLAKE2B 2bdd14ff7a5f898af2d322a6b2862643899dfbe2ad05c99b85f036161612cccfc2c25105c8eef37311634a2aa03ed792db8de3e625aed5adb94cd8f644557fcb SHA512 34f260d780bce286a0a61b710c340d2622cb857aa92a2bdaad63737303ef2f4f1751edc3f415daaa14b9cb483757e367e639136d03f571cba5165129bba31e12
+DIST drupal-8.7.1.tar.gz 17811529 BLAKE2B 5bdb92a8f6c5675dd311417db526be81149240a053bdb94f4294cb571193ed03f2edbc83b51cbcce9e0e322b45981d0949714659f5db2dff211815232cd447e5 SHA512 a386f7991465eade203aba4b20bb894041c76abda97e93afd772a02b215ac496d57a9aed50820a7bd78604c9e6602180fcda933c5121b8536a7d610a3bc3f2e8
+EBUILD drupal-7.67.ebuild 1770 BLAKE2B b429cd79794eb2975636cd89c42f56926c6eb4edf86ff329bc8680ae8ee4e64f85acc2e6a668e5302b75093e59be611d459e1d23b95ded075ccb41866d912107 SHA512 1db7207e4af8c0fb2594ace139c63a14f0f01f40f26b4a785265691f57ac939c462c2b73b32ac63d735cf7b3e984a43a06e385f1c6009c1d6141bc2bbfe1b282
+EBUILD drupal-8.6.16.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
+EBUILD drupal-8.7.1.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-7.66.ebuild b/www-apps/drupal/drupal-7.67.ebuild
index 2d1f90ebbd06..2d1f90ebbd06 100644
--- a/www-apps/drupal/drupal-7.66.ebuild
+++ b/www-apps/drupal/drupal-7.67.ebuild
diff --git a/www-apps/drupal/drupal-8.5.15.ebuild b/www-apps/drupal/drupal-8.6.16.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.5.15.ebuild
+++ b/www-apps/drupal/drupal-8.6.16.ebuild
diff --git a/www-apps/drupal/drupal-8.6.15.ebuild b/www-apps/drupal/drupal-8.7.1.ebuild
index a8514d07dfe0..a8514d07dfe0 100644
--- a/www-apps/drupal/drupal-8.6.15.ebuild
+++ b/www-apps/drupal/drupal-8.7.1.ebuild
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index d44972d59384..50bfc8e9505d 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,8 @@ 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.17.tgz 38056353 BLAKE2B 4192ff89f745a465c8fbbc3979e2359471c31240be8baa3be452da99377f3200292a359fc9b524994bccec3534056042adc2ff33f7423fbf59999c6b7c41138a SHA512 2f93b091600c9ad91e6e4f2ef5e246c442081333ecdbc1b4a26f9bea95bbc8e12fae05f484c04dd1330140be086681acde4f18ae45153c8c91d33798c7588ebd
-DIST moodle-3.4.8.tgz 46052218 BLAKE2B ac7b0aab7212a2c6af3ae8ecc4f90dc30163f47c0cb6dfdffc719b50211132a8c75b77141aa6da97abda2c1456ee685562d37de47f3c7ad9efdfe4a622d9922f SHA512 e16c818c0cdb778af0364997410545bbbcc78b45015806306e0241b32d7a3e23564e3afe47cc13cb55e7a12418012583f985633700bedfe0c210127de3aa2ac5
-DIST moodle-3.5.5.tgz 46684330 BLAKE2B 00df00e62c922211f010ae38a759e33f250e74028dd66cf51690debd3c43a2afe5200e320dc0d258a8624784fce8436cd20923ccaacb01f3190f6b67bad10e0f SHA512 9e3fa3551e1cdfef0b2b31421ca625fcf38f90a2121c05247b60987da81cc9a44cc0fbc5d35ee6d7b91fb81317c2b9b0c3ef76988f656e67008f73331004167a
-DIST moodle-3.6.3.tgz 47707084 BLAKE2B 5bdfca625fe4c96a700524fcaaa36719712b32f37f2ecc4038116accb82ba48438fd8683f0feb67af323567daad32c6a0e8714b648f24d10c304b5ad6f93aca8 SHA512 9a583064321ee0929e3df2b194c783dd5322b6d6e7642fdbf9d18cc511b82f73e8007e234998ea2553cb8147dc22fa4d178f2104c6eb2ebc322a9850afba19c5
-EBUILD moodle-3.1.17.ebuild 2937 BLAKE2B e6dc81392ce7de27765e68363f7b4f772f3ce9f8fafa2fa1139a78a34d8a5ec60441d40d52f4698ba48914dc3ef22bb340b590db24552224e680c11790f9f738 SHA512 ac9fa234a15f04f9ff25fd33f3f8004c80cedc1d54620f483cc9b3b30ac46aa71d80827f4520efad73084d07e7741311413b4b596730b5bef37428e2e066ac9e
-EBUILD moodle-3.4.8.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.5.5.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.6.3.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+DIST moodle-3.5.6.tgz 46703461 BLAKE2B edd438ffd4f1def04f9619150d8ef486323a5e9f458124d317d36e01eb79e2d0ed0039d8dba43a3956aafc8e92c8d2276b6be730607031ba0e561b62a24488ef SHA512 0a08359576665f78d2370d3f2796dd53cba692c5fe68de7cdf8478bb1f24136c4e78149fa6a3c37118015fdf7a401c50913d151b4b38d9928989255688df73f3
+DIST moodle-3.6.4.tgz 47736743 BLAKE2B b3a41b0025651e161a1ee76ec1c121666e8dd0d830a05165b6c4419dff3caccb5fd006434f5e8284b81bd892a1c184d8a008e2b948d3b63c472f31cca55dc77e SHA512 b3b3b138f8a2779dc41f25656a5f2640afa2f3b933d9e2f99065e176d1f5b6c9c4f8bdf8af53af04957eb520043e1c7c53ff6309896e399f4a012f624481ae44
+EBUILD moodle-3.5.6.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.6.4.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.17.ebuild b/www-apps/moodle/moodle-3.1.17.ebuild
deleted file mode 100644
index b96de5d5680f..000000000000
--- a/www-apps/moodle/moodle-3.1.17.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="https://moodle.org"
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.4.8.ebuild b/www-apps/moodle/moodle-3.5.6.ebuild
index 1c5e865ec67c..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.4.8.ebuild
+++ b/www-apps/moodle/moodle-3.5.6.ebuild
diff --git a/www-apps/moodle/moodle-3.6.3.ebuild b/www-apps/moodle/moodle-3.6.3.ebuild
deleted file mode 100644
index 1c5e865ec67c..000000000000
--- a/www-apps/moodle/moodle-3.6.3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="https://moodle.org"
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-7.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.5.5.ebuild b/www-apps/moodle/moodle-3.6.4.ebuild
index 1c5e865ec67c..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.5.5.ebuild
+++ b/www-apps/moodle/moodle-3.6.4.ebuild
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 6a70802fe849..b63d54eca40e 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,3 +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
+EBUILD nanoc-core-4.11.2.ebuild 1592 BLAKE2B 296339b47fcf2130599ea5e09ee6cc39e2cc096b7f0f93353c5178d99f89fabcaee3aa4182d7ba9f264ad2eb1dfaa2fccf659368dd034eafeb8c91d28aa38523 SHA512 fd916642ab968c7cd67a2ff2c791c7ac67c52628d2afe299b8eec6d63b308ee4d89725a757a89a1c78321f1f3ae7279e576b5af286618c5bdac280804cd29311
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
index 65bb6bb41593..d1c733874894 100644
--- a/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
+++ b/www-apps/nanoc-core/nanoc-core-4.11.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 8734d93f6f1a..fd891170a877 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,9 +1,17 @@
 DIST nextcloud-14.0.10.tar.bz2 54634419 BLAKE2B f589b9f292d770b86fbc7207440da71375723ce59b5e7f229fa15dc3347bd1b1f22a65a592c4c9af1238d3c1da3891ae22ac1505ccb7fe9f0988bd038f5ff760 SHA512 f8ec66af3dbac0052a54ac8d74e44baf648b5cee8ec9cbce2f498a675e2fb2241c8725391f21e500bd65ca8ce61fe9a16febf8419b1c5af8ac3da1dc4b869fbf
+DIST nextcloud-14.0.11.tar.bz2 54660881 BLAKE2B d6499f89169202b44b4575201aed248690f945039a15c05e8a78ce2d6116220f2f965b4109f80d66ba26a141444012a9402e229d54b09445cb7df31ec0874d6b SHA512 c9cea545df371140656d837d0b5981290e554edb53738d2f1b6b85c1910d8540d785077d91ce1bc98862574d92ac1b5929aa48d382e38fcd8484ff57304b3cec
 DIST nextcloud-14.0.8.tar.bz2 54751640 BLAKE2B 0b017eeccbeb83f51388a965c48d44d7b03c95ff091e937d44705e4611ffe14134e67092a21b8e93be4455e806f1fbf13c5d1fac4d7e8f5e200b8f3afd8a0a95 SHA512 97434ee8ceb7d728c0a3ac013abcbfe7b52edf64347a762639871c54df8b2fd98e281aa53a553bd53efcbf2bd49342bbeb0cbfe1bed970673a8a5dfabf8fe1f2
 DIST nextcloud-15.0.5.tar.bz2 56489515 BLAKE2B c60a4f01e9bc0d31b2fe1d440c8f0adb512966220bb149cd299a1e7c277b7a4713c96a57a0042f55ea26d3b83598091dc4cea6d3e9565414f3c57fd8f267ae05 SHA512 e31f3dbfec288f87fca220dd509999d0cc221c27e2b923418fce4bd598288881e2ce1c10dca929710a332380fee4f04e43e7302b3406785f23727acf5735d64c
 DIST nextcloud-15.0.7.tar.bz2 56417492 BLAKE2B 048dd8ef79b3dcdbd69b68e9bd43d7ade14fa6d830e5918d12fd3d22db6feba914e620c7610e5b57e9802a9e00c7297ee43559cc03f264e704f10a6cbd5f2de5 SHA512 3868f9e1574d9d094ace7e1662da5df75d3f4399d8e160158a5eb251fb3f06c700fcc5dd312bf20d18bc70f7e37533ce0b7c4acd4e2affa893b84e6fb98bfb1e
+DIST nextcloud-15.0.8.tar.bz2 56469241 BLAKE2B 2d285157060a05f9dd42e3bc7b00c4ea3d103587cda7828a4dad68e4a1651cd43d91e3432ef758091ad85567f7023139c67b769a749dddfe491f4a68bc10c205 SHA512 035b6ccceaf127cbd047c6eaf1f2862c8f73466e4533c443bf3c3f95932f9fd529e0c5e37eec168ad0d682dee19dc655d9e1817394f0d3e5ef68b07280e5ac0f
+DIST nextcloud-16.0.0.tar.bz2 61731904 BLAKE2B a1d81cc07c6bc7680ed6a22146fa000c7a5293146046212727e18d11123ea56ac36df141510aebfd73a8c81ad85cd447a6ba403dd9ac6c0b1a17254fc7c6b5d3 SHA512 a76227c164bc8a38996a5de66f8b067e66795af3c83c7b1e2a1cedc9b51a32ed024e10328baccf1a3e75508fbc58cb5af99716bea00bc34bc56e31d5402b58cf
+DIST nextcloud-16.0.1.tar.bz2 102865395 BLAKE2B 12cb7490e7b329196c2c71c982634364a48fb459fe4e99c55b658476cc693fe9f3e3bef3c8b7ac959ba80fba299f48764ab6e4ef703dddc90c730346253acf73 SHA512 f4fee4659553bd4e742c06d332c76fc95ff5dc9d05940d203a34485951569e9b6978ee922fe63c6fc8a2a6273e5096c1688fe2701267599bfeca9d714e7492d9
 EBUILD nextcloud-14.0.10.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
+EBUILD nextcloud-14.0.11.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
 EBUILD nextcloud-14.0.8.ebuild 965 BLAKE2B 85a1255cea04da166a96736b9f421c606b3cbfc19ff16ea5996ab624dd0da853ad09456a91916d9055020975818410962691bacea6560d0ce73c752460eb9400 SHA512 41c20d697555a6dc5dd45588805d158f0f106437a3b3517f4a146388659bfbadec916a2ec6e2a75edd23d1c8dcb33b380f94945d70d3e0157dbbce0b538de085
 EBUILD nextcloud-15.0.5.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
 EBUILD nextcloud-15.0.7.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
+EBUILD nextcloud-15.0.8.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
+EBUILD nextcloud-16.0.0.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
+EBUILD nextcloud-16.0.1.ebuild 1017 BLAKE2B c4484d59b07f818dfff314fa4b83746685595b763bfb8f2bba98aa5ae58ac483e5951730243f78611a5dcef59cd1d5c28904720eea3ae323fb16d0d0a1618ce1 SHA512 5c21ac8e1a23fdaec145f20a9d73e334b50125bcaac7a9dc2953c4211c6a241903e921f74483bd103d847a718ddbdbcb3562428f9e43c757e8072ca9617d6ac2
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-14.0.11.ebuild b/www-apps/nextcloud/nextcloud-14.0.11.ebuild
new file mode 100644
index 000000000000..e4392ac62888
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.11.ebuild
@@ -0,0 +1,40 @@
+# 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,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.8.ebuild b/www-apps/nextcloud/nextcloud-15.0.8.ebuild
new file mode 100644
index 000000000000..d0d144714efc
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-15.0.8.ebuild
@@ -0,0 +1,41 @@
+# 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-16.0.0.ebuild b/www-apps/nextcloud/nextcloud-16.0.0.ebuild
new file mode 100644
index 000000000000..d0d144714efc
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-16.0.0.ebuild
@@ -0,0 +1,41 @@
+# 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-16.0.1.ebuild b/www-apps/nextcloud/nextcloud-16.0.1.ebuild
new file mode 100644
index 000000000000..d0d144714efc
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-16.0.1.ebuild
@@ -0,0 +1,41 @@
+# 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/novnc/Manifest b/www-apps/novnc/Manifest
index 808089b14fe4..5e1b38d0e756 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -4,6 +4,6 @@ DIST novnc-0.6.2.tar.gz 600675 BLAKE2B f9779a9f03ba653f77090639112cd0c967ff5925d
 DIST novnc-1.0.0.tar.gz 1551574 BLAKE2B 58bd63eb0480b3f20ed16907725e0abcf8c699671614dc195f46a363d6ab9cdb5b0b033ba0ba16bbe39b16437fb94f64a741acd69d1c3c3957a0e60353d78a89 SHA512 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
 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-1.0.0.ebuild 1048 BLAKE2B 2e1e57d3ad3152a6a3fa4cf78e4d597d424c94b1f0d6cf95eced23066554c20fa1dc7e1e03efcbd27f0446b5f2ce4a1036ccce8c6849a67d707e147d339fca76 SHA512 3cf6e611ffe8fc143f04791391c8a38fd00b57bf2c2fcb31d786924c08820a136b4b64409ea742f309d0b00604bb2d13c549684130520cbcb45e93c2a6876f9d
 EBUILD novnc-9999.ebuild 1022 BLAKE2B 6a04bc03d38f3f979de226d9802225225f451e08913cb3b47931941a391ddd6fbe55ca8357708b6f23b2731d8a82ca0362dd43c7c65d73a296e90f49ee361b6b SHA512 bb76bccfee688e20639b6b6f95e1fd253a021f4eb0ba886bd5de68ecd77fc01f5e4bfab0156171b2c50a2c37ec892c485d786285f3496e17aa66ebe9d25e8777
 MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
diff --git a/www-apps/novnc/novnc-1.0.0.ebuild b/www-apps/novnc/novnc-1.0.0.ebuild
index fd0bebd11d30..1a7845372ce0 100644
--- a/www-apps/novnc/novnc-1.0.0.ebuild
+++ b/www-apps/novnc/novnc-1.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
 else
 	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/noVNC-${PV}"
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 246e6dafc898..44c2f3fc1136 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -8,5 +8,5 @@ AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994
 DIST redmine-3.3.7.tar.gz 2371716 BLAKE2B ba1e69419f846ddfa64ddc5d26fda281737501374f5aa4f79bd4c59d5b483a28070103fcc3bf2f3b1c7a4ce96dbfb32d1d1f21a6b74603aad012ce7d2e3373ed SHA512 ba106eb60587788ccd3162274a9a40d2876324e647e1fcafce0f943d69d8fe216a01cbddb2a5a4f41f64513e287c80ec518cef5a6033b3d1ed0bcfc7d1cfcc64
 DIST redmine-3.4.5.tar.gz 2448231 BLAKE2B 11041cbac5ea33c060a90ead56a4479cc86137bad5e0eb6135aed8d19059aedecd2ad52ac63ae6fcc5bbb13b5fc4cd6b05695aff484932b55ad5d7be7cb1c396 SHA512 c77ce76fadb7a2b9d6daf77a898a1ca4d7b1c8616922e89026cee3a4b0ec1a187a746f0a054b786663e78fc510596be736fd12d71b2569f6a63a21d0c95a05ad
 EBUILD redmine-3.3.7.ebuild 6660 BLAKE2B f8e8e9785b682c5ad1d7fa4ba06157a171438d3fed1bfaaebcaad0a063638d87897ea3cade28669fe30b7e69674b4617cf4095777b35dd1ec4f27fff37a5a1ec SHA512 873308418eb2a231d4ecdf41ca2f24da31af8c438a3e02e2982a9d99c80d82c7ed05a13cb67d3c48bd251efdd40658fa62954d84d5e30c29d2c3dce58ec46be3
-EBUILD redmine-3.4.5.ebuild 6668 BLAKE2B d5b9ed082d17cc8c5f98cb67e206c335536b5b43a2c4b50aa91ef736f18196219da18a9390890ca3042cee2f64602a101539e3eaedadb0eb70aa43c476bb5152 SHA512 470206aad952e6e18f02f499a7dcacfc241def2374f2a4a98b69a6cf6a244fe1a355b61b162f6679d00df586d675c316c02e65dd74a0a829ed31e348d9cd85b1
+EBUILD redmine-3.4.5.ebuild 6668 BLAKE2B a0ba11f4cd5e078f72510998092497b5c1eaa9abb509e0f24a5680a4c3c99ec3f502ae3b0cd47df658742ebc968fddc55a12bb3f36db153f2e7939e296eebc90 SHA512 56ca6c12fe532608e005f0db11a2abad4f01ca1fef7d029ef6a0828e2255b983ee37782ed5c9df3ff4b305059ed17bdbcf1272e688e10b255b1a786539f38d6f
 MISC metadata.xml 527 BLAKE2B 251acbf9246fd6c986b37b6320e78619036d30bc8e155e97a93a2c3ca99847eb39d7919ba94f633aa021462cd200dd156b6f7d3c1575151c1d6b38a4ee999bfa SHA512 156e0ee607ad0ae734a98fab405679c55de4e2a5d620cce564a7ac17e8a029869f66c3df6d2733eb8106f9732537355c72be7c7261209af196264d069788eed4
diff --git a/www-apps/redmine/redmine-3.4.5.ebuild b/www-apps/redmine/redmine-3.4.5.ebuild
index d78641a9295b..5b6112dc9338 100644
--- a/www-apps/redmine/redmine-3.4.5.ebuild
+++ b/www-apps/redmine/redmine-3.4.5.ebuild
@@ -22,7 +22,7 @@ ruby_add_rdepend "
 	dev-ruby/i18n:0.7
 	>=dev-ruby/jquery-rails-3.1.4:3
 	dev-ruby/loofah
-	dev-ruby/mime-types:*
+	dev-ruby/mime-types:3
 	dev-ruby/mimemagic
 	>=dev-ruby/nokogiri-1.6.8
 	dev-ruby/protected_attributes
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 4b528da879aa..19a4ecd0d4dd 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-5.1.1.tar.gz 10654780 BLAKE2B c5105315ed07941811016244737d2a697864521a4cf0fedc9ba260629cedbe77cef642f71ea485813eb89cbef1a1bb60fdca3229611f7d2de435f0c28462a3f1 SHA512 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9
 DIST wordpress-5.1.tar.gz 10653910 BLAKE2B 26a4f42dd88d4c2616fb240b8b9a1f64a5380496600e3d132dbc162505907cda49e11b9f132d0f436e9426e77d42d6d78ed6b1e16f04d857429515d192761113 SHA512 e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99
+DIST wordpress-5.2.tar.gz 11195223 BLAKE2B 35bc5190751749f12d88a13314f021a9cefb6dd78aee9ec32e439031cd19af0929c1a84741b7965cc30638fc3f568289e75e25e9b63a1696e4c427ef29aa1f85 SHA512 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824
 EBUILD wordpress-5.1.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
 EBUILD wordpress-5.1.ebuild 1260 BLAKE2B 497617a28239b9636b455fd458e811ae00428a4938891e30d2cdc0144143f29c8bd9988b6dc695ce89b96b044e7cf3ccc14148b7aa13e653c67141625e987d28 SHA512 f6114430beffa148d151909fe1d01ab892b23a25ac83c9e2136ba3c49446164fb4a80407866db25d70e9acf9e0e4b01afbce35735a885d29d002a14332326b9c
+EBUILD wordpress-5.2.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.2.ebuild b/www-apps/wordpress/wordpress-5.2.ebuild
new file mode 100644
index 000000000000..9d6f0eaa173c
--- /dev/null
+++ b/www-apps/wordpress/wordpress-5.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+}