gentoo resync : 17.06.2021

16 files changed, 343 insertions, 187 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8b8fef0418a4..96273a135587 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index a642518b44c9..21d1e8f50548 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -7,4 +7,5 @@ AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501
 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c
 DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442
 EBUILD hsqldb-1.8.1.3-r2.ebuild 5503 BLAKE2B f60641d2e1803e463cd2847c6a71aba983b96d47e55c864f7370829df797ad41aa6b22eaf28ae6c722b42703a0eef1383d005d97578047b5a5803981d0ca5606 SHA512 8006dfcc2160aaf0d7f3d01ee872ec61d3842d3208c0d265d27aa245fde3460ab3e98970d14893e8e21f3b23962311b28d3a8e539f7752eb52a3636d93174f85
+EBUILD hsqldb-1.8.1.3-r3.ebuild 5448 BLAKE2B 8b24ebff172a348b70cdbd7475c2002e0fae42ec4e5ca17125204c2a1252e25f89c0d2d92265ad840900824d6d3b78ee116ea65ed88e7d3224ad2411ccea5a13 SHA512 8f9217c4d821ce994070e119389fc00f56caa00e0e4ca048fc035f516ba4da7afdf9b520570858caf378332d16d29b03483a3a302da1df47b6b958c4c339fbdf
 MISC metadata.xml 312 BLAKE2B 175d7bb3c54ffcc616117749062b16130ca8cf394ffd780991bd8bd5a21509527e2844cd4f1aaeba70b498274131d786b9a16d48d5ee8dca176e949e334093a6 SHA512 2b9fff35bd58701cd4992ddc02f6bc7a2027d90616a5b886ef352ad6c6781949a68478bb17bbc22382189ec73ddd1798f67c27941323cb0b727dfead38c7f975
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
new file mode 100644
index 000000000000..52c9e1b3c181
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=$(ver_rs 1- '_')
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="The leading SQL relational database engine written in Java"
+HOMEPAGE="http://hsqldb.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="
+	acct-group/hsqldb
+	acct-user/hsqldb
+	dev-java/tomcat-servlet-api:4.0"
+RDEPEND="${CDEPEND}
+	virtual/jre:1.8"
+DEPEND="${CDEPEND}
+	virtual/jdk:1.8
+	test? ( dev-java/junit:0 )"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}/resolve-config-softlinks.patch"
+	"${FILESDIR}/${P}-java7.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+HSQLDB_HOME=/var/lib/hsqldb
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	rm -v lib/*.jar || die
+
+	sed -i -r \
+		-e "s#/etc/sysconfig#${EPREFIX}/etc/conf.d#g" \
+		bin/hsqldb || die
+
+	java-pkg_filter-compiler jikes
+
+	eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
+
+	mkdir conf
+	sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${EPREFIX//\//\\/}${HSQLDB_JAR//\//\\/}/g" \
+		-e "s/^SERVER_HOME=.*$/SERVER_HOME=${EPREFIX//\//\\/}\/var\/lib\/hsqldb/g" \
+		-e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
+		-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
+		src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
+	cp "${FILESDIR}/server.properties" conf/ || die
+	cp "${FILESDIR}/sqltool.rc" conf/ || die
+
+	# Missing source file - needed for tests
+	# https://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/trunk/src/org/hsqldb/lib/StringComparator.java
+	# https://sourceforge.net/p/hsqldb/bugs/815/
+	cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
+	cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+# EANT_BUILD_XML used also in src_prepare
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
+EANT_DOC_TARGET="javadocdev"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-4.0"
+
+src_test() {
+	java-pkg_jar-from --into lib junit
+	eant -f ${EANT_BUILD_XML} jartest
+	cd testrun/hsqldb || die
+	./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
+	# TODO. These fail. Investigate why.
+	#cd "${S}/testrun/sqltool" || die
+	#CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
+}
+
+src_install() {
+	java-pkg_dojar lib/hsql*.jar
+
+	if use doc; then
+		dodoc doc/*.txt
+		docinto html
+		dodoc -r doc/{src,zaurus}
+	fi
+	use source && java-pkg_dosrc src/*
+
+	echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
+	doenvd "${T}"/35hsqldb
+
+	# Put init, configuration and authorization files in /etc
+	doinitd "${FILESDIR}/hsqldb"
+	doconfd conf/hsqldb
+#	dodir /etc/hsqldb
+	insinto /etc/hsqldb
+	# Change the ownership of server.properties and sqltool.rc
+	# files to hsqldb:hsqldb. (resolves Bug #111963)
+	use prefix || insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/server.properties
+	use prefix || insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc
+
+	# Install init script
+	dodir "${HSQLDB_HOME}/bin"
+	keepdir "${HSQLDB_HOME}"
+	exeinto "${HSQLDB_HOME}/bin"
+	doexe bin/hsqldb
+
+	# Make sure that files have correct permissions
+	use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}"
+	chmod o-rwx "${ED}${HSQLDB_HOME}"
+
+	# Create symlinks to authorization files in the server home dir
+	# (required by the hqldb init script)
+	insinto "${HSQLDB_HOME}"
+	dosym ../../../etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
+	dosym ../../../etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
+}
+
+pkg_postinst() {
+	ewarn "If you intend to run Hsqldb in Server mode and you want to create"
+	ewarn "additional databases, remember to put correct information in both"
+	ewarn "'server.properties' and 'sqltool.rc' files."
+	ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
+	ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
+	echo
+	elog "Example:"
+	echo
+	elog "${EPREFIX}/etc/hsqldb/server.properties"
+	elog "============================="
+	elog "server.database.1=file:xdb/xdb"
+	elog "server.dbname.1=xdb"
+	elog "server.urlid.1=xdb"
+	elog
+	elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
+	elog "======================"
+	elog "urlid xdb"
+	elog "url jdbc:hsqldb:hsql://localhost/xdb"
+	elog "username sa"
+	elog "password "
+	echo
+	elog "Also note that each hsqldb server can serve only up to 10"
+	elog "different databases simultaneously (with consecutive {0-9}"
+	elog "suffixes in the 'server.properties' file)."
+	echo
+	ewarn "For data manipulation use:"
+	ewarn
+	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+	ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+	ewarn "  --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc <dbname>"
+	echo
+	elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
+	elog "and Using Hsqldb' in the Hsqldb docs at:"
+	elog "  http://hsqldb.org/web/hsqlDocsFrame.html"
+	elog "If you intend to run it in the Server mode, it is suggested to add the"
+	elog "init script to your start-up scripts, this should be done like this:"
+	elog "  \`rc-update add hsqldb default\`"
+	echo
+}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2166d262466c..464e979e94b2 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -42,16 +42,16 @@ EBUILD mariadb-10.2.34.ebuild 33748 BLAKE2B 4dee3db71121d7def075565402634c367f9f
 EBUILD mariadb-10.2.35.ebuild 33807 BLAKE2B 75c52a9c1c744a0b58f3a81ed5163df352dde9eadfa41ef0b0d598aea0faa024796c1c7a2164688744ead3e950db5aa87789dc6aad412e751fbd44d9ff541aa8 SHA512 6904ed0f3217ee3d4ab0139e67d7c1312bcd9771c534fb637279722ebba24af9c5168efb8e4391d553acc38add3229fb2ee62a92bed22262fa4076d0520cd6ea
 EBUILD mariadb-10.2.36.ebuild 33802 BLAKE2B 951616432079ee5e54eaafc8ae1e2e893eeed6b78e0d82f0f600c00eefaa17af32d5280c89c28c377f9f96b930a3d2219062fd9d0214e1addaa612c1c4c0f5af SHA512 551aefbe395f7c35150b59abfd72643316f11fac00116c3119f0b2ffee63afa9d82b3d335455c3cbe402283f98c67966d2767a6d9759db262f8b461a6b956967
 EBUILD mariadb-10.2.37-r3.ebuild 41505 BLAKE2B c72e7fd67c44884cbbb19777e51822abafb598e61ed7f6934d45a8bf20858a6577317852dd642b7cf7caff69d42bfc0eb3dcc0d879652769c1e34d97894ffb2c SHA512 6703492272ef7da489164ff17f4ce1e3802032c16d51eade850ba4caa7222ff3fac55967d5174a7164cca2362c9187743c3e67f79282f601e0f6042bdb37008f
-EBUILD mariadb-10.2.38.ebuild 41707 BLAKE2B ca03c7f2b4ae2af37d07e562e42f3194b605a6722ab9723df055c16b50fd2a28712fb0dc7c5d819569895ecc389d4d3cd5977a2f31e9697c0e8ed8346cc91f5d SHA512 c3c31de610c587f1d2be8863f5c7b7cc4e27591d41d3f04c255b550ae8797bc2081c2948c60cc7f85a02ac311fb9b1a5f3be0a04c4c3932a295e0da71c9d9dfa
+EBUILD mariadb-10.2.38.ebuild 41735 BLAKE2B 849b333549ebfa399e82b0ca29531d6d8d2025c05edd9753ff3616c56a09da5f487d71cf1ffb143e8a9ca905acae38ad671d2494193efef49ab2f100081ec442 SHA512 e00a515c78769dea730a7409a4db33760b4891539d5df624f74842cde55e9a940ec1901cd21112b6ecfd07c2571cb0aef4a434ed2c6ea17a06e39137b04b5b4a
 EBUILD mariadb-10.3.27.ebuild 33315 BLAKE2B dddcb00e569ab38a470fc69932fa1974b18e78e3bc5315dd99281a8b3b491eed9078844abb0c21d4b60e4abbb3e2a1c9468ffbb7414f34410c1b8fa748dff2cd SHA512 da81a47686f868cb881711cfd14736a98ee21fa23a5cb1a7a034f4efef9d36021cac376af976301fb6170e665140a6a04b065f7ad21801d7533609be416f66d4
 EBUILD mariadb-10.3.28-r3.ebuild 41037 BLAKE2B b57fe4df2bbca5c9c1433bc1718447efa4d499c5700734203897aa2bbb48a5ba48f1a84789d06bf879e6fd558e8699d8a2feffa9e680117c74e925eff70adfd9 SHA512 5f67b938748f65f07b101391a3c07296513ccd93d4733198f62faa51701c16d27ebc4f2deb44ae166baed9ab5e72896b661fce6f73a154adbc5f76032bc9267a
-EBUILD mariadb-10.3.29.ebuild 41263 BLAKE2B 01799d2707104dab3c49f65538a1c38ba6262269c571d93f2977f60906bfdab04d542cd89125a7a97b7e124cc75df6b3e3d43262433affd7a93780c7bf264de6 SHA512 87ae73ce086a19527e0544c1bcb59cb9321c8fcc5e0b1767c6879ea64c1339888c7d1e7b63405fe0bfa137daa51bc8131d9184715f9f640daf04669232e91914
+EBUILD mariadb-10.3.29.ebuild 41291 BLAKE2B 8007953ab47d82980f9d16430c9aadf7cd8f81794aa5e34b4897847d161f1bf0ebd364ff711196fefdf3409b13f8210e045acde787824c777df7aa61bd8be15f SHA512 1d058d59cea3e913481f6357713bef25773e72935f2b32755c747f5e6514cff05e80850ef17a64d9849a4da84463671cf3bc180c4de03eb9086f746f6332defd
 EBUILD mariadb-10.4.13-r3.ebuild 33935 BLAKE2B 74eb39d6fec14db04ca11891db579ffec0245794eae688119b74b3e6ca6fecd362494132d3fc64ffd6780e70cc1e0432dc5b98c925decf12f57b3c3648ecec93 SHA512 d48420d78d7357c8c3fe492a0c45380823246ad29ff71b8c5f8ac164089723d78dc8cc6169127247f699c1404199b6d996788583c3d4f48bcd603cb91f9a6ee4
 EBUILD mariadb-10.4.15.ebuild 33966 BLAKE2B 7102c4c5010816fb80199b030218ec7d57b3e7867dacab26cfbefd415e159cd098a51988a78da7cf691d986596112ea6432c823bc791be538ea13ba12fcb7a55 SHA512 94d386d0af525b59d33deca8dcc0af1deb0328218ff371151fcd876d5b0ec586d062ee64391d74c3259e72c6b3ce55eebf6ec8f75bb3fe684136459d472f5e72
 EBUILD mariadb-10.4.16.ebuild 34099 BLAKE2B 88476cfc7a91578451236805dc2d73ecd83535dd7114d5f9bea673fbecad5798b46c0b5a471e0d3b6a00b63a3b05ca01320f2002214e8e4b212ce9116ae35abc SHA512 6d9417fc8d7992dda73b544fdb73b1be24bcfae1de138f84b4560ec7336ad8694b98bab2de3349f477c54865e51d899645f08a9643baf39e17d573b31119c77f
 EBUILD mariadb-10.4.17.ebuild 34094 BLAKE2B 62c8a5485a629e07c61fa493f0852da45d8512f3465da758816c7bbed7844ef59a99ec821cff9378fc6bed05f3588f757727fc0c1eedb0e39f2684662f5e7e98 SHA512 9c1daebbeaea6d7feb31f30e0576d2e1188f1fce35f15914b6cc51748bc0057642a975c536a35714ea075302427dbbc45ae2cd33470af84be2f9b122bc95554e
 EBUILD mariadb-10.4.18-r3.ebuild 41594 BLAKE2B 9e3c6f1794df4e08dd99363acd40a3568d46fa188ca03ce32e8bbf8353ae17d0ee20263166cf56b2d55eb0f0f78dad1dc8137688e812cc421cd3136a810aa6a7 SHA512 4660aac0f5b3f97c1931a6cf3a25278d03e5f34454c8fd686d730fe87edf39ddbd445b352b24e7824dc6a572a03fb8b99f867dcf38032e33f05cd85a6419ff12
-EBUILD mariadb-10.4.19.ebuild 41975 BLAKE2B 35d74d364589c51be9b0a30536b432f1848b408ac5f855df603e61c872679e4a6f207c22a87286e7bd88d18b5433f3026a33617c22d3c25c85879de081d1d0aa SHA512 15dc082755c0015f52881c8e8c1b14787c324e81c0ad24919cb955a7f6ac98dacf1ce69492da39cfa9e2afc8f9bb99dba6bc70caccd309ee9846e8cb3be9877a
-EBUILD mariadb-10.5.10.ebuild 41402 BLAKE2B b5a7cd32dd25e4780fe9d08ec7646a00c38b2ea087d08cd30e48070bec08bc084227f568e5fd39e523b12621f1d0175141a87f9b2ea2f93645fb9562f3b8703c SHA512 f46cc867496005190185636c9fbb1fb63c2bb8d8bb6b1c16c45f82d8cd1bd8159340516f72d5bd7fe52afaab586d98c650bf9625f3bb6b0959dab0ac79f4251c
+EBUILD mariadb-10.4.19.ebuild 42003 BLAKE2B 0ecd66ea4fff900faae8dbc4d025e5ba68436a5d7a0669bd83d198ed18d759bebb3f4cf5292536e37a7da7893dc4fa2dd6345abdb8446d7fc37395e6fd9197e8 SHA512 3dfd2fd2e2afa1a7d14d0101b82bf22624cb8fb291d642a5a1191ac9b7066aad32fe3f55a184d29728da9071fd630cd31e4ab91944310c304e1bd09b9ecaa145
+EBUILD mariadb-10.5.10.ebuild 41427 BLAKE2B 17dee0a97d62cab3677ae091f1134f6033af7d1b82211f2c9287abf1e2225199fd18930a4183733d1631e4c76d6655b6359fc995347061d05f7900b5e3dc83de SHA512 6bc9ab6760dfb088235b04ba126ad7ddf11927b24955904b34aa124e809edfeb0f528a239a8088eb3c1dbbad98056adcfac542be44e84c35b0d8a55af2100c57
 EBUILD mariadb-10.5.9-r5.ebuild 41092 BLAKE2B 8bde28f7f5a3ef726b8bc77f62cc7da65c061699d76b98692d8434866cf4e9c9b8278ddad852ffedce939a57cc34ae3fed72c7c3663b760aa5c835739dcbc569 SHA512 17815ddb3321640897ea839193c324b9c68c56eb666e3d575babebaafb595b6d29a57bfd77bf0a6ed918a5e14c26462fb772dd7adb186957553209a5ef5b142d
 MISC metadata.xml 2625 BLAKE2B 649e3bfdce49ed2352d31849a7d4547e0eeee23fab8ee58705fab62f8e1dee1874885027897bcb2895def5dcfeeea66caa69f83161ac1cfd19154a8712bdf573 SHA512 edbbfc7be64f124c0969f7de67337ba0b579292837d10e18da56b7e4e1cca88a36ac304e7c2625d9ae2bcf625d632a707f9813a0382242fc3d59d384b5b7bd54
diff --git a/dev-db/mariadb/mariadb-10.2.38.ebuild b/dev-db/mariadb/mariadb-10.2.38.ebuild
index ed459dd64677..bb7a2db6f098 100644
--- a/dev-db/mariadb/mariadb-10.2.38.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.38.ebuild
@@ -364,12 +364,14 @@ src_configure() {
 	)
 
 	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
 		if ! use extraengine ; then
 			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
 				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
+				-DPLUGIN_FEDERATEDX=NO
+			)
 		fi
 
 		mycmakeargs+=(
@@ -379,11 +381,11 @@ src_configure() {
 			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
 			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
 			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
 			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
 			-DPLUGIN_CASSANDRA=NO
 			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
 			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
 			-DCONNECT_WITH_MYSQL=1
 			-DCONNECT_WITH_LIBXML2=$(usex xml)
 			-DCONNECT_WITH_ODBC=$(usex odbc)
@@ -462,7 +464,6 @@ src_configure() {
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
 		)
-
 	else
 		mycmakeargs+=(
 			-DWITHOUT_SERVER=1
diff --git a/dev-db/mariadb/mariadb-10.3.29.ebuild b/dev-db/mariadb/mariadb-10.3.29.ebuild
index bb627f3fe8a7..2ee72e2b26df 100644
--- a/dev-db/mariadb/mariadb-10.3.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.29.ebuild
@@ -355,12 +355,14 @@ src_configure() {
 	)
 
 	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
 		if ! use extraengine ; then
 			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
 				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
+				-DPLUGIN_FEDERATEDX=NO
+			)
 		fi
 
 		mycmakeargs+=(
@@ -369,11 +371,11 @@ src_configure() {
 			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
 			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
 			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
 			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
 			-DPLUGIN_CASSANDRA=NO
 			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
 			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
 			-DCONNECT_WITH_MYSQL=1
 			-DCONNECT_WITH_LIBXML2=$(usex xml)
 			-DCONNECT_WITH_ODBC=$(usex odbc)
@@ -452,7 +454,6 @@ src_configure() {
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
 		)
-
 	else
 		mycmakeargs+=(
 			-DWITHOUT_SERVER=1
diff --git a/dev-db/mariadb/mariadb-10.4.19.ebuild b/dev-db/mariadb/mariadb-10.4.19.ebuild
index ca2d2d41378d..24c258c10699 100644
--- a/dev-db/mariadb/mariadb-10.4.19.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.19.ebuild
@@ -369,12 +369,14 @@ src_configure() {
 	)
 
 	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
 		if ! use extraengine ; then
 			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
 				-DPLUGIN_FEDERATED=NO
-				-DPLUGIN_FEDERATEDX=NO )
+				-DPLUGIN_FEDERATEDX=NO
+			)
 		fi
 
 		mycmakeargs+=(
@@ -383,11 +385,11 @@ src_configure() {
 			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
 			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
 			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
 			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
 			-DPLUGIN_CASSANDRA=NO
 			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
 			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
 			-DCONNECT_WITH_MYSQL=1
 			-DCONNECT_WITH_LIBXML2=$(usex xml)
 			-DCONNECT_WITH_ODBC=$(usex odbc)
@@ -466,7 +468,6 @@ src_configure() {
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
 		)
-
 	else
 		mycmakeargs+=(
 			-DWITHOUT_SERVER=1
diff --git a/dev-db/mariadb/mariadb-10.5.10.ebuild b/dev-db/mariadb/mariadb-10.5.10.ebuild
index ecedb5844ba3..264fc2efd676 100644
--- a/dev-db/mariadb/mariadb-10.5.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.10.ebuild
@@ -365,10 +365,11 @@ src_configure() {
 	)
 
 	if use server ; then
-
-		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
 		if ! use extraengine ; then
 			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
 				-DPLUGIN_FEDERATED=NO
 				-DPLUGIN_FEDERATEDX=NO
 			)
@@ -379,13 +380,13 @@ src_configure() {
 			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
 			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
 			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
 			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
 			-DPLUGIN_CASSANDRA=NO
 			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
 			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
 			-DPLUGIN_S3=$(usex s3 YES NO)
 			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
-			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
 			-DCONNECT_WITH_MYSQL=1
 			-DCONNECT_WITH_LIBXML2=$(usex xml)
 			-DCONNECT_WITH_ODBC=$(usex odbc)
@@ -461,7 +462,6 @@ src_configure() {
 			-DWITH_MYISAM_STORAGE_ENGINE=1
 			-DWITH_PARTITION_STORAGE_ENGINE=1
 		)
-
 	else
 		mycmakeargs+=(
 			-DWITHOUT_SERVER=1
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index d3ae4e404f27..b44dece7c82f 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -2,7 +2,9 @@ AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0
 DIST phpMyAdmin-4.9.6-all-languages.tar.xz 4978288 BLAKE2B 73f7cf5da8ec55fb39d5ea1c007d640f521c9b4490c820ef3f2660000f37af751d7e9a9d08d04405497b9e69642c53f6b28f5f84b5401e437bcf3419c2d2323b SHA512 4aa35ae627edfcf99af83a30e328b8b9ccdfa129ae9d16c2672ace234aa8a416ad8840af5bc9998e44b9e26b07abd195cfba1b4c784b0bc6509f5e8e548e62f1
 DIST phpMyAdmin-5.0.3-all-languages.tar.xz 6786864 BLAKE2B 737df7cc7c2bdeda89f81d2d5d61857f5f9c0f1e69c4679df6f728c0df8d50fde589971e5e4cd371f2f33d766cdd17cca5580ccb7b75cecb0122ce49dcf52a05 SHA512 e03b0fcd1998570c243a41bcb9e1bf46c1da8fdb99b8e54ba4de3e7e22ff0d847468f16137b011f22eb2ee58d92debd66f2f0ec1b403775aef879a3f8978ebf1
 DIST phpMyAdmin-5.1.0-all-languages.tar.xz 7902416 BLAKE2B 0b3e8f359e4b528474da8fe15b64f0dc5f82e3366402495c3ba65115852db8041bacdf274ae9e93d9ed9e4edba6c396031cc6f5684ca5a0f270ac1ca7e4d424d SHA512 b49f0c722ef3ea763d9a0eb1fa269717a81affbaf207b108f1cb085a44eae97d690da83fd18ea54477cfb08a646557285d24cd0568aa148b0207f78d17754192
+DIST phpMyAdmin-5.1.1-all-languages.tar.xz 7751820 BLAKE2B 95d54893b7a7d8743769c0a91ef79c4fd22eb69acf2573f781295f20a39e7e667ff0623c900b68705f6fc9852f3b665adc3689c4c7d596c6cbcb78468d36e7e1 SHA512 22586bf9e37224f4a307564e8da73384cdc55d705063a487c17b3a02ab0a0454371d1349aad96b136395a72dff38409f8eac21ab9a7f3e5835ad85fc7854d59b
 EBUILD phpmyadmin-4.9.6.ebuild 1527 BLAKE2B 44c50fbedba73ccb5db54780f7e6a698848ccdf4de82a94f491e7faa51679773bef3de0ef65fde6da0cb4a2baecfd24d6f72705406d4cd2f2b2d7de083ad2cc2 SHA512 756923a68be8ca1f9442d4ba227ae65184e046ce35fbd81c12da7a699ee24348c8ec6c4e7a40ec6cbc271fe75a2be21e3530471e3918db128c36127a089e6153
 EBUILD phpmyadmin-5.0.3.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
 EBUILD phpmyadmin-5.1.0.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
+EBUILD phpmyadmin-5.1.1.ebuild 1538 BLAKE2B 77815f785d11191f403e9384913343cab72b74507d55ec155989e799474857bed4e7b8bf8a1ae87aa5955bc1b79dd2f16277a03a8f36b269a59c2db7536e6dd3 SHA512 ee8ef32e7d47166276efaf68248d0a3b88c8a4e3ccac52878f300dc48e38e9484fbe7f830913d4aa65d0f55e909310dedc4d1260a288a6d5e08df99191be6f79
 MISC metadata.xml 725 BLAKE2B df8f3ed193f57543cdf9ed88e47025c86f4096126ee07f82a0f99b9980ca4d96364066e71955f85ac909f22b15c1ebbb530a128cf5f2cc4008f7ae32ab67c73e SHA512 99c7af80bf189cd4e197ce74c46e8ad15a1a9ada7610dd2c7fbd28bf82638549f4033dc17d79bf73e6c9a801099e0a6e0caa5198366ada6de2f335ac62d4d107
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
new file mode 100644
index 000000000000..92b83232fe06
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PV=${PV/_/-}
+MY_PN="phpMyAdmin"
+MY_P="${MY_PN}-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="https://www.phpmyadmin.net/"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="setup"
+
+RDEPEND="
+	>=dev-lang/php-7.1[ctype,filter,json(+),session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+	virtual/httpd-php:*
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index a0e48ace8308..9d5146e7b9cf 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -27,4 +27,4 @@ DIST redis-6.2.4.tar.gz 2457940 BLAKE2B 3e89e404a624db6f739fdab72b8b7f7f92b6e96b
 EBUILD redis-5.0.12.ebuild 4727 BLAKE2B 296ae8313437d189b96ee93f5b63cefe11abb576d4925e150de6db510183a948bae6a4ae76db1a393e8c1f3c0c17dfad8c52e07b8d1cf36cd88d11df4d2ac17d SHA512 af8a96dcccbc12d8dfb0c77d1c857b245c47d77b3084f11021e9cf02ce1a8258c3c09a855c209356c49ba9aa8a5ad37e732751d908e01e2314d7c2d5ceddf320
 EBUILD redis-6.0.14.ebuild 5092 BLAKE2B 82f39c67cfef273c174c0c7cd144e23a93833c2b00f6143e22ea7e3f3e7fe4f044a4f25f00cc72c7a6f72d934e5c4aaa66742ac7172737afa94cf15bc7188690 SHA512 dcb6983cf72b12b28d6dbef8041afd56789f7bd8d3373edd76bc0f09bb277ff78450ff8081e3a007eef0913944950bbe618856cf18c5e84915dc7245a0d80ceb
 EBUILD redis-6.2.4.ebuild 5098 BLAKE2B da4c193e6974a19ea309a8548b4edbe4ca086fca2c1b287c76546a7e8d16fb6b2b541b264f88cb8ab4367dddf1aea4afc67cd551413554a9c56f4bac2de047da SHA512 4d3e16a007013f8ea7c25ffd55db947b06e27f78f4119e3b6d29c4b5c3a289c1f62cb1e2d7c287be5bc33eb039f99e41ac7c5b04fc0c6057537f44d5f0dfa099
-MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
+MISC metadata.xml 364 BLAKE2B a997b9ef18f8efdcd191d4344898a373d3987cc8630d7d699af0666dac13261a06717e72320034fab170209ab2cc90db122e1a3756fa9ff9149fe7b7796328c3 SHA512 2d6a303748fd5cf5a3a12b382e0944046a7d200f19041a343603068a764f806fd748945c9d5ec2d0f4001f151bc66c1127a461abeefd7eb85a92d2238b74d521
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index d0450c61b48e..a768a2be3aa3 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="tcmalloc">
-      Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
-    </flag>
-  </use>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<use>
+		<flag name="tcmalloc">
+			Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 8d8652879853..b7b5fcd406a8 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,7 +1,6 @@
-AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95
-DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
 DIST sqlitebrowser-3.12.1.tar.gz 3990525 BLAKE2B 9cccd48c83e1953091508f5760b3004c4690791cacc5784286e6ce5220a6e55e761d736d8fbbb135e419beba12def89f63a3d37d6c7e0281f50392f07bf25357 SHA512 f0a62958008693606d9ab04b0413fa10705c7b45fb970c218d8f1adfe8ca01895a6470f369ded6cb7a9338c27385838b8d57c89b5855b4050ce9bec0d69626d1
-EBUILD sqlitebrowser-3.11.1-r1.ebuild 1420 BLAKE2B 2c7d13d4d011bd56cbfac596bd30dcb6d8c8252958be8a481dcacf59e1d16d2b1fb92f6b721a52506d685f51af193a42ce164340314c600f24430199fbdbf444 SHA512 3c9a8d829c49fcdf4f18c0ff2d48f9c4ce281110671101ac306edf1d60586759a6ae40cd0e05e244bfbb3bef6a86f1db6e7c6673fd1951ef665f34ee8fd1865e
+DIST sqlitebrowser-3.12.2.tar.gz 3990817 BLAKE2B a0c1495814a814638428fa50e55d5afeb2d3f5c80c9aafbdea3cc444e8c681c48acd1f24126945a89d7284c3f0a23979f2b3541fae7c7a70803f7e7ad69be6f4 SHA512 a6afc0a4286f07adb7038f3a010c93e14204b477bde27b1599c9bfe3390422d3edfaa2a9381b1f13e63a7aaf90e931ee85358eb8b2c15b6ea55818d29c59395f
 EBUILD sqlitebrowser-3.12.1.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
+EBUILD sqlitebrowser-3.12.2.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 EBUILD sqlitebrowser-9999.ebuild 1303 BLAKE2B 9c1f5eaa7fc2fcf8a73a53aa3b452d266ee5171e8597f23f0265c94e4b05ca84cc6dfed45ad971f0bcb81ebf5a7c3faad765fcda3721c1ccc271d4ba8c9251e4 SHA512 0eed5940ea60d165662c6770dc3a22ca4f82ca3d89b98ddcd92d77ea7c9baa5faba0e7d6dd23b65fd39e330422147c65f1cac4518f12f12336c532089634653a
 MISC metadata.xml 1506 BLAKE2B e52a311da6408b28b570e975745f05607d88a7b0fd2e6144ef008664ddaed062b67f355a141f61d926448829694907e2474d0d0b39088a7c7c8f8a509934d344 SHA512 a4ed70e46b0e86e266ce4a30f401517ab83dcef51fd048047e2dcd13b9c5cc7d9e985e69de5df73f670eaf969a86f835b65035e7093f9c195464dcb4ea09de7b
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
deleted file mode 100644
index f86683323281..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.11.1-unbundle.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake
---- sqlitebrowser-3.11.1-orig/cmake/FindQScintilla.cmake	2019-03-20 11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/cmake/FindQScintilla.cmake	2019-03-20 11:17:49.611365342 -0400
-@@ -42,10 +42,12 @@
- # either expressed or implied, of the FreeBSD Project.
- #=============================================================================
- 
-+SET (QT_MIN_VERSION "5.6.2")
-+FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets )
- 
- find_path ( QSCINTILLA_INCLUDE_DIR
-   NAMES qsciscintilla.h
--  HINTS ${QT_INCLUDE_DIR}
-+  HINTS ${Qt5Core_INCLUDE_DIRS}
-   PATH_SUFFIXES Qsci
- )
- 
-@@ -80,8 +82,8 @@
- 
- 
- find_library ( QSCINTILLA_LIBRARY
--  NAMES qscintilla qscintilla2 libqscintilla2
--  HINTS ${QT_LIBRARY_DIR}
-+  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
-+  HINTS ${Qt5Core_LIBRARIES}
- )
- 
- set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
-diff -Naur sqlitebrowser-3.11.1-orig/CMakeLists.txt sqlitebrowser-3.11.1/CMakeLists.txt
---- sqlitebrowser-3.11.1-orig/CMakeLists.txt	2019-03-20 11:12:47.452357850 -0400
-+++ sqlitebrowser-3.11.1/CMakeLists.txt	2019-03-20 11:19:07.740367280 -0400
-@@ -61,26 +61,12 @@
- endif()
- 
- if(NOT FORCE_INTERNAL_ANTLR)
--    find_package(Antlr2 QUIET)
-+  find_package(Antlr2 REQUIRED)
- endif()
- if(NOT FORCE_INTERNAL_QSCINTILLA)
--    find_package(QScintilla QUIET)
-+  find_package(QScintilla REQUIRED)
- endif()
- 
--set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
--
--if(NOT ANTLR2_FOUND)
--    set(ANTLR_DIR libs/antlr-2.7.7)
--    add_subdirectory(${ANTLR_DIR})
--endif()
--if(NOT QSCINTILLA_FOUND)
--    set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
--    add_subdirectory(${QSCINTILLA_DIR})
--endif()
--add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
--
- find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
- 
- set(CMAKE_AUTOMOC ON)
-diff -Naur sqlitebrowser-3.11.1-orig/src/src.pro sqlitebrowser-3.11.1/src/src.pro
---- sqlitebrowser-3.11.1-orig/src/src.pro	2019-03-20 11:12:47.459357850 -0400
-+++ sqlitebrowser-3.11.1/src/src.pro	2019-03-20 11:22:02.891371623 -0400
-@@ -178,10 +178,6 @@
-     }
- }
- 
--LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
--LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
--LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
--LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
- unix {
-     LIBS += -ldl
- }
-@@ -222,9 +218,7 @@
- }
- 
- UI_DIR = .ui
--INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
--LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
--DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
-+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
- 
- unix {
-     # Below, the user can specify where all generated file can be placed
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
deleted file mode 100644
index 9264df0706cd..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="https://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="
-	app-editors/qhexedit2
-	dev-cpp/antlr-cpp:2
-	dev-db/sqlite:3
-	>=dev-libs/qcustomplot-2.0.0[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtxml:5
-
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r libs || die
-	sed -i 's#"src/qhexedit.h"#<qhexedit.h>#' src/EditDialog.cpp || die
-	#find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
-
-	sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package/ s/ Test//" -i CMakeLists.txt || die
-		sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon images/sqlitebrowser.svg
-}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
new file mode 100644
index 000000000000..d094723adf0a
--- /dev/null
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.12.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A light GUI editor for SQLite databases"
+HOMEPAGE="https://sqlitebrowser.org/"
+
+if [[ "${PV}" = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+ MPL-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-editors/qhexedit2
+	dev-db/sqlite:3
+	dev-libs/qcustomplot
+	>=dev-qt/qtconcurrent-5.5:5
+	>=dev-qt/qtcore-5.5:5
+	>=dev-qt/qtgui-5.5:5
+	>=dev-qt/qtnetwork-5.5:5[ssl]
+	>=dev-qt/qtprintsupport-5.5:5
+	>=dev-qt/qtwidgets-5.5:5
+	>=dev-qt/qtxml-5.5:5
+	>=x11-libs/qscintilla-2.8.10:=
+"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.5:5
+	test? ( >=dev-qt/qttest-5.5:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	>=dev-qt/qtsvg-5.5:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/find_package/ s/ Test//" \
+			-e "/set/ s/ Qt5::Test//" \
+			|| die "Cannot remove Qt Test from CMake dependencies"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTING=$(usex test)
+		-DFORCE_INTERNAL_QCUSTOMPLOT=OFF
+		-DFORCE_INTERNAL_QHEXEDIT=OFF
+	)
+
+	cmake_src_configure
+}