gentoo resync : 18.11.2019

32 files changed, 418 insertions, 308 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 38889d9cf6a4..cbc5c39e1627 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
index a4a752f999ed..e52b44a759bd 100644
--- a/www-apps/gitit/Manifest
+++ b/www-apps/gitit/Manifest
@@ -1,8 +1,8 @@
 DIST gitit-0.12.1.1.tar.gz 274787 BLAKE2B af4c6824f0e59caa88c16c64cd009ba9e234b19c07f44b1f71291f7ec42fe083c9d118feb5f0ed40364df30bf0e79d48cc11b450128c4797f26d969df7d9fb24 SHA512 ad27445b517e268d773993f2f642b8fa392c25b863ee6370d235708c9d6015363a253afd9e3ea0ed46414b6b5ad98bad445f73e9f459285d0c31590ef42b91f1
 DIST gitit-0.12.2.1.tar.gz 271239 BLAKE2B 20424b20afd0720dd5b4ac1fbf9753c3fbe8288478569672643825cd83bb54a99975306cf7bdcfe52dc2d729922ca20f129a293c808dd2c60027e23c9490bf28 SHA512 dd81ae190bd77b39e15881d87dd7efdcd02ac16a4933f3d44a5c900275fc494c8bc9a883c92fcf18ff49a6285d6dd56464e57695c9cb39d5616d43dbdcc58162
 DIST gitit-0.12.2.tar.gz 270891 BLAKE2B 9b05fb70ac1c98c8eb6f54d987e7d53c609f87a2c2b3f557ffaae36a1dc72806cbc4ac63d990d5e6727805fec5e589de3eb979bc11b78a19fcfa1cabf4db727a SHA512 3420335d3aabfde5466e4a70319712d87cf98e7151fe9a23d58807f74fa2bdb74cbf028fe4ab764a192f0e7ad9c56b70749029d64306c495d8012824c8f281cf
-EBUILD gitit-0.12.1.1-r2.ebuild 3431 BLAKE2B 4720267f3ad781100d7c5c69b5f50d5e55ac54a753d46872b2b8f439c5e99496e25102a3d4365f117dfd209f018fee7fe8d94938c793c993118ba7ea4f8059b7 SHA512 e30db2b635e9a47b6a74d7459483ab472143c26ba8a54b65d575f43c4b0bbdb90854154457d2a94d88e86710a13f795352c1fa40d8f018b210b7ad3af8a8cb49
-EBUILD gitit-0.12.1.1.ebuild 3368 BLAKE2B d91e44cd83c4134c0082f9db71ca0370742dee7fc625bcbb894394077b878d5b72879652914d09434cc98fbbb6242b8bb8ba6a40b48c2c1640e5c1654ee577e0 SHA512 88d114591b85d38df649208f633e31b0939db1f34e09a3577fff3ffcb6bb8d63a027c5e38491d8e27ec7a75d8b64143787699fd5b3f2ae2ddd93b7985dfe9153
-EBUILD gitit-0.12.2.1.ebuild 3392 BLAKE2B 3b49103b936daa7047f935d2536cd927267b930f231c5ecbdcf09cc551e76ff25bb795d08d111ff33f0cdc502bd5fd381dcd89fd233208e30afd0487de9009af SHA512 62bbb9363771d5f356164383a12ecdf31dfc31c2fde34e7a03a2d2fe92da4991fca3e873e14ac423a5ccffa685e62d49d943598b321ba48e881984f8f6df511b
-EBUILD gitit-0.12.2.ebuild 3361 BLAKE2B 74c0b745dcaaa8fb82e5bda364f4a7d6ed85abaaa346d478f847b68f6bc2910aa0b315f433345890170226a8b3d7cc15bb4d54f7c50137e1e352645bce9c0b87 SHA512 6e0f4acaea641fd4fb18d25b4c4cb8eb8b67028de6b1df3ec7b10e0714e82cae79e510bbe78a41e60ce385748afc8d4b28dc059be4d31e1a05180ac7c02cadfd
+EBUILD gitit-0.12.1.1-r2.ebuild 3423 BLAKE2B 9bb7b9225614a7b0716074822893ccc5fcaf786f812419af978b14ad13fb9ad5e2a467d04c2c719083869cf0b2a86e922502b9c958c2e8d40f0ab70c8f954e00 SHA512 c7f13f94f4b00768aef3eec7c823bb4e880d7b46480c2c098a905bcce852512c2c66b808fd38502364b56d4076c92b36b26ecd6e74cd265980946be77b952ee4
+EBUILD gitit-0.12.1.1.ebuild 3360 BLAKE2B b0e8335f5f280fd222e9b779c8291cc924a344e5edef8ea3dc1c59808066fb7e36cef034477cb570d0a8aecd369d789741ff1802dcbe8ea4220897cf08fda52b SHA512 2f0c471289ce828a10ebb0b0af7a52504bd1d1a5b1c0146c6562f6144ee30418293dbd3238e43249d159f38f6c2c078c0f1904ad1b26e2d2abf70f299f0dc635
+EBUILD gitit-0.12.2.1.ebuild 3384 BLAKE2B 769ccd9837c1533d9be2f0873ef9771d6012c758d662dc48d7b76d79731abcb2dfb02ae0d4bcc172a112069f717ad192b031703eb79c6b443ef31b2444609028 SHA512 73e30b3cf65c4d94125a77adeb053faf56239225364ca01b183e4e9e0b995c3b74c891fc1f5337776ddce740fbfcffabce376fe58fdfcc5a17932dba72727403
+EBUILD gitit-0.12.2.ebuild 3353 BLAKE2B d01c8a8f965e85377b1173f44ac43641ea0a211097c60d89610ff65466ae742eb10c54d87eca3545a740f8e4f62720a76f45ede7a989af30a1a953a3cc5bca81 SHA512 a4554ec771f69c0239fb5d22151868427258790dec765f5db7b6f666d0dd764edf7bc941d0b7f900a3fc5d3d6ceffe30b0afc232c99f6a28d247e3a18c82d6e5
 MISC metadata.xml 1425 BLAKE2B ab2606f347d8d99f01907d132df362516973e61fd36e9bb87f969bb53c17b04f1daa87ca3ca0aa45fa0859437bd392ad7071316ac49790dc962032c8e7364d0b SHA512 c3e877337e7c03fbe0a53d46b704100a19c450862be2f2de49b0a130e18f0704656ee371f832b8fe6efb0145f5af7d86deac024bb7972c01572da53c6439f9d6
diff --git a/www-apps/gitit/gitit-0.12.1.1-r2.ebuild b/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
index e5f5c987a448..5bb96f459a0e 100644
--- a/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
+++ b/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
 HOMEPAGE="http://gitit.net"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/www-apps/gitit/gitit-0.12.1.1.ebuild b/www-apps/gitit/gitit-0.12.1.1.ebuild
index 828413fdc4f2..a9fede7ee3c6 100644
--- a/www-apps/gitit/gitit-0.12.1.1.ebuild
+++ b/www-apps/gitit/gitit-0.12.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
 HOMEPAGE="http://gitit.net"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/www-apps/gitit/gitit-0.12.2.1.ebuild b/www-apps/gitit/gitit-0.12.2.1.ebuild
