gentoo resync : 27.03.2021

14 files changed, 25 insertions, 174 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f6735c313c09..9865ea15ef79 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 11ef89a37961..8084f1fc2192 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -1,12 +1,8 @@
 AUX grafana-r1.confd 870 BLAKE2B e222e17f5a14dc48f9bbc922250754d88610a951b1e6230736fffc0624a24a140bd9a9f11c6900e0f57b652ce3f334963ea453a5db5ee667863c6b69acc0f207 SHA512 cb6836ba69b9d1f0c50778823c507eaffd963341edbc4ea5409d0b068cfcecececfacac71e34b1d546a85674f67b12db99f384e5c6aa2186abe86814818d5db1
-AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e871a86738f21b8b3ee68caf1e2b437343f739564dac5ef91db5dcb6b2f31b49a936f9d4e6a62cca4 SHA512 13b9868a4c0a5a7209e6f4aa1206a93a0fb33b0234c4c0a6942bdab9d1cf139049181c066e01c49f639165ea422259fa7cab9e0bdf21537b3722bd86691d9b2c
 AUX grafana.initd 1498 BLAKE2B ac97391c228c09353ef11efb0de37f25802484fbbf71bccedfc9858079ca679ba1567a2a7a40e250ed1fa7477189c30b8c5f175e607b455ae755566a9d89098d SHA512 c3ef1926fabe53728adca6954eb48e8d69c33b4238795e2d0d0406e55e08b3f84760b1abfec556f258af3184e10e6fa116c1b21c704575a54f88050a5266ec87
-AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
-DIST grafana-bin-7.4.1.tar.gz 51266762 BLAKE2B 8f0cc812e67ea2c91d0b1758a3d675289d6b5bedd42061fb994473073fcb3e174740d7a3546fa2b1482b39425daa45bb817f867deedf85ba56966282ee8aa9cb SHA512 f7d2e91139d32999d43cabb7843a5368eff2af1386bf865ae8aaf9c099c6c24a5b494029e4a5e4f4c7c5ecd5f23e0e0229c82fd5c142a2e01edf2c63239e5cf0
-DIST grafana-bin-7.4.2.tar.gz 51266527 BLAKE2B ce1edd1b1a718fbc8acf5e20218f1d5dc82823e5246ea6504f10c92c6309e7a89cdb270b2fa448554370acc521d5b2eb1ac8d160cb206cd9ba223be849fe4e50 SHA512 404e36d0fa4bbe2b39d6bcba0ab04a92a0f5db5878089c2b972ecb2d7b8a7409aa1b1d1fc81deec620da223b942113500661003804b93f17ddccd38f1f1ad361
-DIST grafana-bin-7.4.3.tar.gz 51268825 BLAKE2B 8af8279eaf30b0235a1bb8d44995ad4bce9c71bf80dbbe67aad91de7c5c4e4cc74ca41feedce07c8f7faf15826753b88ac928b5d04914c6a2be73c5e4f1cc052 SHA512 d841e829ca9b8d66294334b3870cd4ca40385e6896b5a25795f8696498f12ee192ab93c4c5a663bc745f77fb8b3b3d46d6066387c6d70c67177f6bc049abd9e9
-EBUILD grafana-bin-7.4.1.ebuild 1768 BLAKE2B 1b643ac33f03e7a792a334017259deaa2b178ea565987cd9690439b583e5245465533fd1569c3d11b8f3fc34bece619173320cd308e6fa7ff9272df4a87acc7d SHA512 2e5f1f8f588175e72f2b167cc07add05eb33345d48618a2bf0b13a8cfb16a802b906a3d532574c558ee614b9ae7dcae5b105c3cfebecafdc503709771fd32025
-EBUILD grafana-bin-7.4.2.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
-EBUILD grafana-bin-7.4.3.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
+DIST grafana-bin-7.4.5.tar.gz 51268864 BLAKE2B c59e16dd8cde882c8f7ffaa3352aeaf38f2fa1e5da3d340796403b0719d33b9eeb5fb7d8ac54b8321f2617d534a3121d2f8a86462e7cf07019baf2a08b141cc2 SHA512 8ad7e2fa9ca92a406690f5a14ea111ff329e6abb4330d4ede5bb34870c3d28cdec940db4c849bb99c097276ad10a3d4c70cf6b73ed8286d45fdf056673d0892f
+DIST grafana-bin-7.5.1.tar.gz 55420645 BLAKE2B 1100f68eeaeda5dd4d7928c0e16bcefe686427866472a750228eaa5612bc7c7d40db24d8767ae8e9766d70593de2504c57cb8a145efa1ff81074d38c69452ca7 SHA512 bee8b95820a8d8983aa430ee1e7de65da0b90ecfe0eeab8d8a5486af818a4bede73846bcc5aae2c9735204be004171ae98bccd7546d3c0220030260f1f1ed203
+EBUILD grafana-bin-7.4.5.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
+EBUILD grafana-bin-7.5.1.ebuild 1769 BLAKE2B 5a68f16b65e6ef167c4476131b505a9947878b9f64b77e9a52240fff659f2d5ca6a0256c240a32d7d2f1b59505284a5ea974059cecae785ff5d5f0aca5c83e3d SHA512 45afd377bf5400a620744f7ad2daebcf36bd972f98a8baab270c68497d0c28662154bef6a68aac0123e6a1c382c9c77d02a28c7b0ae7a0f0e1ceb9f2a5b89bb5
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/files/grafana.confd b/www-apps/grafana-bin/files/grafana.confd
deleted file mode 100644
index 207ef765f653..000000000000
--- a/www-apps/grafana-bin/files/grafana.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Config file for /etc/init.d/grafana
-
-# The user to run your application as.
-GRAFANA_USER=grafana
-
-# The group to run your application as.
-GRAFANA_GROUP=grafana
diff --git a/www-apps/grafana-bin/files/grafana.initd.3 b/www-apps/grafana-bin/files/grafana.initd.3
deleted file mode 100644
index c454fb249753..000000000000
--- a/www-apps/grafana-bin/files/grafana.initd.3
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting grafana server"
-
-    checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "/var/lib/grafana/dashboards"
-    checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "/var/lib/grafana/plugins"
-    checkpath -d -o "${GRAFANA_USER}:${GRAFANA_GROUP}" -m750 "/var/lib/grafana/sessions"
-
-	start-stop-daemon --start -b \
-		--make-pidfile \
-		--pidfile /run/grafana.pid \
-		--chdir /usr/share/grafana \
-		--user ${GRAFANA_USER}:${GRAFANA_GROUP} \
-		--exec /usr/bin/grafana-server -- \
-		-config=/etc/grafana/grafana.ini \
-		cfg:default.paths.data=/var/lib/grafana \
-		cfg:default.paths.logs=/var/log/grafana
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping grafana server"
-
-	start-stop-daemon --stop \
-		--pidfile /run/grafana.pid \
-		--user "${GRAFANA_USER}" \
-		--retry=TERM/20/KILL/5
-
-	eend $?
-}
diff --git a/www-apps/grafana-bin/grafana-bin-7.4.1.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.1.ebuild
deleted file mode 100644
index 0de07551fc7b..000000000000
--- a/www-apps/grafana-bin/grafana-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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/grafana-bin/grafana-bin-7.4.2.ebuild b/www-apps/grafana-bin/grafana-bin-7.4.5.ebuild
index 229e2a789b9e..229e2a789b9e 100644
--- a/www-apps/grafana-bin/grafana-bin-7.4.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.4.5.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-7.4.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.5.1.ebuild
index 229e2a789b9e..229e2a789b9e 100644
--- a/www-apps/grafana-bin/grafana-bin-7.4.3.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-7.5.1.ebuild
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index 20646ac4d962..b878be5345d5 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,7 +1,5 @@
-DIST piwigo-11.2.0.zip 17694759 BLAKE2B 3a9b2de54d8f30790003c1d3a93c1d12f6cb845eda2d0cbd5b5f45a0dac9ff24de6a94a458a6895b264f73516ad01faf9606a81840529fd02eedaa6ccce9d3fc SHA512 d8120265b8f8e5e8e6275cbcec3af22bbc4b59f32a744d9b6152b2e9ddeb6384cccc4445211e6dfde2ca84f9ae382424260b98106a3acb4f469242c8dbe741ed
 DIST piwigo-11.3.0.zip 17695593 BLAKE2B cc77c6b041c19714bed3d3a767e8a1c69d623c711c47601d606000fbab16fbb51ea781c5a01e12e7ed40468bef769d323676a61711cc092f024c874ce67825c9 SHA512 5544e94801007a80ffe8951a1427ef75245c09aa41991679baed112068c2acf751543428842e98305db0a17b3938846ed40e3c5f7c301d1b155b8673557585c4
