gentoo resync : 16.04.2022

21 files changed, 59 insertions, 1315 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 52fd0824c495..1bd416d652c3 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
deleted file mode 100644
index 3d06a4059bab..000000000000
--- a/dev-db/mysql-cluster/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX my.cnf-5.6 4504 BLAKE2B 5d904925d12ad4c3826426e7e7790800028c9adf9b42692adf3260cd8dae910338683fbcd3e5148f113c1ab27481e5ffe61871716a069c50f295cf756b3e685c SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae
-DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4 SHA512 48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
-DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc SHA512 2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05
-EBUILD mysql-cluster-7.4.21.ebuild 25709 BLAKE2B b00417ed38df0304a4976eec949ec277c1e1f1a92ba406a7750f4fba24865950575d2ef919c2801e03e186beb33c32a3fcbdc1ba63122c0b9825322652d559e7 SHA512 71a9fcd958d7d8a4a8c67f31439ad7fca3fe4694497039abca39a4dd24db645fbf9c62c6167447912eae21397fcb8f105e544862856affc9410c61b1d678e388
-MISC metadata.xml 1139 BLAKE2B 4d5151286587941b1c56f7107af93921b0ce259fe2020551fd686307cf86976400d76ddc5d05e92415e08666710dcf382a2bedc44680d54b807495deddabee29 SHA512 5e968dd886f4805d651b014a131410b4105ec6aa8b542ad1290115b5632c13966b223be0eb5b4545914cecca06a8d1eff6e28ad5c2af8a78fbbcf00a08faa5fd
diff --git a/dev-db/mysql-cluster/files/my.cnf-5.6 b/dev-db/mysql-cluster/files/my.cnf-5.6
deleted file mode 100644
index df462ab69a14..000000000000
--- a/dev-db/mysql-cluster/files/my.cnf-5.6
+++ /dev/null
@@ -1,139 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size				= 16M
-max_allowed_packet 			= 4M
-table_open_cache 			= 400
-sort_buffer_size 			= 512K
-net_buffer_length 			= 16K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 128M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 48M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
deleted file mode 100644
index 8254f5d151d1..000000000000
--- a/dev-db/mysql-cluster/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>mysql-bugs@gentoo.org</email>
-    <name>MySQL</name>
-  </maintainer>
-<use>
-  <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
-  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
-  <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
-  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
-  <flag name="server">Build the server program</flag>
-  <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name="test">Install upstream testsuites for end use.</flag>
-  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
deleted file mode 100644
index d78696ae60ea..000000000000
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ /dev/null
@@ -1,811 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190121-0015Z"
-
-#fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-inherit eutils flag-o-matic prefix toolchain-funcs java-utils-2 user cmake-utils
-
-MY_PN="mysql-cluster-gpl"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQL-Cluster-7.4/${MY_PN}-${PV}.tar.gz
-	https://downloads.mysql.com/archives/MySQL-Cluster-7.4/${MY_PN}-${PV}.tar.gz"
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-	SRC_URI="${SRC_URI}
-		mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-		https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
-fi
-
-HOMEPAGE="https://mysql.com/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="client-libs debug extraengine jemalloc latin1 numa
-	+perl profiling selinux +server	static static-libs systemtap tcmalloc
-	test yassl"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	static? ( yassl )"
-
-KEYWORDS="~amd64 ~x86"
-
-# Shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-	EGIT_CLONE_TYPE=shallow
-else
-	MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-cluster-7.3.22-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
-	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
-	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
-	"${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.patch
-	"${MY_PATCH_DIR}"/30000_all_mysql-cluster-multilib-property.patch
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-	kernel_linux? (
-		sys-process/procps:0=
-		dev-libs/libaio:0=
-	)
-	dev-libs/libevent:0=
-	>=sys-apps/sed-4
-	>=sys-apps/texinfo-4.7-r1
-	jemalloc? ( dev-libs/jemalloc:0= )
-	numa? ( sys-process/numactl )
-	tcmalloc? ( dev-util/google-perftools:0= )
-	systemtap? ( >=dev-util/systemtap-1.3:0= )
-	!yassl? (
-		>=dev-libs/openssl-1.0.0:0=
-	)
-	>=sys-libs/zlib-1.2.3:0=
-	sys-libs/ncurses:0=
-	${JAVA_PKG_E_DEPEND}
-"
-DEPEND="virtual/yacc
-	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	>=virtual/jdk-1.6
-	test? ( dev-perl/JSON )
-	${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql
-	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-	${COMMON_DEPEND}
-	>=virtual/jre-1.6
-	perl? ( !dev-db/mytop
-		virtual/perl-Getopt-Long
-		dev-perl/TermReadKey
-		virtual/perl-Term-ANSIColor
-		virtual/perl-Time-HiRes )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		local GCC_MAJOR_SET=$(gcc-major-version)
-		local GCC_MINOR_SET=$(gcc-minor-version)
-		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
-		# non x86{,_64} arches
-		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-			die
-		fi
-	fi
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	# This should come after all of the die statements
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	java-pkg_init
-}
-
-pkg_postinst() {
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Create log directory securely if it does not exist
-	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-	if use server ; then
-		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-			einfo
-			elog "You might want to run:"
-			elog "\"emerge --config =${CATEGORY}/${PF}\""
-			elog "if this is a new install."
-			elog
-			elog "If you are switching server implentations, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		else
-			einfo
-			elog "If you are upgrading major versions, you should run the"
-			elog "mysql_upgrade tool."
-			einfo
-		fi
-
-		einfo
-		elog "Be sure to edit the my.cnf file to activate your cluster settings."
-		elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
-		elog "The first time the cluster is activated, you should add"
-		elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
-		elog "This option should then be removed for subsequent starts."
-		einfo
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# Grab the patches
-	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
-
-	mv -f "${WORKDIR%/}/${MY_PN}-${PV}" "${S}" || die
-}
-
-src_prepare() {
-	_disable_engine() {
-		echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-	}
-
-	_disable_plugin() {
-		echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-	}
-
-	if use tcmalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S%/}/sql/CMakeLists.txt" || die
-	fi
-
-	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
-	if [[ -d "${S}/support-files/SELinux" ]] ; then
-		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-	fi
-
-	local plugin
-	local server_plugins=( semisync )
-	local test_plugins=( audit_null daemon_example fulltext )
-	if ! use server; then # These plugins are for the server
-		for plugin in "${server_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	if ! use test; then # These plugins are only used during testing
-		for plugin in "${test_plugins[@]}" ; do
-			_disable_plugin "${plugin}"
-		done
-	fi
-
-	# Don't build example
-	_disable_engine example
-
-	cmake-utils_src_prepare
-	java-utils-2_src_prepare
-}
-
-src_configure() {
-	# Bug #114895, bug #110149
-	filter-flags "-O" "-O[01]"
-
-	append-cxxflags -felide-constructors
-
-	# bug #283926, with GCC4.4, this is required to get correct behavior.
-	append-flags -fno-strict-aliasing
-
-	CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-	# debug hack wrt #497532
-	mycmakeargs=(
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-		-DINSTALL_BINDIR=bin
-		-DINSTALL_DOCDIR=share/doc/${PF}
-		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
-		-DINSTALL_INCLUDEDIR=include/mysql
-		-DINSTALL_INFODIR=share/info
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DINSTALL_MANDIR=share/man
-		-DINSTALL_MYSQLSHAREDIR=share/mysql
-		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-		-DWITH_EDITLINE=bundled
-		-DWITH_ZLIB=system
-		-DWITH_LIBWRAP=OFF
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		# The build forces this to be defined when cross-compiling.  We pass it
-		# all the time for simplicity and to make sure it is actually correct.
-		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-		-DWITHOUT_CLIENTLIBS=YES
-		-DENABLE_DTRACE=$(usex systemtap)
-		-DWITH_BUNDLED_LIBEVENT=OFF
-	)
-	if use test ; then
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-	else
-		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-	fi
-
-	if ! use yassl ; then
-		mycmakeargs+=( -DWITH_SSL=system )
-	else
-		mycmakeargs+=( -DWITH_SSL=bundled )
-	fi
-
-	if use server ; then
-
-		# Federated must be treated special otherwise they will not be built as plugins
-		if ! use extraengine ; then
-			mycmakeargs+=( -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 )
-		fi
-
-		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
-			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
-			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-			ewarn "You MUST file bugs without these variables set."
-
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-			)
-
-		elif ! use latin1 ; then
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=utf8
-				-DDEFAULT_COLLATION=utf8_general_ci
-			)
-		else
-			mycmakeargs+=(
-				-DDEFAULT_CHARSET=latin1
-				-DDEFAULT_COLLATION=latin1_swedish_ci
-			)
-		fi
-		mycmakeargs+=(
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-DWITH_EMBEDDED_SERVER=OFF
-			-DWITHOUT_VALIDATE_PASSWORD=1
-			-DWITH_NUMA=$(usex numa ON OFF)
-		)
-
-		if use profiling ; then
-			# Setting to OFF doesn't work: Once set, profiling options will be added
-			# to `mysqld --help` output via sql/sys_vars.cc causing
-			# "main.mysqld--help-notwin" test to fail
-			mycmakeargs+=( -DENABLED_PROFILING=ON )
-		fi
-
-		if use static; then
-			mycmakeargs+=( -DWITH_PIC=1 )
-		fi
-
-		# Storage engines
-		mycmakeargs+=(
-			-DWITH_ARCHIVE_STORAGE_ENGINE=1
-			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-			-DWITH_CSV_STORAGE_ENGINE=1
-			-DWITH_HEAP_STORAGE_ENGINE=1
-			-DWITH_INNOBASE_STORAGE_ENGINE=1
-			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
-			-DWITH_MYISAM_STORAGE_ENGINE=1
-			-DWITH_PARTITION_STORAGE_ENGINE=1
-			-DWITH_NDBCLUSTER=1
-		)
-
-	else
-		mycmakeargs+=(
-			-DWITHOUT_SERVER=1
-			-DEXTRA_CHARSETS=none
-			-DINSTALL_SQLBENCHDIR=
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
-	if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
-		rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
-	fi
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	# Convenience links
-	einfo "Making Convenience links for mysqlcheck multi-call binary"
-	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-	if [[ -d "${ED%/}/usr/data" ]] ; then
-		rm -Rf "${ED%/}/usr/data" || die
-	fi
-
-	# Unless they explicitly specific USE=test, then do not install the
-	# testsuite. It DOES have a use to be installed, esp. when you want to do a
-	# validation of your database configuration after tuning it.
-	if ! use test ; then
-		rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
-	fi
-
-	# Configuration stuff
-	einfo "Building default configuration ..."
-	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-	[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
-	local mycnf_src="my.cnf-5.6"
-	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-		"${FILESDIR%/}/${mycnf_src}" \
-		> "${TMPDIR%/}/my.cnf.ok" || die
-	use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
-	if use latin1 ; then
-		sed -i \
-			-e "/character-set/s|utf8|latin1|g" \
-			"${TMPDIR%/}/my.cnf.ok" || die
-	fi
-	eprefixify "${TMPDIR%/}/my.cnf.ok"
-	newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-	if use server ; then
-		einfo "Including support files and sample configurations"
-		docinto "support-files"
-		local script
-		for script in \
-			"${S%/}"/support-files/magic \
-			"${S%/}"/support-files/ndb-config-2-node.ini
-		do
-			[[ -f "$script" ]] && dodoc "${script}"
-		done
-
-		docinto "scripts"
-		for script in "${S%/}"/scripts/mysql* ; do
-			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
-		done
-	fi
-
-	#Remove mytop if perl is not selected
-	[[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED%/}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	_disable_test() {
-		local rawtestname reason
-		rawtestname="${1}" ; shift
-		reason="${@}"
-		ewarn "test '${rawtestname}' disabled: '${reason}'"
-		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-	}
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might run out of order
-	mkdir -p "${T}"/var-tests{,/log} || die
-
-	# Run mysql tests
-	pushd "${TESTDIR}" > /dev/null || die
-
-	touch "${T}/disabled.def"
-	# These are failing in MySQL 5.5 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in main.mysql_client_test \
-				binlog.binlog_statement_insert_delayed main.information_schema \
-				main.mysqld--help-notwin main.flush_read_lock_kill \
-				sys_vars.plugin_dir_basic main.openssl_1 \
-				binlog.binlog_mysqlbinlog_filter \
-				perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-				funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
-				main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-			_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	for t in \
-		ndb.ndbinfo ndb.ndb_tools_connect \
-		ndb_binlog.ndb_binlog_index ; do
-			_disable_test  "$t" "False positives in Gentoo (NDB) (Latin1/UTF8)"
-	done
-
-	_disable_test main.mysqldump "Extra expected warning not recorded in test results"
-
-	if ! use client-libs ; then
-		_disable_test main.plugin_auth "Needs client libraries built"
-	fi
-
-	# Set file limits higher so tests run
-	ulimit -n 3000
-
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
-	retstatus_tests=$?
-
-	popd > /dev/null || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	local failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	[[ -z "$failures" ]] || die "Test failures: $failures"
-	einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-	if [[ -z "${MY_DATADIR}" ]] ; then
-		MY_DATADIR=""
-		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-			MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-			if [[ -z "${MY_DATADIR}" ]] ; then
-				MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
-				| sed -e 's/.*=\s*//' \
-				| tail -n1`
-			fi
-		fi
-		if [[ -z "${MY_DATADIR}" ]] ; then
-			MY_DATADIR="${MY_LOCALSTATEDIR}"
-			einfo "Using default MY_DATADIR"
-		fi
-		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-			if [[ -e "${MY_DATADIR}" ]] ; then
-				# If you get this and you're wondering about it, see bug #207636
-				elog "MySQL datadir found in ${MY_DATADIR}"
-				elog "A new one will not be created."
-				PREVIOUS_DATADIR="yes"
-			else
-				PREVIOUS_DATADIR="no"
-			fi
-			export PREVIOUS_DATADIR
-		fi
-	else
-		if [[ ${EBUILD_PHASE} == "config" ]]; then
-			local new_MY_DATADIR
-			new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-				| sed -ne '/datadir/s|^--datadir=||p' \
-				| tail -n1`
-
-			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-				ewarn "MySQL MY_DATADIR has changed"
-				ewarn "from ${MY_DATADIR}"
-				ewarn "to ${new_MY_DATADIR}"
-				MY_DATADIR="${new_MY_DATADIR}"
-			fi
-		fi
-	fi
-
-	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_DATADIR
-}
-
-pkg_config() {
-	_getoptval() {
-		local mypd="${EROOT}"/usr/bin/my_print_defaults
-		local section="$1"
-		local flag="--${2}="
-		local extra_options="${3}"
-		"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-	}
-	local old_MY_DATADIR="${MY_DATADIR}"
-	local old_HOME="${HOME}"
-	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
-
-	# Make sure the vars are correctly initialized
-	mysql_init_vars
-
-	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-		die "Minimal builds do NOT include the MySQL server"
-	fi
-
-	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
-				ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
-			else
-				elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-				mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-				|| die "Moving MY_DATADIR failed"
-			fi
-		else
-			ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
-			if [[ -d "${MY_DATADIR_s}" ]]; then
-				ewarn "Attempting to use ${MY_DATADIR_s}"
-			else
-				eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
-				die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
-			fi
-		fi
-	fi
-
-	local pwd1="a"
-	local pwd2="b"
-	local maxtry=15
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-		local tmp_mysqld_password_source=
-
-		for tmp_mysqld_password_source in mysql client; do
-			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
-			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
-					MYSQL_ROOT_PASSWORD=
-					continue
-				fi
-
-				einfo "Found password in '${tmp_mysqld_password_source}' section!"
-				break
-			fi
-		done
-
-		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
-		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
-		fi
-
-		unset tmp_mysqld_password_source
-	fi
-	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
-	# These are dir+prefix
-	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
-	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
-	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-	fi
-	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-	fi
-	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-	fi
-
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
-		ewarn "Please rename or delete it if you wish to replace it."
-		die "MySQL database already exists!"
-	fi
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-		einfo "Please provide a password for the mysql 'root' user now"
-		einfo "or through the ${HOME}/.my.cnf file."
-		ewarn "Avoid [\"'\\_%] characters in the password"
-		read -rsp "    >" pwd1 ; echo
-
-		einfo "Retype the password"
-		read -rsp "    >" pwd2 ; echo
-
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
-		MYSQL_ROOT_PASSWORD="${pwd1}"
-		unset pwd1 pwd2
-	fi
-
-	local options
-	local sqltmp="$(emktemp)"
-
-	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
-	# see http://bugs.mysql.com/bug.php?id=31312
-	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
-		federated ssl log-bin relay-log slow-query-log external-locking \
-		log-slave-updates \
-		; do
-		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-		egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
-	done
-
-	einfo "Creating the mysql database and setting proper permissions on it ..."
-
-	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
-	if [[ ! -d "${PID_DIR}" ]]; then
-		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
-	fi
-
-	if [[ ! -d "${MY_DATADIR}" ]]; then
-		install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
-	fi
-
-	pushd "${TMPDIR}" &>/dev/null || die
-
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
-
-	local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-	[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-	einfo "Command: ${cmd[*]}"
-	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
-	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-	fi
-	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-	|| die "MySQL databases not installed"
-
-	use prefix || options="${options} --user=mysql"
-
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
-		${options} \
-		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
-		--max_allowed_packet=8M \
-		--net_buffer_length=16K \
-		--socket=${socket} \
-		--pid-file=${pidfile} \
-		--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-	#einfo "About to start mysqld: ${mysqld}"
-	ebegin "Starting mysqld"
-	einfo "Command ${mysqld}"
-	${mysqld} &
-	rc=$?
-	while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-		maxtry=$((${maxtry}-1))
-		echo -n "."
-		sleep 1
-	done
-	eend $rc
-
-	if ! [[ -S "${socket}" ]]; then
-		die "Completely failed to start up mysqld with: ${mysqld}"
-	fi
-
-	ebegin "Setting root password"
-	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
-		"--socket=${socket}" \
-		-hlocalhost \
-		-e "${sql}"
-	eend $?
-
-	if [[ -n "${sqltmp}" ]] ; then
-		ebegin "Loading \"zoneinfo\", this step may require a few seconds"
-		"${EROOT}/usr/bin/mysql" \
-			"--socket=${socket}" \
-			-hlocalhost \
-			-uroot \
-			--password="${MYSQL_ROOT_PASSWORD}" \
-			mysql < "${sqltmp}"
-		rc=$?
-		eend $?
-		[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-	fi
-
-	# Stop the server and cleanup
-	einfo "Stopping the server ..."
-	kill $(< "${pidfile}" )
-	rm -f "${sqltmp}"
-	wait %1
-	einfo "Done"
-}
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index e015dff8e73e..4de20e9f147e 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -4,10 +4,10 @@ AUX init.d-s6-2.3 4980 BLAKE2B b165f6a87cc3570ef6aa28d82dedbd0bc5e151c73e7a97bca
 AUX init.d-supervise-2.3 5331 BLAKE2B 764fe71adaf1514d57739d03b75f86b227d1cfefef88d74473626722dbebb51e2f3757bc0c4ef1ed8c52e9f3c9fab930c5f7855862642f87dde86b8dfd4051e8 SHA512 1932c1fdb73e9b5c30b1424399bac330bb0825163a5cad2388fe0efe03ccb350c5c53586d277e30ba62d01ac729598f33552b255adc5714b9cb299e22c456d72
 AUX log-s6 373 BLAKE2B e4579d7288c7e05c1abba55c29759eb3b0b49153c7b134e28b7308ba83e33c409d82ddc2e9794d0a398330b5b72ac33d165c6140259857ce3204928b20c2f6ac SHA512 e686bc0a4d9d5daf263c5a5f6bb883da1495feb9910f93c791af2d858b2adbf7cfc785c336ce470609f3f7bd12dabb97b470453bd67316feef5ed4df9ee9307d
 AUX logrotate.mysql-2.3 453 BLAKE2B 80f1d78ff5531443c1038abeac2ae8b1177e12b069f83e62e1844b08584bcb64e1b8c31bbf2399e6f9a9dbdf52599ee76de0cbe299a11aadf38bfc5b8f9d1b90 SHA512 b45773ccc270e4c6689751e008f6fa03c5de5963b7f2347ecb9975400e865120c8ac1362ca7b4920516b2da87748b86e4810dce0760b0e48c029df4a2f590348
-AUX mysql.conf 37 BLAKE2B 66f792ee51ca18e692e069a2627dd3a122dadbd0cf9097857da049ade3cc21fdc45bd7725c68def448a2763e5688ade468c17f53776b780be6f6d2a0245b1b7c SHA512 7b4940666d21f09fda47e2b24bd252c83af4372f34f1b3410c59d8f439fb7c0166d5a1b8d857bf67f2263f15d95a0fa0b67f225152a18c180b67d28f4ceb5f00
+AUX mysql.conf-r1 33 BLAKE2B 62a01dd872d73abe6fe705c5b2771bbd1c1ffcac69b06ee783c84fb34cc806d831688a8ef69ea8671528db9096e87abdc9b37e6cf52a7b5abffee9e6b5bc9ed4 SHA512 04e7a1b4b1007d8c0a15285408834bf6a9b59fbce55e34fbc52857a90091c0b67c89d032e0ae8a6f990e726bad5a7f53106dff7ba41e09e5ba2ff343d00e486f
 AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8536f0dbdc1ca3d149076ee71a373efc0cfa3ca900e87c8ccb91aa0beeb10bf8634553ddc3309ba3b2c9 SHA512 2016ea7d9c8fe9447675ec9612655f1b955a3f04ce417ebb1c7a8a86a29ef176a5737a9bd3bc5e45508e2e23a764a763897881b511f65635193291e212fd58aa
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.3-r3.ebuild 2040 BLAKE2B bf08d909328662fd985f61e7d0a86569f02940048ca7e170eca76240fca60326aa7f3690f9bd0d8c94352e230d64855cc63ccbe983669a2fbc2ceb0335ab52de SHA512 0bedf30c9cf2860600f945de998e3edaf2d6a59fc659de07c65d10a44a299305a2fd99e87991055ba125af516ce31251229d570f772ad29b5743890e4ab7ea76
+EBUILD mysql-init-scripts-2.3-r4.ebuild 2057 BLAKE2B cbc3cdf3698419ebf0e8a10cc0734a904c8812f501b3911bacdf054791e15e1286d51515a13fbf4a38390a00336f48f5610fefbd9d959eb8f27a418716cbc6ad SHA512 5352471b11759e27b9e7d8455ede7f64f70951a91ed5ce6a0ffff33d54a3a80e2d9074f73464292afdac00abfa3a295a455bdb7a5b2d3a62ad2708497b10f4aa
 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
diff --git a/dev-db/mysql-init-scripts/files/mysql.conf b/dev-db/mysql-init-scripts/files/mysql.conf
deleted file mode 100644
index 74cd5f836e76..000000000000
--- a/dev-db/mysql-init-scripts/files/mysql.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
diff --git a/dev-db/mysql-init-scripts/files/mysql.conf-r1 b/dev-db/mysql-init-scripts/files/mysql.conf-r1
new file mode 100644
index 000000000000..6883dc798881
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/mysql.conf-r1
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
index 34fe271b9756..889e84ccfc61 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_install() {
 	doexe "${FILESDIR}"/mysqld-wait-ready
 	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
 	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	dotmpfiles "${FILESDIR}/mysql.conf"
+	newtmpfiles "${FILESDIR}/mysql.conf-r1" "mysql.conf"
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index e1297e22dcc3..e3129e90bde4 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -1,5 +1,4 @@
 AUX mysql-super-smack-1.2.destdir.patch 420 BLAKE2B be3b49d142a32f6ed00edbd6085d20f202f1d3061ad2e1463f2ea7be434ae1114bd9b776a03840ae9e4baff209b43a25b089a0e3863181273146e462dfcb3e7c SHA512 9319fb29af0e91bedc969a0c5f02bcac386274aa179af7ef3130b18ac9bfa36a0a422a76e50abb777323cac242283c1b680051689a6269ab7e567b5ae53a216b
-AUX mysql-super-smack-1.3-automake-1.13.patch 7680 BLAKE2B 99a28b7c857575b8e824d0e3f5ae87668a47e1e234315ad3657c5e388051164bcc03cadc9f80d9eac82f2b4f79864a595944a2ec896885b52044264ca3529755 SHA512 b74994f03b136c7642423ee5eb1346134ed127a9ca0996df83ed777f49f9dff3efe93889bc3a375868afec38be20303ffbede98dcfd3b6ec5921f0e417b5a000
 AUX mysql-super-smack-1.3-autotools.patch 6988 BLAKE2B aaf6d8cedd4a01f2f11cd80b953ea6787fa2e218ee452b009e49c1e16b05f3548072f0e65a6eed6effbcb29c65f8d576181b30e7f503242f4b0d835e79020be1 SHA512 9aa29299b945b84e6979c0c9f0184c7e0ffafdcb63ead926b05a11c3f12f6e88b1bd3157e24c6623da26bc5d5d2a5eeb20c0870286db2b4708981c9b3a27c8d3
 AUX mysql-super-smack-1.3-gen-data.patch 2265 BLAKE2B 42f85a5779968d13262ddf3b726d4522912bc29c4d81fce41fe61caeab85c7fa93be5c3497dc21a0acabc67e59446cc941deb6fb98ac2154cf7f84214b500ff6 SHA512 6a08a3ccc158e7c8e0500a8d3231d0b1fc0d0f4a41e2a5bf40426e480c6fc373b0fa7ff5c08b5d40afe559a34b97fd00412c43fe9212047f2c4d063b98ac2154
 AUX mysql-super-smack-1.3.amd64.patch 702 BLAKE2B e986f6c487d05c9de0ee3f3a397a2c63d21c05209efc48e8fa173975b88839baa6100150d0cdd6df42b7435cc8a411b5235cf92a586850ae3d57cb564a8b95a8 SHA512 5ac9c130534d5cea6caa70f6373850181ae81c68c1eb3cb9e7a774bdeeafdf822582fe9cb548b9eb1268a2b4edc516461b95238454abefcdd25677066d720da9
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch
deleted file mode 100644
index 6cf69580b887..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-automake-1.13.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-diff -aurwN a/configure.ac b/configure.ac
---- a/configure.ac	2014-06-20 14:43:52.744753334 -0400
-+++ b/configure.ac	2014-06-20 14:59:51.263609319 -0400
-@@ -16,9 +16,9 @@
- 
- # Process this file with autoconf to produce a configure script.
- 
--AC_INIT()
-+AC_INIT([super-smack], [1.1])
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(super-smack, 1.1)
-+AM_INIT_AUTOMAKE
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
- 
- # Checks for programs.
-@@ -31,6 +31,14 @@
- AM_PROG_LEX
- AC_PROG_YACC
- 
-+AH_TEMPLATE([HAVE_CRYPT], [Define if we have a crypt()])
-+AH_TEMPLATE([HAVE_MYSQL], [MySQL Support])
-+AH_TEMPLATE([HAVE_ORACLE], [PostgreSQL Support])
-+AH_TEMPLATE([HAVE_PGSQL], [Oracle Support])
-+AH_TEMPLATE([SMACK_DATADIR], [Sample .smack data files])
-+
-+AC_CONFIG_MACRO_DIRS([m4])
-+
- # get super-smack datadir
- AC_ARG_WITH(datadir,
- [  --with-datadir=DIR      Specify default smack datadir],
-diff -aurwN a/m4/crypt.m4 b/m4/crypt.m4
---- a/m4/crypt.m4	1969-12-31 19:00:00.000000000 -0500
-+++ b/m4/crypt.m4	2014-06-20 15:06:42.289976907 -0400
-@@ -0,0 +1,5 @@
-+AC_DEFUN([AC_FUNC_CRYPT], [
-+    AC_CHECK_LIB(crypt, crypt)
-+    AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
-+])
-+
-diff -aruwN a/m4/lex.m4 b/m4/lex.m4
---- a/m4/lex.m4 	1969-12-31 19:00:00.000000000 -0500
-+++ b/m4/lex.m4 	2014-06-20 16:51:23.548854098 -0400
-@@ -0,0 +1,6 @@
-+AC_DEFUN([AM_PROG_LEX],
-+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
-+AC_PROG_LEX
-+AC_DECL_YYTEXT])
-+
-diff -aurwN a/m4/libz.m4 b/m4/libz.m4
---- a/m4/libz.m4	1969-12-31 19:00:00.000000000 -0500
-+++ b/m4/libz.m4	2014-06-20 15:06:24.260569878 -0400
-@@ -0,0 +1,4 @@
-+AC_DEFUN([AC_LIB_Z], [
-+    AC_CHECK_LIB(z, compress)
-+])
-+
-diff -aurwN a/m4/mysql.m4 b/m4/mysql.m4
---- a/m4/mysql.m4	1969-12-31 19:00:00.000000000 -0500
-+++ b/m4/mysql.m4	2014-06-20 15:10:48.291892456 -0400
-@@ -0,0 +1,76 @@
-+#serial 1
-+AC_DEFUN([AC_LIB_MYSQL], [
-+    AC_ARG_WITH(mysql-lib,
-+    [  --with-mysql-lib=DIR    Look for MySQL client library in DIR],
-+    mysql_lib=$withval, mysql_lib="")
-+
-+    if test "x$want_mysql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for libmysqlclient])
-+        AC_MSG_RESULT()
-+
-+        mysql_ok=no
-+
-+        SAVE_LIBS=$LIBS
-+
-+        mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \
-+                   /usr/local/lib /usr/local/lib/mysql \
-+                   /usr/local/mysql/lib"
-+
-+        for dir in $mysql_lib; do
-+            if test "x$mysql_found" != "xyes"
-+            then
-+                if test -f "$dir/libmysqlclient.so" ;
-+                then
-+                    LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
-+                    MYSQL_LIB="-L$dir -lmysqlclient $LIBZ_LIB"
-+                    AC_SUBST(MYSQL_LIB)
-+                    AC_CHECK_LIB(mysqlclient, mysql_real_connect,
-+                                 mysql_ok=yes, mysql_ok=no)
-+                fi
-+            fi
-+        done
-+
-+        if test "x$mysql_ok" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib'])
-+        fi
-+    fi
-+])
-+
-+AC_DEFUN([AC_HEADER_MYSQL], [
-+    AC_ARG_WITH(mysql-include,
-+    [  --with-mysql-include=DIR
-+                          Look for MySQL include files in DIR],
-+    mysql_include=$withval, mysql_include="")
-+
-+    if test "x$want_mysql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for mysql.h])
-+        AC_MSG_RESULT()
-+
-+        mysql_found=no
-+
-+        mysql_include="$mysql_include /usr/include /usr/include/mysql \
-+                       /usr/local/include /usr/local/include/mysql \
-+                       /usr/local/mysql/include"
-+
-+        for dir in $mysql_include; do
-+            if test "x$mysql_found" != "xyes"
-+            then
-+                if test -f "$dir/mysql.h"
-+                then
-+                    MYSQL_INCLUDE="-I$dir"
-+                    AC_SUBST(MYSQL_INCLUDE)
-+                    mysql_found=yes
-+                fi
-+            fi
-+        done
-+
-+        if test "x$mysql_found" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find mysql.h in '$mysql_include'])
-+        fi
-+    fi
-+])
-+
-diff -aurwN a/m4/oracle.m4 b/m4/oracle.m4
---- a/m4/oracle.m4	1969-12-31 19:00:00.000000000 -0500
-+++ b/m4/oracle.m4	2014-06-20 15:05:05.543169365 -0400
-@@ -0,0 +1,10 @@
-+AC_DEFUN([AC_LIB_ORACLE], [
-+    ORACLE_LIB=""
-+    AC_SUBST(ORACLE_LIB)
-+])
-+
-+AC_DEFUN([AC_HEADER_ORACLE], [
-+    ORACLE_INCLUDE=""
-+    AC_SUBST(ORACLE_INCLUDE)
-+])
-+
-diff -aurwN a/m4/postgresql.m4 b/m4/postgresql.m4
---- a/m4/postgresql.m4	1969-12-31 19:00:00.000000000 -0500
-+++ b/m4/postgresql.m4	2014-06-20 15:06:09.311064874 -0400
-@@ -0,0 +1,75 @@
-+AC_DEFUN([AC_LIB_PGSQL], [
-+    AC_ARG_WITH(pgsql-lib,
-+    [  --with-pgsql-lib=DIR    Look for PostgreSQL client library in DIR],
-+    pgsql_lib=$withval, pgsql_lib="")
-+
-+    if test "x$want_pgsql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for libpq])
-+        AC_MSG_RESULT()
-+
-+        pgsql_ok=no
-+
-+        SAVE_LIBS=$LIBS
-+
-+        pgsql_lib="$pgsql_lib /usr/lib /usr/lib/pgsql \
-+                   /usr/local/lib /usr/local/lib/pgsql \
-+                   /usr/local/pgsql/lib"
-+
-+        for dir in $pgsql_lib; do
-+            if test "x$pgsql_found" != "xyes"
-+            then
-+                if test -f "$dir/libpq.so"
-+                then
-+                    LIBS="-L$dir $SAVE_LIBS"
-+                    PGSQL_LIB="-L$dir -lpq"
-+                    AC_SUBST(PGSQL_LIB)
-+                    AC_CHECK_LIB(pq, PQconnectdb,
-+                                 pgsql_ok=yes, pgsql_ok=no)
-+                fi
-+            fi
-+        done
-+
-+        if test "x$pgsql_ok" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libpq in '$pgsql_lib'])
-+        fi
-+    fi
-+])
-+
-+AC_DEFUN([AC_HEADER_PGSQL], [
-+    AC_ARG_WITH(pgsql-include,
-+    [  --with-pgsql-include=DIR
-+                          Look for PostgreSQL include files in DIR],
-+    pgsql_include=$withval, pgsql_include="")
-+
-+    if test "x$want_pgsql" = "xyes"
-+    then
-+        AC_MSG_CHECKING([for libpq-fe.h])
-+        AC_MSG_RESULT()
-+
-+        pgsql_found=no
-+
-+        pgsql_include="$pgsql_include /usr/include /usr/include/pgsql \
-+                       /usr/local/include /usr/local/include/pgsql \
-+                       /usr/local/pgsql/include"
-+
-+        for dir in $pgsql_include; do
-+            if test "x$pgsql_found" != "xyes"
-+            then
-+                if test -f "$dir/libpq-fe.h"
-+                then
-+                    PGSQL_INCLUDE="-I$dir"
-+                    AC_SUBST(PGSQL_INCLUDE)
-+                    pgsql_found=yes
-+                fi
-+            fi
-+        done
-+
-+        if test "x$pgsql_found" != "xyes"
-+        then
-+            AC_MSG_ERROR([Could not find libpq-fe.h in '$pgsql_include'])
-+        fi
-+    fi
-+])
-+
-diff -aurwN a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am	2014-06-20 14:37:35.266956252 -0400
-+++ b/src/Makefile.am	2014-06-20 15:12:40.278227315 -0400
-@@ -16,7 +16,8 @@
- 
- # Process this file with automake to create Makefile.in
- 
--INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-+AM_CPPFLAGS = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-+BUILT_SOURCES = super-smack-yacc.hh
- 
- noinst_PROGRAMS=test-dictionary test-client test_tcp_client
- bin_PROGRAMS=super-smack super-smack-gen-data
-diff -aurN a/src/super-smack-lex.ll b/src/super-smack-lex.ll
---- a/src/super-smack-lex.ll	2003-05-14 21:08:34.000000000 -0400
-+++ b/src/super-smack-lex.ll	2014-06-24 08:56:05.970614176 -0400
-@@ -6,7 +6,7 @@
-   #include <ctype.h>
-   #include "query.h"
-   #include "parse.h"
--  #include "super-smack-yacc.h"
-+  #include "super-smack-yacc.hh"
- 
-   static string q_str = "";
- %}
-
diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index 7b8a275f3ef7..0433c88c1978 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -1,3 +1,5 @@
 DIST mysqltuner-1.7.21.tar.gz 223961 BLAKE2B 1307afc2a73b40330817fe0c0b834a537b14caed1125acbdc5a03e98787321ffbbfb84ba0a2077adb0fa49c0e2df947dc0062d2218866c689fbfd903776f7fbd SHA512 2b5d8a7cc3f0ebe3a481cd77e395ead37ec037f0a9b9649bbf450215bc83f4049a297d86b171c7e2e7d51b3fbe381069310f13d3b8152f5a90e05a9efbabd4dc
+DIST mysqltuner-1.8.3.tar.gz 254525 BLAKE2B 7fa1fe24ab454aa15a03e62410e08988a4a0d3ac9b1e4df0219a67bffa4d6113d8c89d6f93f8e6d08a35ecc4bdbf5c0148d8e53138f05a5c22899ecca98b3614 SHA512 965ad0204cb449aa113bf1880a91468d48467c84e7d42ac8f12e7ee4035e49dc7cb191d2b11b6e5b084a60c3857e92ac4d1bef63f688538f3468fda32304a702
 EBUILD mysqltuner-1.7.21-r1.ebuild 821 BLAKE2B 23679c3e3999c1777ef031cdac553a9dadb9f45ce1075abc6df428defab1880733cfe81a86db899f164381ed4497f9986f925720c8abe842bc4eac5ad32c668c SHA512 3e1adaa4d1bca9a226b57f89802cff6df449e0d5e9e59dc84b52b245140a7bbfe21da0c0db5f4bae2137eaf94f2734b44caab39faa15c1707d2c511cca7f09ea
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD mysqltuner-1.8.3.ebuild 848 BLAKE2B 7d9bef55a27e20bccfe21f8c2b90cb14f911c639bd85b55049b3b57f01004c2fe85054f5146015a3ab8608d2cf48f3ae3e5704f486264f9b1d52b139d88f5e56 SHA512 677e206f50c918a83538704b66c5c44b97c76955cbd3e6dff270f8662fca9ee303d0b0af539a04eca72fdf47f2eefe16e0b18c4f23686d9ff224047511dd3a05
+MISC metadata.xml 607 BLAKE2B 51f3f5075cefa6184953d66ab4267463138fb02ae96f461f61eadbac9f49bba644f8ed4f293a49d4f56cdd361975a713b8ee08456874fee2a694d75cb99f3b7a SHA512 bf276a0a678188581b493b791771ad4c5508371b9db2a6dbcaf1afa401b7959179bdaaeea7c33c42ec4733fb78093009e5459a06de799bbbecc85150434a3397
diff --git a/dev-db/mysqltuner/metadata.xml b/dev-db/mysqltuner/metadata.xml
index 115e9d64a669..070d028f5266 100644
--- a/dev-db/mysqltuner/metadata.xml
+++ b/dev-db/mysqltuner/metadata.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		MySQLTuner is a script written in Perl that will assist
+		you with your MySQL configuration and make recommendations
+		for increased performance and stability.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/major/MySQLTuner-perl/issues</bugs-to>
+		<remote-id type="github">major/MySQLTuner-perl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/mysqltuner/mysqltuner-1.8.3.ebuild b/dev-db/mysqltuner/mysqltuner-1.8.3.ebuild
new file mode 100644
index 000000000000..77500787a893
--- /dev/null
+++ b/dev-db/mysqltuner/mysqltuner-1.8.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="MySQLTuner-perl"
+
+DESCRIPTION="Makes recommendations for increased performance and stability for MySQL"
+HOMEPAGE="https://github.com/major/MySQLTuner-perl"
+SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/perl-Getopt-Long
+"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	newbin mysqltuner.pl mysqltuner
+	dodoc {CONTRIBUTING,INTERNALS,USAGE}.md
+	einstalldocs
+
+	# Passwords and vulnerabilities are meant to be fed to the script uncompressed.
+	dodoc basic_passwords.txt vulnerabilities.csv
+	docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv"
+}
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index 7ac86aba060a..50545059fe82 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -1,5 +1,3 @@
-DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
 DIST sqlcipher-4.5.1.tar.gz 18132121 BLAKE2B 233ffbd9636eae78533553325f08fa3ceb1e01ce0d809be44ca8ed64d46478d6a70dd40f81c38a1f0524986932ebe8614e52fda9dfc1c2f20134692cac7d4b16 SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3