index 3f726c930eac..9ed02d571d8f 100644
--- a/www-apps/gitit/gitit-0.12.2.1.ebuild
+++ b/www-apps/gitit/gitit-0.12.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
 HOMEPAGE="http://gitit.net"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/www-apps/gitit/gitit-0.12.2.ebuild b/www-apps/gitit/gitit-0.12.2.ebuild
index 6d1b430eeb33..9fcfde99b656 100644
--- a/www-apps/gitit/gitit-0.12.2.ebuild
+++ b/www-apps/gitit/gitit-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
 HOMEPAGE="http://gitit.net"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
diff --git a/www-apps/liquid_feedback_core/Manifest b/www-apps/liquid_feedback_core/Manifest
index 7d55b5d965c4..d2372e69b782 100644
--- a/www-apps/liquid_feedback_core/Manifest
+++ b/www-apps/liquid_feedback_core/Manifest
@@ -1,10 +1,8 @@
 AUX liquid_feedback_core-2.2.3-gentoo.patch 609 BLAKE2B 2e142166f14f755720ed27213c4bbe8c30070dc36f6640c32ce9505614eb438140f7c7ea9c9fc0089ba62a100f5ef634adce107e2218dcb2d14b5584c52aceec SHA512 59058bd2ec5c60c13864b0d928b536ef3222be23eba49427b1c7c76c6e84a0130d802102eb3c14a48c5d60d1b93e8859feec339368e479bae1c08acbaeb2f63d
 AUX liquid_feedback_core-3.0.4-gentoo.patch 843 BLAKE2B 81b37cf79c20a83db0d5c55df82db93674177b9821781c60605113877ac7c2a5659f38c4466731ccdf3dbce8507ecf2bc2ea758b21dbd08f91b38af7bd1b4aec SHA512 7eb4f00c375f102910d755c3a2896fa4d3f1213c430e6cb1154a7d135f8445580245f93055a1d6f84fa1826f74c226d3bac9ebfd37d5be4c45ec9fd34e05b859
 AUX postinstall-en.txt 1498 BLAKE2B 0b29f386ea2c6a132046a42ebb246ecb428821d76a027722b4260f7c7bd00e99186ce145a2b5d7f169eb25b28a702ef4d3c2e0a0ae3217321f6969a2efc02304 SHA512 cd1488337b3faae08a1d7c326b4c1445863fb07b3d39b63460703467ad85524acf0fc14a19278a9cf995304e3a79c1b90ecdc0098f984d106d484f79d315b8e2
-DIST liquid_feedback_core-v2.2.3.tar.gz 124770 BLAKE2B ea020095572b2fe9f8c48206c192360f590f20be7cc213ec7dac509416e0b8419b32cc91a0a527a0e39d3f373fcc11250e666dfcd73534fde1320f5da58306a4 SHA512 a87af2b4ba218289b679a1ffb5751d29eed0d368233e431123c8ce98c1eab5bf62f516e4beb3177ecb302c9062c86b6f908cff3155783dcfcb2d279804079a87
 DIST liquid_feedback_core-v2.2.6.tar.gz 127440 BLAKE2B d62ecd8c9947259a7213f92ecaf1491a5e858ff2fdaff5e020fc4ec0c433297d8a7701a812de200130a1ed7f08ded1d9f31d42de7fffa2981361efee0e31646c SHA512 6f680398a7d2e529e642dc94ba16bc1b33d25459ddbf629c06387391ef13c0e212a108cc337cd2bc29505f4f6436b6e92994e63eaa09fe1c07733d2821d9b7f1
 DIST liquid_feedback_core-v3.0.4.tar.gz 142983 BLAKE2B 05e8c1630a8fa3932b4fc291843dd0c45e2333940394a0632309c9041dc850cc894a6cb54fb840329f67812ebcde5d540c338cf27a88ad428aaa066329725409 SHA512 baea8a61c94e640557d0169b6171247ff0303ff1a9c8b587c6769e367cf56805c1a1e660aadf7178d984182be6dde326770240b3ffeda42139c4a94445a2bbf8
-EBUILD liquid_feedback_core-2.2.3.ebuild 969 BLAKE2B 7528a6059a7e1eb1d6e340028c9195a77db8e3de471e99333b8d8232093c5c7be05e81b397ea9baadbea96de59269a5ade470a06c333f9e7f2f24adf9322b58f SHA512 681fb30dabad60453bac888f01557a50d5cf65693eb453f42f7e495a1c3a1c1259a28804f3431c0d323e451aa6caf40e0c2c1685e732b0c131637da499fddbe7
 EBUILD liquid_feedback_core-2.2.6.ebuild 1106 BLAKE2B df24ce5b1a7644b187323950268cd6148f5d2d73887d045e6985c484996a21c56b85f2032b832806d8b8a74cfedef821ed52aa14457605daf75a926be6e123d7 SHA512 d2ee14faf7f435f7d83954e9ce0bdb2fa861ea417927d117d948c77c06c13cdfe0623471367b384d91983418b8d32be1e3032f7e449fc336b8c5ac5b754f4e87
 EBUILD liquid_feedback_core-3.0.4.ebuild 969 BLAKE2B 9202588851c23b109db9805c299ceb7fece980311acf980ab7f7374ad7d787928a47cac119c8faed3ca11fc9a27bcbc973bc7eef25ceff6b5a75927507fd529a SHA512 9b667019dbc756a8baaf082b147a008f3216073e5fe0b3b863a74cc3e52fe67b4a1d90672df42f8ea6d2bed75fd32ee6a9f07c9818dcf18a43c934dc4f5c6e9a
 MISC metadata.xml 1099 BLAKE2B c846e77c5b1531e4ea502b308146062803cd79f74b275cf131343fe5c9c6b0f86a107c84f40cf3be95910ed5b99174d0c9883836a06b535b2d4f08514c9b082e SHA512 1fbc5d0f4eff2085665038a48155b652d434ec42019a5343fe1c1ef34a7b863aa2f21636145d105cf9052ef0756400f29098f3017f948d3aa0fb854f89cd6ff0
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
deleted file mode 100644
index e3b9b16d3f0a..000000000000
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
-SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/backend/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="HPND CC-BY-2.5"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-db/postgresql"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.3-gentoo.patch
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CPPFLAGS="-I $(pg_config --includedir)" \
-		LDFLAGS="${LDFLAGS} -L $(pg_config --libdir)"
-}
-
-src_install() {
-	dobin lf_update lf_update_suggestion_order lf_export
-	insinto /usr/share/${PN}
-	doins -r {core,init,demo,test}.sql update
-	dodoc README "${FILESDIR}"/postinstall-en.txt
-}
diff --git a/www-apps/liquid_feedback_frontend/Manifest b/www-apps/liquid_feedback_frontend/Manifest
index 437a81d0c5bb..a48c5157fcca 100644
--- a/www-apps/liquid_feedback_frontend/Manifest
+++ b/www-apps/liquid_feedback_frontend/Manifest
@@ -2,12 +2,9 @@ AUX lqfb-apache.conf 1433 BLAKE2B 2dd199afd8cf2fcabb480bbb309fba56a0b65fefe82462
 AUX lqfb.example.com.conf 624 BLAKE2B cca8acf615ad52bc342d2c9d831734a6bfb54428e7d41b86c68e1535168cfe99603cf2a8a2439cef1bcf2921c507fb7b5460236d95f479d2b0be629f6323104a SHA512 2e55fa22f7217aad6a83b15ceb723872e9b506b0199d224ff8a08592ce884341354a40c9b2ae6d4f9fb62d6fff80d6c77954b0d1056f18b44831c3d5bb705d4c
 AUX myconfig.lua 904 BLAKE2B 3a15ac09495c124fa73f15e533e91f9bda09a9c3194de135e329340b934e3ec1a0c28dd7f57e893057bbf8e7513311aa1e28ec331812d896b5551fdab3d709af SHA512 acd21b4e4ae5a43ed8d31fdb13a7531f43df78897792987cf1eeb6b0f85fae30dd61ce96ac6fcc383f857093739ecfe92de84cdf21a8210218cd4cc4801769c6
 AUX postinstall-en.txt 2550 BLAKE2B 10f43b315cd156d74e3e70a8af1bbcd2a7a2e1835409e0ef4af6007ee7f95814bfb4863c9660f3f8bfc33bcd6b5988339462063a7102555a2ea772dcb5705861 SHA512 a0c2ebcffffde5e15645efa753d567b75622f65481837a9c3613cad586166e4ba7e2a5d988e7ca2735b3a5e4de971ef68a7f0f73626c4d813ff58e8ef726efe8