-DIST piwigo-2.10.2.zip 17391322 BLAKE2B 9982b398b8f3ead6bb5e70b34508d868e2a7440c1fe2d066f659d1a04e90f3239af0b63c2bcdc2fa250edab216acd155d5201d2634c30b275008f25bd0a5e7d0 SHA512 b75359a5ca1fd863de766eaf46dee64fc36482162fd1013bb95fd98553ae1135f9eafd584929a8d0f4dd074e9231978e84917e557de328786c6060098ab3734b
-EBUILD piwigo-11.2.0.ebuild 1146 BLAKE2B a23be570f3514cdf6288ce9009105f0e5ed7ec3e270e36d80c1b1d66f84aa6f79e1c9a8d61c9a30b3cb9ad17b7d7f0371a2269a41542b54070eeae3b0fed5b7e SHA512 1d0f3a389cd36697658e553a3f2410087425e653c92da052efad6b9f9cd8e1e7b7a49d8b6d563a7144801eaf34a440c6f8c9b4260385b0e8a441b76b98a8de1a
+DIST piwigo-11.4.0.zip 17728014 BLAKE2B 54888c89667970a86e2153d42e377165cb19f1dc6fa7b481b440a1e3c2803139202d8b22e78a5c15378e12f55999a10693a0b56f6a4b14a2153b3b00e39eaacc SHA512 7e8288d51d9b7dfacdb2534e7f36a6230799c3649f827ffc12b3c5b4420bf35de315373e2e6b27edb120c008c3ff5c7de359afcc29879454c82ce1c2016d2146
 EBUILD piwigo-11.3.0.ebuild 1146 BLAKE2B a23be570f3514cdf6288ce9009105f0e5ed7ec3e270e36d80c1b1d66f84aa6f79e1c9a8d61c9a30b3cb9ad17b7d7f0371a2269a41542b54070eeae3b0fed5b7e SHA512 1d0f3a389cd36697658e553a3f2410087425e653c92da052efad6b9f9cd8e1e7b7a49d8b6d563a7144801eaf34a440c6f8c9b4260385b0e8a441b76b98a8de1a
-EBUILD piwigo-2.10.2.ebuild 1146 BLAKE2B 4a47a7efcbd4dfc2615b37d6c68abf800b8c09a04ac4aaee1c2e92512ecc280d3e59dfdd2ac652e588c5fe669ed5006161d7420dbf9b6c8887ef11d43ba57d3c SHA512 01eef0e9659d5c689972fc29e5247f54c654b378c1ae3bd2a9f03ff8618b3b260c7b104385b68c6609a4eb7d4735ab70d13eab571f94c0f68e6bb609cd42aedb
+EBUILD piwigo-11.4.0.ebuild 1146 BLAKE2B a23be570f3514cdf6288ce9009105f0e5ed7ec3e270e36d80c1b1d66f84aa6f79e1c9a8d61c9a30b3cb9ad17b7d7f0371a2269a41542b54070eeae3b0fed5b7e SHA512 1d0f3a389cd36697658e553a3f2410087425e653c92da052efad6b9f9cd8e1e7b7a49d8b6d563a7144801eaf34a440c6f8c9b4260385b0e8a441b76b98a8de1a
 MISC metadata.xml 1022 BLAKE2B 88bca793744995b53bf2c0a5061d47798d4f2b42a8025f7bc2f1cf7dc11234d5a8c5df9ed08b9d63b99465e06015bd5dcefaa87d1daf39f8b795ab89e264a563 SHA512 8d011157201c6e25b0252239cf6bc87f596a414a37fbf990c44dfc419b5bb28b4796b4a0c9e00d78154bdbb5dd7e6f0e99b99df56fa4736a7cc55a6ccecdbf09
diff --git a/www-apps/piwigo/piwigo-11.2.0.ebuild b/www-apps/piwigo/piwigo-11.4.0.ebuild
index 978f3b237a3f..978f3b237a3f 100644
--- a/www-apps/piwigo/piwigo-11.2.0.ebuild
+++ b/www-apps/piwigo/piwigo-11.4.0.ebuild
diff --git a/www-apps/piwigo/piwigo-2.10.2.ebuild b/www-apps/piwigo/piwigo-2.10.2.ebuild
deleted file mode 100644
index c8dbcb4fbb88..000000000000
--- a/www-apps/piwigo/piwigo-2.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 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="http://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/webmcp/Manifest b/www-apps/webmcp/Manifest
index 95c3ccdc6667..dc4f69e4f547 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
 AUX webmcp-1.2.6-gentoo.patch 5156 BLAKE2B 4d0680753a83422483c33909b692bc6a0fdd146216889aa83e6a9b99a15bf92920913330de12f2e2125b976214753ec4853b7dd48dabf8c2a0c88fb9b7d1ada5 SHA512 7e57b4f5f32f280198e8c6e01c21ed1414af3bf87a77022af37e3d144576a7d23c9f912e7f41282ef6d984f4323af1dbdda472cfe076fc62a6ee1a47d0529a7c
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.6.ebuild 1433 BLAKE2B 2992e27650896416405f9315e295d030062f271c9392973a09d935f0dbed619cc80912535b33baba8b320eb7bb9927053e38b0077b9390e0eac66baf9d6f7f61 SHA512 96ecc61450f7de7fb280fb6ea1ffb1f906e7c27245dacc1bc5e31d8c864639af4b8d572416eaa1fb46160371dd268a6065a1c11377433a793c8f293670c1a847
+EBUILD webmcp-1.2.6-r1.ebuild 1685 BLAKE2B f19c420e563f36047cd653ef74f442986112dd361d2e9f836747857c01484e801a9c42433862cdb32b82bddd6b1d3c3ecf8d3c33e83eeec81cb53e6cf6d5e1ec SHA512 0f62e6c94ad104e0b57925cb0f471f70af7e42a860a9a384c0ece2a21f7b3c0aa05423655f1562bce21eb0e0402c31d370d68283260dd19c15b652dd235cf720
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
index 70f63e2a0bd3..135b1a65ad3f 100644
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ b/www-apps/webmcp/webmcp-1.2.6-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single toolchain-funcs
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="Web application framework written in Lua and C"
@@ -13,18 +15,26 @@ SRC_URI="https://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MY_P}
 LICENSE="HPND"
 KEYWORDS="~amd64"
 SLOT=0