-EBUILD sqlcipher-4.0.1.ebuild 1581 BLAKE2B 032a1f9743e926ac051241b27c24e762b7e7360aab7eef8f9f137a838f9ff4142eacae709adec0ed37d8b0ddc37a0dbd1556cb88dfba4491938a4d1ddb1a2e8c SHA512 c1ea4418e572a28e240a41e7649ffd84418d50c5943f4c49a8097fe5e7e52cfd25f56827bcaa932695fa800efcc5fd3ee927720247747811296c2991fce14c78
-EBUILD sqlcipher-4.5.1.ebuild 1583 BLAKE2B 14f83d16acd21dfc42de299afe5c97e780947f23156d74e04a402b802f02785d11ffe82328b9e4467595c2c6f78444719f3fad4316af4bb304fa54585632c743 SHA512 2b73dc38db811c2bcffb0f43aea883574a75120c695c57727a881124912b4c9f7670fd755d93d23acfb452cd9be67ee812a97797b128f23f89a63bbee7acad48
+EBUILD sqlcipher-4.5.1.ebuild 1581 BLAKE2B 54b56fd5fb68e9d860b5c8919df9a3a6cc370fa23dec0ee1722d1092ecee0d53f82dc7e46c1cc1a9d7fe972cd8b96286a81d70d1b4dc367fb0bea134cd5cb2b9 SHA512 ebf9635419ff9e4a4cfebbd4c97d85c97f0523d61144b7f0f199af7b1b4fb61d6325ca695145a37c79fa6b531e25807cf46e9321923e9b86a2bff097cda6ad72
 MISC metadata.xml 342 BLAKE2B 8b5efdecc7c683933b65a9f82c8744d618f1550aa990b3c1d17a63bac32101cb6beba5506d587bd9f96105bb01f4967ffbd1a64255ed183a54749d28892c7e1f SHA512 9d8dd1a27aeba6f0c12a4665887eee68bbe4a5c53a9f8bff8c207e81e06aa9d50bd31177c1eae0b5e89170ee6f10951626bc72b28372dfafbe6271acd393635c
