Updating liguros repov21.1.3

39 files changed, 395 insertions, 520 deletions

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index b57cd8a0d6bd..bb3450fe0966 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -1,4 +1,2 @@
-DIST cgit-1.2.1.tar.xz 89648 BLAKE2B c1dc2fe9af58cc00bef9e11c5f784c5696d108671456be61c46e971659df3274874e751b26d6e124c2b3e7b407bbad2878ec5d74f26a0469146bfc66a479501c SHA512 c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36
 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
-DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
diff --git a/www-apps/cgit/cgit-1.2.1.ebuild b/www-apps/cgit/cgit-1.2.1.ebuild
deleted file mode 100644
index 04dc11ed32ec..000000000000
--- a/www-apps/cgit/cgit-1.2.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.18.0"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
-	https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc +highlight libressl +lua +jit"
-
-RDEPEND="
-	dev-vcs/git
-	sys-libs/zlib
-	virtual/httpd-cgi
-	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) )
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-	!<www-apps/cgit-0.8.3.3
-	doc? ( app-text/docbook-xsl-stylesheets
-		>=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
-	webapp_pkg_setup
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	rmdir git || die
-	mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
-	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
-	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
-	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
-	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
-	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
-	echo "DESTDIR = ${D}" >> cgit.conf
-	if use lua; then
-		if use jit; then
-			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
-		else
-			echo "LUA_PKGCONFIG = lua" >> cgit.conf
-		fi
-	else
-		echo "NO_LUA = 1" >> cgit.conf
-	fi
-}
-
-src_compile() {
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-	use doc && emake V=1 doc-man
-}
-
-src_install() {
-	webapp_src_preinst
-
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
-
-	insinto /etc
-	doins "${FILESDIR}"/cgitrc
-
-	dodoc README
-	use doc && doman cgitrc.5
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	keepdir "${CGIT_CACHEDIR}"
-	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
-	fperms 700 "${CGIT_CACHEDIR}"
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	ewarn "If you intend to run cgit using web server's user"
-	ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}
diff --git a/www-apps/cgit/cgit-1.2.3-r1.ebuild b/www-apps/cgit/cgit-1.2.3-r1.ebuild
deleted file mode 100644
index 707d23f3bcc5..000000000000
--- a/www-apps/cgit/cgit-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit toolchain-funcs webapp
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.25.1"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
-	https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +highlight libressl +lua +luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/cgit
-	acct-user/cgit
-	dev-vcs/git
-	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua:0 )
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	virtual/httpd-cgi
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		>=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	rmdir git || die
-	mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
-	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
-	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
-	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
-	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
-	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
-	echo "DESTDIR = ${D}" >> cgit.conf
-	if use lua; then
-		if use luajit; then
-			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
-		else
-			echo "LUA_PKGCONFIG = lua" >> cgit.conf
-		fi
-	else
-		echo "NO_LUA = 1" >> cgit.conf
-	fi
-
-	eapply_user
-}
-
-src_compile() {
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-	use doc && emake V=1 doc-man
-}
-
-src_install() {
-	webapp_src_preinst
-
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
-
-	insinto /etc
-	doins "${FILESDIR}"/cgitrc
-
-	dodoc README
-	use doc && doman cgitrc.5
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	keepdir "${CGIT_CACHEDIR}"
-	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
-	fperms 700 "${CGIT_CACHEDIR}"
-}
-
-src_test() {
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" test
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	ewarn "If you intend to run cgit using web server's user"
-	ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}
diff --git a/www-apps/cgit/cgit-1.2.3-r100.ebuild b/www-apps/cgit/cgit-1.2.3-r100.ebuild
index de5a2ff91597..47516154dc91 100644
--- a/www-apps/cgit/cgit-1.2.3-r100.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc +highlight libressl +lua test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/www-apps/cgit/cgit-1.2.3.ebuild b/www-apps/cgit/cgit-1.2.3.ebuild
deleted file mode 100644
index e01974c18b1e..000000000000
--- a/www-apps/cgit/cgit-1.2.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WEBAPP_MANUAL_SLOT="yes"
-
-inherit webapp eutils multilib user toolchain-funcs
-
-[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
-
-GIT_V="2.25.1"
-
-DESCRIPTION="a fast web-interface for git repositories"
-HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
-	https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +highlight libressl +lua +luajit"
-
-RDEPEND="
-	dev-vcs/git
-	sys-libs/zlib
-	virtual/httpd-cgi
-	highlight? ( || ( dev-python/pygments app-text/highlight ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua:0 )
-	)
-"
-# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		>=app-text/asciidoc-8.5.1 )
-"
-
-pkg_setup() {
-	webapp_pkg_setup
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	rmdir git || die
-	mv "${WORKDIR}"/git-"${GIT_V}" git || die
-
-	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
-	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
-	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
-	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
-	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
-	echo "DESTDIR = ${D}" >> cgit.conf
-	if use lua; then
-		if use luajit; then
-			echo "LUA_PKGCONFIG = luajit" >> cgit.conf
-		else
-			echo "LUA_PKGCONFIG = lua" >> cgit.conf
-		fi
-	else
-		echo "NO_LUA = 1" >> cgit.conf
-	fi
-
-	epatch_user
-}
-
-src_compile() {
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-	use doc && emake V=1 doc-man
-}
-
-src_install() {
-	webapp_src_preinst
-
-	emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" install
-
-	insinto /etc
-	doins "${FILESDIR}"/cgitrc
-
-	dodoc README
-	use doc && doman cgitrc.5
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	keepdir "${CGIT_CACHEDIR}"
-	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
-	fperms 700 "${CGIT_CACHEDIR}"
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	ewarn "If you intend to run cgit using web server's user"
-	ewarn "you should change ${CGIT_CACHEDIR} permissions."
-}
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index bf68019694bb..2feacb3537fb 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1 +1 @@
-DIST chromedriver-bin-87.0.4280.20.linux64.zip 5564194 BLAKE2B ec11817045f9ab60a34eaacf701a609b7ccbf4548e82df8348cac86ca0faaeb51a66f2873ca444fcd8c67bea3ff885caaf749008307f8dbbf1b37ffa24b9e7bf SHA512 b46518fa756b19e83d2c491470f6528d3eefa7ad6d7f59ca6c05e8ddc655c92ca641f2264678571731eb9f8a3809d0dffa137cfbfbfce39358b39045d712879d
+DIST chromedriver-bin-88.0.4324.96.linux64.zip 5685461 BLAKE2B 77a6f1c3919e620bcf0c6cfb08b31adc47c091abefa9b1dce9c6c28883c09165cb21a76a81e90c3cae27eb6781fbae74e901b7553344ace6fda8025df1458727 SHA512 a1dfa0106e77ebab742fa865519be7e0f50997263a6b7968b74948dc0c788567b9eadc1f3b433f8d35babff564210f89a910ef14476845438db11a50418ffe75
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-87.0.4280.20.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-88.0.4324.96.ebuild
index c96967a171b8..3d245b3e146a 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-87.0.4280.20.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-88.0.4324.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index f15d82a9293b..e85fad20ceac 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,5 +1,4 @@
-DIST drupal-7.77.tar.gz 3335456 BLAKE2B f1feae0cc992dfd7f6c809e4f505f71a4ebe84aefd3bfa3945946ba9a4397535e4d04b23c15fdcb96033f8d001e36529389dddd067301fa65cee5da8611ef454 SHA512 cbb047ab60e583be7fc1dc0ffd2398fa912e2b2fbf5d0446997cdad33422ac4b3b4e544b92cedcaf5e7c992609eb33e9a187c36d01e333f90772c84d386b9997
-DIST drupal-8.8.12.tar.gz 19515836 BLAKE2B 4627328d7df1496a12f4c5c97ab141b6b0b0e48233a4dd63a4b977b4ed0c044cd315711af992792802de2c6e3aaa6acc7e9a88c98e82317e25db22b4697d25a7 SHA512 b219a19f47acf775e1bb488584466b9a2a57926e52320a23b33f34fc400bd8313f088e22eb66ed4619767aaf8b009096cc5e585513dc65692869caf0e7c0d1d3
-DIST drupal-8.9.12.tar.gz 19808188 BLAKE2B b19a396734b615d2b63abd641a0183d94a3a7864092f364697924e060ce4d78e587ede4f51023144ab6a0a9d5138eafc3b5954e120cab52d9cdb4703104a0f37 SHA512 736ae2bfe4c4c6ae6dba2618992410a29c1f2a25c21b484a3e352203fb2309121ef03a4156b4a1262d2a1d534b94476eb06566e1265fa9af814eb034de4ba03a
-DIST drupal-9.0.10.tar.gz 16867321 BLAKE2B 834605d38984713b18951ce47c4d33de5e8198dbfc8552a32772637a8987fd8d9b0328917f5af630ce055044455fb22381c8c9e7ddc60f077848907b1d008ccf SHA512 e43f7b92ead39a0d5cd0f52e1a479aff16e1be3abf9f492ddf52156cd96526ae4b16361378a948719c3a8112b791ff50f455f13002c4827aee3702ddb1496353
-DIST drupal-9.1.2.tar.gz 17762094 BLAKE2B 77a7cd5bd887ad73a60bf6308c8c97c367b4d08fec0786004884f6d41092d18e147836f0bacb8a28fadf822ec401c609aa2c89f6ed2cae238deb644e30f74a81 SHA512 b71f42e2620c9a14236b7f76897859841fd121858a5b29962e407e7918c44028835d53761cc26e2eabba1464ef65965ab74ed769e734431cca541256e8eecdf0
+DIST drupal-7.78.tar.gz 3335651 BLAKE2B 16bf438b4c7892f2d001d89e194e8735b66a0c2bdcae5f38c14bd1233122d437ad786142c82aa34c0e3e22ce9dc4b14903f1f58ea42447157615559cc02002f2 SHA512 405ed053c0b73e8768ee2a8dda9fb7257e8c8664cbf76025dd58d34ed16bfd0c9e853b92cfee03e85b38e9d6d9c578d52c6943e804224ce73cf7be414f4cfb91
+DIST drupal-8.9.13.tar.gz 19805034 BLAKE2B 2682c30b810ffd2089c51b0b9776b0b5fd664d415b4014d1923a1136683608a9231a6cda13732a28ea4cb7a277ffdb3e3427b6e49897a58645ac57c500d7e644 SHA512 2d8fa904a0c229c2430e24b89c85da9ec74ba88c12ed3b4afa9f2258377970ed8de7c0ce5397c89f2875e93b9f2e8d1bb174a71b4ad0904c1e6e2d7994c977c0
+DIST drupal-9.0.11.tar.gz 16877941 BLAKE2B 53969ee3ee1bd2ed3672e37e01cdbf181a895b20750087778b0bcd687e7b1ad5fb73d0bd280dbc324921294a0586cf966a1f781a5f1d47d3daa81c91aa17975e SHA512 98b20aba886e36f76a2bea9b6eba1e92bf81e57cc272460e510e24f4622a6895fdb37407cbfc07875ef4c04845a2255f794f8626646b17ed461342a5b04dce10
+DIST drupal-9.1.3.tar.gz 17763646 BLAKE2B 5faf8bdd1bb7cd3f062cbdb881d567f6cec706d06ce980f7aa4f666d172e635feb32ad41723e88a99a68b6026aaed3003251c3f5c879719e24e5dacf19f98ae9 SHA512 57d8edca0064221c80924a8ea981af9ea66497fee14e4d736d96024ea26abb84e16af62f4d9bf5d69c69eb6851861d09f7d6dd54d92a2c0ae8fb2ac9585f6b74
diff --git a/www-apps/drupal/drupal-7.77.ebuild b/www-apps/drupal/drupal-7.78.ebuild
index 4e6998d1e429..4e6998d1e429 100644
--- a/www-apps/drupal/drupal-7.77.ebuild
+++ b/www-apps/drupal/drupal-7.78.ebuild
diff --git a/www-apps/drupal/drupal-8.8.12.ebuild b/www-apps/drupal/drupal-8.9.13.ebuild
index 1fa351c0c00f..1fa351c0c00f 100644
--- a/www-apps/drupal/drupal-8.8.12.ebuild
+++ b/www-apps/drupal/drupal-8.9.13.ebuild
diff --git a/www-apps/drupal/drupal-8.9.12.ebuild b/www-apps/drupal/drupal-9.0.11.ebuild
index 1fa351c0c00f..1fa351c0c00f 100644
--- a/www-apps/drupal/drupal-8.9.12.ebuild
+++ b/www-apps/drupal/drupal-9.0.11.ebuild
diff --git a/www-apps/drupal/drupal-9.1.2.ebuild b/www-apps/drupal/drupal-9.1.2.ebuild
deleted file mode 100644
index 1fa351c0c00f..000000000000
--- a/www-apps/drupal/drupal-9.1.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-9.0.10.ebuild b/www-apps/drupal/drupal-9.1.3.ebuild
index 1fa351c0c00f..1fa351c0c00f 100644
--- a/www-apps/drupal/drupal-9.0.10.ebuild
+++ b/www-apps/drupal/drupal-9.1.3.ebuild
diff --git a/www-apps/gitit/gitit-0.13.0.0.ebuild b/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
index 12a22b58b39c..e24c23a2a38e 100644
--- a/www-apps/gitit/gitit-0.13.0.0.ebuild
+++ b/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,16 +17,16 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+plugins"
 
-RDEPEND=">=app-text/pandoc-2.9:=[profile?] <app-text/pandoc-2.10:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+RDEPEND=">=app-text/pandoc-2.9:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?]
 	>=dev-haskell/base64-bytestring-0.1:=[profile?]
 	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
 	>=dev-haskell/configfile-1:=[profile?]
 	>=dev-haskell/doctemplates-0.7.1:=[profile?]
 	>=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?]
 	>=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
