gentoo resync : 08.10.2021

3 files changed, 2 insertions, 90 deletions

diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 297939e6264f..98aac8a3a83a 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,7 +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.36.1.tar.gz 49645517 BLAKE2B 48325d3155721571a7df7b295d4df342b4d2ad59c14e995c79205c3eb71530a80172ff595bb15ba1d90f90841197099fd6cb8da0f42f82549971b9d3a4d7ec1a SHA512 1b84c0ac2160e2a04e7b8da2ffa2bbbda32e6306ca30f6794e4298ac8085ddee4cc2d755394e49af3a00eac393d8e79fdff284b665fba33629fbd1af1f8413d1
 DIST mediawiki-1.36.2.tar.gz 49653546 BLAKE2B 3b5a286848973a5f7f1794e834e056ac3d49f61df7c524d8e67bc559b39cfd8c69bc4dcd31a9e6ea3ec6a004ba6331846d32e9b941041bf70d73b8c7c323378e SHA512 e4f18425dad547c547cac4926d5bcb2f996fcedc5df84b1a55773954c9c98ea0db075e65d5352ae92e2040b5154393c0dfb4d25e48a44272233008b61d29df78
-EBUILD mediawiki-1.36.1.ebuild 2567 BLAKE2B 4154bffccd7c140c1c9a9299d79c551f05a0bd3a570b299b56960814675e173aeca331867f173b9d467c456324db8b5855247f104d4fb7cf1eb7213e415d7e29 SHA512 7a4d9836d9b257fd181168cf5dd7fe2c69b50a80cb5b2c1121a510f414481886c922dbbebd2f9a0de866dbf44b71c3c962e0e011358b10de03e23a818ea2e118
-EBUILD mediawiki-1.36.2.ebuild 2570 BLAKE2B 6fab5279bef31daea0a6d0077c708cab758d34675f1ff707cdd5527e34b47449f083ee8958718fe89d98e29fc364f459c265fc8c2515aaa0f114e1567113fd81 SHA512 3addd9e6f8a4026ef14d4020f9d8b2ec7f96e4b076aaf3a8faba0a11e0b215c1454638c0a2a9c7cab6e1ad9c1fe81d5f8a7fb876afcb01db1e226506ac394e62
+EBUILD mediawiki-1.36.2.ebuild 2567 BLAKE2B 4154bffccd7c140c1c9a9299d79c551f05a0bd3a570b299b56960814675e173aeca331867f173b9d467c456324db8b5855247f104d4fb7cf1eb7213e415d7e29 SHA512 7a4d9836d9b257fd181168cf5dd7fe2c69b50a80cb5b2c1121a510f414481886c922dbbebd2f9a0de866dbf44b71c3c962e0e011358b10de03e23a818ea2e118
 MISC metadata.xml 270 BLAKE2B 9041e12c102c98e539b1d69a8b47a683f7f2fd2e5c1d9b0d8ceb4af9b7abc98d56cd64f4ed335717cffe7acef253748f7798997b8edab1c73d4b4f8eb75528c5 SHA512 fbdd6fdd911b687eaa654d7a9cc25c469c68de3d582d29c142acb5f3944be4ca8205345b94841b831f1b25f604c97bdbeab2bc10bd1cc6a371f651297b56f692
diff --git a/www-apps/mediawiki/mediawiki-1.36.1.ebuild b/www-apps/mediawiki/mediawiki-1.36.1.ebuild
deleted file mode 100644
index 14b37df2d8f8..000000000000
--- a/www-apps/mediawiki/mediawiki-1.36.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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.36.2.ebuild b/www-apps/mediawiki/mediawiki-1.36.2.ebuild
index b2781106013a..14b37df2d8f8 100644
--- a/www-apps/mediawiki/mediawiki-1.36.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.36.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 )"