diff --git a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
deleted file mode 100644
index 9751b1c88489..000000000000
--- a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Full Database Encryption for SQLite"
-HOMEPAGE="https://www.zetetic.net/sqlcipher/"
-SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug libedit readline static-libs tcl test"
-
-# Tcl is always needed by buildsystem
-RDEPEND="
-	libedit? ( dev-libs/libedit[${MULTILIB_USEDEP}] )
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/tcl:*"
-
-# Libedit and readline support are mutually exclusive
-# Testsuite requires compilation with TCL, bug #582584
-REQUIRED_USE="
-	libedit? ( !readline )
-	test? ( tcl )
-"
-
-DOCS=( README.md )
-
-# Testsuite fails, bug #692310
-RESTRICT="test"
-
-src_prepare() {
-	# Column metadata added due to bug #670346
-	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-fts3 \
-		--enable-fts4 \
-		--enable-fts5 \
-		--enable-geopoly \
-		--enable-json1 \
-		--enable-memsys5 \
-		--enable-rtree \
-		--enable-session \
-		--enable-tempstore \
-		$(use_enable debug) \
-		$(use_enable libedit editline) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl)
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -type f -delete || die
-	einstalldocs
-}
diff --git a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
index 4d7ee1fefb7f..3e42f15b41c7 100644
--- a/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug libedit readline static-libs tcl test"
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 9b73ae8bb586..266011c035b0 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -7,7 +7,7 @@ DIST sqlite-src-3380000.zip 13236840 BLAKE2B f303e39a9d913994f0756f986de9d316322
 DIST sqlite-src-3380100.zip 13241298 BLAKE2B 9dbccd5942f146da4c40d6208c491473c191752a74ee18ce131f3dea533976732440974e97906aead460daee39c7d6085ffa0f093d8f17e8f64c813bbb2409ad SHA512 df200916789c15e010a8e62dd8257833f34d4cf3496080a72fdc2330a530c193cda055e3c9ed39a404b87c8001c83a4b187491525ca95b5c5a1dbdd2f41cc222
 DIST sqlite-src-3380200.zip 13242285 BLAKE2B a07f895f57c355e2ec1c96fc857b63d774ff52f7e49c22b1c936b260e6e7787ec656059c02cc6d38845c4368507067d86dac493559541fbb914a3da9cbc67cce SHA512 fd457602db4577b31bc6053fd3cceb220337275e3fd26976f4270fb8a7da4fa047ca23dd18e2795cdfd894d05bad4c53954a81391d71507d359fb224995e420a
 EBUILD sqlite-3.37.2.ebuild 12919 BLAKE2B 69decab1fb8d5b9815597b35ac4442d16afa82583431dcba1daa054f7264ed19f4517be3f2c408055ca472d1bb28ed58ea96718bae0ae6888be8158ef892521d SHA512 b06119380784525486934d74c0e9cb0df74197d03959f60ff2d2cbd87d5a30e9fa9e5f08adfed0ae8e3002a3309bcbe9a727f95d71f7e4c19eda6db79f366df8
