gentoo christmass resync : 25.12.2020

17 files changed, 130 insertions, 37 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 515ca1619132..768afbe385da 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index bde3b36d178e..c0fb27014c24 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,9 +1,9 @@
 AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
 AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
-DIST baikal-0.6.0.zip 3432758 BLAKE2B db55008e2e971fd8d6edabe38f333c32564ef34cf7f3a93ad9d67083646c9575cdf9ba1d51108c5fe9f5d385a53bd78d1406318f3a72672126b5f31cc032b104 SHA512 75cd3e30c3df4bc5057e14215b320647c9683702171671ed58ac83e12f7770454d81970f036fd96dbb9aefe0928fcf40ae11128687fd261a0dccadf15d148905
 DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
 DIST baikal-0.7.1.zip 3596673 BLAKE2B ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5 SHA512 4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
-EBUILD baikal-0.6.0.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
-EBUILD baikal-0.6.1.ebuild 1446 BLAKE2B 5944a7dd73429ee30975230eb49a4eb842ec4dbf538ff31e9d070d3aa31acd73c3f3ebcfc140d00bb28714316431e9c3125e8e8ae010debc9eaf7b0a1000070b SHA512 12b9b6a9d0c6135455502923e38218612344d37836d4d2a244f7092049a1e164482eace228b114fa6ab1423b0242ea712dbfbc046fd73254c2582373a5206e3f
-EBUILD baikal-0.7.1.ebuild 1492 BLAKE2B 9114046fed804f9916f082c6e6a3ece77240a5eba18ea702496ddf5fa94b09f18e60225b1da01eca07dfcd192e4d615e2cf6d5d6431550918353cbc1efdc2ec9 SHA512 a3cf22f7b00d6747bce3f9c0e3cca38f24d70acb2dc79a77af3d1fd539c4e4c27030d59cfce58ae7aa3f75af7f4c074a7c05a32c7b0f91a9b4e62d035f71200f
+DIST baikal-0.7.2.zip 3602276 BLAKE2B 160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9 SHA512 df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
+EBUILD baikal-0.6.1.ebuild 1449 BLAKE2B 21193bf53e21c7979ca0577b9dab5a7baaa1341e627d8a90eef80a0b9f325440ec91f7ef120d7758fcaa410b36ed01746aaeaa801c2e4219bfd8d2cf2b4ba20c SHA512 46f04d5c04793cb6b1db1688296644f5c6865f9f8049ce435103e946c4cce95cd4ef3a53d00a5e01d770bb95e32040c30b6964b29fd628cb7d049c1c0969fcf6
+EBUILD baikal-0.7.1.ebuild 1495 BLAKE2B eeed4fd23336d07ebb31e28a81bb408a40775e3bac1fcce7d173f9890ffe0c540d851811166b2bb3760621dcbe140ec3e328dc8fd8170aed97aa83eeb1f69d70 SHA512 873c0ea18387a0eb39dc9ca5348d404fa351d4a6b9dbc7a40fd0dd17877835fc51803d08f5f9f4d1419035edaf009711c88a7ced4647e6c3402cfe7bb20dc5d2
+EBUILD baikal-0.7.2.ebuild 1495 BLAKE2B 38079a7e73a0f87aa3539a7e40ea44b47818d8c6f550f63174d2bd893406f4da53027c2cc84c97f74e91cbc0ac0299d04e753e40250d22896f741c8876e73487 SHA512 ad2a6467f4217ccbebbf8cb4fca3c8d657900ef90cc6d18233856251b2bb5cb66804d353ba028002cf1546123dadd7ffba867fb232bd3677288e6016d2fffd3a
 MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.6.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild
index b8a74120fedd..ba407dd2359c 100644
--- a/www-apps/baikal/baikal-0.6.1.ebuild
+++ b/www-apps/baikal/baikal-0.6.1.ebuild
@@ -15,7 +15,7 @@ IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
 	mysql? ( virtual/mysql )
 	sqlite? ( dev-db/sqlite )
 	virtual/httpd-php"
