Updated several packages, adding Crypt-Argon2

Signed-off-by: Vance M. Allen <vma_gentoo@vmacs.us>

6 files changed, 27 insertions, 72 deletions

diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index d583009..eb73332 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1,6 +1,4 @@
-AUX postinstall-en.txt 916 SHA256 b8cde9b18beeab31eaf713c3a07bcd6a831bffa233019b1524948aa7773f0c5d SHA512 d53b2d2b2d9cb1cb83bf452f71d7098e5c6a460bdfa914e7d9bf57090544931eeeae249cf0e738a73c351f06854f7e3490e1c5d84271be43e45bec91a32c732a WHIRLPOOL 05c96f5ada3b8a05671f1e8a04af503fe83bedf09fe84374e92d186e30352168ef5e9aac608c73bca92c0b29160fa25bf7453b3482dfc0b022cf9b140e0a6167
-AUX postinstall-sv.txt 764 SHA256 46bf71e91721e3a0d269680c059642dd694a4f8d6184503545d7c4a46f9414e3 SHA512 4a7110fd497d5330fd289743942a9339bd7b7ffa0812578c4552ae539774576ca7ce6df8bc8ed45ca6bb4d61d7183c1094d6a2480988497e131f3687274b3e0b WHIRLPOOL 86a91ca55da9f777ed98a2435a9b1f909b54e258a2a74781466ba0d3e4ffae142af9c3f0746cdde18d5c360252f840529a59dbb71749295130ee63007e45d4e6
-DIST Joomla_3.8.2-Stable-Full_Package.tar.bz2 7728707 SHA256 d79c776b78c5c0f88a74843d57f1beb7b929b8366a5a0f85ee350c33873b8381 SHA512 cba0b8dfe35f5b58840f764d9fd678e8a4e637238634050107838f8fcc8e9cbfc89c13900d84b9cfa8b8b2d1fa31c6c179848fde5225161c79ae0ac5e3f47001 WHIRLPOOL c34de130197101531e7226e619b23c10cde366c5a6a56ced306c89143ad70b0706eefe1615fa9b0ce1be896d25fd11f9ce7aa95e1493d887c6f688198943a034
-DIST Joomla_3.8.3-Stable-Full_Package.tar.bz2 7713317 SHA256 4f5857a85f9d5fce1212e70a35993390f6231c4e95dbd803e64be7ac6006c980 SHA512 fbf48c130aad6e3013aabd1364cd1712cdd75134a7d49e55c611cdc2b494795f0015fa9c94139dc1345dea081946ecfe52c3f2432efad76295495bea6ef4bbba WHIRLPOOL 17259bdb4e40fef908bf69fd370775ea07912ed7289e04cec8559126c50fd3c51cd8007e3bb370f034f9b27aa5b1c867c6986f0717d792d782b27ca939a199d8
-EBUILD joomla-3.8.2.ebuild 1495 SHA256 067b3acb66b27bc45d8e35407cd9970eebc4836e0b9cfd9cf754d401a09e5b4e SHA512 25b5d1210902d8154b9201cbd99a326a5f099ec641af68430441d67412d953eb9b21ed58ea2ac9a458e04a3af088b12dd9c78b8d6cae96d0842c2023b296da51 WHIRLPOOL 054705d2e9165a7a3c0fe194b1e95e0e89c45aaaebe6d737111d794dd3ed3d146d2a3b3e60777a1316076d947c0304f11daabf6f7f27024fc5305611cf3130e6
-EBUILD joomla-3.8.3.ebuild 1495 SHA256 067b3acb66b27bc45d8e35407cd9970eebc4836e0b9cfd9cf754d401a09e5b4e SHA512 25b5d1210902d8154b9201cbd99a326a5f099ec641af68430441d67412d953eb9b21ed58ea2ac9a458e04a3af088b12dd9c78b8d6cae96d0842c2023b296da51 WHIRLPOOL 054705d2e9165a7a3c0fe194b1e95e0e89c45aaaebe6d737111d794dd3ed3d146d2a3b3e60777a1316076d947c0304f11daabf6f7f27024fc5305611cf3130e6
+AUX postinstall-en.txt 916 BLAKE2B 0f89355cd8a1f9507de8a231c519930d25887717ae9519b90f5d77e9f928d8846585236a7c7cf5f48349508e5a811288f5833fd175d10d1c119c6a772c9ef12b SHA512 d53b2d2b2d9cb1cb83bf452f71d7098e5c6a460bdfa914e7d9bf57090544931eeeae249cf0e738a73c351f06854f7e3490e1c5d84271be43e45bec91a32c732a
+AUX postinstall-sv.txt 764 BLAKE2B 6cf5780b60c39b35845557d4e386ca4e2f2c5ca9e7fa45fd67feedf108d57ac5d1a11b80bb68861a14f30c83f55302f9cc49a4dff25015faec5ebac2a4c1a071 SHA512 4a7110fd497d5330fd289743942a9339bd7b7ffa0812578c4552ae539774576ca7ce6df8bc8ed45ca6bb4d61d7183c1094d6a2480988497e131f3687274b3e0b
+DIST Joomla_3.9.20-Stable-Full_Package.tar.bz2 8030179 BLAKE2B c5aed02691f5bae50183c9f56a47837074a07cdb73e34319e87c1acaecec1b30b968fde4e5276d6153a511cb363e615952b0cf258c796cd0754f590b30fb36ac SHA512 ed885916525e202267c6508156f69dcc9f4688231906ebae1e2ae9f823c9221202f9b88b4ee1ebc26827ba0992fd5a9f3ecc3651bedab7399a078603ad68e5bf
+EBUILD joomla-3.9.20.ebuild 1495 BLAKE2B d1345412d9ef0aaec2c48eb15ae3c5bef4dc9208525727bf2d56dbb219cea8bee908d21a62e6bb8e99b71ab933354149050f6eb9ef46163da83de3623398c2d3 SHA512 25b5d1210902d8154b9201cbd99a326a5f099ec641af68430441d67412d953eb9b21ed58ea2ac9a458e04a3af088b12dd9c78b8d6cae96d0842c2023b296da51
diff --git a/www-apps/joomla/joomla-3.8.3.ebuild b/www-apps/joomla/joomla-3.8.3.ebuild
deleted file mode 100644
index e3ead25..0000000
--- a/www-apps/joomla/joomla-3.8.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit webapp versionator
-
-MY_PV=$(replace_version_separator '_' '-')
-
-DESCRIPTION="A powerful Open Source Content Management System"
-HOMEPAGE="http://www.joomla.org/"
-M_PN="Joomla_${MY_PV}-Stable-Full_Package"
-SRC_URI="https://github.com/${PN}/${PN}-cms/releases/download/${MY_PV}/${M_PN}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-S="${WORKDIR}"
-need_httpd_cgi
-
-RDEPEND=">=dev-lang/php-5.3.10[json,zlib,xml]
-	virtual/httpd-php
-	|| ( dev-lang/php[mysql] dev-lang/php[postgres] )"
-
-src_install () {
-	webapp_src_preinst
-
-	touch configuration.php
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	local files=" administrator/cache administrator/components
-	administrator/language administrator/language/en-GB
-	administrator/manifests/packages
-	administrator/modules administrator/templates cache components images installation
-	images/banners language language/en-GB media modules plugins
-	plugins/authentication plugins/content plugins/editors plugins/editors-xtd
-	plugins/search plugins/system plugins/user plugins tmp templates"
-
-	for file in ${files}; do
-		webapp_serverowned -R "${MY_HTDOCSDIR}"/${file}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/configuration.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/configuration.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postinst_txt sv "${FILESDIR}"/postinstall-sv.txt
-	webapp_src_install
-}
diff --git a/www-apps/joomla/joomla-3.8.2.ebuild b/www-apps/joomla/joomla-3.9.20.ebuild
index e3ead25..e3ead25 100644
--- a/www-apps/joomla/joomla-3.8.2.ebuild
+++ b/www-apps/joomla/joomla-3.9.20.ebuild
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index ff751f0..dd00323 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 1514 BLAKE2B f2a7284a49638a2e1ca694a84b490f4a3348cab1afe1b022f617fc7df74c958be29e36e3c777514765b7a01758f11cfb653092e2190a5e7dc572884f5942196c SHA512 58d11cdf8daaa2ee62ca64dfeddad3ef2d10feac5b93b51f96e5802dd2915c3d969b8e99d059e79a9b62386ae70a7690db3c4e4d248501e839769bc7f24d2dd5
-DIST mediawiki-1.33.1.tar.gz 37863816 BLAKE2B 2f4ce62c3b46738d31af9fcfde61a9521a0bb838c035ef539f4263e61b7fe5db59597a3142a6f942fabaad1bb97c7058a21df654588e6a60023fa5fad5e4d88d SHA512 0cf786872714546fb13843bc5f8b851bfcc665f7459a0326a3fb77efb0d1976b618d4e2206d3fb0852a60b7fa375e98aa0b5600b03209ce9eabd9e3dc5db7d1a
-EBUILD mediawiki-1.33.1.ebuild 2364 BLAKE2B 5026e3364ae048e973a6f11d898ae52831e541f3b682420bc41c4936504ec778826a1f5be34546bc2c9aa97a84c4a39a32fa571a5b73db1a2618679fdfe6bbdc SHA512 0adfcc39cfcb96f80e33d3d428e3d2cd243a36caf51a4505aed59456fde85c677b38252a383eff32d0d5946b19cd7a57516e0691961aaeab2fdcce701f204056
+DIST mediawiki-1.34.2.tar.gz 40721102 BLAKE2B fbf7e8a19cd51e1dd3eab85442ce4e65ee9591bb4d2c6faa93ecbfc43e0b6cf88501a0027a7ba0f1adb55d9946de9958abcb14f9fb95b826ba674f1aa8306553 SHA512 ea95b46b746c0c180b5cb3b8a2263a2f94207eadbb1638c2113e97b1503c3f0a4d82a2107ce4cabca4790512b81564bda49defe30ac0fdb9bddf3230d6201f8b
+EBUILD mediawiki-1.34.2.ebuild 2547 BLAKE2B 671e90fbf8be26c4c3817e112a1c34dee51712cf44d2e35a27b20ef4b58c10014e6f0d8a22625ee6a9ca5d0637325444c90b80abd775418b86a96cccd84969e5 SHA512 39687dd0c3e6a03a13cac0d7343c1e261266b6ff5b9c9ad710d7fed2e1e853923fcc7ff038dbfa1735592bfaf0074bc5cca5ecaeac6dbfc06e0bfdd3df11c67e
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/files/postupgrade-1.16-en.txt b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
index e26939c..0840f97 100644
--- a/www-apps/mediawiki/files/postupgrade-1.16-en.txt
+++ b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
@@ -30,8 +30,8 @@ http://www.mediawiki.org/wiki/Manual:Upgrading
 Upgrade extensions
 ==================
 