-DIST liquid_feedback_frontend-italian-2.2.2.tar.gz 7496 BLAKE2B 7f5cad3e68565587f602d97d135a4beed573b20511c3bd03ebaa5dc4935dadc593ab21af647364b6cca55cf23a55cd8e61fccb67700cbb00598325def7abda18 SHA512 e58e8efa1c68d35dd23e286eb5720516e2f9ccf21be9697376e3c263eea50bfc80d68497959d07c26482317d6787d53ac19be68c21d0a3b5b65cbe457fbbb322
 DIST liquid_feedback_frontend-italian-2.2.7.tar.gz 7670 BLAKE2B 8131613849efdea1eaa1eda4f5620d7418d6b32c0f57b0aebb07c7dbe17afda2eee814733eada0656a159a93dda97a5a21e17db71baf3ca84e708caf502a4247 SHA512 63cfcb4a565fa570777c2f3d2dcec2e98f16415ad9f8a6d62076f4e2cdf0ddae95610688b6b7751a865344acb7b65f78e7cb1ae4103b24dacf63e3e346405918
-DIST liquid_feedback_frontend-v2.2.2.tar.gz 356003 BLAKE2B d30b2c6d58413f5f856b1293226933c0c67be3871221e262ddc5790640814983141987eba76f371bdc77862e5f4dd4e2981e0efe892a03f8d4b60367682580cb SHA512 0b145130814b9e6969189733ce9ccd523672e605f1cd8d4b2a8b931607ffe6b0110b142197ca50ec81326f381fdd4479c929b9eac0e92a5713749df72518962b
 DIST liquid_feedback_frontend-v2.2.7.tar.gz 362509 BLAKE2B 980e261ac9bddfb0f87757457fe58e93481e6d56dc0199b9fc72308e094aec21730f6d901f2e5c1b18a7f5993d1704cc91f64870c16c6215cbbf806095aabe12 SHA512 aa8c99e53c329dbf4659dabe617938d63b2aa42bab99ff4e200d4e15be8ed8ef5f64a71293fa796adde47525d1a76ece3b04cff982474eb2307a3fcd4f269d78
 DIST liquid_feedback_frontend-v3.0.6.tar.gz 497521 BLAKE2B a9e7e7944b418a707a459093b41798818644e2d8aed47a48808c2bf7800acdcde61a04e07483dbb387264df2236b1b02f2410cb34f62bdec6244405db0cf3474 SHA512 d283d277cf6836c53398480c566158481fc65400e128bc4817975fd39c41e6e56b17f7f789a74b1b2a89f84aaf315101e9aa86a474c1817362443d03610fe6e9
-EBUILD liquid_feedback_frontend-2.2.2.ebuild 1523 BLAKE2B e79b097db4c0a00b8cd0e79b3991606b834adc6bcf07a6bb594124c312b1154ffc9338c844b0c086540701a14bbee1f0b0a327b607b78568434b520bbaf46042 SHA512 d54e7ba11740200ae4fb30559db39c80975bc39e20e0af2ba0b6437e9d14c41c4d35288a36fd257d8c64d393ea166046c3d25be1e809c19b88b39cefa76dc7c4
 EBUILD liquid_feedback_frontend-2.2.7.ebuild 1560 BLAKE2B 91318feaac8adfbdaa6797e8c49ced78dbbe8e28fadd62a6b9f4db7e2ac2de384139226a97490d67c307b78317c1a3bbf4d373c772020e4c41cef5afdfb01736 SHA512 70691035f6a1d8b81c008a71d2905d6c90ef2d0fe2f9ddaa235095678a77b15d450de896e378552bcc771f60b94e2c1854062883f4fdae3a42620573c86cbcde
 EBUILD liquid_feedback_frontend-3.0.6.ebuild 1093 BLAKE2B 668e3a642ba1ca17d61841880456bc7aa112fb512fc1cafa835420fd9b5db1e41db57f79d229c54c11bfb57363344cd178c8826855c90433b494bfea27114c7f SHA512 e37d9681c02b4cbcfa7e485abacff654a3de1a35b142449e2d7c0dc432f2479e22cdb54c943c9cf24a34639b4a0a1231af18cf056a32afe984cf7242fe90104f
 MISC metadata.xml 699 BLAKE2B 12bf221f2c88a9f60051a1e91e00d855a12c937384470c92272f0ecd195f0a0cbb921ff401932a77a4304f02ed30f8afc9339035eaa6995c932db04b7529e06a SHA512 5a9961a632ba7d64fa23d2e6d43cff15cdd4b0fae14681cf7a0c809cdaa527cc6a1e5dcde7d7d9f26cf824cd18599f39345e5592064c4ebbfa29406256117038
