From 6791c37c898392865e481378c8faff67d2d404af Mon Sep 17 00:00:00 2001
From: "Vance M. Allen" <vma_gentoo@vmacs.us>
Date: Sat, 1 Aug 2020 15:34:09 -0600
Subject: Updated several packages, adding Crypt-Argon2

Signed-off-by: Vance M. Allen <vma_gentoo@vmacs.us>
---
 app-admin/webmin/Manifest                          |   6 +-
 app-admin/webmin/webmin-1.930.ebuild               | 309 ---------------------
 app-admin/webmin/webmin-1.953.ebuild               | 309 +++++++++++++++++++++
 media-sound/teamspeak-client-bin/Manifest          |   6 +-
 .../teamspeak-client-bin-3.3.2.ebuild              |  78 ------
 .../teamspeak-client-bin-3.5.3.ebuild              |  78 ++++++
 perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.003.ebuild  |  21 ++
 perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.006.ebuild  |  21 ++
 perl-gcpan/Crypt-Argon2/Manifest                   |   4 +
 www-apps/joomla/Manifest                           |  10 +-
 www-apps/joomla/joomla-3.8.2.ebuild                |  50 ----
 www-apps/joomla/joomla-3.8.3.ebuild                |  50 ----
 www-apps/joomla/joomla-3.9.20.ebuild               |  50 ++++
 www-apps/mediawiki/Manifest                        |   4 +-
 www-apps/mediawiki/files/postupgrade-1.16-en.txt   |   4 +-
 www-apps/mediawiki/mediawiki-1.33.1.ebuild         |  79 ------
 www-apps/mediawiki/mediawiki-1.34.2.ebuild         |  86 ++++++
 17 files changed, 583 insertions(+), 582 deletions(-)
 delete mode 100644 app-admin/webmin/webmin-1.930.ebuild
 create mode 100644 app-admin/webmin/webmin-1.953.ebuild
 delete mode 100644 media-sound/teamspeak-client-bin/teamspeak-client-bin-3.3.2.ebuild
 create mode 100644 media-sound/teamspeak-client-bin/teamspeak-client-bin-3.5.3.ebuild
 create mode 100644 perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.003.ebuild
 create mode 100644 perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.006.ebuild
 create mode 100644 perl-gcpan/Crypt-Argon2/Manifest
 delete mode 100644 www-apps/joomla/joomla-3.8.2.ebuild
 delete mode 100644 www-apps/joomla/joomla-3.8.3.ebuild
 create mode 100644 www-apps/joomla/joomla-3.9.20.ebuild
 delete mode 100644 www-apps/mediawiki/mediawiki-1.33.1.ebuild
 create mode 100644 www-apps/mediawiki/mediawiki-1.34.2.ebuild

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index c3a733b..cf2c4d7 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,6 +1,6 @@
 AUX gentoo-setup 13727 BLAKE2B dca9dadd5775006f5bfbeee870723db8806a2236c984e2b4cec70031101f97fc5d4e1e1fd9219f27cdaa31ee860d247f71a01180b392154c16ca6554b1f73483 SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e
 AUX init.d.webmin 2167 BLAKE2B b90957ca4273ccc6deb35837704523361c3ed8b61034cb067919dffeabd7a8e6153ab2deceffc7745b209ffe8c6b52ad8fd391aa76591a9870c5f8f60223fb64 SHA512 deedded42854f4b29b28f24afec5171c4ee0f3301c4a0f4f9442f1c39b2aac39490315049641ed0b60182bdeb88d3f8d34672a707f95ecfa755d03d7f4dff49b
 AUX webmin.service 416 BLAKE2B aef00b0f948286c54736613e37f114e6ffd90453cc6eadc3afffe7fa114df4e6a8b91e4f02da6fdfaa3eb2f57254e5e6785b201d0461f28839742cc13d883816 SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e