-	>=dev-haskell/happstack-server-7.5:=[profile?] <dev-haskell/happstack-server-7.7:=[profile?]
-	>=dev-haskell/hoauth2-1.3.0:=[profile?] <dev-haskell/hoauth2-1.12:=[profile?]
+	>=dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/hoauth2-1.3.0:=[profile?]
 	>=dev-haskell/hslogger-1:=[profile?]
 	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
 	>=dev-haskell/http-4000.0:=[profile?]
@@ -39,13 +39,13 @@ RDEPEND=">=app-text/pandoc-2.9:=[profile?] <app-text/pandoc-2.10:=[profile?]
 	>=dev-haskell/network-uri-2.6:=[profile?]
 	dev-haskell/old-locale:=[profile?]
 	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?]
+	>=dev-haskell/pandoc-types-1.20:=[profile?]
 	dev-haskell/parsec:=[profile?]
 	dev-haskell/random:=[profile?]
 	>=dev-haskell/recaptcha-0.1:=[profile?]
 	dev-haskell/safe:=[profile?]
 	>dev-haskell/sha-1:=[profile?]
-	>=dev-haskell/skylighting-0.8.2.3:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
+	>=dev-haskell/skylighting-0.8.2.3:=[profile?]
 	dev-haskell/split:=[profile?]
 	dev-haskell/syb:=[profile?]
 	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