-EBUILD sqlite-3.38.0.ebuild 12910 BLAKE2B d868b2a683442e7e21b880b38a0250078546ca4196dd9bdbbb19503dbb7bb33c580f81433410005f49059b5cc9f7bbcc8e8b71b941c275eb3e307ad3fbb75b4a SHA512 6e8a3ef4c20027b7fb830e0570616f9ee22df56915863c3a9fd45a5df84ed6e126ac455591c414d0ac395e529818f5817a20dfa39d598b38fb839b156b15b125
+EBUILD sqlite-3.38.0.ebuild 12909 BLAKE2B a0fe292b29b82068f67be79cff09f810cc54023f318f41ba7a566abc66296a862959998b5eebba64e31246a0f7d74d4a8e496b1103039af337f55e86bbb76769 SHA512 42c431a5db67754d82c7be5c43ec9abcc91eaf02f74f24e2650831293379afa8d7da7ac2bbd011208666e355a0c5eda3dcf42cfafc2228d443a7948cde132897
 EBUILD sqlite-3.38.1.ebuild 12915 BLAKE2B 7449d9ff7c77b6b11d66d1586b13fd69933d8545b397b882ee183104dabb89c0e72f815b1f7cd99aaac672294b9e7676e6dbee7c1879614aff98bcb39564140f SHA512 4cc7eb9d9e15c76c56c43e05718cda66a0ef6ecfee3ce74fe14643891e853f45c8e7ec8608b1cc1b19a46569e6842714bb2eccc490e4a4f8a63dc58a7371f789
 EBUILD sqlite-3.38.2.ebuild 13106 BLAKE2B 4d3ed7bd5f18f77afd03108e52d3691072f02b0c81e63e22305580eabb460449dfdd77ac5ccfd5ff3242cffe4afa367a442b4bfae5e221c7c2c58ec9711ff7b1 SHA512 c2958c3e075fd2fb569fd12489d20193b34475cb65828da1037eaeceb9d665e65a11213e4c630eb96fdc9cf5a318d172c3b883989281976c73bbb261cb4d5215
 MISC metadata.xml 771 BLAKE2B 34887e6d8a43fde66998787bfb3ca4bda644918a3a80afc650546547f132a9ff482a955ea5df8dded47a971a317be099bf5d9708a00ab25f00f78b714c3ed521 SHA512 e5955f59348abdee15c7fcaff38c220ab0ad84a717600525686e33a1fb7d29498c5b510d81c87ca49d48d7d11da782cf3840f38f1d4bd0e696fd7166aedeb597