-DIST webmin-1.930-minimal.tar.gz 2876574 BLAKE2B c8d47e7ef63f8c7ebcb8d6232dc137c6febb7964f414ac39ebb038ef5b2ae003712b2949d04e2d5833d60b0e9ed8832cc0c97918b54f3040eb90d78456da77b9 SHA512 4960339bd6ff2dff093e27b893f9de4b3cb4f2f8fa503a5fa020b2130abb30f60a36fa4cf3529b3255ae9dbabbcb6ac65b74781948f8196e902945d86e79ee9e
-DIST webmin-1.930.tar.gz 30932910 BLAKE2B 0ef13922a1da8446e3393a5fc4fe1cdd14da21110e2fedb2aba7b0bf32d25c0b20b731ee47cc9c3f2be884e97bb14b64f6366000967652b001e55a0ceab2dee1 SHA512 10f3a14b318329dd1a04786e17abc27ba6896a9efaa657ff37c36afa439d65b71805a839e0ea1c95785e77d97d4a4c0e79019fb09681feb7aed06fd5c22b3323
-EBUILD webmin-1.930.ebuild 10394 BLAKE2B a7ebd0d6711d6039ce53d87ca058cff0a05929db64e3465a2368336d0f8b5fc7a5b14a5998cf3179146bce1f2ad5e2a83a467d1a930b1206ad33a0c6a5b29c07 SHA512 83c2b148b128158c7c0eba6b6888c063fed4316e9ca5afad4e0c14f52778582da41711970f3fb748fcf25a00d7a448c85289f80e1cd33f14e71a1209735b8410
+DIST webmin-1.953-minimal.tar.gz 3599434 BLAKE2B b15266213400a9ed53d4f96b0cc5ea52b4749caa2f34b8c7deb7ffb08e605450d10aa58f813fe79fa06d64fb18abfde1a6c07ba5d859ca7716f3f1649f80ca8f SHA512 cd82b6173200f635b28a3bf12af62c620a267b335c11ddb893f35847ac446d8705f0857f1cb6109c93075948d078456fbf0363d6d4abdee856cdf59186f881e1
+DIST webmin-1.953.tar.gz 46898438 BLAKE2B 86ec3ffd8485f4ddadff91385fc939aad50de2b1a0f15e9942ee057f15702443f8c131e06c408690d9b7d3b37bcbf5462a1a51056a8f89e409ce972631be25cb SHA512 b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
+EBUILD webmin-1.953.ebuild 10394 BLAKE2B a7ebd0d6711d6039ce53d87ca058cff0a05929db64e3465a2368336d0f8b5fc7a5b14a5998cf3179146bce1f2ad5e2a83a467d1a930b1206ad33a0c6a5b29c07 SHA512 83c2b148b128158c7c0eba6b6888c063fed4316e9ca5afad4e0c14f52778582da41711970f3fb748fcf25a00d7a448c85289f80e1cd33f14e71a1209735b8410
diff --git a/app-admin/webmin/webmin-1.930.ebuild b/app-admin/webmin/webmin-1.930.ebuild
deleted file mode 100644
index 6d02e04..0000000
--- a/app-admin/webmin/webmin-1.930.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
-	virtual/perl-Socket
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Set the installation type/mode to Gentoo
-	echo "gentoo" > install-type
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Create the systemd service file and put the neccessary variables there
-	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
-		|| die "Failed to patch the webmin systemd service file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	# Run pkg_config phase first - non interactively
-	export INTERACTIVE="no"
-	pkg_config
-	# Every next time pkg_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	if systemd_is_booted ; then
-		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
-	else
-		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	fi
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postrm() {
-	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		ewarn
-		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-		ewarn "To fix this just disable them if you intend to use Webmin again,"
-		ewarn "OR delete them if not."
-		ewarn
-	fi
-}
-
-pkg_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
-	# 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
-	export ssl=1
-	export no_ssl2=1
-	export no_ssl3=1
-	export ssl_redirect=1
-	export ssl_honorcipherorder=1
-	export no_sslcompression=1
-	export no_tls1=1
-	export no_tls1_1=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.953.ebuild b/app-admin/webmin/webmin-1.953.ebuild
new file mode 100644
index 0000000..6d02e04
--- /dev/null
+++ b/app-admin/webmin/webmin-1.953.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils pam ssl-cert systemd
+
+DESCRIPTION="A web-based Unix systems administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-MIME-Base64
+	virtual/perl-Socket
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	virtual/perl-Time-Local
+	dev-perl/Authen-Libwrap
+	dev-perl/IO-Tty
+	dev-perl/MD5
+	dev-perl/Net-SSLeay
+	dev-perl/Authen-PAM
+	dev-perl/Sys-Hostname-Long
+	>=net-dns/dnssec-tools-1.13
+	!minimal? (
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		ldap? ( dev-perl/perl-ldap )
+		dev-perl/XML-Generator
+		dev-perl/XML-Parser
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local perl="$( which perl )"
+
+	# Remove the unnecessary and incompatible files
+	rm -rf acl/Authen-SolarisRBAC-0.1*
+	if ! use minimal ; then
+		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+		rm -f mount/{free,net,open}bsd-mounts*
+		rm -f mount/macos-mounts*
+	fi
+
+	# For security reasons remove the SSL certificate that comes with Webmin
+	# We will create our own later
+	rm -f miniserv.pem
+
+	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+	# We will use our own later
+	rm -f setup.{sh,pl}
+
+	# Set the installation type/mode to Gentoo
+	echo "gentoo" > install-type
+
+	# Fix the permissions of the install files
+	chmod -R og-w "${S}"
+
+	# Since we should not modify any files after install
+	# we set the perl path in all cgi and pl files here using Webmin's routines
+	# The pl file is Prefix safe and works only on provided input, no other filesystem files
+	ebegin "Fixing perl path in source files"
+	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+	eend $?
+}
+
+src_install() {
+	# Create config dir and keep
+	diropts -m0755
+	dodir /etc/webmin
+	keepdir /etc/webmin
+
+	# Create install dir
+	# Third party modules installed through Webmin go here too, so keep
+	dodir /usr/libexec/webmin
+	keepdir /usr/libexec/webmin
+
+	# Copy our own setup script to installation folder
+	insinto /usr/libexec/webmin
+	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
+	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+	# This is here if we ever want in future ebuilds to add some specific
+	# config values in the /etc/webmin/miniserv.conf
+	# The format of this file should be the same as the one of miniserv.conf:
+	# var=value
+	#
+	# Uncomment it if you use such file. Before that check if upstream
+	# has this file in root dir too.
+	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+	# Create the log dir and keep
+	diropts -m0700
+	dodir /var/log/webmin
+	keepdir /var/log/webmin
+
+	# Create the init.d file and put the neccessary variables there
+	newinitd "${FILESDIR}"/init.d.webmin webmin
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}etc/init.d/webmin" \
+		|| die "Failed to patch the webmin init file"
+
+	# Create the systemd service file and put the neccessary variables there
+	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%config%:${EROOT}etc/webmin/config:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
+		|| die "Failed to patch the webmin systemd service file"
+
+	# Setup pam
+	pamd_mimic system-auth webmin auth account session
+
+	# Copy files to installation folder
+	ebegin "Copying install files to destination"
+	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+	eend $?
+}
+
+pkg_preinst() {
+	# First stop service if running so Webmin to not messup our config
+	ebegin "Stopping any running Webmin instance prior merging"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	# Run pkg_config phase first - non interactively
+	export INTERACTIVE="no"
+	pkg_config
+	# Every next time pkg_config should be interactive
+	INTERACTIVE="yes"
+
+	ewarn
+	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+	ewarn "To avoid problems, please before using any module, look at its configuration options first."
+	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+	ewarn
+	if systemd_is_booted ; then
+		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
+	else
+		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+	fi
+	elog "- The default URL to connect to Webmin is: https://localhost:10000"
+	elog "- The default user that can login is: root"
+	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+	# First stop service if running - we do not want Webmin to mess up config
+	ebegin "Stopping any running Webmin instance prior unmerging"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+}
+
+pkg_postrm() {
+	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		ewarn
+		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+		ewarn "To fix this just disable them if you intend to use Webmin again,"
+		ewarn "OR delete them if not."
+		ewarn
+	fi
+}
+
+pkg_config(){
+	# First stop service if running
+	ebegin "Stopping any running Webmin instance"
+	if systemd_is_booted ; then
+		systemctl stop webmin.service 2>/dev/null
+	else
+		rc-service --ifexists -- webmin --ifstarted stop
+	fi
+	eend $?
+
+	# Next set the default reset variable to 'none'
+	# reset/_reset can be:
+	# 'none' - does not reset anything, just upgrades if a conf is present
+	#		   OR installs new conf if a conf is missing
+	# 'soft' - deletes only $config_dir/config file and thus resetting most
+	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
+	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+	local _reset="none"
+
+	# If in interactive mode ask user what should we do
+	if [[ "${INTERACTIVE}" = "yes" ]]; then
+		einfo
+		einfo "Please enter the number of the action you would like to perform?"
+		einfo
+		einfo "1. Update configuration"
+		einfo "   (keeps old config options and adds the new ones)"
+		einfo "2. Soft reset configuration"
+		einfo "   (keeps some old config options, the other options are set to default)"
+		ewarn "   All Webmin users will be reset"
+		einfo "3. Hard reset configuration"
+		einfo "   (all options including module options are set to default)"
+		ewarn "   You will lose all Webmin configuration options you have done till now"
+		einfo "4. Exit this configuration utility (default)"
+		while [ "$correct" != "true" ] ; do
+			read answer
+			if [[ "$answer" = "1" ]] ; then
+				_reset="none"
+				correct="true"
+			elif [[ "$answer" = "2" ]] ; then
+				_reset="soft"
+				correct="true"
+			elif  [[ "$answer" = "3" ]] ; then
+				_reset="hard"
+				correct="true"
+			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
+				die "User aborted configuration."
+			else
+				echo "Answer not recognized. Enter a number from 1 to 4"
+			fi
+		done
+
+		if [[ "$_reset" = "hard" ]]; then
+			while [ "$sure" != "true" ] ; do
+				ewarn "You will lose all Webmin configuration options you have done till now."
+				ewarn "Are you sure you want to do this? (y/n)"
+				read answer
+				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+					sure="true"
+				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+					die "User aborted configuration."
+				else
+					echo "Answer not recognized. Enter 'y' or 'n'"
+				fi
+			done
+		fi
+	fi
+
+	export reset=$_reset
+
+	# Create ssl certificate for Webmin if there is not one in the proper place
+	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+		install_cert "${EROOT}/etc/ssl/webmin/server"
+	fi
+
+	# Ensure all paths passed to the setup script use EROOT
+	export wadir="${EROOT}usr/libexec/webmin"
+	export config_dir="${EROOT}etc/webmin"
+	export var_dir="${EROOT}var/log/webmin"
+	export tempdir="${T}"
+	export pidfile="${EROOT}var/run/webmin.pid"
+	export perl="$( which perl )"
+	export os_type='gentoo-linux'
+	export os_version='*'
+	export real_os_type='Gentoo Linux'
+	export real_os_version='Any version'
+	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
+	# 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
+	export ssl=1
+	export no_ssl2=1
+	export no_ssl3=1
+	export ssl_redirect=1
+	export ssl_honorcipherorder=1
+	export no_sslcompression=1
+	export no_tls1=1
+	export no_tls1_1=1
+	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+	export port=10000
+
+	export atboot=0
+
+	einfo "Executing Webmin's configure script"
+	$wadir/gentoo-setup.sh
+
+	einfo "Configuration of Webmin done"
+}
diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
index e554c67..93c5d93 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -1,5 +1,5 @@
 AUX teamspeak3 258 BLAKE2B a70cae413c2392b601f69f9ab4196c06b711beb35822be9cb9621325472fef7caea06bee183f6b73f1d4cb8122be15712ba53dd3b148f6bc5ddd5a98ab7f108f SHA512 b587b3991e927922854f155ac61e8d923a6b84a1da88a040277d670203be7dc11b5fbf79508d3894e94a2686da1758781b158c7598c8a61b151798c6a7b1880e