diff --git a/www-apps/baikal/baikal-0.7.1.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
index 1c55957ab51e..450d04422760 100644
--- a/www-apps/baikal/baikal-0.7.1.ebuild
+++ b/www-apps/baikal/baikal-0.7.1.ebuild
@@ -15,7 +15,7 @@ IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
 	mysql? ( virtual/mysql )
 	sqlite? ( dev-db/sqlite )
 	virtual/httpd-php"
diff --git a/www-apps/baikal/baikal-0.6.0.ebuild b/www-apps/baikal/baikal-0.7.2.ebuild
index b8a74120fedd..39d0aca079d3 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.7.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit webapp
 
@@ -15,7 +15,7 @@ IUSE="+mysql sqlite"
 REQUIRED_USE="|| ( mysql sqlite )"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json,pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
+RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
 	mysql? ( virtual/mysql )
 	sqlite? ( dev-db/sqlite )
 	virtual/httpd-php"
@@ -32,7 +32,7 @@ src_install() {
 	doins -r html/* html/.htaccess Core vendor
 
 	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
+	dodir /etc/${PN}
 
 	einfo "Fixing symlinks"
 	local link target
@@ -42,9 +42,10 @@ src_install() {
 		rm "${link}" && ln -s "${target}" "${link}"
 	done
 	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
 	dosym . "${MY_HTDOCSDIR}"/html
 
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
 	webapp_src_install
 
 	if has_version www-servers/apache ; then
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 1c98a610e4e8..4ace72182106 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -2,4 +2,4 @@ DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e
 DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
 EBUILD blohg-0.13-r4.ebuild 1782 BLAKE2B 5012b63c40993659b6c4f53143d9a2cf0a36bf57af4034f5716e7651589fa26f5051296906b8d698874c4fa78d94a6a97c4bd627b6a1dd40500cc5dc4892c44f SHA512 203b20ceee6b75cc284a69e82355ace43cb7ac7d5048ffb91e825e1a928738cf83faa1a04025a0ee5fa58db84d7474975b2891afa802d213e6bafed3138d2642
 EBUILD blohg-9999.ebuild 1782 BLAKE2B 5012b63c40993659b6c4f53143d9a2cf0a36bf57af4034f5716e7651589fa26f5051296906b8d698874c4fa78d94a6a97c4bd627b6a1dd40500cc5dc4892c44f SHA512 203b20ceee6b75cc284a69e82355ace43cb7ac7d5048ffb91e825e1a928738cf83faa1a04025a0ee5fa58db84d7474975b2891afa802d213e6bafed3138d2642
-MISC metadata.xml 1042 BLAKE2B f3c51f87f297164098a40305261718a6110e3aa5df6bd69c0222c2d619cac32a45574849364d8d2e9bfe552b16dbd49587a3c7da1d46904f3dbcca14ddcd55ee SHA512 5a12c082bc4148d54d5070da23ad3367a723a6581ea63a305c85f7e0eb0b6f51fd0c982ee79afed76cea9fcee6b95e2cae003136967a12847f8a450698af015d
+MISC metadata.xml 952 BLAKE2B 10ae48a9360ccc8bb8c1ecf2b0b49c1db2fd7121b149168c6a8bf205af39aa652a7366ea2da19377d078b8ebd6ce8a6fe82b78b7f6ef3cee7c60351cadae08fc SHA512 a2abed323a28bf7dfb093a9a058c25882cc0dd3d13d2da39342247152d378edb11aee7ddff675fd1067cd9160166bca29e51bda98ce82a400acf985fd9e829f2
diff --git a/www-apps/blohg/metadata.xml b/www-apps/blohg/metadata.xml
index 0c2e5695ad78..c7137f08c10f 100644
--- a/www-apps/blohg/metadata.xml
+++ b/www-apps/blohg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		blohg is a Mercurial (or Git) based blogging engine written in Python,
 		built with the Flask micro-framework and some of his available extensions.
diff --git a/www-apps/cgisysinfo/Manifest b/www-apps/cgisysinfo/Manifest
index d5ac4a1ba1ed..d099e0fa182e 100644
--- a/www-apps/cgisysinfo/Manifest
+++ b/www-apps/cgisysinfo/Manifest
@@ -1,3 +1,3 @@
 DIST cgisysinfo-0.4.1.tar.gz 17662 BLAKE2B 63997c790d7d42d0a91f53f667a75b53b1954c1bf13f97f99918bcd926c6dcb4a7e75b1658490aab2d0d1ac666f163c910d903b26675994755c82d84bc52fa0f SHA512 a966c96345454424258b623038b555767d71e1e4258f92114081d93e8ce490b26e4c2b88f6ad527f0b55d267d008da3b13774b7e2499ad6b96e035ba3be2e912
 EBUILD cgisysinfo-0.4.1.ebuild 589 BLAKE2B 609f0743cfccc514007edc71fcc409935aef3f8d4711ab8d94f8e421548fddc95353ae9743e830ca501dbd356a519175f3ee5cff7c3e30c0e129159cf556c0d7 SHA512 b11d6b67dc941c2c01278bd7489a2892a408358b31589779919675a06691267ece842043e8256fb9942f6318411bda2c5acc63c897a37b3e47bb5ea1f95b22de
-MISC metadata.xml 647 BLAKE2B 8b9b09de4ebdac20b8799cb19c2b0d1463dc3d91ab57ae215da522adb316b1bc4b21ce61ed9a6044a6bb6c3a18cb6b6b08c6b9bf73deb9cd453aeaae5d2a65be SHA512 ebae3cddf204165d1b7b20a2223dd8922829721f11b93363fb6cefe745d2cdca1adcca769540883016f44417d92ded8cc77734f88b71d4b5deac13ad19b7f623
+MISC metadata.xml 557 BLAKE2B 934096eae76c7bb416b42adbd6bf944dc35d8bfe54a27feaf40973c19ca0e4d46d9601fb3b944864cab2ac7fdf6fed9fec8ebea40d5883b8f48a6995b9a123eb SHA512 0c376a48eab60958198d461333e9cbd67c25d46f8398c7f18b15ca530a8c8235c42cf3c3e69a14d2415b8836aa7ddbafba7a2576d3ce7ea89fe649203875c966
diff --git a/www-apps/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
index 44c61e61b12e..165bafac9afe 100644
--- a/www-apps/cgisysinfo/metadata.xml
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		cgisysinfo is a small CGI utility to show basic system information on Linux
 		machines.
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index edd206d98b86..c0e5f1821373 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -6,6 +6,7 @@ DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e61296
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.1.ebuild 2347 BLAKE2B d9df9cbae9d4e6110e8cc4ef185993617f09838aae5df53b0e275cbe4fb0eac0729f4be643b19e219ec21d92cab236092bdc63e2293eefcee3fd23dfd764bd65 SHA512 1aceb24cc626f4d3c8a4ce7219d276979647b6f177ae8cb25ad2586397420bf3942bd2bd4c543355b208fe8c2eb48224943dee8614a6e568ff3f573a112d047b
 EBUILD cgit-1.2.3-r1.ebuild 2458 BLAKE2B 297231fdfc91bec9c6f2dbf697063f2483d5cff69da6ded09ddb302d6a4d5faae34cdab07d003044fe41d389de629373d51513994cdea52e5c7ed3afa251f8d0 SHA512 b1c1a66a19b940340e74f42d7a68b2ceb22668adfb93449c0a67d80a0ad9df644c61ec775e7db5dbf78a11f3ac05de4f46a0219dcf906bf65bfeae0c020482a6
+EBUILD cgit-1.2.3-r100.ebuild 2446 BLAKE2B c9f2e3a3b2c72578851ec2d987f1faa3601f6b3dd2e7cadc6def20d79b93128611a7e6b70757eb35d454c4a6cde1ff0f564ccb10ac88d50699850199a3ab7652 SHA512 e9fca75c65a4da0bb276287cba8e9509eb5d3015ee2b9d3b6758b35968e006ebbdc9c9415cdbd37440ab85048f75e29548413c6876ab4e061dbe7329d3c920b8
 EBUILD cgit-1.2.3.ebuild 2356 BLAKE2B 5e39bfa383449891743deabbcb039e587b9c3d28a15a9d687b14cec9a73638a5611d3caa1431ea65bf9e918e5d32a2a73e7b2276dd6b568aa8868828247ff041 SHA512 5b9392924214fc0d2a64028108f7bf9674c2ec0b07695b0ef511876b2d3a7e585e3bc213068561c802f647fb7371b886e783ca4a835b6cefeddc3d9af68dcd88
-EBUILD cgit-9999.ebuild 2302 BLAKE2B d10aea4b88887ae0d643dd3cf2c0e94749a3e8ce6f4bc1f9b815759635aa9b72d35d17f2276805dbd2695e77491bac0526bfc8200a3319992cd127818fc095e0 SHA512 0618de0855f371b636d72de20edc200f215108bdbbbaa0778318aa0af37f8209882ce987c7b807ece47d2f87e103b3f007cae94d66c4a4e4b0c6ce274b08cb47
+EBUILD cgit-9999.ebuild 2290 BLAKE2B 81bb04d4adb0aa15974f1e66054a93afdd99d0ca7f50ab3e3269cef8e8fe0b3ea4a33ceec814b1cd606d0e0b136c6c54e82ea31e15e04692d46a76dfa87d30f9 SHA512 b1b0bf21089991be8f3a9e30f60a33740fac35e085a9027c103388d72bc2469ef98286c1b8fd0abfbb1423889abd6736ac4c3ab01dc3f5af948cecb76c63dd64
 MISC metadata.xml 685 BLAKE2B 2793077bfed6ffb365ca0bcff6b58c0973f3dd832829e0f93a69a81833e0b9a2d8d9aa7b4338591b6d52037f4da1b6fd6f0faf69c712997325b0c610c241a08e SHA512 a81af07e4c6da49fb9a2c921fe3d610715ae9833bfa58e38fbbfcbfa67c071c15d48ebcc8726872017bfd901f6b4f67990a3c45c4ba6891900a8fb5245f2ddc3
diff --git a/www-apps/cgit/cgit-1.2.3-r100.ebuild b/www-apps/cgit/cgit-1.2.3-r100.ebuild
new file mode 100644
index 000000000000..08c24550c1b8
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.3-r100.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit lua-single 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 test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/cgit
+	acct-user/cgit
+	dev-vcs/git
+	highlight? ( || ( dev-python/pygments app-text/highlight ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	lua? ( ${LUA_DEPS} )
+	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
+	use lua && lua-single_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
+		echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf
+	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-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index 4b617428b6e8..8975d5eebd66 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-{1..2} luajit )
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit git-r3 toolchain-funcs webapp
+inherit git-r3 lua-single toolchain-funcs webapp
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
@@ -17,7 +18,8 @@ EGIT_REPO_URI="https://git.zx2c4.com/cgit"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +highlight libressl +lua +luajit test"
+IUSE="doc +highlight libressl +lua test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -27,10 +29,7 @@ RDEPEND="
 	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 )
-	)
+	lua? ( ${LUA_DEPS} )
 	sys-libs/zlib
 	virtual/httpd-cgi
 "
@@ -42,6 +41,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	webapp_pkg_setup
+	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -52,11 +52,7 @@ src_prepare() {
 	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
+		echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf
 	else
 		echo "NO_LUA = 1" >> cgit.conf
 	fi
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 7baf32c19d04..f187c5f8f1e7 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,5 +1,5 @@
 AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced9657980269906a0395ffd6287d8b89ce41fd437086173177a9727daa2cd03de8bda26045c013f7c6dc SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd
-AUX kibana.initd 1022 BLAKE2B 8eb81203f713e75d3eead4eb25a7670c7fab8af67d1fbe749856959061feedf049caa234e58c1bd39bd4127a34c9d3de0bde0a3d41bd4856aa5176e6fd442158 SHA512 e4555584ab4f3980ec703edcfb8349ec8847cae0fb25ba2243ff3404d8d7058fb317bd4b06c2df7a8b369f733648422f0e0cb8db745844ce36d4ada3385a4f90
+AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f01064cd5bcec7449a968242368abc3144f6436d8765c1738e7786147cbc1ecabed9c734035daf4669 SHA512 e5fd56da7fc83466c26acdbd3e9aa341676ac9221495f6f83c46263838c15951164d31ac7e62b732fba1c0e63c6e5c2c97681b15ac5409b74a5c090f72ae6383
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-6.8.13-linux-x86_64.tar.gz 188072148 BLAKE2B 452a09bc7d876b57b36a50feb38731ded18b959f48861da259d75234614dbf072ff9cfd817fe4c21a2c83515934f42f5ddc7e7e634dfc9e2b327ee9d4b2ac730 SHA512 14144900eac8985de0982eda88e44474ebbd828bf9efa0b6f02ae0627c711e145e28cfbc931f63d7bb5dc5b3ad1056cdc972990cddc36f7050a29a34d9472508
diff --git a/www-apps/kibana-bin/files/kibana.initd b/www-apps/kibana-bin/files/kibana.initd
index 80623fe54b37..6ed750d8be9c 100644
--- a/www-apps/kibana-bin/files/kibana.initd
+++ b/www-apps/kibana-bin/files/kibana.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 KIBANA_USER="${KIBANA_USER:-kibana}"
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 5a2713c9e167..6f9a5de5d360 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +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.35.0.tar.gz 48039474 BLAKE2B 54d4e5edd4d7531815840d180a92bdaf008e28df3ea9ad26ba27673e4c6f904f5643c0ff333efd5a7e03512b54514c9eb74c5ed1774ef7f4085dbc50dcf42f4d SHA512 0d3d5b464abc2fdea2aa798bdf7fc53d5269852d9ed3f787710528505bbccfed2796b0e2459f5776929f3f0f207a145ae4a8f13e3040322e22d59481a71cfcde
-EBUILD mediawiki-1.35.0.ebuild 2562 BLAKE2B 10573dc1f8645d56927ac6cd0b89689e0c01612edf8c5ce60bd142bd54cb261c1cc84bf9f83f692fe3db57cdc31247843072a8734d5be4348eb7dc26eea0283a SHA512 bd35f2df7ade0661955877a56a2ac4289a6142e720c55fef739308dad9fb3ea97dbbbf7c28b6059dcf4404b9329f74017de609539f66c12175fda60c6495da58
-MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
+DIST mediawiki-1.35.1.tar.gz 48046673 BLAKE2B f476547442bf78db3b306165bedcf9878f38f61f6a11b7ce9b30b576b5c14e3b8089d622d4d722801fdb3c0352c7bdec39e0e9c251666b94397dcc9f7433b5c5 SHA512 71afdfeaa52459fc87e135449579b65aac6ed528240050a6fb5073ab19d091584f5fdfec7a8a48f060b1ddba322243d2e00e659f7e964fbeec69f22a271d756d
+EBUILD mediawiki-1.35.1.ebuild 2562 BLAKE2B 10573dc1f8645d56927ac6cd0b89689e0c01612edf8c5ce60bd142bd54cb261c1cc84bf9f83f692fe3db57cdc31247843072a8734d5be4348eb7dc26eea0283a SHA512 bd35f2df7ade0661955877a56a2ac4289a6142e720c55fef739308dad9fb3ea97dbbbf7c28b6059dcf4404b9329f74017de609539f66c12175fda60c6495da58
+MISC metadata.xml 269 BLAKE2B b5fe1916a519f7f4dab2a7eafc819ccd487169cc055360ffa0376411629fa03bed0bb3a9fad9e54143ca0294edf56a4ea53569afb0cdd191ef8cba7fd6d4deb0 SHA512 399d848eb675167467ee711ad74bd73c6fccf5a31928ee86cf88ed65ee1fbfe8cb1b8b868d0a8d18a6f36d1b9449353b556e201d09ac5dccc2995b956a2c7c4c
diff --git a/www-apps/mediawiki/mediawiki-1.35.0.ebuild b/www-apps/mediawiki/mediawiki-1.35.1.ebuild
index f41b4ccfb759..f41b4ccfb759 100644
--- a/www-apps/mediawiki/mediawiki-1.35.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.35.1.ebuild
diff --git a/www-apps/mediawiki/metadata.xml b/www-apps/mediawiki/metadata.xml
index f2f2ba9e2823..e4e6c1dbf3f5 100644
--- a/www-apps/mediawiki/metadata.xml
+++ b/www-apps/mediawiki/metadata.xml
@@ -5,4 +5,5 @@
 	<email>web-apps@gentoo.org</email>
 	<name>Gentoo Webapps</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>