gentoo auto-resync : 26:12:2022 - 14:07:48

4 files changed, 4 insertions, 92 deletions

diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index a4b4c8570ef7..0eb6359b3933 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -2,10 +2,8 @@ AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca459
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.38.4.tar.gz 55393813 BLAKE2B 384413d1d04af82318cde37c5071b39b9119bcf0af90afd6f82e16b50bb75dec48a9b13cef4abfdda59fef9bf72723da9c3ca37a791ea9f2d204cd621b3013b5 SHA512 feb1b4a8eacf0ec1377681482e244527a4185af583776ea5ce2cfb27e0cf119ae8d66fab4bc24c34bf82df74cf13f10a9b9c488f2ed9f8be24e5c992588d9fcf
 DIST mediawiki-1.38.5.tar.gz 55608920 BLAKE2B 4af95e2ca7d0680ff978a320df6430b107db18f0e367d5505d6fc42fecbd7ffa4fc536dc3c9e1dc640345906812046c82e34d44fd6a3461cd2614bde5cf76069 SHA512 74c05628dcee49d0749d839da325bc494c9717db79fc90d6386062f29c2da06ed7c38deb4e6fb46863a37f6dc80b64fff9b1857c959d3b4030ac6a7504f077de
-DIST mediawiki-1.39.0.tar.gz 55728839 BLAKE2B dfb3a2b06d3d0cd519ef42aefe4b33069f61f859fb3112b36b82e43ccc58d1f4467542c07cb0923a0de31be7c77aa86b3ac041ee24e549ca910a755eab0c6b6d SHA512 b89f8f277dd6536e5042393ad6af5401c0842a309a235d973c0faf7f966e44878f86e10ea22123d6a935cd3479b1a5d510dae60aff1e7f5a66ce8afee36ba12c
 DIST mediawiki-1.39.1.tar.gz 55569065 BLAKE2B e7297ea5718ae6802ccdc0e939ebc1f5edfd46f9bd46c3f4879e0b6a4568d7d440f30806eebc06156acd6ce3ef3bced6ee992d236e7646659d8839418c179a98 SHA512 88e9f961cad1e1f69b3be04f3fa487cd2baf82ec3443b827b5f7541b7f717d8901d0c0be6928ba3e46db4c350edadf5d7f342d49e3b55f77e8a8b079e5aacd37
 EBUILD mediawiki-1.38.4.ebuild 2576 BLAKE2B 9ee21af68bf0af942fb9b7948be718a20a7e8a5bdc3ea3419da30e8f2737f9c8b7464cf8d30d19e9294aaf50b91200b1177c81a7372770728bfb65fdf9017067 SHA512 27b1922549fc23af3fc7a3ff0a378a300b32b988225f8f78f3141c04c7d2629e0db354d7c322de7db44629e6474cd7fdbaf7c60622501b6544e55fcef2e0f091
-EBUILD mediawiki-1.38.5.ebuild 2579 BLAKE2B 72274264fd44c3acac46f9973c55eca89025801a213ed1d6fdddb1013743e5166d2ed9b2a060712db957c3af8c4c8cc38b186dc15f3e07bb9dd7cdffc522462f SHA512 ed761efecd0ef7ea32e54e2d40e6f6f9d106841adb0608265ba12c5572edce30125aa8d937262bee64d76af3bfd1109885664f8378832481ea0d686201ae074a
-EBUILD mediawiki-1.39.0.ebuild 2570 BLAKE2B 00905f5c44e1bfcce0575f44db0ee8245a33e20734762755c1a03da9de0c44319cb74ba80771bcbd2e99e0949d55d349a274872ef418e0a77fcccc114c336a12 SHA512 a23d58e2882898a9fa462d863d6c5e777535c10641391681bd6d582ccf9d75a911d85d1f206362d1f271a98af88f88b3fa35e5cc948d7fb1089b49c680771a58
-EBUILD mediawiki-1.39.1.ebuild 2570 BLAKE2B 00905f5c44e1bfcce0575f44db0ee8245a33e20734762755c1a03da9de0c44319cb74ba80771bcbd2e99e0949d55d349a274872ef418e0a77fcccc114c336a12 SHA512 a23d58e2882898a9fa462d863d6c5e777535c10641391681bd6d582ccf9d75a911d85d1f206362d1f271a98af88f88b3fa35e5cc948d7fb1089b49c680771a58
+EBUILD mediawiki-1.38.5.ebuild 2576 BLAKE2B 9ee21af68bf0af942fb9b7948be718a20a7e8a5bdc3ea3419da30e8f2737f9c8b7464cf8d30d19e9294aaf50b91200b1177c81a7372770728bfb65fdf9017067 SHA512 27b1922549fc23af3fc7a3ff0a378a300b32b988225f8f78f3141c04c7d2629e0db354d7c322de7db44629e6474cd7fdbaf7c60622501b6544e55fcef2e0f091
+EBUILD mediawiki-1.39.1.ebuild 2567 BLAKE2B 33f107cb05639694d8853f6170017f4986dda2f9f17a2b19168378f05ec16c7fe93e014f57acfe5d09423df726f086ba46bfe0eca41cf254aead4b119d9c2c99 SHA512 66216ddea4dfa170d8e537a5c5c9b2678384854a9c5b1612a507639ad92f9a93413003fbe29dd4779aba4c94c0e68b0de2968f9b554f5779a0b4f844b9c5472d
 MISC metadata.xml 359 BLAKE2B 79703ba1428aafa7d5ab14386601405a4ec03015fe7920b9c8f9bc3e1fbaefce4345a77410acc429689f42610c7526fd501667230d4aa786c3d02b9241f3fd50 SHA512 6d35f7bd19d1af197137a66ac215e25e2e3b551f2b1be1b234fce56f09c3b62c3056810b154a332ce018597d759434c54148e93cc4d6013698bce8cf1d370561
diff --git a/www-apps/mediawiki/mediawiki-1.38.5.ebuild b/www-apps/mediawiki/mediawiki-1.38.5.ebuild
index bb79cc3c61e6..e072d30ab809 100644
--- a/www-apps/mediawiki/mediawiki-1.38.5.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.38.5.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 )"
 
diff --git a/www-apps/mediawiki/mediawiki-1.39.0.ebuild b/www-apps/mediawiki/mediawiki-1.39.0.ebuild
deleted file mode 100644
index f2819a3ef25c..000000000000
--- a/www-apps/mediawiki/mediawiki-1.39.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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[calendar,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.39.1.ebuild b/www-apps/mediawiki/mediawiki-1.39.1.ebuild
index f2819a3ef25c..87ea1912039a 100644
--- a/www-apps/mediawiki/mediawiki-1.39.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.39.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mediawiki.org"
 SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"