gentoo resync : 09.07.2022

4 files changed, 93 insertions, 5 deletions

diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index c0ba6125f061..49b041cd1d13 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,7 +1,9 @@
 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.37.2.tar.gz 51239351 BLAKE2B 01bebdba62e60d910ff046d39d4bc3a9c62fd71818bf766ed47332d843c54309e0e68d2948b1381a395c6e2fbd6c8e96cf04376e7108ea39445cc619cad21856 SHA512 a92cbdf7fd60e91d5690919c3ab301a32b4c9cb5681ba8b6ba74d21d22947aa2da894b1e4f3294684e40cfeb47a529bf1cb253692baa4f9251d47d7c98015844
-DIST mediawiki-1.38.1.tar.gz 54877814 BLAKE2B 792e22602a816a3f21e77268e38fab450c9ff89a4e490e9592536c2df9d54d7a8cb68a240cf26aeb6d50dd6a87beb7b4fb3cb9f5b88af8d7c16040dbf1cd80ff SHA512 895d21a5b249176099c8d7dee3c83e162b74305615cc8f60288c1d79dbde6f8976257440c109942780fc93dff0645ea1630830b6843eef2eb57d1bfc10e9b846
-EBUILD mediawiki-1.37.2.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
-EBUILD mediawiki-1.38.1.ebuild 2579 BLAKE2B 72274264fd44c3acac46f9973c55eca89025801a213ed1d6fdddb1013743e5166d2ed9b2a060712db957c3af8c4c8cc38b186dc15f3e07bb9dd7cdffc522462f SHA512 ed761efecd0ef7ea32e54e2d40e6f6f9d106841adb0608265ba12c5572edce30125aa8d937262bee64d76af3bfd1109885664f8378832481ea0d686201ae074a
+DIST mediawiki-1.37.3.tar.gz 51513011 BLAKE2B 5d30d582e1efbc93ea65ac9bfc7a338f04fcd568cf30e58d0eca1c601c2d45261ad75cdad9d9d726e2b2c63f5a2d7ef01e26cfbbf0c77a3d110c98d06312f991 SHA512 5c5e406a3ecf83136bb46606b4dd7288b99959a17b37c3b0b74426f47fee8b9b14f3b5106f99d41c07e4924b78bcc3cc61e0058ceb98a087d3ba5ab5a51402e3
+DIST mediawiki-1.37.4.tar.gz 51545350 BLAKE2B 67fa368fcdee1ca6b6a1d8bb565e392746516d76f6934c88540ea9dd7973296601fb922a0e00e7a0a6669078fd66c766ff7b9e3001f562e2a4082de2dc91d2ce SHA512 b92d954a3bc7d4b202ae8f43e95b8111a388fe8af4991fab468196bda035bccfd67700f873c081e922e19d17881a15d00ab44f06d60f4d78019b85c6761cab26
+DIST mediawiki-1.38.2.tar.gz 54983049 BLAKE2B d1b0c5fc1e63d94c1e6830ff128a7b781928fb0ebf3d0823cdb28672412750c168b37b73c9c5efd0dec248a96a25d97fd9fd211a71237dfef0985fbb54d89e1a SHA512 0b548f3eff5eff01a4a33ee18347861a81481d45fcaf3252f9a07fc4f5423a6c9c18a11d6f014d8afc59d0f13650940af81c95b4d9e094310944b5717b7a6072
+EBUILD mediawiki-1.37.3.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
+EBUILD mediawiki-1.37.4.ebuild 2570 BLAKE2B 898b5ac318f24872b3d6dcc59ac9a83ea08b6c0631005275d64c2ff480156cac6b001b720489cb8fa3d929fbf911c1c448a21734f6ef49f871314f044c13fa14 SHA512 5578a2030404c76d0962926b67e20df106f56674c0349dab982a3b76e9d9f361dbd8e482bd2db1b48cefa74ff72ce70214dbb6ba0a8d1a8b51aa2385f2aca89c
+EBUILD mediawiki-1.38.2.ebuild 2576 BLAKE2B 9ee21af68bf0af942fb9b7948be718a20a7e8a5bdc3ea3419da30e8f2737f9c8b7464cf8d30d19e9294aaf50b91200b1177c81a7372770728bfb65fdf9017067 SHA512 27b1922549fc23af3fc7a3ff0a378a300b32b988225f8f78f3141c04c7d2629e0db354d7c322de7db44629e6474cd7fdbaf7c60622501b6544e55fcef2e0f091
 MISC metadata.xml 270 BLAKE2B 9041e12c102c98e539b1d69a8b47a683f7f2fd2e5c1d9b0d8ceb4af9b7abc98d56cd64f4ed335717cffe7acef253748f7798997b8edab1c73d4b4f8eb75528c5 SHA512 fbdd6fdd911b687eaa654d7a9cc25c469c68de3d582d29c142acb5f3944be4ca8205345b94841b831f1b25f604c97bdbeab2bc10bd1cc6a371f651297b56f692
diff --git a/www-apps/mediawiki/mediawiki-1.37.2.ebuild b/www-apps/mediawiki/mediawiki-1.37.3.ebuild
index 6d430cdf861e..6d430cdf861e 100644
--- a/www-apps/mediawiki/mediawiki-1.37.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.37.3.ebuild
diff --git a/www-apps/mediawiki/mediawiki-1.37.4.ebuild b/www-apps/mediawiki/mediawiki-1.37.4.ebuild
new file mode 100644
index 000000000000..933e06932521
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.37.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/mediawiki/mediawiki-1.38.1.ebuild b/www-apps/mediawiki/mediawiki-1.38.2.ebuild
index bb79cc3c61e6..e072d30ab809 100644
--- a/www-apps/mediawiki/mediawiki-1.38.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"