gentoo resync : 23.09.2020

22 files changed, 391 insertions, 537 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 818a0112cbd8..85ca0e7b0ef5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/datadraw/Manifest b/dev-db/datadraw/Manifest
index 9e2146bed806..e0ba73cb683f 100644
--- a/dev-db/datadraw/Manifest
+++ b/dev-db/datadraw/Manifest
@@ -1,3 +1,4 @@
+AUX datadraw-3.1.1-buildsystem.patch 7368 BLAKE2B bc889c8ee2741a6aa363b32fce0caa6034fdc03244d5a2f23e973cd93018ada11d8e6b8759ad81ae32c5794154372f0978d7ea5eac74bdce567efee2712ad483 SHA512 580a96cb62ecac814b3b91caaddb793971491cfbaedf1fa2bcf3154e8acbac520996d1c3d575690f41b77e4463208585e3631f97f73da7fc839dc2f9d2eb5e1a
 DIST datadraw3.1.1.tar.gz 607914 BLAKE2B ec4f6bafce924edda39a19f4e29ec7ac5c52dafbb0e8412280fd232e91b2bdf525fc931518249857f5b35a2f76c40a5fb28493db6220dacd86113361f780d38d SHA512 64773b984cb9d6928ec486833ee03f07c6c5f21dcfcc446e21fe90eb432b7a09459ea65e24c46df70bc6b791dfc640caf16b6f6cdd8a35319969bb8ec7e65009
-EBUILD datadraw-3.1.1.ebuild 1002 BLAKE2B 47f1d82234b8e2548d0c3420a5fe40121d0d39530bb2c05d09ad442fc2a778b036566e7ac79df6ab6f86a3729fe0fd123576d4afaa4435873145e8850351ad84 SHA512 5ba2c3d348ce7533dff173a3ed5bbf710ef55f7a3dcadc5360581704a3ceae4857ab773ca74165c81faa1a84226d5d706a9996df16db80ea22d2837a602e545d
+EBUILD datadraw-3.1.1.ebuild 823 BLAKE2B 15a28bdcc6b059848d1340d0ed567cf2e09fc9990960c3e5f63d5375cb8c527aaa4f5d3d05372c734c7ebb813662a0c82e7a0d2bfbe18b226cae1151f095585c SHA512 14bd407d4ac16d8603543674e220fc19c00f9df00e9e86ca5cab06c496e110bda67b096f3f7a8087b550393f4bc56a660d93dfcd1869365e2b8296eb0204e9cd
 MISC metadata.xml 583 BLAKE2B bb602abc24fa9252a7fd6c6ef24acb1585209d7ff695f9e1d0e044672fbeffab42454fe309f9341d979ec01073241af1683aca8b3ff9b0aca2664861c7192c06 SHA512 a771756ad279d2183df72e74fb6c4df994515f7de99485fcc4ef59b6e5618ec06c192e674efee7a354b9ccb2def3f361ef19e46c1817d55af9dd9dec20f28467
diff --git a/dev-db/datadraw/datadraw-3.1.1.ebuild b/dev-db/datadraw/datadraw-3.1.1.ebuild
index 608c45988c11..584245a0341e 100644
--- a/dev-db/datadraw/datadraw-3.1.1.ebuild
+++ b/dev-db/datadraw/datadraw-3.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="feature rich database generator for high performance C applications"
 HOMEPAGE="http://datadraw.sourceforge.net/"
@@ -12,39 +12,33 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}${PV}/${PN}${PV}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
+IUSE="examples"
 
-DEPEND=""
-RDEPEND=""
+S="${WORKDIR}/${PN}${PV}"
 
-S=${WORKDIR}/${PN}${PV}
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
 