diff --git a/dev-db/sqlite/sqlite-3.38.0.ebuild b/dev-db/sqlite/sqlite-3.38.0.ebuild
index ee0d17cc7e1f..c4d76620eda4 100644
--- a/dev-db/sqlite/sqlite-3.38.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.38.0.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index ef107891edf8..713107535639 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -2,4 +2,4 @@ AUX sqlmap.bash-completion 5757 BLAKE2B f602d99b6b0a30cf405b390eaef355f7a4b4fa42
 DIST sqlmap-1.6.2.tar.gz 7258723 BLAKE2B cc972eda5351683904e4c9d4f7e0ab9c127c22de597397e976060808812032b2041f68ab2d737784e499a20a7ca930167427390ca178269d744ee71738e5c270 SHA512 a3057486f5096fb2a242296b4ceeb1c500246fbd322c3e52f71e72cd91d1c676ca6f7746becf887625e45d0b14443a669410b28bd6a995124a6e8006c4534976
 EBUILD sqlmap-1.6.2.ebuild 1331 BLAKE2B 40fdcfd802252b9a996da8be8a90d45925f1a06099a49d3c0cdd5af232b440003483fbc6e001e706149497ae224723fd2e32fd65953bd14074a7f2a82b8a5785 SHA512 31b004012264cc0a58dcfdc611df346382f1b613a90b08aa2a344a2b87b5025b90c10877c666452e5428f9bc8161bc6c78eb0782542fac0dea2e33686c18cf28
 EBUILD sqlmap-9999.ebuild 1331 BLAKE2B 40fdcfd802252b9a996da8be8a90d45925f1a06099a49d3c0cdd5af232b440003483fbc6e001e706149497ae224723fd2e32fd65953bd14074a7f2a82b8a5785 SHA512 31b004012264cc0a58dcfdc611df346382f1b613a90b08aa2a344a2b87b5025b90c10877c666452e5428f9bc8161bc6c78eb0782542fac0dea2e33686c18cf28