diff --git a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.2.ebuild b/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.2.ebuild
deleted file mode 100644
index 82f9bb1350bd..000000000000
--- a/www-apps/liquid_feedback_frontend/liquid_feedback_frontend-2.2.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-PN_F=${PN}
-PV_F=v${PV}
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="Internet platforms for proposition development and decision making"
-HOMEPAGE="http://www.public-software-group.org/liquid_feedback"
-SRC_URI="http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v${PV}/${MY_P}.tar.gz
-l10n_it? ( mirror://gentoo/${PN}-italian-${PV}.tar.gz )"
-
-LICENSE="HPND CC-BY-2.5"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="l10n_de l10n_el l10n_en l10n_eo l10n_it"
-
-RDEPEND=""
-DEPEND="www-apps/rocketwiki-lqfb
-	www-servers/apache
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare () {
-	for lang in zh-Hans zh-TW ; do
-		rm -f locale/help/*.${lang}.txt
-	done
-	for lang in de el en eo it ; do
-		if ! use l10n_${lang}; then
-			rm -f locale/help/*.${lang}.txt
-		fi
-	done
-}
-
-src_compile() {
-	emake -C locale
-}
-
-src_install() {
-	dodoc README
-	dodoc "${FILESDIR}"/lqfb.example.com.conf
-	dodoc "${FILESDIR}"/postinstall-en.txt
-
-	insinto /var/lib/${PN}
-	doins -r app db env model static tmp utils
-	insinto /var/lib/${PN}/locale
-	doins locale/*.lua
-	insinto /var/lib/${PN}/locale/help
-	eshopts_push -s nullglob
-	for helpFile in locale/help/*.html ; do
-		doins $helpFile
-	done
-	eshopts_pop
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/myconfig.lua config/*
-	dosym /etc/${PN} /var/lib/${PN}/config
-
-	insinto /usr/share/${PN}
-	doins "${FILESDIR}"/lqfb-apache.conf
-
-	fowners apache:apache /var/lib/${PN}/tmp
-}
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index c85937d2aad9..70c4e4efcaaf 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,7 +1,5 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
-DIST mediawiki-1.32.2.tar.gz 36188194 BLAKE2B 5f5a2b077ec6451541134e7d3cd6dc6ed1fc1a35716f496b8028e3852a767a70ab5331a94d93a3dbea5d8f0df6ae3622aa01b7375ad6053d57e771d0b2eb3d95 SHA512 79f13245fe2a8851780ac9f38c3f439a4911f6760e810712922b18c577e3ee6e4b0f3e336c567f6115258aebd5fc5e7c6c1045f43b5d0f615bfdcfb54fd16335
 DIST mediawiki-1.33.1.tar.gz 37863816 BLAKE2B 2f4ce62c3b46738d31af9fcfde61a9521a0bb838c035ef539f4263e61b7fe5db59597a3142a6f942fabaad1bb97c7058a21df654588e6a60023fa5fad5e4d88d SHA512 0cf786872714546fb13843bc5f8b851bfcc665f7459a0326a3fb77efb0d1976b618d4e2206d3fb0852a60b7fa375e98aa0b5600b03209ce9eabd9e3dc5db7d1a
-EBUILD mediawiki-1.32.2.ebuild 2439 BLAKE2B 734d7d537bd429c67d48de191ae3a5a3541eab6215011ca506373ebfd655ec4027d7c800aac3799d70a46c87d0cf812b0cdef070c4c97a0a213161e037da5cbe SHA512 2dbc7bca92d6cf21efc3e787fd7315ec10f5648461e8b7bbc754e3eb6bea65f89e8ad484aaedd22327cc83ecf70d86e1b1ba64574542059bee512bd1d6113405
-EBUILD mediawiki-1.33.1.ebuild 2432 BLAKE2B fd1ec71f6a4d766708b13e279c0d54449b50574ce019313ae9815e20732c00053b31fb28cf9e89084444e1afe6dfca9d8f135e0693b7487f740386aeea4bb97a SHA512 96a7da76578eae6a2dc5c408e4bfeb279a318d87182506c665df0be27a3269d1150e6bde51ba110456124920e639fb4dbdfa5dc8cb783c409a1b322880fe6cca
+EBUILD mediawiki-1.33.1.ebuild 2429 BLAKE2B 8bb74e2af72ad74283b19e1e233181de5186e62dde63c6731c3a80123bb1d80ff97f8fd34132e6c6ab1918af84186caa1bcefcd61c222af961d00e1ead37c9e1 SHA512 5b222928ee037a1087ca48cf5603bcddad1b41b6020574116274e155f0d7aa548943cf9c7d6acbec4c64405c408d3ac74026a44eff5483d27f9f8a067f2c307b
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.32.2.ebuild b/www-apps/mediawiki/mediawiki-1.32.2.ebuild
deleted file mode 100644
index f347fc044169..000000000000
--- a/www-apps/mediawiki/mediawiki-1.32.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit webapp eapi7-ver
-
-MY_BRANCH=$(ver_cut 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
-IUSE="imagemagick mysql postgres sqlite"
-
-RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	mysql? (
-		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
-		)
-	sqlite? (
-		>=dev-db/sqlite-3.3.7[fts3(+)]
-		>=dev-lang/php-7.0.0[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-apps/mediawiki/mediawiki-1.33.1.ebuild b/www-apps/mediawiki/mediawiki-1.33.1.ebuild
index bed5bd82992b..b64e691018f9 100644
--- a/www-apps/mediawiki/mediawiki-1.33.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.33.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres sqlite"
 
 RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 67be08d4e7fa..4ef0b41df177 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,10 +2,10 @@ 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.5.8.tgz 46729651 BLAKE2B dbfd69970ee864d71d5f9f2a65e95f7eb3232b7379c36fd729f7b42c581a7af95e7b22529c67aa074a45be946e089b3259629000ddcbea4b78b6a9c5925d054f SHA512 045877445c3c58fd105219fed75bc3f39a618a64b7811aab3a28db4d45ed4d7210ac8e39d69f19ed19b8d81d9a6608872f3acc00e693b3388f574bb3c7874b0d
-DIST moodle-3.6.6.tgz 47777341 BLAKE2B 36f65b1945f66a7686dfb1880dedc31c711c5b02ce713742dcdfdb9b93fc187912c8d67b2acba11165346c6dcb8d6c844da542254e67c61dca1d39a34eab5abb SHA512 d23f5b63f186b3a45b1d1acf04e9fc9caf222437e739bf93bd38be22d802c38f0bd7487cedba39f0fa943882135245e74fedbb9e5f1afc7929c747e5965242b8
-DIST moodle-3.7.2.tgz 45744766 BLAKE2B da801662496e8ff66db8ffe2bd099b5b8bae7b59e8493fa7f727eeb5d8834b0f942c816de1758896d4b0929571f086851c9b3d0d063633e571bdb12dffe7c223 SHA512 034722f7a10871965849aaac24bb487c5f0cac8132ef058729d068e538d8e2c3e2215304310b1a50d7cfdee4242c1094cf6d8323a5c2ecc5c98bd9bca295dfa0
-EBUILD moodle-3.5.8.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.6.6.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
-EBUILD moodle-3.7.2.ebuild 2949 BLAKE2B cb6e624bb0c83c5e8a3e7d9a541cb61dcf93dd6b06bdbf417ac96631444665a08bfdb5d1366636c0452421faf6350d4b886d08d6a9a07b8676f45cdcb040ffa8 SHA512 593727dc584922aa6a0074c01ab6d31bf738c7e198d4901ce2766c2dbda9eae26b0f2ccb4360d117da3d8fb76f34b656b6f777d2e1aa992401bc8bd627774c67
+DIST moodle-3.5.9.tgz 46748268 BLAKE2B 41c1b9f47f088438fddaa3bbf913091610d8b5aece8413944d79ba67381a50c510c257eab56c8a41f755335417549107c4e349134f3d0c39579329efd04cee34 SHA512 262449f3c424655d86746c13548187e412575ba4abe5d4bac2bcd64aa8f2ce4ea3fd3663bba8a61c10c9bd9192d5fb1ee19d75484340972a909284bc5d923a2c
+DIST moodle-3.6.7.tgz 47805595 BLAKE2B 567d179d3f2c600960c979dc54a92de9bf95e0710de20f6dcb304d8d6a528d929b60183f56e707a3254a2c98060c2c3ced62272360912716d8a1cf2fa7bd3b98 SHA512 b406fccb8ea572cf14cb8c06e746778b1ce92a170537ed4cd17e1a0977d30e5b8711a7cb36f7d845acc1af31a348faf7cf3b8beca815c1caa8ac0b2c2cf48ae4
+DIST moodle-3.7.3.tgz 45782119 BLAKE2B 2732e0269d65f213b71e32231f7fff8ba06f2456466f8fa00f9e7f204f0f7160b3552763c555f952a35cbb9344c9494e7122bd9a6f9ecea8b9ca18a8a9d90e07 SHA512 e9cb7d633be57ed9a66f54f33d2b2827a0ee18d3e7d48f463e8526b817e470d9d1930dbef557f84d94c1dc20a2543874e3bbbae4ac89eeda62217ac2bbddb14d
+EBUILD moodle-3.5.9.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.6.7.ebuild 2949 BLAKE2B 948d8ccf72fa401f3243b6ed4751de0ecf498502c5d1fa1f592c0dcc649670e99c2576d0d1ba40be463ebb4ae2bd3803000c6132e3d00eae5758bf70bccd256e SHA512 0c300c8f3b7e7758a1d29ae12be386f4b459cdc65fcd39ed45da307e503e03bcd99e68aa6798260e813aa92d03e4f1d0a4161e6e093d0b4fca6cb0b6db86a86f
+EBUILD moodle-3.7.3.ebuild 2949 BLAKE2B cb6e624bb0c83c5e8a3e7d9a541cb61dcf93dd6b06bdbf417ac96631444665a08bfdb5d1366636c0452421faf6350d4b886d08d6a9a07b8676f45cdcb040ffa8 SHA512 593727dc584922aa6a0074c01ab6d31bf738c7e198d4901ce2766c2dbda9eae26b0f2ccb4360d117da3d8fb76f34b656b6f777d2e1aa992401bc8bd627774c67
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.8.ebuild b/www-apps/moodle/moodle-3.5.9.ebuild
index 1c5e865ec67c..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.5.8.ebuild
+++ b/www-apps/moodle/moodle-3.5.9.ebuild
diff --git a/www-apps/moodle/moodle-3.6.6.ebuild b/www-apps/moodle/moodle-3.6.7.ebuild
index 1c5e865ec67c..1c5e865ec67c 100644
--- a/www-apps/moodle/moodle-3.6.6.ebuild
+++ b/www-apps/moodle/moodle-3.6.7.ebuild
diff --git a/www-apps/moodle/moodle-3.7.2.ebuild b/www-apps/moodle/moodle-3.7.3.ebuild
index 02e7fab65927..02e7fab65927 100644
--- a/www-apps/moodle/moodle-3.7.2.ebuild
+++ b/www-apps/moodle/moodle-3.7.3.ebuild
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index a1b5d4ac761d..a3567a867620 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -3,6 +3,7 @@ AUX netbox-2.5.11-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99
 AUX netbox-2.5.12-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
 AUX netbox-2.6.1-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
 AUX netbox-2.6.4-no-pip.patch 652 BLAKE2B 22612628cfa2ca10303a4328ed3c09bb7859c84eda1253330639e3b3576470b34b62bd775b2888043f7d01fefff746cb044bfbf0851eb0245009f46d42c2ab5a SHA512 a331b155ee9bed9a77bfd50eb2008f7281294fe16d280a4d7dc4ecc91fcd014a7cf581a7c9d01f02e2085fb6858bb377029906fd1fcdc042610c0bdda5464537
+AUX netbox-2.6.7-no-pip.patch 1062 BLAKE2B c134503d9c65bdc82147dcf045b69531276c021d650842b28407ed92ac6c7811e98be83b73279f93db2838e2edf7c651ab4e2a43f5421487029c708edb5a6f8f SHA512 e0ac02fcb65a5b7a0e199ef1d82993f75018fd45779bd073b3cfa75b18c221b17db390d5f6a81545505771effa5cd7aabfc96da107b3968b8f7e2a8bcbed9ade
 AUX netbox-rqworker.initd 463 BLAKE2B 9a77e8366018cc6d6a3130580df1ce5e84db06f44857a89243f6f7f527c94477669d2da1f1b588386ca341acd2825484761635346e1cd61ff576c85b506525b7 SHA512 881ef3745aeab79f641e5648301d5584b9ebc8e75c550c01ce6f8d78731b5dde4d4f4b47e2f01d55c788f755eea7e633c82b2dd6027b9cd32385f7d66ff3e1ef
 AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd0a6ae6ca4fd0034fdf3dada4cc49a259edd9e565571102351eca447f568ab9becbd7e6a86099e SHA512 14e4544717f17d37209a1613a962fad9110ae0ec39512649d50776eaa2270fd8ba8a4456b11fb66941081aa96553668d7b3ebd12f631f56d234784bdd25f9de0
 DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
@@ -11,10 +12,12 @@ DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768d
 DIST netbox-2.6.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a34f9509644deddce7c53e5ac8b3832df55604f3328d699f8f703ae15ad5b52312e1af8fcccabb7cd06377c8a09 SHA512 b137ec7f2d33bb7b48bcb38719ac9ea8cc31d7d38e33cedfb3279b8be2078c9a48ede10db1e4b4cab4a08c77e010060936e445cb6a1d2e6247bcc8d935cc9c3a
 DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e640acd12890d242c2c93768b21b5f8ebdbaecdfa31c0eaab0150edf52f08a1f424102fd940dd359bd8eafd4af SHA512 0b76e5bc3f56effbf7493680d10d549caf36e7769e21a2c24449cbe329379369f3428354c228d0cbbbc153dc62efb5c0e56c4a0d71c99f3267acd2446f48fb8a
 DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d98e52555e511ee16492fd96a6cb7604dce8f5954120ab8b3a48d6acf7878721005bcfd2bd9e3880294dfbcd4d SHA512 9b44442cea1f76cdecb37faee8fe32012b869ff63c1b0bc678d2bb8624851941e9296854a9d85abea24e49a75fd5b31b968e4adbd56e5bc03a1c9f28fc8b846e
+DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
 EBUILD netbox-2.5.11.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
 EBUILD netbox-2.5.12.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
 EBUILD netbox-2.6.1.ebuild 4245 BLAKE2B 8e04b1ee274fa82d7db31627c12c7fe7038dfd7f79640d2c737dd6a6c9cfed6c1c0eb67b355bd6e96f62a1c7840329adfe86c793efb2fd97a2c71f9e485914fd SHA512 a6d53f3b1fd03b6ee2a6e1eb7cf3da083922277350f21d20ff319d4ff09f8e5692e5f2dcc16e8ac85c198a52be1bba0cd6dc53779fa96241679e7ce1e3c36597
 EBUILD netbox-2.6.4.ebuild 4253 BLAKE2B 4eafb9fe1d6784f8560911f6a3de0e991e1e31be022634faf22ea7191a00e720613c6cb03650fdbb49cb9141abddec60d3548ddbef3ad784a7aeb4223c7537b2 SHA512 4b50e5561d746d668d37e0b1f52c8190aba36fba4dbf06dae12078b890dc5cef7038d6b1e5db107e20897509d0381a5205226c78769ea751e4859ff7c7564622
 EBUILD netbox-2.6.5.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
 EBUILD netbox-2.6.6.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
+EBUILD netbox-2.6.7.ebuild 4253 BLAKE2B a7bc7d7cc3043236a63973544d2ac7051d474b4b4e2e6cb44e617c20bb61e2abe58ef148fc68b715a0d6513f9a89cc734f527eb1aebbbe94457fd0118b270f35 SHA512 025be51114549859ba406276c1af6cd16ac668cb0982d1bd3cbd0ed87a852a3cef6d16ff9a864b4b7fca7e4be442556702ff8e3e985109f2bc4021efd7886d5e
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/files/netbox-2.6.7-no-pip.patch b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
new file mode 100644
index 000000000000..a47e151c0842
--- /dev/null
+++ b/www-apps/netbox/files/netbox-2.6.7-no-pip.patch
@@ -0,0 +1,32 @@
+diff --git a/upgrade.sh b/upgrade.sh
+index d17dec06..6972ed2f 100755
+--- a/upgrade.sh
++++ b/upgrade.sh
+@@ -10,27 +10,6 @@ cd "$(dirname "$0")"
+ PYTHON="python3"
+ PIP="pip3"
+ 
+-# Uninstall any Python packages which are no longer needed
+-COMMAND="${PIP} uninstall -r old_requirements.txt -y"
+-echo "Removing old Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Install any new Python packages
+-COMMAND="${PIP} install -r requirements.txt --upgrade"
+-echo "Updating required Python packages ($COMMAND)..."
+-eval $COMMAND
+-
+-# Validate Python dependencies
+-COMMAND="${PIP} check"
+-echo "Validating Python dependencies ($COMMAND)..."
+-eval $COMMAND || (
+-  echo "******** PLEASE FIX THE DEPENDENCIES BEFORE CONTINUING ********"
+-  echo "* Manually install newer version(s) of the highlighted packages"
+-  echo "* so that 'pip3 check' passes. For more information see:"
+-  echo "* https://github.com/pypa/pip/issues/988"
+-  exit 1
+-)
+-
+ # Apply any database migrations
+ COMMAND="${PYTHON} netbox/manage.py migrate"
+ echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
new file mode 100644
index 000000000000..5058c6208136
--- /dev/null
+++ b/www-apps/netbox/netbox-2.6.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1 user readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/netbox-community/netbox"
+SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap webhooks"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
+	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete from the installation guide [1].
+
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
+
+If this is a new installation, please follow the installation guide
+other than this difference. Also, if you need ldap or webhooks, set the
+appropriate use flags when you emerge netbox to install the
+dependencies.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you have webhooks turned on,  you should also add the netbox-rqworker
+service to the default runlevel and start it.
+
+If this is an upgrade, follow these instructions:
+
+Stop the netbox service. If the  netbox-rqworker service is running,
+stop it as well.
+
+Next, run the upgrade script as described in the upgrading guide[2].
+
+Next, check for new configuration options and set them as appropriate
+for your system.
+
+Next, start the netbox service.
+
+Finally, if you are using webhooks, start the netbox-rqworker service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox /opt/${P}
+	fowners -h netbox:netbox /opt/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use webhooks &&
+		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	keepdir /var/log/netbox
+	fowners -R netbox:netbox /var/log/netbox
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 66e44881b52f..bb5af654125f 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,9 +1,15 @@
 DIST nextcloud-14.0.14.tar.bz2 54774735 BLAKE2B 41016b45f3a07081daafeca39267f78cea5e04dcbebad62a73764f88749e628f6399929e07c2438c8cea2971891241d8b7ba066b1d02673c5827c0cd1d2429c6 SHA512 8efdcafb9cb1b52964cb6a8319e7bbdd633fa7a65b497b3cabd1a58763c88ce5de9f09eee0b9b6916f4c9c6aec86cd3df5c617c33120bf6280c43cfdfd789164
 DIST nextcloud-15.0.12.tar.bz2 56765490 BLAKE2B 6e0c7c00ff419f0041cf271f747003e40ed641ddb7a71345e49ed2e09a61a872f4bf0b978bb78b9426691c221db4f25d484f9b068dec5da1c4bfe8c1d67f1105 SHA512 0f30b45cc33ba3a0afccdb14f7c1ca171ee63f5a3deae98973ef48806b2b2418a52422b0ed33db1e1b455ddcc4d35169f355418c85e847c8b7b7371ea3da296f
+DIST nextcloud-15.0.13.tar.bz2 56983967 BLAKE2B 2a062df7426cf47a4872eced8e2eff664b16d39a60d6ed962d0720ce56a1ed2e526b6b7b414145ee9e429965076b6e9b0531316c702566a0be7eecca18a89f91 SHA512 638c73e971fe08951f6abf3f5b8d53feecfa0dbeaf57ff5ed9805e1e12d75ac62131af6e2c7b6c91d2c59a55a0722a836e2896a202952d51345897ef5b17e2bb
 DIST nextcloud-16.0.5.tar.bz2 62129676 BLAKE2B 733729f3d36f133cb7fb31e73690a56d8a4507a2fb12437d2061d62194ae8fd437777c32bd6fb0dd652a3a1ce3065b9aec2bdcbd89c2fdc07ea391cdc7f98435 SHA512 ace0e3fa343838e89dba0e1c9411b98c851498107bb34b38376e1f4970a3c1efd6b0c15e2ddceca13c00923c868a5c917aa8d5fd25d61b31f1ab9752e9b65622
+DIST nextcloud-16.0.6.tar.bz2 62110436 BLAKE2B f0cdd447507a6cd5f02718d16604f0a3a77662aebb1909a1f1dbfc33f7b7dcf46e17bb22ae954ccc348f3601c314bc75b43dd627aba5bc28d7b1e205c8c99967 SHA512 7716f6365123162ea106a3d7d80cc4f436f8f1e02d2bcc3ed2e42723bc83040a3d80aa7e9e589bdf7db052c0bf4720f4775e066bcfd84a5c2e7d404d08a8620e
 DIST nextcloud-17.0.0.tar.bz2 64500339 BLAKE2B 91fdd182347816e69f668dc6558e519556aae38abee1e86230610f6c935e82aaec5f003359c5744aa5d4c4b8299cdeaf2b58736124d3c9fe32b07445a6f4e609 SHA512 d271d6220c72473f0ccc1ca776fb883e0d2cf4e338a7aa0143cce8d8ffeecf825eb5e41d42467d22922995dc6adb2751831158923e0dea29405dbb11bea85b04
+DIST nextcloud-17.0.1.tar.bz2 65252188 BLAKE2B 4f9a675636da18ed10d1b92844612e868a4884abf13b15f956bbee0bfc214989840e3d1a135b399fea3a6a5993f638c180363291543f337d6eba572eed514a33 SHA512 74974cd5d19650ecd3f94a397ecce58fea57d62ab0205f87a108f0a57b5745fbe37d5bf272004d5aefef7c17a43558c219afb5304fb14c569beaa8a5fc5fe00d
 EBUILD nextcloud-14.0.14.ebuild 975 BLAKE2B 9e4f38aefdb61c239954600a6f00c841c2e958f7efc55f1e403e4b5bf771fd40e5e7082ddeef976213ae3e11f84e1c95ec61b3f09afa2a022f9b2815c1075af7 SHA512 5fcc09902cc47085d42fcefeffe0c75188aeddc42b72b3cf416aa41c38f2e97594040993f6f89e353ef1e1f30a0d4a00d14f7dbf9733d52bf81301bbe426beb3
 EBUILD nextcloud-15.0.12.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
+EBUILD nextcloud-15.0.13.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
 EBUILD nextcloud-16.0.5.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
+EBUILD nextcloud-16.0.6.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
 EBUILD nextcloud-17.0.0.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
+EBUILD nextcloud-17.0.1.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-15.0.13.ebuild b/www-apps/nextcloud/nextcloud-15.0.13.ebuild
new file mode 100644
index 000000000000..98628f30fd7d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-15.0.13.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 ~arm64 ~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.6.ebuild b/www-apps/nextcloud/nextcloud-16.0.6.ebuild
new file mode 100644
index 000000000000..98628f30fd7d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-16.0.6.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 ~arm64 ~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-17.0.1.ebuild b/www-apps/nextcloud/nextcloud-17.0.1.ebuild
new file mode 100644
index 000000000000..98628f30fd7d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-17.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 ~arm64 ~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/owncloud/Manifest b/www-apps/owncloud/Manifest
index df6d9d37f65b..ed5e631c9c2b 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,5 +1,7 @@
 DIST owncloud-10.2.1.tar.bz2 20354052 BLAKE2B da7c148e322c202ba599421cdbaf3b20f9ed9d490e7bfe7427a0892bbd1fc12520b21b9769d3afedeb93108632a58efbc13f919f20bc9b8a0faec88010f14540 SHA512 316125cd9540c1830a122fb56ee4bd4df1eedc397ef24996ee7dca582989bdfaee4ab659df3bac2a905c817919f2804bdc419ab18c9db2461909cf5941dda169
 DIST owncloud-10.3.0.tar.bz2 19419688 BLAKE2B bb7cbc367f500dddcd9b46a1aac847d3664f07af7077a5cd8135281436f4444208d93ee27d334156502e94ce4522e05685391177cde42556e5070284daba12ba SHA512 fc8662b1531c30bbf434f6a042c9b42b92e5acf0e7801866b232addd77998cceaeb16bacf6a91abe0762fe5676c36d59bbef58c00f379f34f5988c7cd181bf74
+DIST owncloud-10.3.1.tar.bz2 19715056 BLAKE2B 5e6026dc1ca9d7e1469e4a592b05807e4cc6ed83293eb3ad94b13d8aefd8eaf2b79e3aa9fca2e28dbc5b6c8d93a19c50d358a4fa7e393e0aaa00307c1652545d SHA512 4f3e60409c199f8075987aa5716a8f2736e875c045349562b79d2c785b9e99bc7d01d17e110b9c768b410f261e7a81904feb1dccffd6da11d4daca82b7201e14
 EBUILD owncloud-10.2.1.ebuild 1275 BLAKE2B 0f2990eb49aa741733cca2bfc1860d6f644d0fb489eaf944f3177641c178308fd99ea93d22a2ee032f7587d0cee6e6b9202a08bf58c340d92630664f5bfa6213 SHA512 7ed6fb59c3a699f6dae7169c74820ca55c1c7d06c823c4693fe01339820d248cbb16724414f0e3df6ed78f38524c9563ab4c77a592e0414c1289633e8a54c295
 EBUILD owncloud-10.3.0-r1.ebuild 1259 BLAKE2B 3b4c68b1944852eeb1770db91466c12f697076057d58db461bce021757548f4d2daf1901dc444bb93ac536ac8942672b64a740f86a1239fd8dc87d5719ec5046 SHA512 e416a9d252fcb98e6af9faec401904afbcc4be00731b3e1ea431074785ba36e8f5732e96dc0bbd02cacebb3d18b9bc51f54d8babd854f6f67b25f174127bc59b
+EBUILD owncloud-10.3.1.ebuild 1259 BLAKE2B 3b4c68b1944852eeb1770db91466c12f697076057d58db461bce021757548f4d2daf1901dc444bb93ac536ac8942672b64a740f86a1239fd8dc87d5719ec5046 SHA512 e416a9d252fcb98e6af9faec401904afbcc4be00731b3e1ea431074785ba36e8f5732e96dc0bbd02cacebb3d18b9bc51f54d8babd854f6f67b25f174127bc59b
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.3.1.ebuild b/www-apps/owncloud/owncloud-10.3.1.ebuild
new file mode 100644
index 000000000000..df2ef215759e
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${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-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,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
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 61146a8528f8..f1de6cf3068b 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,7 +1,5 @@
 AUX webmcp-1.2.5-gentoo.patch 5020 BLAKE2B bee0281373658a94379f88c0d8e8d4b144c5c622c2e651bda5ef49bfc44d702605483b21077031d7c1fb851ee37af8fa4a1c7f249817f8d06c89d158a5ceec0c SHA512 91b3b2679b2254b78120d3ec360d2770aaff82a21c8aa0fa00190d4dd215d4c9d837682c3562332e24ef079fd147618c7727ba721dc4e1302c6c71c875307a60
 AUX webmcp-1.2.6-gentoo.patch 5143 BLAKE2B f4b8ca3ec283f3b4e7149cb746adc889099ac90ffaf5265670ae9446d55135fcd73907e84525f44d0d20a312a6e4033fd503c48caf884c6b106a6c1a054f5c85 SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10
-DIST webmcp-v1.2.5.tar.gz 131003 BLAKE2B 362d06101db325841e2a2399041c5a13da6cca5750db08d2e5c06bc5a5402b87603ff218b9d6a8c5b9d78309dd2b097f91d5c0ea80f302afb36451e90870ff6c SHA512 40ce2f48c0e7362b7cb7a20a44c19d597fd919d98dbd2865aa6c1b5f9c41f593aee408309cf530a7cd0f94e2976ddda93816e723228a7285e689f13e31135589
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.5.ebuild 1414 BLAKE2B e674a9fc46ae7559420be599603b1adb946e1cbe475dd0a4849bf32d525ef4c06aa8f7d487e559e7efd5117445eceedb4cb9ea2fc6a6fbd35fae9bc69cd2626e SHA512 b1417be89af120657ff94e8eaff7275f800a49ba5782fc99a73a5f1e36c9fb68cd6c795e896854adae16d1b689cc13f00781b8b32ea4182a93ee12b1e2737b75
 EBUILD webmcp-1.2.6.ebuild 1414 BLAKE2B 23deebc5359c15f31d9a76b8b2cca925451f8e753385eab93ab7e7e27a6d17a521e2495c56c0742f8eb8dafb22f86dbe7f779ddc4f7e13669a9e02e499d191c2 SHA512 04de52cf954b54031cf41f56dbd10ee655b778688543e5c490c1aa6beb2f357409a71702dcb49ba5a94316f7c10218cdfb7320b335247c65b04f0d892147574a
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/webmcp-1.2.5.ebuild b/www-apps/webmcp/webmcp-1.2.5.ebuild
deleted file mode 100644
index 33c08e14666e..000000000000
--- a/www-apps/webmcp/webmcp-1.2.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-v${PV}
-DESCRIPTION="Web application framework written in Lua and C"
-HOMEPAGE="http://www.public-software-group.org/webmcp"
-SRC_URI="http://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-KEYWORDS="~amd64"
-SLOT=0
-IUSE=""
-
-RDEPEND="dev-lang/lua
-	dev-db/postgresql"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC)
-	# Dereference symlinks
-	cd framework
-	mkdir lib.link
-	mv lib/* lib.link
-	cp lib.link/* lib
-}
-
-src_install() {
-	into /usr/lib/${PN}
-	dolib.so framework/lib/*.so
-	for subdir in "" ".precompiled"; do
-		MY_DEST=/usr/lib/${PN}/framework${subdir}
-
-		cd framework${subdir}
-		exeinto ${MY_DEST}/accelerator
-		doexe accelerator/webmcp_accelerator.so
-		insinto ${MY_DEST}
-		doins -r env js
-		exeinto ${MY_DEST}/cgi-bin
-		doexe cgi-bin/webmcp*.lua
-		into ${MY_DEST}
-		dobin bin/*
-		insinto ${MY_DEST}/lib
-		doins lib/*.lua
-		cd ..
-
-		for file in extos.so mondelefant_native.so multirand.so; do
-			dosym ../../$(get_libdir)/$file ${MY_DEST}/lib/$file
-		done
-
-		insinto /usr/share/${PN}
-		doins -r demo-app${subdir}
-	done
-	dodoc doc/*sample.conf libraries/mondelefant/example.lua
-	dohtml doc/autodoc.html
-}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 38beaf3e3f48..9f436fc6e038 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,7 @@
-AUX postinstall-en.txt 1554 BLAKE2B 0a6e291b6d590e03fe4702a9e01f88a59fc4d820f95b4e7541d03f32dc397f86de694de73c5d9d8910e30a7f7f49f59b5f918b75ff16f537f9fd0931052e3e57 SHA512 d03a9da686ea1806e0583706af271738fa0b912cf7d718c096e2efbdb03b178e5b4137ec6ba5d91d85ca71f3403ca45e61eb992467cf05846e02dc10f5bbb03c
-AUX postupgrade-en.txt 1653 BLAKE2B cf2e403046ff8646b7dfffaec7c267633fa735f1be7448f76c9bfeefb2372c169453123db169d70bf871dc4c1ee1a239aeb17a25a1de582b23b38a7d589fd1c2 SHA512 3fa8b143a4cd8e23798423427ec31174947eeccfdbc5611dca3b32e02484f68602713dd75c3153db344de4151de1924fbaa6807e360fddeda79fa0dc70005913
+AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
+AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
 DIST wordpress-5.2.4.tar.gz 11199173 BLAKE2B 879f5de709b56474674aef575ba79fffa57263080a043d51adada12fe9f766f7c0731195d468f0103bca8e5ffa2d9775ec3d328a76fd0fe104044de131c11037 SHA512 eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0
+DIST wordpress-5.3.tar.gz 12372564 BLAKE2B a3cb1e76dd62ffe4e3689e9d3fdb1a96b8f787a763610684a0fbb0ae7fe9ad34252d1cb7119f3edf24c771bf50ca4a322e26e9b3894d12250ceb299f6fd3b019 SHA512 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07
 EBUILD wordpress-5.2.4.ebuild 1260 BLAKE2B b3478b9f1821baaee2517a15ee9ea6e67e2bc2dfa760e2a7b87bcd3933a2db89903e3d92f85b52db6afaa3906649dc7372cb80cfd6c3c962c87d215dbf6497f9 SHA512 077876f0d5c75686f33cfe5b6422a0bb8eefb56519f8b4cc098dde7c39dc09a38f4a43db4b8412890666e8adcab1f4f39f5601a34c7647b9c428987168dd8209
+EBUILD wordpress-5.3.ebuild 1368 BLAKE2B f5b45626e424d308eae0e46b4d403d9b8e26cac04b9d882d30806c7ec2cb450b85a39fb04fa543ae98b799d4b5513505f3e4f8f6d745f9670e45e0a770442658 SHA512 705fd916adf648b921e531e075f532421220505106f8a2fe644440f959d5a7e4fe75b8f81a6b7ec79ef750cdef348c56c1937554cafe4d6bbd275ecdf2053370
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/files/postinstall-en.txt b/www-apps/wordpress/files/postinstall-en.txt
index 54c97717bc37..aa26202b493a 100644
--- a/www-apps/wordpress/files/postinstall-en.txt
+++ b/www-apps/wordpress/files/postinstall-en.txt
@@ -25,13 +25,6 @@ Wordpress has had a history of serious security flaws. Any application
 with less widespread use but the same amount of security issues would
 have been removed from the tree.
 
-After a short period of being in the unstable tree we once again decided
-that we hard mask the package.
-
-THIS MEANS THAT THERE IS NO GUARANTEE WHATSOEVER THAT THE PACKAGE WILL
-GET UPGRADED WITHIN A REASONABLE AMOUNT OF TIME EVEN IN THE CASE OF
-SEVERE SECURITY ISSUES.
-
 We consider installing this package a severe risk to your system and 
 you should keep a close eye on the common security trackers so
 that you are able to fix problems with your installation yourself if
diff --git a/www-apps/wordpress/files/postupgrade-en.txt b/www-apps/wordpress/files/postupgrade-en.txt
index 5c7b3276db98..030326fbf632 100644
--- a/www-apps/wordpress/files/postupgrade-en.txt
+++ b/www-apps/wordpress/files/postupgrade-en.txt
@@ -10,28 +10,14 @@ http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/wp-admin/upgrade.php
 
 and follow the instructions on the screen.
 
-Note that the default theme has changed between Wordpress 2.x and 3.x,
-so if you were using the default theme, your site will fail to load after
-the upgrade. Log in to the admin interface and open the themes section to
-reset to the new default theme. If you face other troubles after the
-upgrade, you might want to look for broken plugins or themes.
-
 ------------------------------------------------------------------------
 !!!!!!!!!                 SECURITY WARNING                   !!!!!!!!!!!
                                                                      
 Wordpress has had a history of serious security flaws. Any application
 with less widespread use but the same amount of security issues would
 have been removed from the tree.
-                                                                     
-After a short period of being in the unstable tree we once again decided
-that we hard mask the package.
-
-THIS MEANS THAT THERE IS NO GUARANTEE WHATSOEVER THAT THE PACKAGE WILL
-GET UPGRADED WITHIN A REASONABLE AMOUNT OF TIME EVEN IN THE CASE OF
-SEVERE SECURITY ISSUES.
 
 We consider installing this package a severe risk to your system and 
 you should keep a close eye on the common security trackers so
 that you are able to fix problems with your installation yourself if
 required.
-
diff --git a/www-apps/wordpress/wordpress-5.3.ebuild b/www-apps/wordpress/wordpress-5.3.ebuild
new file mode 100644
index 000000000000..5a8f16d8897e
--- /dev/null
+++ b/www-apps/wordpress/wordpress-5.3.ebuild
@@ -0,0 +1,57 @@
+# 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}"
+	# allows plugins update if allowed within WP
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/includes/file.php
+
+	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
+}