-Certain extensions have been updated in order to work with MediaWiki 1.13. Be
-sure to upgrade to the latest versions of such extensions. You might need to
+Certain extensions have been updated in order to work with installed MediaWiki.
+Be sure to upgrade to the latest versions of such extensions. You might need to
 perform manual updates to custom extensions.
 
 
diff --git a/www-apps/mediawiki/mediawiki-1.33.1.ebuild b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
index ce9c6e2..f8b511b 100644
--- a/www-apps/mediawiki/mediawiki-1.33.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit webapp versionator
+EAPI=7
+inherit webapp
 
-MY_BRANCH=$(get_version_component_range 1-2)
+MY_BRANCH=$(ver_cut 1-2)
 
 DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
 HOMEPAGE="http://www.mediawiki.org"
@@ -12,15 +12,16 @@ 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"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
 
-RDEPEND=">=dev-lang/php-5.5.9[json,mysql?,postgres?,session,xml,xmlreader]
+RDEPEND="dev-lang/php[ctype,fileinfo,iconv,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:3[fts3(+)]
-		>=dev-lang/php-5.5.9[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
 	)
 	virtual/httpd-php"
 
@@ -28,6 +29,13 @@ 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
 
@@ -38,9 +46,8 @@ src_install() {
 	# install instructions guide the user to enable the feature.
 	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
 	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
+	docinto databases
+	dodoc docs/databases/*
 	# Clean everything not used at the site...
 	rm -rf ${DOCS} COPYING tests docs || die
 	find . -name Makefile -delete || die