-MISC metadata.xml 670 BLAKE2B 3d8b2779a6d7d2eb3b176d525877e748a1ec418376bf330ee13d7854d035ebdf6050cb081484030cdf4ad85f3478eef3c978b856d064d79ebd5c348dc2187e17 SHA512 2973b4a3ca75b92aa9547eae217eb1035c500d262696c86e09226895d96f1a3f1ac7e7e81e1d09c55615cac9c1beed63bded08f9d17764c330d93dce6a4c0458
+MISC metadata.xml 714 BLAKE2B e1afbf31fcc7a0ed38af080c7b85248b0ca50ac6865252fff3eb8aacafae02380d833e3852601c7a5733d5947ea19818c7db303f49465fea337b4cd6cc373ff2 SHA512 0349fb06cca9483950d5325c4fea54b07c1621ae25296c6a743d235b95eaabf0533eb0396bbf1c72963097eda7b7f8d829a7a675dabd6a8a6ce4a2ab0fc96b16
diff --git a/dev-db/sqlmap/metadata.xml b/dev-db/sqlmap/metadata.xml
index 9be066d6c8f4..d5f5a618a4d0 100644
--- a/dev-db/sqlmap/metadata.xml
+++ b/dev-db/sqlmap/metadata.xml
@@ -16,5 +16,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sqlmapproject/sqlmap</remote-id>
+		<remote-id type="pypi">sqlmap</remote-id>
 	</upstream>
 </pkgmetadata>