@@ -68,6 +68,18 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.0
 "
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'aeson >= 0.7 && < 1.5' 'aeson >= 0.7' \
+		'pandoc >= 2.9 && < 2.10' 'pandoc >= 2.9' \
+		'pandoc-types >= 1.20 && < 1.21' 'pandoc-types >= 1.20' \
+		'skylighting >= 0.8.2.3 && < 0.9' 'skylighting >= 0.8.2.3' \
+		'hoauth2 >= 1.3.0 && < 1.12' 'hoauth2 >= 1.3.0' \
+		'happstack-server >= 7.5 && < 7.7' 'happstack-server >= 7.5'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag plugins plugins)
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 72779504cef8..3d89231effed 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,3 +1,4 @@
 DIST grafana-bin-7.3.1.tar.gz 53950606 BLAKE2B 16e0253371cb267876772e788e00d2330c664e3f0fea7f3891dbf5d4300e0baf99dd626ac2801201fda87f967d0013a151c672b341179e355acd43430f51acaa SHA512 0436b5bec58e52582542bb1efe7825ffc7abd5289d82916c6a54c6aee77a7350060ef877734b32332a5f3935cf1a3404b670e5f9344a8bb9b5c91d95ad81e214
 DIST grafana-bin-7.3.3.tar.gz 53921906 BLAKE2B 7fff1f6d1ef833815011505ec712e625fca59718ecdc8855bf5495c252b76f7d3dfe7ef28b6c66bd219750817c03a55921e6658c318ec3a227531641e9eb489a SHA512 0b982ac893f31c898865349f41efcb60ccf5789108d573677d9f33a5baf3cb532a8e80704bbd00154062de4d201a3e203f58569f1fd291fec2edfc0a2f434dfb
 DIST grafana-bin-7.3.4.tar.gz 53996284 BLAKE2B c84efcfc0bd6229dbceb364acb418ded4e20158563253d6dc1937cf14a3bf2a4a06a1694e8f2baa2099221d14d64f09437454cdf81cf3f62299ffa0c4178b5d7 SHA512 0bf2e1e199bc2c520a3218b0691c7743ff3b2306c43e4f6821c78015863488456bf85a7fceceaa6a64152d21053b9676e47ceb7ceda02ec446d06ee1878cafb6