-DIST TeamSpeak3-Client-linux_amd64-3.3.2.run 95632176 BLAKE2B b1a418e6af6c364050a532063b3129e27d03ac36ec325ab5f2044896f5eae02fb4a251e71b23bc125d41f169aa35d8dde340b333a67b845ebaca7faefa49fe70 SHA512 1dd8912120ba0e9e84849fd793d54aee56e98396f6228a4bcec5c79485b9902398eeefb8f276abd46bbe627e7bd3c8fc5d740d05807342f837ac226f475510d7
-DIST TeamSpeak3-Client-linux_x86-3.3.2.run 94323084 BLAKE2B f3b0317e8cbc7143d9814a52c8a8c9cd04aa012a40172aca59e6d4db956a19ae5752bffa102f06e34ad0dd5b211082e00ca06056c05a4a2dbbd8adfd76a0c0e7 SHA512 56b7b231ffa5195418823da435fd4daef2cbdbc653d3cfd328f60881a1370b9dd6f99479e9093216d0768ddb04bdd6c6cf1a7019d836abd89806518eeee23496
-EBUILD teamspeak-client-bin-3.3.2.ebuild 1939 BLAKE2B b2db292034389f625f4f9725a5c45a387ff0a82865a52bbd0262125a025bd347d00700447058061491637d84e6279bf34d8c5741a28e9c96cee2371b80d3f15a SHA512 dfbbb0232e564b16726ebd2ac9301a9170cf9a0e163c7d7c3ca1b595656dd21c26192ee08b1f8b1eff402a7abc4a599a1a5ae707da083381f13526890c0f31b2
+DIST TeamSpeak3-Client-linux_amd64-3.5.3.run 97454216 BLAKE2B 228542b7b5169bd4bc86f320f7d9b4e099d088db9bb5c944b7b1e9d029b8c505a50447468fb02bb2b5e34c0f3a4e088a1af2bab466a7ec71e128541fabe9b562 SHA512 8b0ea835b179596ec16c092790383691650f6cb92b97d4ab2012872edc2f4d82e0b3a3ea4551651c4824703b9ef01ba9c95a50ee262d5f279151d780dc3faef6
+DIST TeamSpeak3-Client-linux_x86-3.5.3.run 95939656 BLAKE2B 5aec52b4461d45cd19947e3f87729a40bca23bc78d45565bad59a1f11b437e253f0bf073ad32ca1a43396b8bcf47794d0efb0673ec0b7314e3dd5c2a0dcdb140 SHA512 54a6d7ad03a357a78be71710e7878b9b5c0a54d175bf4242a35ba82df1abfa692dc4d4c921099677c5d163caf18b68db73a87b8637b216ef5c72eaa25b6deab7
+EBUILD teamspeak-client-bin-3.5.3.ebuild 1939 BLAKE2B b2db292034389f625f4f9725a5c45a387ff0a82865a52bbd0262125a025bd347d00700447058061491637d84e6279bf34d8c5741a28e9c96cee2371b80d3f15a SHA512 dfbbb0232e564b16726ebd2ac9301a9170cf9a0e163c7d7c3ca1b595656dd21c26192ee08b1f8b1eff402a7abc4a599a1a5ae707da083381f13526890c0f31b2
 MISC metadata.xml 708 BLAKE2B 5e7cd83c58319706e57b6d40b7f69fa5ee3c9c28b5ba56078c50b1cb1da50578539286838e0501d176bf686d7a14612a07383ddff3a5afaf15079ac685ccfd9f SHA512 192cb133ecea4239ed304883cf71d6328b5926db9d9a513ad0cdb049205195f20fd480ba1228a7990ae26cd5761a3c36e39ce358f30456aa137d1247435ddd9b
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.3.2.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.3.2.ebuild
deleted file mode 100644
index e1df3d6..0000000
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.3.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils unpacker
-
-DESCRIPTION="TeamSpeak Client - Voice Communication Software"
-HOMEPAGE="http://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
-
-LICENSE="teamspeak3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa pulseaudio"
-
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	dev-libs/quazip[-qt4,qt5]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[accessibility]
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	sys-libs/glibc
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}?page=downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-src_prepare() {
-	default
-
-	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
-	rm libQt* || die "Couldn't remove bundled Qt libraries."
-
-	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
-
-	# Remove unwanted soundbackends.
-	if ! use alsa ; then
-		rm soundbackends/libalsa* || die
-	fi
-
-	if ! use pulseaudio ; then
-		rm soundbackends/libpulseaudio* || die
-	fi
-
-	# Remove quazip
-	rm libquazip.so || die
-
-	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
-	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
-}
-
-src_install() {
-	insinto /opt/teamspeak3-client
-	doins -r *
-
-	fperms +x /opt/teamspeak3-client/ts3client
-
-	dobin "${FILESDIR}/teamspeak3"
-
-	make_desktop_entry teamspeak3 TeamSpeak3 \
-		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
-		Network
-}
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.5.3.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.5.3.ebuild
new file mode 100644
index 0000000..e1df3d6
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.5.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils unpacker
+
+DESCRIPTION="TeamSpeak Client - Voice Communication Software"
+HOMEPAGE="http://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+
+LICENSE="teamspeak3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa pulseaudio"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	dev-libs/quazip[-qt4,qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	sys-libs/glibc
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}?page=downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+src_prepare() {
+	default
+
+	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
+	rm libQt* || die "Couldn't remove bundled Qt libraries."
+
+	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
+
+	# Remove unwanted soundbackends.
+	if ! use alsa ; then
+		rm soundbackends/libalsa* || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm soundbackends/libpulseaudio* || die
+	fi
+
+	# Remove quazip
+	rm libquazip.so || die
+
+	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
+	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
+}
+
+src_install() {
+	insinto /opt/teamspeak3-client
+	doins -r *
+
+	fperms +x /opt/teamspeak3-client/ts3client
+
+	dobin "${FILESDIR}/teamspeak3"
+
+	make_desktop_entry teamspeak3 TeamSpeak3 \
+		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
+		Network
+}
diff --git a/perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.003.ebuild b/perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.003.ebuild
new file mode 100644
index 0000000..daa4924
--- /dev/null
+++ b/perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.003.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# This ebuild generated by g-cpan 0.16.9
+
+EAPI=5
+
+MODULE_AUTHOR="LEONT"
+MODULE_VERSION="0.003"
+
+
+inherit perl-module
+
+DESCRIPTION="Perl interface to the Argon2 key derivation functions"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="alpha amd64 amd64-fbsd arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 x86-fbsd   ppc-aix amd64-linux arm-linux arm64-linux ppc64-linux x86-linux ppc-macos x86-macos x64-macos m68k-mint sparc-solaris sparc64-solaris x64-solaris x86-solaris x86-winnt x64-cygwin x86-cygwin"
+IUSE=""
+
+DEPEND=">=dev-perl/Module-Build-0.422.400
+	dev-lang/perl"
diff --git a/perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.006.ebuild b/perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.006.ebuild
new file mode 100644
index 0000000..00a627b
--- /dev/null
+++ b/perl-gcpan/Crypt-Argon2/Crypt-Argon2-0.006.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# This ebuild generated by g-cpan 0.16.9
+
+EAPI=5
+
+MODULE_AUTHOR="LEONT"
+MODULE_VERSION="0.006"
+
+
+inherit perl-module
+
+DESCRIPTION="Perl interface to the Argon2 key derivation functions"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 riscv s390 sh sparc x86   ppc-aix amd64-linux arm-linux arm64-linux ppc64-linux x86-linux ppc-macos x86-macos x64-macos m68k-mint sparc-solaris sparc64-solaris x64-solaris x86-solaris x86-winnt x64-cygwin x86-cygwin"
+IUSE=""
+
+DEPEND=">=dev-perl/Module-Build-0.422.400
+	dev-lang/perl"
diff --git a/perl-gcpan/Crypt-Argon2/Manifest b/perl-gcpan/Crypt-Argon2/Manifest
new file mode 100644
index 0000000..842f8c4
--- /dev/null
+++ b/perl-gcpan/Crypt-Argon2/Manifest
@@ -0,0 +1,4 @@
+DIST Crypt-Argon2-0.003.tar.gz 34541 BLAKE2B c2079e5ff54fb8c7dbe897cc78ef741e61ff394eb2c0f5e9881fe0b4c66c4f4eb401cac21ac32f4041971d7dd88e96f94425887863810304405d83c652cd1be8 SHA512 a7853bdf6fedb967272e8f6ed2e4781c9e4a50d90a98b7af09a1fadf8b9834c640ff0dd8f1c95db03cee56e15520276c90d0587b9807989dee9d90acc6a76e82
+DIST Crypt-Argon2-0.006.tar.gz 33758 BLAKE2B 1b0a12278dc5ef84c5feaba31920482f50bf47d31ac36df4cb7fe604c86a42efcfb9bc322f06df79a8c1d32b3716b14d86e68d7804778c6f8ac75a40b0de675a SHA512 3d8e0376723fe3a9cf5e4f4c49c6cc87837e5021b162fa5f24ef1cbee3d8e838e6450a2b484e4a7cf340d2d994380422e7fa153d22c34ae5c1db5dd60c64c990
+EBUILD Crypt-Argon2-0.003.ebuild 707 BLAKE2B 2473a16de243c27decee75b81e7fb62493706d5a2950dad258e7eb33acd8c4af29188992953bda9022d34b4acfc1d6b197c239eaa14b3df7d4d23f79ed2f19c0 SHA512 40ba9844774840f486be939dacb4f5b457f71bdbcdf6bbaad48961256a93a8d7a94292f570902bed2aec5d8b1358c4b1d3f826f81bd171685e3d07db324d9757
+EBUILD Crypt-Argon2-0.006.ebuild 693 BLAKE2B cfd1a0f81714928e31993a13c0ab307bbf2696fb3c8d6c2d658510dbdc9fcd8922d4715f4921a1494bb6ac85c2861e8754fbe9b3839bbc057de8445ac06e4971 SHA512 1281a1ddd8f668c7de91132b7247e29d0cb60d4584c2a4b0c781575edadcdb195fdb7f8f49636a29d4a670919593a408a2207869c0c442cfec53f61a6f99a600
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.2.ebuild b/www-apps/joomla/joomla-3.8.2.ebuild
deleted file mode 100644
index e3ead25..0000000
--- a/www-apps/joomla/joomla-3.8.2.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.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.9.20.ebuild b/www-apps/joomla/joomla-3.9.20.ebuild
new file mode 100644
index 0000000..e3ead25
--- /dev/null
+++ b/www-apps/joomla/joomla-3.9.20.ebuild
@@ -0,0 +1,50 @@
+# 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/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.33.1.ebuild
deleted file mode 100644
index ce9c6e2..0000000
--- a/www-apps/mediawiki/mediawiki-1.33.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit webapp versionator
-
-MY_BRANCH=$(get_version_component_range 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"
-
-RDEPEND=">=dev-lang/php-5.5.9[json,mysql?,postgres?,session,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	sqlite? (
-		dev-db/sqlite:3[fts3(+)]
-		>=dev-lang/php-5.5.9[pdo]
-		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-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 RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto php-memcached
-	dodoc docs/php-memcached/*
-
-	# 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.34.2.ebuild b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
new file mode 100644
index 0000000..f8b511b
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 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[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[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 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
+}
-- 
cgit v1.2.3-65-gdbad