-src_prepare() {
-	tc-export CC
-	sed -e "/^CFLAGS=/s:-g -Wall:${CFLAGS}:" \
-		-i configure \
-		-i dataview/configure \
-		-i util/configure || die
-
-	sed -e '/^datadraw:/,+2s:\\$(CFLAGS):\\$(CFLAGS) \\$(LDFLAGS):' \
-		-i configure || die
+src_configure() {
+	tc-export AR CC
+	default
 }
 
 src_install() {
-	dobin ${PN}
+	dobin datadraw
 
-	insinto /usr/$(get_libdir)
-	for lib in util/*.a ; do
-		newins ${lib} lib$(basename ${lib})
+	local lib
+	for lib in util/*.a; do
+		newlib.a ${lib} lib${lib#*/}
 	done
-	insinto /usr/include
 
-	doins util/*.h
+	doheader util/*.h
+
+	HTML_DOCS=( www/index.html www/images )
+	einstalldocs
+	dodoc manual.pdf
 
-	dodoc README
-	if use doc ; then
-		dodoc manual.pdf
-		dohtml -r www/index.html www/images
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
-	use examples && dodoc -r examples
 }
diff --git a/dev-db/datadraw/files/datadraw-3.1.1-buildsystem.patch b/dev-db/datadraw/files/datadraw-3.1.1-buildsystem.patch
new file mode 100644
index 000000000000..8ef1156fb6d3
--- /dev/null
+++ b/dev-db/datadraw/files/datadraw-3.1.1-buildsystem.patch
@@ -0,0 +1,263 @@
+--- a/configure
++++ b/configure
+@@ -16,8 +16,8 @@
+ if [ "$CC" = "" ]; then
+     CC=gcc
+ fi
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -Iutil"
+-LIBS="util/ddutil-dbg.a"
++CFLAGS="${CFLAGS} -Wall -W -Wno-unused-parameter -Wno-unused-function -Iutil"
++LIBS="util/ddutil.a"
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+     CFLAGS="$CFLAGS -m64"
+@@ -74,17 +74,17 @@
+ 
+ echo "
+ 
+-datadraw: \$(OBJECTS) util/ddutil-dbg.a
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) -o datadraw
++datadraw: \$(OBJECTS) util/ddutil.a
++	\$(CC) \$(CFLAGS) \$(LDFLAGS) \$(OBJECTS) \$(LIBS) -o datadraw
+ 
+ clean:
+ 	rm -f \$(OBJECTS)
+-	make -C util clean
++	+\$(MAKE) -C util clean
+ 
+ install: datadraw
+ 	install -d \$(PREFIX)/bin
+ 	install datadraw \$(PREFIX)/bin
+-	make -C util PREFIX=\$(PREFIX) install
++	+\$(MAKE) -C util PREFIX=\$(PREFIX) install
+ 
+ deb:
+ 	fakeroot debian/rules binary && sudo dpkg -i ../*.deb
+@@ -99,8 +99,8 @@
+ src/dvdatabase.h src/dvdatabase.c: src/Database.dd
+ 	datadraw src/Database.dd
+ 
+-util/ddutil-dbg.a:
+-	make -C util
++util/ddutil.a:
++	+\$(MAKE) -C util
+ 
+ " >> Makefile
+ 
+--- a/dataview/configure
++++ b/dataview/configure
+@@ -43,13 +43,8 @@
+     shift
+ done
+ 
+-if [ "$debugging" = "true" ]; then
+-    CFLAGS="-g -DDD_DEBUG $CFLAGS"
+-    LIBS="$LIBS ../util/ddutil-dbg.a"
+-else
+-    CFLAGS="-O2 $CFLAGS"
+-    LIBS="$LIBS ../util/ddutil.a"
+-fi
++CFLAGS="$CFLAGS"
++LIBS="$LIBS ../util/ddutil.a"
+ 
+ if [ ! -d obj ]; then
+     mkdir obj
+@@ -74,7 +69,7 @@
+ 
+ echo "
+ 
+-dataview: \$(OBJECTS) ../util/ddutil-dbg.a
++dataview: \$(OBJECTS)
+ 	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) -o dataview
+ 
+ clean:
+--- a/examples/array/configure
++++ b/examples/array/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Array.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-array: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o array
++array: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o array
+ 
+ htdatabase.c htdatabase.h: Array.dd
+ 	../../datadraw Array.dd
+--- a/examples/attributes/configure
++++ b/examples/attributes/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Attrtest.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-attrtest: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o attrtest
++attrtest: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o attrtest
+ 
+ htdatabase.c htdatabase.h: Attrtest.dd
+ 	../../datadraw Attrtest.dd
+--- a/examples/extension/configure
++++ b/examples/extension/configure
+@@ -12,7 +12,7 @@
+ ../../datadraw Graph.dd
+ ../../datadraw Color.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+--- a/examples/graph/configure
++++ b/examples/graph/configure
+@@ -13,7 +13,7 @@
+ 
+ ../../datadraw -I ../../util Graph.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -53,8 +53,8 @@
+ 	../../datadraw -I ../../util Graph.dd
+ 
+ ../../util/ddutilup.a:
+-	make -C ../../util clean
+-	make -C ../../util ddutilup.a
++	+\$(MAKE) -C ../../util clean
++	+\$(MAKE) -C ../../util ddutilup.a
+ 
+ clean:
+ 	rm -f \$(OBJECTS)
+--- a/examples/hash/configure
++++ b/examples/hash/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Hash.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-hash: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o hash
++hash: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o hash
+ 
+ htdatabase.c htdatabase.h: Hash.dd
+ 	../../datadraw Hash.dd
+--- a/examples/heap/configure
++++ b/examples/heap/configure
+@@ -13,7 +13,7 @@
+ 
+ ../../datadraw -I ../../util Heap.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -53,8 +53,8 @@
+ 	../../datadraw -I ../../util Heap.dd
+ 
+ ../../util/ddutilup.a:
+-	make -C ../../util clean
+-	make -C ../../util ddutilup.a
++	+\$(MAKE) -C ../../util clean
++	+\$(MAKE) -C ../../util ddutilup.a
+ 
+ clean:
+ 	rm -f \$(OBJECTS)
+--- a/examples/sparse/configure
++++ b/examples/sparse/configure
+@@ -9,7 +9,7 @@
+ 
+ ../../datadraw Sparse.dd
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../../util"
++CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -I../../util"
+ LIBS=""
+ 
+ if [ "`uname -m`" = x86_64 ]; then
+@@ -28,8 +28,8 @@
+ 
+ echo "
+ 
+-sparse: ../../util/ddutil-dbg.a \$(OBJECTS)
+-	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil-dbg.a -o sparse
++sparse: ../../util/ddutil.a \$(OBJECTS)
++	\$(CC) \$(CFLAGS) \$(OBJECTS) \$(LIBS) ../../util/ddutil.a -o sparse
+ 
+ htdatabase.c htdatabase.h: Sparse.dd
+ 	../../datadraw Sparse.dd
+--- a/util/configure
++++ b/util/configure
+@@ -16,7 +16,7 @@
+ if [ "$CC" = "" ]; then
+     CC=gcc
+ fi
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function"
++CFLAGS="${CFLAGS} -Wall -W -Wno-unused-parameter -Wno-unused-function"
+ 
+ if [ "`uname -m`" = "x86_64" ]; then
+     CFLAGS="$CFLAGS -m64"
+@@ -72,21 +72,14 @@
+ makeMakefileTop "u-dbg"
+ makeMakefileTop "up-dbg"
+ 
+-echo 'all: debug optimized
+-
+-debug dev:
+-	@echo "Making debug build:"
+-	@$(MAKE) -f Makefile ddutil-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
+-	@$(MAKE) -f Makefile ddutilp-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
+-	@$(MAKE) -f Makefile ddutilu-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
+-	@$(MAKE) -f Makefile ddutilup-dbg.a CFLAGS="$(CFLAGS) -DDD_DEBUG"
++echo 'all: optimized
+ 
+ optimized opt rel:
+ 	@echo "Making release build:"
+-	@$(MAKE) -f Makefile ddutil.a CFLAGS="$(CFLAGS) -O2"
+-	@$(MAKE) -f Makefile ddutilp.a CFLAGS="$(CFLAGS) -O2"
+-	@$(MAKE) -f Makefile ddutilu.a CFLAGS="$(CFLAGS) -O2"
+-	@$(MAKE) -f Makefile ddutilup.a CFLAGS="$(CFLAGS) -O2"
++	@$(MAKE) -f Makefile ddutil.a CFLAGS="$(CFLAGS)"
++	@$(MAKE) -f Makefile ddutilp.a CFLAGS="$(CFLAGS)"
++	@$(MAKE) -f Makefile ddutilu.a CFLAGS="$(CFLAGS)"
++	@$(MAKE) -f Makefile ddutilup.a CFLAGS="$(CFLAGS)"
+ 
+ clean:
+ 	rm -f obj/* objp/* obju/* objup/* obj-dbg/* objp-dbg/* obju-dbg/* objup-dbg/* *.a
+@@ -120,7 +113,7 @@
+     UPPER_SUFFIX=`echo $SUFFIX | tr '[a-z]' '[A-Z]'`
+     UPPER_NONDBG_SUFFIX=`echo $NONDBG_SUFFIX | tr '[a-z]' '[A-Z]'`
+     echo "ddutil$SUFFIX.a: \$(OBJECTS$UPPER_SUFFIX)
+-	ar -rcs ddutil$SUFFIX.a \$(OBJECTS$UPPER_SUFFIX)
++	\$(AR) -rcs ddutil$SUFFIX.a \$(OBJECTS$UPPER_SUFFIX)
+ 
+ " >> Makefile
+ 
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 34d4882f3596..bdaf79b1e9eb 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,6 +1,8 @@
 AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
+DIST mariadb-connector-c-3.1.10-src.tar.gz 746801 BLAKE2B 5c6c5b46306cd081d28f2e8be81fea5fd92b5dd75aac7711cfe5958f8a493b1bd84e79c96295b584effcd828303b35c0152a28892fe0bbd2994a6738ef62d5a5 SHA512 6b95b54e1c05a81010659d1b143330cbce411e3327e543eb240a4ab378336826c6958983b96beeaaff64836f4c5cc5c48eb8a7be6bb521dcb2bbe15e4048f38a
 DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a SHA512 cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42
+EBUILD mariadb-connector-c-3.1.10.ebuild 2369 BLAKE2B 31acc451fa0c66ff4551465a7c1cf7940c1e5848e63774d96cd1c64c2dc5b0038cece7900162639fe9dcfdea77c1c17c1deea46b750a4691caf9e5bcc9002bf6 SHA512 8c14a776c521c67f0230058b6d32af6de053081158dcacbdadcbaf741d7faaa07945fbada968040acd961b1c485e36a1188021eecfcadbf177a97df356ba8a06
 EBUILD mariadb-connector-c-3.1.9.ebuild 2343 BLAKE2B 652296c85beb8bc4e6529e8dcddc19d3448559e446092344ea0b86a9b758c81d56c48b05c6bef3df6f55226a3e410009cea42c86c8bc25e43ba0bd31139ea7ff SHA512 414fc4666d6d16b2572416c7e537e27e96112b876c564076d8d80a40c0303e41b7d0ecf61865aa1a2900fc5df1a809417ef22d71ce849733d609022952c1bce8
-EBUILD mariadb-connector-c-9999.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
+EBUILD mariadb-connector-c-9999.ebuild 2369 BLAKE2B 31acc451fa0c66ff4551465a7c1cf7940c1e5848e63774d96cd1c64c2dc5b0038cece7900162639fe9dcfdea77c1c17c1deea46b750a4691caf9e5bcc9002bf6 SHA512 8c14a776c521c67f0230058b6d32af6de053081158dcacbdadcbaf741d7faaa07945fbada968040acd961b1c485e36a1188021eecfcadbf177a97df356ba8a06
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
new file mode 100644
index 000000000000..be4696f0f209
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DWITH_ICONV=ON
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 91e9ba93b995..be4696f0f209 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -62,6 +62,7 @@ multilib_src_configure() {
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
 		-DWITH_CURL=$(usex curl ON OFF)
+		-DWITH_ICONV=ON
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
 		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DINSTALL_LIBDIR="$(get_libdir)"
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
deleted file mode 100644
index 6c74e32dd9d3..000000000000
--- a/dev-db/mysql-workbench/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
-AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
-AUX mysql-workbench-8.0.21-boost-1.73.0.patch 4579 BLAKE2B 2e39180d9c4ac6fb87b03bdb4cbff5b2f09df9334cbf83465c4a79705f060a18dc7a1a2520857ff262e8f5d599498234be84cba57f77b70659f14c7ba9d19fb6 SHA512 eab05b945c9e5217619748d3bce6909d15dc4a40e40017a735fe13610ae2731c97696c4b8bfe285d4eb62773b1534f24c8a5c50897dd61c99073ce5915be36b7
-DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
-DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe SHA512 986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc
-DIST mysql-workbench-community-8.0.20-src.tar.gz 19391920 BLAKE2B 9baf37dec18002ebf7956979fa1e3e45b69a7061bd85d6b2ef25f058ce7595a6847ea314b7443dadf7524ff985ff4e87869e91ea7a012e6cf07a6d139a6c733b SHA512 b31314fac018959a008b283c795df5a676d6c667827e87a98379ce1de172b98cfdf8dd5cac009e2fb78241358afcb318abfed0178d73840bf6b4432b85b6a4e7
-DIST mysql-workbench-community-8.0.21-src.tar.gz 19211633 BLAKE2B 452ac946d478acb1d0e358d2bc44125f0b7d1f1bc2943d2b03ce6767e659df71b7525b7a51ed1cd5560f02a7a1047e2cd35477a71ddd91f71992e5becc3d1c0d SHA512 40c1144f801424c3b46eb033c9d1174c9bd903cd17672924eacd3ff58daa91b0d09f6045af4746ce7490f5ab2b0973b6d7f44ee8ae022607057cb0f09fc59a3f
-EBUILD mysql-workbench-8.0.19-r1.ebuild 2629 BLAKE2B 3796fddc98646419abf3b497862b1e3eecbd3d846dc4654bb4629adab10679738d2434b48b5fbc221c3383bbc59cc94ef0bc25b22beb18a8cb73628a7560c26a SHA512 4ef8643322b88a123a0cac098f5835e64581ab21e1eefa339b92bc1d507f03a9976bfa67a75a14e58165e90cf8ad1aa16e259db32ccc22c172a82b7f15fe3df4
-EBUILD mysql-workbench-8.0.20.ebuild 2639 BLAKE2B cada322f63595aaf9a6add80d1db5f160f616f4026cb65f8bd3bb968def8348ff8cc89b7fbc1f6c550780b5df332ef6f814dbf9f1578734671eedcd07276b334 SHA512 ce59a3350cae3f4714e139553f824aa29992ea374bdfcf4a9b881ef9a875f069845d4e4655597aacc7c4ed05105536b79a8dabdef430efa57703f29af7422be0
-EBUILD mysql-workbench-8.0.21.ebuild 2678 BLAKE2B b4beba334812494af029c372321999d65fe0c8b613ebd3aa3eed95f1fc85366b15159f7af27cdb35faf0d4acff5d3d06fb6f5606f25b99eeb122651716a7fae1 SHA512 077105f1bf95a827df03cd56dcbe27e3f2b953115ac3415cab2381d8bd05bfddc8df3b6b17d65b0dd3359dc8e159ee63ac1d68bc96623f3a186e5952f0f8a882
-MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
deleted file mode 100644
index 2d3d8db243f8..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/plugins/migration/CMakeLists.txt.~1~	2015-02-25 09:08:47.000000000 +0100
-+++ b/plugins/migration/CMakeLists.txt	2015-03-07 07:28:56.745378152 +0100
-@@ -10,7 +10,8 @@
- if (UNIX)
-   configure_file(wbcopytables.in wbcopytables)
-   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/wbcopytables DESTINATION ${WB_INSTALL_BIN_DIR})
--  
-+
-+  SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
-   add_executable(wbcopytables-bin
-       copytable/copytable.cpp
-       copytable/python_copy_data_source.cpp
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
deleted file mode 100644
index c624dea0e56d..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.19-mysql-connector-8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru a/build/cmake/Modules/FindMySQLCppConn.cmake b/build/cmake/Modules/FindMySQLCppConn.cmake
---- a/build/cmake/Modules/FindMySQLCppConn.cmake	2019-12-18 13:31:34.520496484 +0100
-+++ b/build/cmake/Modules/FindMySQLCppConn.cmake	2019-12-18 13:32:32.590496631 +0100
-@@ -27,7 +27,7 @@
-   set(MySQLCppConn_FIND_QUIETLY TRUE)
- endif ()
- 
--find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include /usr/local/include)
-+find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc)
- 
- SET(MySQLCppConn_NAMES mysqlcppconn)
- 
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
deleted file mode 100644
index 85825f14c047..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.21-boost-1.73.0.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Patch from Alt Linux as provided in https://bugs.gentoo.org/723432
-
-diff --git a/library/forms/swig/mforms.i b/library/forms/swig/mforms.i
-index cb74ba41..05535e56 100644
---- a/library/forms/swig/mforms.i
-+++ b/library/forms/swig/mforms.i
-@@ -3,6 +3,7 @@
- #pragma SWIG nowarn=401,402,509
- 
- %{
-+#include <boost/bind.hpp>
- #include <boost/signals2/signal.hpp>
- #include <sstream>
- #include <frameobject.h>
-diff --git a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp b/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp
-index 24db3d63..d997c410 100644
---- a/modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp
-+++ b//modules/db.mysql.sqlparser/src/mysql_invalid_sql_parser.cpp
-@@ -31,6 +31,7 @@
- #include "base/string_utilities.h"
- #include <sstream>
- #include <boost/lambda/bind.hpp>
-+#include <boost/bind.hpp>
- 
- using namespace grt;
- using namespace base;
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp
-index 3da58757..a9b082ac 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_inserts_loader.cpp
-@@ -27,6 +27,7 @@
- 
- #include "mysql_sql_inserts_loader.h"
- #include "mysql_sql_parser_utils.h"
-+#include <boost/bind.hpp>
- #include <boost/foreach.hpp>
- 
- using namespace grt;
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp
-index 0c0f72bc..baf3d897 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_normalizer.cpp
-@@ -22,6 +22,7 @@
-  */
- 
- #include <glib.h>
-+#include <boost/bind.hpp>
- #include <boost/signals2.hpp>
- #include <cctype>
- 
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp
-index ef51d77c..68f397ae 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser.cpp
-@@ -39,6 +39,7 @@
- #include "base/string_utilities.h"
- #include <sstream>
- #include <iterator>
-+#include <boost/bind.hpp>
- #include <boost/lambda/bind.hpp>
- 
- using namespace grt;
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h
-index 9e790dfb..2addd87e 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser_utils.h
-@@ -30,6 +30,8 @@
- 
- #include "base/string_utilities.h"
- 
-+#include <boost/bind.hpp>
-+
- using namespace grt;
- 
- template <typename T>
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp
-index 617487b5..9614ad9c 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_schema_rename.cpp
-@@ -22,6 +22,7 @@
-  */
- 
- #include <glib.h>
-+#include <boost/bind.hpp>
- #include <boost/signals2.hpp>
- 
- #include "mysql_sql_schema_rename.h"
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp
-index bbbb733a..51c3215d 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_specifics.cpp
-@@ -28,6 +28,7 @@
- #include "mysql_sql_parser_fe.h"
- #include "grtdb/charset_utils.h"
- #include "base/string_utilities.h"
-+#include <boost/bind.hpp>
- #include <boost/scoped_array.hpp>
- #include <sstream>
- 
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp
-index b87535a0..3900b7a8 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_statement_decomposer.cpp
-@@ -29,6 +29,7 @@
- #include "mysql_sql_parser_fe.h"
- #include "base/string_utilities.h"
- #include <boost/foreach.hpp>
-+#include <boost/bind.hpp>
- #include <boost/lambda/bind.hpp>
- 
- using namespace grt;
-diff --git a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp
-index 0f9f80ad..1cb5f78a 100644
---- a/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp
-+++ b/modules/db.mysql.sqlparser/src/mysql_sql_syntax_check.cpp
-@@ -28,6 +28,7 @@
- #include "mysql_sql_parser_fe.h"
- #include "grtdb/charset_utils.h"
- #include "base/string_utilities.h"
-+#include <boost/bind.hpp>
- #include <boost/lambda/bind.hpp>
- 
- using namespace grt;
diff --git a/dev-db/mysql-workbench/metadata.xml b/dev-db/mysql-workbench/metadata.xml
deleted file mode 100644
index 64e908505cd8..000000000000
--- a/dev-db/mysql-workbench/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>graaff@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">antlr/website-antlr3</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
deleted file mode 100644
index 2db141fb63cb..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.7.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		app-crypt/libsecret
-		dev-libs/glib:2
-		dev-cpp/antlr-cpp:4
-		dev-cpp/atkmm
-		dev-cpp/pangomm
-		>=dev-cpp/glibmm-2.14:2
-		dev-cpp/gtkmm:3.0
-		dev-libs/atk
-		>=net-libs/libssh-0.8.5[server]
-		x11-libs/pango
-		x11-libs/gtk+:3
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		>=dev-libs/rapidjson-1.1.0
-		dev-libs/libsigc++:2
-		>=dev-libs/boost-1.55.0[nls]
-		>=dev-cpp/ctemplate-0.95
-		>=dev-libs/libxml2-2.6.2:2
-		dev-libs/libzip
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1
-		virtual/opengl
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
-		dev-python/pexpect
-		>=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-		app-admin/sudo
-		>=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-		dev-lang/swig
-		virtual/jre
-		virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-	"${FILESDIR}/${P}-mysql-connector-8.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-	## And avoid -Werror
-	sed -i -e 's/-Werror//' CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	if has_version dev-db/libiodbc ; then
-		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-	fi
-
-	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-	local mycmakeargs=(
-		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-		${IODBC}
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.20.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.20.ebuild
deleted file mode 100644
index 2590c53d77bb..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.20.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.7.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		app-crypt/libsecret
-		dev-libs/glib:2
-		dev-cpp/antlr-cpp:4
-		dev-cpp/atkmm
-		dev-cpp/pangomm
-		>=dev-cpp/glibmm-2.14:2
-		dev-cpp/gtkmm:3.0
-		dev-libs/atk
-		>=net-libs/libssh-0.8.5[server]
-		x11-libs/pango
-		x11-libs/gtk+:3
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		>=dev-libs/rapidjson-1.1.0
-		dev-libs/libsigc++:2
-		>=dev-libs/boost-1.55.0[nls]
-		>=dev-cpp/ctemplate-0.95
-		>=dev-libs/libxml2-2.6.2:2
-		dev-libs/libzip
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1
-		virtual/opengl
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
-		dev-python/pexpect
-		>=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-		app-admin/sudo
-		>=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-		dev-lang/swig
-		virtual/jre
-		virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-	## And avoid -Werror
-	sed -i -e 's/-Werror//' CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	if has_version dev-db/libiodbc ; then
-		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-	fi
-
-	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-	local mycmakeargs=(
-		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-		${IODBC}
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild
deleted file mode 100644
index d811ec775a6e..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.21.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-ANTLR_VERSION=4.7.1
-
-inherit gnome2 flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="https://www.mysql.com/products/workbench/"
-SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
-	https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		app-crypt/libsecret
-		dev-libs/glib:2
-		dev-cpp/antlr-cpp:4
-		dev-cpp/atkmm
-		dev-cpp/pangomm
-		>=dev-cpp/glibmm-2.14:2
-		dev-cpp/gtkmm:3.0
-		dev-libs/atk
-		>=net-libs/libssh-0.8.5[server]
-		x11-libs/pango
-		x11-libs/gtk+:3
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		>=dev-libs/rapidjson-1.1.0
-		dev-libs/libsigc++:2
-		>=dev-libs/boost-1.55.0[nls]
-		>=dev-cpp/ctemplate-0.95
-		>=dev-libs/libxml2-2.6.2:2
-		dev-libs/libzip
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1
-		virtual/opengl
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		>=dev-db/mysql-connector-c++-1.1.8 =dev-db/mysql-connector-c++-1*
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
-		dev-python/pexpect
-		>=dev-python/paramiko-1.7.4
-"
-
-RDEPEND="${CDEPEND}
-		app-admin/sudo
-		>=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-		dev-lang/swig
-		virtual/jre
-		virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
-	"${FILESDIR}/${PN}-8.0.19-mysql-connector-8.patch"
-	"${FILESDIR}/${P}-boost-1.73.0.patch"
-)
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-	## And avoid -Werror
-	sed -i -e 's/-Werror//' CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	if has_version dev-db/libiodbc ; then
-		IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config"
-	fi
-
-	append-cxxflags -std=c++11
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar"
-	local mycmakeargs=(
-		-DWITH_ANTLR_JAR=${ANTLR_JAR_PATH}
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DIODBC_INCLUDE_PATH="/usr/include/iodbc"
-		${IODBC}
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d8e65e84d5cb..b612adf33d2f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -20,8 +20,8 @@ DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf29
 EBUILD mysql-5.7.27-r2.ebuild 31722 BLAKE2B b19b37cb6840d6cd20d64807a2324190325cc607827173a3ee6270fa167fdeb0b370a488c3391861601323b5979fe5803a955ebcd645eaf96edf45ee2af73ca3 SHA512 0f7ffadb2841a6553f443aaca8bb133fb6e35b3af5d3781156a335baaf44c585f843bb6332e5946d333dd0455c051bd8820810814740d00efd29bec471b4ef7f
 EBUILD mysql-5.7.29-r1.ebuild 31458 BLAKE2B 5f68d00d9c52432b249be3dcd5c6847d5507700e58d53381a7397babe49681dadb4c39daa59850d353855abbaef59f648cef95a19a11da815200bb60b7f6f55b SHA512 7dd0e4ce9b9b1d7d28f9dced9647664d6ec1f50d9f2a31b41c7f67be4bb8cd2018638fb9b15d06ef5ec29a78b3258dec18757f404717e01d57a7c04caa137c5c
 EBUILD mysql-5.7.30-r1.ebuild 30683 BLAKE2B fb6c808884b175e231c782c80e7fb6993ee6bed6fec8263fef23d5e1b2e92e2d990b9ed45bc2fb6aba06620e6825fbd9d60a1fd48c68ad1b2fe251089ee9280c SHA512 9fe9e04a60e3aa4945861c13a5f828325cbc23311d9a412e5434551ca384479e5b72d181292c0cb4730b3da1d331eec6379ff483f6da66dd682754680851377a
-EBUILD mysql-5.7.31.ebuild 37542 BLAKE2B ad2fa00871891a41481adfdcb1fae29a07235e5c017926ff5e64d0ffcf870d7cf0ae72f92706f3221028775ce3d2f2e1939c3b9b2efc15711f9c2eb9601348c5 SHA512 5c051be326fba867c3e455bed9e192c6e61c9c0203ca739e99c5cc32c76e667965311a17b0c6481347d2c71f24b2f49635782df4a528b1d8856fb6e5c25bd895
+EBUILD mysql-5.7.31.ebuild 37541 BLAKE2B adf7175ae7e528e904fe3c9ab487fdbfff89ca240fd9e2539b457235a9972636a0fb1025f02e83a34b45690a6e2359486420604667433883854a5978f9b84d31 SHA512 a0092616a555400e8baedff4cb926ae20b8eb9c8ee5c54542b6649b196fb13468b2017b808f49b0dbe5bb9a662a0e5340457b9eab3347409269a53225bc5b8ec
 EBUILD mysql-8.0.19-r2.ebuild 37949 BLAKE2B c0ae41237387d4c58bac1f0f218fa467eba25a79e44605489f3835a1508c94423ea31c7d7d3f39e00f91a56a2320ffcca4fd968a425a3f898c9b7c2b9713f902 SHA512 434b40517a183a8bbb877ad79661ccc3ee1a89d40a374823c8778d87f75593f295c7a635496be1cb6376036da9c3acd5f82bfa2b62a88165b9c4b4b0ffd6469f
 EBUILD mysql-8.0.20-r1.ebuild 37217 BLAKE2B 2aef6bce1bd7f8e5e55b64caa304b427c84fcd365e265a6ce0d2458491349cd8c04c17a50644d1be7fca9218e17ad748b9307fe7b32270c6ba936077e2746d9b SHA512 ca65ad63a374696e4adc2d73176de71a0b27e267b91dfba20641303c4b9e8cfa1241375c7cd69af660b2d2632c629ab0658d1ed6e2454032a689f2995a2c505c
-EBUILD mysql-8.0.21-r1.ebuild 38165 BLAKE2B df3c24f2e2ca07b7aada24ad1afca9b8d8b97b15280eb749d0446623e73cca0d42734558dbad904a5721bbdaa59fd7c3ef5daf2127522131b7a1200a2c197b8a SHA512 36e6aca99fdf2bef9a2d36d8fbe5b78f1a8b0b61f0b2c56385ffdae07bb5589d90417714b96e842b2c34b6e0f75b103051c54b314645bc6397192a9486a15346
+EBUILD mysql-8.0.21-r1.ebuild 38164 BLAKE2B b116bdce0e266fad0e0c673b9dc5eb036991b0a334c102401abad24d37ae711b9a390441592da86fb22fbacb37d53cb8a7dadd764c4eba323f4aeeb589316fd0 SHA512 4dcf7f718a3c07d86e90f0337d182db950ecbdb7ef764eac985c53620fefe568465e6183f790c0f049063705c6db622f863cacc87b773cdf15ce0ac34f119a5e
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.7.31.ebuild b/dev-db/mysql/mysql-5.7.31.ebuild
index 023b1a18184b..8731897ca911 100644
--- a/dev-db/mysql/mysql-5.7.31.ebuild
+++ b/dev-db/mysql/mysql-5.7.31.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.21-r1.ebuild b/dev-db/mysql/mysql-8.0.21-r1.ebuild
index 438008e72d5c..f66ee05d1adb 100644
--- a/dev-db/mysql/mysql-8.0.21-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.21-r1.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 90343736738c..d4b00d5a455e 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -13,13 +13,13 @@ AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438
 DIST postgresql-10.14.tar.bz2 19042154 BLAKE2B addddf00179190780bd30ed97cf6881670d18fda77062cdb5dc7cc161c64c3d5522db288902d0612db30fc6fcc1b619c7a102887ed438e27739e936bf5659425 SHA512 eecd2aa8df7e4779606ec547b7bf0207ebb2be10a4b332f06c3b72116f0619fe27fb651f2fd4504c73b740ab7f92468919244a615d460bb9c35085174a0dbc78
 DIST postgresql-11.9.tar.bz2 19959019 BLAKE2B 655d1c9e6eebde19402a4c220ee674c589641c5b6f4e6298c8c06d3330069178952455f5af58f90b9af196ba9c8fd03db0ccd70b8bc49335e465f0ed537eaf59 SHA512 2c5c2f51aa01f02af4aa0849441767383e30fef69dd52efa442892f39d2456bfa8bf01f633a265e00eca0745e792609d2c1d33f77d8f29a02f5f374c84f2bf6e
 DIST postgresql-12.4.tar.bz2 20669776 BLAKE2B fb3f865a8a5e5280e7cc5da43f8658029170cd15dae8cc5fb1e741a122ea1f13418ac7743ec417ab4436976bc0ce12753fc8a301200143c975e8739d59816fa7 SHA512 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
-DIST postgresql-13beta3.tar.bz2 21411847 BLAKE2B 6195e246f683c0da8b7fc8bb185474cfec9d556897f8a9f9ebf6138a644760c2e74fd9981de236280879bd78f9aba25c765ed065c84b7789b8ff0776fe9532ae SHA512 62804ab44dbfaad8f3d498eacc687620077023d4ce27fe817185a85ebea3aa55f673f2d83eb5477efbe980e3c536f328369c906b4ba71fc0702393bffb6fe2c0
+DIST postgresql-13rc1.tar.bz2 20996763 BLAKE2B 5073474f2e558580d70c83e932df8ad2c7b79e02b5736e40c5cbdf76e6265d993141dd292c61ce60b180f0742988896645f0bafc850ebcfff5dbbb8b1edf37d3 SHA512 4587e4195a1eed999f181ff6567feb621b838cd9d3c4a75877d968a669fb5d59f0144c828e5d41f9721fcba77fbded1be16a4dcd4b6fd3a4c17672807fd74b52
 DIST postgresql-9.5.23.tar.bz2 17682366 BLAKE2B 74713d6483ae1ad3d2dfc4b1ac9d30a6785ff34f61b735924f2d469861516ad5160cbfda9c09b96adf264237b6f3ad8fd6ddeef60b6af6b5b63d6c1a36fb9354 SHA512 b7a1e936a0043b57b3ece79610855820d2ea6a86e4a4be0c4c8358bf3e1ef8fa88bc60106d6b865d86231d16b5e3c098b4dbd93125a125b3cc5d468ffea64db1
 DIST postgresql-9.6.19.tar.bz2 18880036 BLAKE2B ad9c5684e2c0fb276589560f7dbe01241b5caf763f5a20991244ad7b473397576c9530658eb91e085e8416156b0ac81750f08ed85d5e5a689321891d10b6e114 SHA512 4d8d4a0e4645d71683a5fccb9cd88917e1870ba139f102e0ea82da9c8d1ad669f029e0feb6d409e2016dfd247229ec7daf04f7f2de3ab6c5b4053834ac244a26
 EBUILD postgresql-10.14.ebuild 13535 BLAKE2B fb84595125a36ed531d700db25845abacf4ced5897eaaad4e9cf5e8e1bcf4fd941a483d7380bfbf6fcfe2432ba9fbfde3edde1865309dd09ab44043abb3c3533 SHA512 01858923a47d0692501e8e56347068144b691cb5d554bc6cc44e8e9fc01ed005467d44376e0f7ec6cfc90b2580fe5fdf3c2c877d83da04fe5f5a69dd41d1acc6
 EBUILD postgresql-11.9.ebuild 13666 BLAKE2B d8cabef60a2d0ddb71340d1a0c6df2e582e8bcb2c35f6288f5f67f680c0fe5be9c0c60738487ebbc4a22aed658c8cb4032d61a03cf4a39ba57712ae1acd7e5a0 SHA512 ecc859a075ea988abb2f2b37bc94418b604abc7a93cf643102fd240ec2bddd14109a09443b4d86ff2de4f84f2ce8c6a3960e10d72b2b2e6976da7636333a2616
 EBUILD postgresql-12.4.ebuild 13638 BLAKE2B 9eb30632bb9dbe9599fd5ca555f74a6a3a1e1279e7abc29b9118b00bbac88048a17250b76e346c240adc3a210fcf802a543647da4622ca380e0744e3602c344a SHA512 520e1f44fcc83a639f85301db662c8262cfc3fb56371358c4f2139cb15ff95c5d288e44261b7d3591e0c8532c311668cddc70d803b1ea329b0d6cccdc7e548bb
-EBUILD postgresql-13_beta3.ebuild 13462 BLAKE2B 57f75f15da71e3bf0ce48b15a52e378f753c03ea9dd59f16a5630f2abd3705df9c270a061f6729d541cbcf1c73ef861b4179000459b4aa2dfed39d686b7fb043 SHA512 c43bbbff4fad1f343a845b499305001d7b1e6d933fd2141625e3bbe4a3ebb2fe1cbd8051bf50ee33b5608be25b95c9716b3f09d0d10fb628eb447e7fedbfbf97
+EBUILD postgresql-13_rc1.ebuild 13462 BLAKE2B 57f75f15da71e3bf0ce48b15a52e378f753c03ea9dd59f16a5630f2abd3705df9c270a061f6729d541cbcf1c73ef861b4179000459b4aa2dfed39d686b7fb043 SHA512 c43bbbff4fad1f343a845b499305001d7b1e6d933fd2141625e3bbe4a3ebb2fe1cbd8051bf50ee33b5608be25b95c9716b3f09d0d10fb628eb447e7fedbfbf97
 EBUILD postgresql-9.5.23.ebuild 14356 BLAKE2B e1cda95af93a53aee2404107b876861115a1415b51024853498e921147a70720b249285aeca777c47c317be5c5824d80c943c336ada8d07f7204afb0223d2120 SHA512 c7b6fefe53fbb12cecfa3db8f21acc4b2718a2e7b042d68b2c39e9892fb190e31dfd12690838e1d3d93940887d16c4b8cfc376ee813659aebebe316cadc0efec
 EBUILD postgresql-9.6.19.ebuild 14589 BLAKE2B a7c07a8a1fbe8bf35bad70a8e37579d20c8664e9511dea076c7a37ed40e9833721ab23b60ce28116c7bf1abf7f1b80423a298f97720536f229ce3b86ec8ab2fa SHA512 7373ecf70a742efb6d37b34934b3256bc9a638ba8aa6550069f714682bfa43c94b50e8a374ef51fc623409607a5d30180c129ca666f1011b1610a3f1f32f8741
 EBUILD postgresql-9999.ebuild 13812 BLAKE2B f0eb8f0d79c3d4d9f0bdd0fe49f9b8354ce0bbd237b286e1509b9d9573cb6c023a855c10c97d836909495a0e23fc785716820e6e54e86b0f31765e0aef53a645 SHA512 3e56a9b619e4a94658035121d71a5e86c115f7dd3a13318ff0b6c341b59ad0cb836376b7f0074a3e28e7b17f93c3e2b9317a6662de19f77d6f6c4e6b4bc1066b
diff --git a/dev-db/postgresql/postgresql-13_beta3.ebuild b/dev-db/postgresql/postgresql-13_rc1.ebuild
index 210d6e3dfda1..210d6e3dfda1 100644
--- a/dev-db/postgresql/postgresql-13_beta3.ebuild
+++ b/dev-db/postgresql/postgresql-13_rc1.ebuild
diff --git a/dev-db/textsearch_ja/Manifest b/dev-db/textsearch_ja/Manifest
index 4e3b010132fc..f4598523e80e 100644
--- a/dev-db/textsearch_ja/Manifest
+++ b/dev-db/textsearch_ja/Manifest
@@ -1,3 +1,3 @@
 DIST textsearch_ja-9.0.0.tar.gz 47126 BLAKE2B ac6ed27a2e9686f9a50e3ecddecda39429479095eabfe7749b5d8dfee93be1f04217d255e05046c07744b4be6b2279ebc2474f9157f8f5fba218fff6b202e4cb SHA512 1a516431709f2e9ec14a32c7edf7a6cafd2bd231853ead42d7a6381a964a66df37414f9e99959a3cc1f3b6dd50cce1f8142b300f255ae8eb498f6e3544e0dcd4
-EBUILD textsearch_ja-9.0.0.ebuild 605 BLAKE2B 33bc136afba5e9996b9253428484e47792657d54ed8961c9fa1ad81d1e50323182f57b2d99cadb322ef6b0210bdd52fedfc391d4efadf93046ff38bf6afbc2b5 SHA512 556262040bcbb55c1f5b902742f19788c23430ecd3d8a55fb8a1b121d1fb7d406f0298d462d7468da85eb5241311b95693d29b86c4cf6e3699a350cba4fd17f6
+EBUILD textsearch_ja-9.0.0.ebuild 597 BLAKE2B ccc6103f5b26447ae6c622d20dac4a51ea1bcfa99d5b3736fcf17f07517154632a45f93e4097ea1219ce744b43da6e89769b7f9a71dc9fccd07098b02a1c53f2 SHA512 09838eea22d76b7298cc8d18bc5002b56e402b9bae579359088b6b2ba3b68ce6b39ff1ef693427d8e8e6be1fe658bbe53e1efe9ab0cfdc6fa2a416e99d028d70
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/dev-db/textsearch_ja/textsearch_ja-9.0.0.ebuild b/dev-db/textsearch_ja/textsearch_ja-9.0.0.ebuild
index 2fa5d4ea83b1..a685bb8b725d 100644
--- a/dev-db/textsearch_ja/textsearch_ja-9.0.0.ebuild
+++ b/dev-db/textsearch_ja/textsearch_ja-9.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Integrated Full-Text-Search for Japanese language using morphological analyze"
 HOMEPAGE="http://textsearch-ja.projects.postgresql.org/index.html"
@@ -10,10 +10,10 @@ SRC_URI="http://pgfoundry.org/frs/download.php/2943/textsearch_ja-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND="app-text/mecab
-		>=dev-db/postgresql-7.4[server]" # pgmecab requires PGXS
+DEPEND="
+	app-text/mecab
+	>=dev-db/postgresql-7.4:*[server]" # pgmecab requires PGXS
 RDEPEND="${DEPEND}"
 
 src_compile() {