+DIST grafana-bin-7.3.7.tar.gz 54132750 BLAKE2B 19bd49cd254b87492e072a0a13d7dfd3b33aa19dedefd68cd1f945d58cfcd5dd0b3cd10363c5cccd5309b0bf86a088df50839c3c66cfd25e4de4c6ab84b8c5da SHA512 40d698ef0f877a9c0e692494345138cb7bc76ef75881643804f75613427fb2174fd29abbf2d3c4c11dec515b6bc2913398d1a90d6000ffcfae1e0e5eead4241a
diff --git a/www-apps/grafana-bin/grafana-bin-7.3.7.ebuild b/www-apps/grafana-bin/grafana-bin-7.3.7.ebuild
new file mode 100644
index 000000000000..0de07551fc7b
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.3.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..ea15f9cf3f7b
--- /dev/null
+++ b/www-apps/jekyll-watch/jekyll-watch-2.2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="jekyll-watch.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rebuild your Jekyll site when a file changes with the --watch switch"
+HOMEPAGE="https://github.com/jekyll/jekyll-watch"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/listen:3"
+ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
+
+all_ruby_prepare() {
+	rm Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index 5b9729c8243d..024159d8adca 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1 +1,2 @@
 DIST jekyll-4.1.1.tar.gz 1398438 BLAKE2B ac207d58b155e069fda40b4598d441d8fb88f22e85740082829d018dc9cefe51ca636b23a6207c37711c4d26e078f6e4913946599f0200b8e8cb065a9ceff952 SHA512 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
+DIST jekyll-4.2.0.tar.gz 1412419 BLAKE2B 351852b52abc227f8e1eedeeef0871a593d66ffc95f4ed644441f81e841582ab9f393b206f049107daa7e9deaa63d36359ff8d0b47c69b629dda2ea462cd0481 SHA512 aee4d832631a285c3d37576b5f3d80073b56afefcb8c8a19a74435ce431b606b5cedc28a02c8e3930f9bc35ab432c952f96e1878b3bee6b9d33fbd01f0a147ec
diff --git a/www-apps/jekyll/jekyll-4.2.0-r1.ebuild b/www-apps/jekyll/jekyll-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..40520250a3c6
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.2.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0
+	>=dev-ruby/em-websocket-0.5
+	dev-ruby/i18n:1
+	>=dev-ruby/kramdown-2.1:2
+	dev-ruby/kramdown-parser-gfm:1
+	dev-ruby/liquid:4
+	>=dev-ruby/mercenary-0.4.0
+	>=dev-ruby/pathutil-0.9
+	=dev-ruby/rouge-3*
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/terminal-table-1.8:0
+	>=www-apps/jekyll-sass-converter-2.0
+	>=www-apps/jekyll-watch-2.2.1-r1
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/httpclient
+		dev-ruby/kramdown-syntax-coderay
+		dev-ruby/launchy
+		dev-ruby/nokogiri
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Replace git command in gemspec
+	sed -e 's/git ls-files/find -not -type d -print/' \
+		-e 's:_relative ": "./:' \
+		-i $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures because this requires bundler
+	rm test/test_theme.rb || die
+	rm test/test_theme_assets_reader.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
+	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+	#sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
+
+	# Tries to use bundler and install packages.
+	rm -f test/test_new_command.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/jekyll/jekyll-4.2.0.ebuild b/www-apps/jekyll/jekyll-4.2.0.ebuild
new file mode 100644
index 000000000000..8affdcb77943
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.2.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0
+	>=dev-ruby/em-websocket-0.5
+	dev-ruby/i18n:1
+	>=dev-ruby/kramdown-2.1:2
+	dev-ruby/kramdown-parser-gfm:1
+	dev-ruby/liquid:4
+	>=dev-ruby/mercenary-0.4.0
+	>=dev-ruby/pathutil-0.9
+	=dev-ruby/rouge-3*
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/terminal-table-1.8:0
+	>=www-apps/jekyll-sass-converter-2.0
+	>=www-apps/jekyll-watch-2.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/httpclient
+		dev-ruby/kramdown-syntax-coderay
+		dev-ruby/launchy
+		dev-ruby/nokogiri
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	# reported upstream https://github.com/jekyll/jekyll/issues/8556
+	eapply "${FILESDIR}"/jekyll-missingdep.patch
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Replace git command in gemspec
+	sed -e 's/git ls-files/find -not -type d -print/' \
+		-e 's:_relative ": "./:' \
+		-i $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures because this requires bundler
+	rm test/test_theme.rb || die
+	rm test/test_theme_assets_reader.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
+	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+	#sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
+
+	# Tries to use bundler and install packages.
+	rm -f test/test_new_command.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 609291cc9bb8..a8c6fc4d2c98 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,10 +1,10 @@
 DIST kibana-6.8.13-linux-x86_64.tar.gz 188072148 BLAKE2B 452a09bc7d876b57b36a50feb38731ded18b959f48861da259d75234614dbf072ff9cfd817fe4c21a2c83515934f42f5ddc7e7e634dfc9e2b327ee9d4b2ac730 SHA512 14144900eac8985de0982eda88e44474ebbd828bf9efa0b6f02ae0627c711e145e28cfbc931f63d7bb5dc5b3ad1056cdc972990cddc36f7050a29a34d9472508
-DIST kibana-7.10.0-linux-x86_64.tar.gz 252795226 BLAKE2B a8a390c8a8fbc0a592d494b3807cf8d7e4f7c066dde0a297d0596ace31d2302639ac935ed44dea12c747a8050209a895deb8f283023563aba957ae4a35987803 SHA512 385fe5d875ba074e0931a1e9ebbac8e3d91d300ca478f589da06b01c68e4694c5953a538afd6c385bdccec0f0d3cda1a5dc39f1b56e41d584cdcab8fba466677
+DIST kibana-7.10.2-linux-x86_64.tar.gz 249171053 BLAKE2B 279b1f67a9aaaf6d4bd0a8ba6028794ce8a9a996c9e9daad0815f9dfe9c696748d4210a7496907ee4be8fac111a2f08cc6d84d8fdac0b959b4ce6ee48f712d1a SHA512 aa68f850cc09cf5dcb7c0b48bb8df788ca58eaad38d96141b8e59917fd38b42c728c0968f7cb2c8132c5aaeb595525cdde0859554346c496f53c569e03abe412
 DIST kibana-7.8.1-linux-x86_64.tar.gz 337517217 BLAKE2B 208933ef5efccea3e718ff5ef1bfa28a08c75ba3a1a91b1eb00020d33ec1df2c17e299d423be4d2f3c2c5bfcb6189a80ebade26753379148aa72d9f7901a2e8d SHA512 92f3717b2f9ea915570ee8587f1ad0c2a428c266e1cd7dcda485b8b81191c5c1b3155872299c56dbba8de93807b2cc67a0d197ecb2e8df44e09060d4fac1d759
 DIST kibana-7.9.2-linux-x86_64.tar.gz 295714192 BLAKE2B 74ddb493013a097b1501a27f3ddb06e2081a3ebeaa06c5340d2229bcad936e8ae2249530f487ed1b42e697f2fd04ed6cea5c784f35d68e06b0ea3036f9f25cad SHA512 79d7b836a93b496fa9dc58d3d2286ca6f6ad4d5c66558047a24841085b41c8beeae2a4f68a8883013b93e3036e029f76ebcb6e30080fc0b1979377b1f6d2b19a
 DIST kibana-7.9.3-linux-x86_64.tar.gz 295755102 BLAKE2B e803d92c396684ce56b8b1a82eabfb6c1a88344d07b46d8770ab93ced14cc02fc22fdefec9fa3dbf1e893d02078dd27f7f2fbf1a2445d9d4942dfb1caba92a8e SHA512 c82b0dc91f2e6e585c6187b357ad8da6078a9b17974f6574628161a54981ea64b2f0b6c2e85bb052d20d5d5f64210fae7fbc3f78d7f30722d6f1e5d095b0a2f7
 DIST kibana-oss-6.8.13-linux-x86_64.tar.gz 70392218 BLAKE2B 752119ec4251005dc13acc9c707df6c3d8975d32b610cfaff65884d07a232712fa90ae6dfa46bc0394e98efb94f7e1a1f974b4dcb76b1da5cd6cadded7ae15ba SHA512 58e3d52616ca306739642e7932ec2f6388231c966e6fd5ce3431fc39e46183745f90ae069d659ad6c59f5c1361220e012723ccccd7dc47f61f53bf6d14705cde
-DIST kibana-oss-7.10.0-linux-x86_64.tar.gz 110358556 BLAKE2B 0221699cd5f07db4223574b3b946ec25bb3f1a756cca350509ff8e61458d26cf328042a1383d0d8eee42af7071780ba3d57d063541e05413cff1672a0e6b985a SHA512 477d3a79319a0f14f3c844d52e23d997c736ba5acc0184ed1c1c853b3795fa2890ba692efa23d882ab09275bc03708c9a1a63d80fd13f7844d1fc8a48c0f2f75
+DIST kibana-oss-7.10.2-linux-x86_64.tar.gz 111701314 BLAKE2B b72ebac1d628cdf486b815d7b9bc87d14d09d21d86affdafa2b7809486649bd10f7d63ba832bb0841102915d5efefce2d4324df8314272a37774ea031fa59ef4 SHA512 77ebb247d5326f3f9ab97d57ecc00c7f70deae0e1857d8b5d8f9a5d05d6713e27514cca342df666be79ab85a580e9dc5c7fa9676d67e95db64a0d69546d8d699
 DIST kibana-oss-7.8.1-linux-x86_64.tar.gz 154344863 BLAKE2B 19fefe509efd2c803a017d5cc7ea262cfc3065c71a8dae04bbe99f7c2421a1b1a6ee0cbf298d2e7ab8b7283ef67b9f8f2c1db876136dbad7abedcc843b287db4 SHA512 381e467cb6f18892a5d5403e6eab640ffaf6ae2b76bc3e52eb94a377bf773e7dee631d0dc72162e276eafbc10c9c70629c106d25707921b32d2ebb18f69315ba
 DIST kibana-oss-7.9.2-linux-x86_64.tar.gz 137021505 BLAKE2B 6e27e40e94a925fe0b6e5fa94050f69088c9d4092428ec8024cfa5d1665f5f0cdc6bb1c3910360808bb4fd28d76bc1150d51aa7f9003121aeb2aef9f929233db SHA512 39d796324b744f0b34548f1d97e042c5aaa66004f052627cfe7cb5ac998ac45df510b76692c297443af1cdd36a75ffd172810969b788df0fa972feedd78c1719
 DIST kibana-oss-7.9.3-linux-x86_64.tar.gz 136992027 BLAKE2B c39b7325461780878cdd06f2f1abd5c3585f7014d6a6703c5ada429dc90686f1d065c9aa2b5bfd6735d609bed3bd2d4a31a6787ee644e63dd0b01b563dc7c900 SHA512 11b9ecaf5e8866b1b4d8bdd2004f3bfe801c2f5ee9bad8c83cd1a368ba2cfe46b357aabf1b1a50f5aef7852b2fd885642384327b3fd53977ec3fc404cf0e6eb8
diff --git a/www-apps/kibana-bin/kibana-bin-7.10.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.10.2.ebuild
index 617e4c5de701..7efcf6021c95 100644
--- a/www-apps/kibana-bin/kibana-bin-7.10.0.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.10.2.ebuild
@@ -22,7 +22,7 @@ IUSE="x-pack"
 RDEPEND="
 	acct-group/kibana
 	acct-user/kibana
-	>=net-libs/nodejs-10.21.0
+	>=net-libs/nodejs-10.23.1
 	<net-libs/nodejs-14
 	x-pack? (
 		dev-libs/expat
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index f23234535494..28e16377d749 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,5 +1,4 @@
-DIST moodle-3.10.tgz 57423153 BLAKE2B fe59ef50e28a0170ff7a158d0ab52d93e30e4739a6af61cc2c3f6c93e763c459ebef8e6bda138af2ac2c6000d7ed6ea718821c01d2417b7c55d9c1faaeff2afa SHA512 f0a55c5ed3636943a5193cadc3755cfd509619b1f85c003dffa6387c131f0579c02b40e825932b313d649d5e1e557f8e63569b5b51dada59f8aed5eac0474500
-DIST moodle-3.5.15.tgz 46781368 BLAKE2B 5d47fc9526122314a490ef9728e8b1c8fddc233539de406d8077d59e7c14c6920d887fc074c94f9f5ffe6d66df68a325d03ab652cf1b39dc4870e64a7a638de1 SHA512 283f2f059181c3ba79799cb0b474bf9c5b876c528f1779b72b86a4b4087bfa73afc875dca5f454d527d5b3f0bfb3cc59531b59830f60e426bd9ef7bc65302698
-DIST moodle-3.7.9.tgz 45879636 BLAKE2B d07f080ed7333c575a04c813c0ffe4fce26ded2f1df267fdf5a1c5b9b787859d9d0c8d688dc435dd51f9850335528edb15a07b5a37200acca097f15c522e94df SHA512 22452ea2b497aeedba6be739f573c8ca1d4dec3aca401f1ce6aac3fa96411f94fc72aeef895a5c35b97112fb6dd1d836b421fa26740a3dcb6936ae88d4267b9f
-DIST moodle-3.8.6.tgz 53308269 BLAKE2B 20e722bbcd1f4575fa4450b6d7cefd1d882322776975f47940f49300f6c6a4bb9b80dae9e936207c5168a8847ae5d77e535d722aed07b68c1c29bad472cc6b74 SHA512 c3e63d6872fc476391747af03f25f0153a51dcc8a8a81d0330bd368d8bef9703dac700bf975a1891e701faed28227dd4d26a5d61255ca4b5bb349f91db66f20e
-DIST moodle-3.9.3.tgz 57048773 BLAKE2B 21721718ae19c42c61ad4f0d971887e4bf545b88126ab12570d3a9b54e33821b0a99708adcbed78d49ed324d8525a2410db8988b614f76513b61067cb9e4ecc2 SHA512 830e81f28e54c8ebbb4528fe113c1b1b345bb47c80abc725b6afd8111d92315d5af4c82e4241d235bdd22a1b9324b1e63cc3a66bdfa352a768c4604adbec4bdc
+DIST moodle-3.10.1.tgz 57464025 BLAKE2B 55a7f1ba24fa516cdb5f67a936797a5e9450ddd279bd3ea67a3fe4b321019dddae57f928a816374282dd9c08e78281b4835879a1ff5843e1997f61cede1ed05f SHA512 3460857b5e0d524849d30d3d883fc35624cb2afe52184e85cb63477b7b17b8737338b91f6f8b5cd263fa1a3666288c85f8f3b10fcab3669cb5b1e68f6d8e5399
+DIST moodle-3.5.16.tgz 46790181 BLAKE2B 921026617cc435f481ef5533908ca2a809fc63c57365d3cc114acb51ea246ea035d37c63fc64b8cfc25b29250ac2a3e92cbb5c838dce53b6e62971901c73de19 SHA512 ae9b2689a232c48a6d682627271e83460d6d95154f58dd8d1e27a58faec49c1089680378d943b1b45c3ebfa8e1f6cd1b879108b0c79bd9f49aab44e9520690c6
+DIST moodle-3.8.7.tgz 53309020 BLAKE2B 6be85529dd7cd69631b1f2de0873ffb00bb1d50b8165d2198b3ee08a2ffbd34b4e9f3f2b97e956166ffc3617e7c234051c8f43e81838b1470caa7f6b9b2b91c6 SHA512 28cd050bcec988cf235776be8058f1f153a76e7720dd47db16f6c243dc4b542eac230a73e5fa86ca62dea056e9e6a1af71e4b485a7ccc6198b19670900871527
+DIST moodle-3.9.4.tgz 57068491 BLAKE2B 9a7f3c1d5eae206b063e1dc5d471a34f378f8dd5b3f227cd87b2fc2a9c6b7429fab5d803a09a1fe312cbd936b37696aaf4b92ce8cd06b675ad7c891ff03fd518 SHA512 1a5069005aed3f0e1b5620d6c091cb8e9ad9003f95ae9d66055eb52e892feaf54b150942baecdc27a8d2884a349e3b882e16b187a2188e03aca0146abbc75a7a
diff --git a/www-apps/moodle/moodle-3.10.ebuild b/www-apps/moodle/moodle-3.10.1.ebuild
index 1012b291cbc9..35d47aa5db46 100644
--- a/www-apps/moodle/moodle-3.10.ebuild
+++ b/www-apps/moodle/moodle-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/www-apps/moodle/moodle-3.5.15.ebuild b/www-apps/moodle/moodle-3.5.16.ebuild
index 8b94917f96cc..5b538bc3be85 100644
--- a/www-apps/moodle/moodle-3.5.15.ebuild
+++ b/www-apps/moodle/moodle-3.5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/www-apps/moodle/moodle-3.7.9.ebuild b/www-apps/moodle/moodle-3.7.9.ebuild
deleted file mode 100644
index 53ac6f44ea4e..000000000000
--- a/www-apps/moodle/moodle-3.7.9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit webapp
-
-MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
-
-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-3+"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
-
-# 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.1[${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
-
-	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.8.6.ebuild b/www-apps/moodle/moodle-3.8.7.ebuild
index 53ac6f44ea4e..407eecf4f7f0 100644
--- a/www-apps/moodle/moodle-3.8.6.ebuild
+++ b/www-apps/moodle/moodle-3.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/www-apps/moodle/moodle-3.9.3.ebuild b/www-apps/moodle/moodle-3.9.4.ebuild
index 1012b291cbc9..35d47aa5db46 100644
--- a/www-apps/moodle/moodle-3.9.3.ebuild
+++ b/www-apps/moodle/moodle-3.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/www-apps/nextcloud/files/php-argon2-en.txt b/www-apps/nextcloud/files/php-argon2-en.txt
new file mode 100644
index 000000000000..44d6487890da
--- /dev/null
+++ b/www-apps/nextcloud/files/php-argon2-en.txt
@@ -0,0 +1,11 @@
+Migrating from an existing Nextcloud deployment
+
+if you migrate data from a previously existing Nextcloud deployment, you may
+need to enable USE=argon2 on dev-lang/php (if previous system ran on a php
+version using this hashing algorithm)
+
+This is not listed in ebuild requirements as this will not be required for
+most systems (new installs and some migrations)
+
+More details in bug:
+https://bugs.gentoo.org/762388
diff --git a/www-apps/nextcloud/nextcloud-18.0.12.ebuild b/www-apps/nextcloud/nextcloud-18.0.12.ebuild
index de1b7898efdf..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-18.0.12.ebuild
+++ b/www-apps/nextcloud/nextcloud-18.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,5 +37,7 @@ src_install() {
 	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
 	webapp_src_install
 }
diff --git a/www-apps/nextcloud/nextcloud-18.0.13.ebuild b/www-apps/nextcloud/nextcloud-18.0.13.ebuild
index f4ace9730f93..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-18.0.13.ebuild
+++ b/www-apps/nextcloud/nextcloud-18.0.13.ebuild
@@ -37,5 +37,7 @@ src_install() {
 	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
 	webapp_src_install
 }
diff --git a/www-apps/nextcloud/nextcloud-19.0.6.ebuild b/www-apps/nextcloud/nextcloud-19.0.6.ebuild
index de1b7898efdf..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-19.0.6.ebuild
+++ b/www-apps/nextcloud/nextcloud-19.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,5 +37,7 @@ src_install() {
 	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
 	webapp_src_install
 }
diff --git a/www-apps/nextcloud/nextcloud-19.0.7.ebuild b/www-apps/nextcloud/nextcloud-19.0.7.ebuild
index f4ace9730f93..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-19.0.7.ebuild
+++ b/www-apps/nextcloud/nextcloud-19.0.7.ebuild
@@ -37,5 +37,7 @@ src_install() {
 	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
 	webapp_src_install
 }
diff --git a/www-apps/nextcloud/nextcloud-20.0.4.ebuild b/www-apps/nextcloud/nextcloud-20.0.4.ebuild
index de1b7898efdf..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-20.0.4.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,5 +37,7 @@ src_install() {
 	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
 	webapp_src_install
 }
diff --git a/www-apps/nextcloud/nextcloud-20.0.5.ebuild b/www-apps/nextcloud/nextcloud-20.0.5.ebuild
index f4ace9730f93..0aa3ba1808c6 100644
--- a/www-apps/nextcloud/nextcloud-20.0.5.ebuild
+++ b/www-apps/nextcloud/nextcloud-20.0.5.ebuild
@@ -37,5 +37,7 @@ src_install() {
 	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
 	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
 
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
 	webapp_src_install
 }
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index 99de152d320e..917383281fab 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1 +1,2 @@
+DIST piwigo-11.1.0.zip 17689960 BLAKE2B 978e15fdf00d66e425b3132f062296e48e5acf0e29bfc3dd3d8882b6684fd22a7084fa43d99813090a1263f3388f9c03cfe7e6bbbf35aeec9b728fe339028f9a SHA512 a85872de2fbbcfc062a0f90c06b44a59af5d1a474741c82515f4e01e5d49333d2432eb534129d970f751a2b6c1c6b988b30896422e5a1f2aa1ed4db36b9ca120
 DIST piwigo-2.10.2.zip 17391322 BLAKE2B 9982b398b8f3ead6bb5e70b34508d868e2a7440c1fe2d066f659d1a04e90f3239af0b63c2bcdc2fa250edab216acd155d5201d2634c30b275008f25bd0a5e7d0 SHA512 b75359a5ca1fd863de766eaf46dee64fc36482162fd1013bb95fd98553ae1135f9eafd584929a8d0f4dd074e9231978e84917e557de328786c6060098ab3734b
diff --git a/www-apps/piwigo/piwigo-11.1.0.ebuild b/www-apps/piwigo/piwigo-11.1.0.ebuild
new file mode 100644
index 000000000000..572f385b0a8d
--- /dev/null
+++ b/www-apps/piwigo/piwigo-11.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="https://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+BDEPEND="app-arch/unzip"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index 0f7e469955e0..972dfcb68e1c 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1,2 +1,2 @@
 DIST postfixadmin-3.2.4.tar.gz 1331185 BLAKE2B a16df15f6376f9024114c5870174168e5f3d4b0f52d8759db0d83cb4c05fbbe2949056de0ca5ce097652588b777d59f08bcc2555577c95fbd7f2ebc5dd7f357f SHA512 2bd7ae05addbaf3c6c7eebea16ec1e21b2c67c8e6161446ed82a9553c26c04e19c1ec9ce248a9b9df504df56d309590259e6f04907b04b593548028b40e40d47
-DIST postfixadmin-3.3.3.tar.gz 1851580 BLAKE2B 005c2a370b6fe0d09a8f1845ff9537b7be3629844983b8592cb43f119d6c8691730140161c993e9edd53a73174944aeded8b4e50472e97823edc39721deb7af4 SHA512 363b91eb07f263a0f595e020725cacf9f9de058adaef3987efb3257d0e6fba526b075f8328e47763256278797ec946305d1e4c8ff5c55d77753f9ed72bfa4121
+DIST postfixadmin-3.3.4.tar.gz 1853142 BLAKE2B bc3fb8c61b386a1ad182fb602e95a74aa8671c62dbf8e1cdb5f7e26bdfa974b831cef9e6723f816278a6083aaf98eb6f79bb783efb9cc81b350625a21cd38f5f SHA512 7891f013be87785599898042cf1590e0e121eebfcb55bfbc90dab9c257d2cb590639fbb155a0b6246d2848cecb8812707c31a6df478bb2866a17c25d9f387070
diff --git a/www-apps/postfixadmin/postfixadmin-3.3.3.ebuild b/www-apps/postfixadmin/postfixadmin-3.3.4.ebuild
index 34d114c08b8b..34d114c08b8b 100644
--- a/www-apps/postfixadmin/postfixadmin-3.3.3.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.3.4.ebuild