-IUSE=""
 
-RDEPEND="dev-lang/lua:0=
-	dev-db/postgresql:="
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/postgresql:=
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
+src_prepare() {
+	default
+
+	# Use correct LUA version
+	sed -e "s/-llua/$(lua_get_LIBS)/g" -i libraries/multirand/Makefile -i libraries/mondelefant/Makefile -i libraries/extos/Makefile || die
+}
+
 src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) MYLDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC) $(lua_get_CFLAGS)" LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
 	# Dereference symlinks
 	cd framework
 	mkdir lib.link
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index d64dcbda71c3..beb6ae26e9e4 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.6.2.tar.gz 15603881 BLAKE2B bae9af32d91b15586f94eb84a16970528bfca9f394e1655603a1d25750b7a39044ed7fc07f6c626c64cbaedefcb9770fbea439f3467b67c42de4a26ac51d6586 SHA512 5602104cdaaaf354f0b24782ceb0b32b8a8af5e4a9d698376a9ac263bc77f0c5d461d40587e0010e63e97c3d415db6ad3aead6069bba5ebcba03e783fbacbb69
-EBUILD wordpress-5.6.2.ebuild 1368 BLAKE2B a0e95cf88dd7d7d2eaf901ceec7cf43abcbf6575661f03079fe88229b5f1172516bc4c67a06206a5e33327e07055e930d79013e6429fc063de17f50530bee2db SHA512 312c59227d518c4cfc55f10657c04b18ba9028b16b4333015f64c612103bf9d7e86283395deaa5fbd7d5e04d97f7e66d7628dc738d7d4517e99653970e153197
+DIST wordpress-5.7.tar.gz 15747536 BLAKE2B 858c0b89039f0b8a9017cf33426db7b06fb2b8eb342906b88f1b04e448c7e512e4e800a7d282b42a0c0d516641030d0dc42aacace07b5504a3e7b3d96a2b3878 SHA512 84516473add8624cd7e318af98d257f5f113fcc98cd9f5c0a0d7c1a8060f9f5dd5989d995259d3920b89f71f3391fc8b28b520f7d8aae7511cc1e26e90116567
+EBUILD wordpress-5.7.ebuild 1368 BLAKE2B a0e95cf88dd7d7d2eaf901ceec7cf43abcbf6575661f03079fe88229b5f1172516bc4c67a06206a5e33327e07055e930d79013e6429fc063de17f50530bee2db SHA512 312c59227d518c4cfc55f10657c04b18ba9028b16b4333015f64c612103bf9d7e86283395deaa5fbd7d5e04d97f7e66d7628dc738d7d4517e99653970e153197
 MISC metadata.xml 428 BLAKE2B 0995af6d73ebb2fb3d42dcd56376b05e62f4f5a716ba21d19cfca37acb284ef350312c5d0d21d8797bf7255494cd5077656c38be502bbfd40bdc10d1cc74987d SHA512 cc1dcdc59abafcb9cceb0423f3be99ba3abfed728420c0def6de048a011c9345daba0b3ebc0ef0220e3755a64f8be8d667472535c637512ca8e80ab372faca77
diff --git a/www-apps/wordpress/wordpress-5.6.2.ebuild b/www-apps/wordpress/wordpress-5.7.ebuild
index 230beac91636..230beac91636 100644
--- a/www-apps/wordpress/wordpress-5.6.2.ebuild
+++ b/www-apps/wordpress/wordpress-5.7.ebuild