gentoo resync : 21.06.2020

16 files changed, 101 insertions, 296 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9001894039f9..a6e5e2019b69 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index 7d336cb4eedc..8da26de10b76 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,5 +1,4 @@
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1
 EBUILD libdbi-drivers-0.9.0-r1.ebuild 2169 BLAKE2B 156460ded1a2756ecf2275a6cdf7d9e76491f2bb091961e5c8bc16fb52e6ffe54e98ee014bf22f6759dd83ad48dfa2b1f9d04059f74b482cacf08c6cf73aafee SHA512 92adc747d5e1cca9327e0f2cd1234f69b3c92861391354f2a488897dea9a2900460e3eaee6431ce38659fcb55dc7ebb4f5b3297d483926c59cbc47c8c0e3d2ac
-EBUILD libdbi-drivers-0.9.0.ebuild 2127 BLAKE2B 2e79a711a78f4f3a1e98622caa41c16113468a6d5a57eddd34a436b9ac4b34b7a472ca305a201ee8c3ed0dc6a30a5347a714bd63423ad58d310af254bde1c4b3 SHA512 f3920c02e51574b4d4200b59e3fd8b3da7d1ae58ab2bb64f8ddf937bcaf6a58c3d7eeb9208edf7fb53f47c771c365fc8c1a0390cac47cdf90e419a9b91df657b
 MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
deleted file mode 100644
index 6f3b490144fd..000000000000
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools ltprune
-
-DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
-HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
-LICENSE="LGPL-2.1"
-
-IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86"
-SLOT=0
-REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
-RESTRICT="firebird? ( bindist )"
-
-RDEPEND="
-	>=dev-db/libdbi-0.9.0
-	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-text/openjade )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README README.osx TODO"
-
-pkg_setup() {
-	use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
-}
-
-src_prepare() {
-		#"${FILESDIR}"/${P}-fix-ac-macro.patch \
-		#"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
-		#"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-	# WARNING: the configure script does NOT work correctly
-	# --without-$driver does NOT work
-	# so do NOT use `use_with...`
-	# Future additions:
-	# msql
-	# freetds
-	# ingres
-	# db2
-	use mysql && myconf+=" --with-mysql"
-	use postgres && myconf+=" --with-pgsql"
-	use sqlite && myconf+=" --with-sqlite3"
-	use firebird && myconf+=" --with-firebird"
-	if use oci8; then
-		[[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
-		myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle"
-	fi
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static) \
-		--with-dbi-libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_test() {
-	if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then
-		ewarn "Tests disabled due to interactivity."
-		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
-		return 0
-	fi
-	einfo "Running interactive tests"
-	emake check
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 31f33bef4344..8820774c703b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -32,17 +32,17 @@ DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 3ad0da663c31831d3b511b88
 EBUILD mariadb-10.1.38-r1.ebuild 29427 BLAKE2B 4817945be76f85f162f6a26381d1e327bd0907304e9376faf3828f9c8e7ac7f0e8bec344b64af6da5bf78dafd1d8d40a44e2554c1862e9adce0666f2e990da61 SHA512 2b611ad16609527f1c5f1857ffc893a48b70a1d52018d0907723be892268d7c64dfcb727e44e64af9ae9f992585990dd13a5af64acb07f3a5ba2abb35562afad
 EBUILD mariadb-10.1.43.ebuild 29830 BLAKE2B 0b105fd2ea914b0e7fe5d47c58784a1c68f5dcb57c90e612bd207bd6ee7cb6b4e7f20e4e3d4e257326742963cd132336939d5bbbff35c669f668dd3f71146aab SHA512 4e6156acf7f78aa79293b6b11c535a862d21ccbe0592c100cba3a5bf4f3db770e2a1e8ab25e914e22a8cb2bbf247dee79fcf686e6357c72a1dfe65e5398713b9
 EBUILD mariadb-10.1.44-r1.ebuild 32167 BLAKE2B ea6304c6e0ef890a5443d4e46bd172876705b93e4c35bbf64935c8ae78d38e7baf44c433317dadac14ffca699df19df744e68ec782945bbf603c092b0cda77fb SHA512 54c45813c42e55b109e27b35d78a2d404ad038db6eefbc90d6c4382c9d30a15164ab1febed3efef03b7cd68012e164ec8bafa6e010eb5838881609d44ba5bc75
-EBUILD mariadb-10.1.45.ebuild 30682 BLAKE2B d8cadb03db271493a7381c5eaf2637c8955fc71ae87597599946b9d7c945844a5dc14b5abffe65bf5bf70fce252f893cedb865ca56b528c8735988c343f2df95 SHA512 06b301948c985e484c90687a0f385377e039d06bd4a837c0a551df600211ddd9fcae356edfa9ac4465d74fc1f9827b43e796ef4183bd1954c15aa5c1e020ef3e
+EBUILD mariadb-10.1.45.ebuild 30681 BLAKE2B 9d9e3872a86b923d06cc5f8594a554935cdb1dcb122f1e917fffd4a19c0fe7c1b2b2bee2b769f0495fb96360482f4467d3c7653cc86b3b965df586056c53921b SHA512 d953ded0e4db9ff71826767512ea7fbacc1cadd56442bc960d18844cd06c8cfe3a6a59af15a4d687b745a8769110f826a7d1ab0cf5a30773c73971473a6cc4da
 EBUILD mariadb-10.2.22-r1.ebuild 32490 BLAKE2B 1909cd64d969d82cd7826920aa04a9c92c7022d8d0b395f1ca8bf237cd2ad86ec919c9e4412aac3788b7cd5956df5f8d06bc18df345c12f3382405ecc9e920b7 SHA512 d219c571b941e3f3214bef82893507ec8ed233a6623f0cb7dba9e327fef628afca9af610a49378697ba10f14b6137eab50d5f0290fde46871970cf56d31b6e6c
 EBUILD mariadb-10.2.29.ebuild 33063 BLAKE2B 0cbf1bf88713221ef663ebb4e3e7e60e170890177b272a3ed851b192e3f45700b40daaf14de32f2bf752f5820ae75e6fef84ebc21ce56176fcc2f6a9214a47ea SHA512 183ad995db6fc08f3da3913f64510bfa4252c31e8478a19738bb6b421c66555db452a8d77243a5ba8e97e0dd6fdda2b47f29f2fd01abac26b114aaa3b8856f4c
 EBUILD mariadb-10.2.31-r1.ebuild 34996 BLAKE2B 5afbfd085d07291e4e4d92e3d5023fbfc214cebd8075299d122abb929271fa88a3ff635d7b534ee023bd1c2c994251fbdd4fb91cdd195a55333361b5c248d347 SHA512 49224247f852201a0d6df85ecd90f37e5e3b62d3e8b355be003ce998e6aed8a672a3dd2cc302462da5aaf99979feae90d9d9ebc1f6298826b41193bcff354ad0
-EBUILD mariadb-10.2.32.ebuild 33629 BLAKE2B 8651fc63c6e549eef366c0b00ea4027e8f9cfa37d2877cd9cf992656d60b6a6062590b49e421b09bdfd8209fb45eeb1581af88466502d78626b2e6242f8b9a83 SHA512 d3885f7c8b4fdf502770b90c58d8baecde82dfaa88b6d788d285b642a4065486df205d908ce14ec6735620f4ffb633f923b1c0348dd97a1f847baec77adc2b73
+EBUILD mariadb-10.2.32.ebuild 33628 BLAKE2B 28abc1b30dc5f512d0a22e2d1016dce48bce40bb7ede91ff072db630e91672eb91f077b16059fdd0bced364d6a6caa3790036b53a42f218e6c1d72cf96427809 SHA512 8117597b72cd5e59186430f097f02228ca35ce533a591bd339c837b1889fa4e85bebb6a8647837f5260503120ffda31395ebdd3c162faac8243b187a8d2c7dae
 EBUILD mariadb-10.3.20.ebuild 32690 BLAKE2B 35f9eb05a31fa3949464a77b044dc00561c016572a88fc028cb9ff58a1c149db72cd09d9cb0e1cb9e64b055881940adec0bcf990b3cbaa1bf9fb26a3d066ceda SHA512 861f3608796ab075c052e623cb8949adcea2bf49c97e81b70f9236ca8f67d6ca32602c7946f556763b7f421d275845c896f74db8e5ac966a387ccbcc69c29afd
 EBUILD mariadb-10.3.22-r1.ebuild 34771 BLAKE2B c8dca58770e27fce52ed0b492968334cbdf6bc7e6f691dd610a39cfab5261eccd467afa8a832388140d584349db7ce5668c5c0b13a4080f0b8bbe26a077a74b8 SHA512 e860dd7b60b5f6ce5dca20915364fd94f17c0fb80cf1afdd4b791f3c2454cb7240a7bebf91a8fcb4c52a6f5c71d1bec95436b0f662656d2b97387fc1de7ac6ee
-EBUILD mariadb-10.3.23.ebuild 33406 BLAKE2B 259cfef2866cae0b8546b7b9b56d5681e6122b1ff17b17c7b20ad060d225e329751c864025d01e59b4e032e1c0569070a3c5eca477c32bbd8cf67717c288b001 SHA512 2ea5971fa7b29dc434d681de0b099932e216d3d0988181e3646895672b7284fa97eb7c5fcd21cac1ceeabc266de0d5a5c581c1898b76e4a5cac897f774ed7a1a
+EBUILD mariadb-10.3.23.ebuild 33405 BLAKE2B c01d64c8ca3a9418bc19bab7c8f029a3f4d7ec5e25060e4383630d84f32dc99cca1c772a0428362a632c03035d705a73c46841b0c164a2f0857155f24a31ce5d SHA512 2dc8bc08fbf9704137fc7ffde8681c6aadb3e5067d8654f1c6eaac660c4dc3626a56bfd7833688c6b8d982adf53f358a53d9e2a5e46c6e73b02aa34189f13174
 EBUILD mariadb-10.4.10.ebuild 33342 BLAKE2B 8aa25f71b60b596994749905a9af6d0171a259bafba7ab76ff68e855d97de0363a687d4c603fe2ffb1d14196ff51ab5e8706c05d2c2a0dfdcb8f801001b1e0bf SHA512 ac6dcded63450f4a83e1bc41fd5a881bfe7f712cc4e31270d2d1b3015dd48e4a79876acc359e6bd6fd6f1c560a281fad96f4369965d9734b88165a27a5a1a70b
 EBUILD mariadb-10.4.12.ebuild 35329 BLAKE2B 88641f83a0e7e7617834b5bf27249e9ea863eb933be1b04389e4da0af004540f6c1472eb04dc98e4b51a89d81fbb651a88839db514adbf137169a315075fbfcd SHA512 647a0e6651ee8ca4f61bde0a88e9e2de4c3f06f10a7bcc0ce8bf940de830051025c89fa3428f154b14e58c050bf1dccf525804cccb73cdbabe265bf62dd9b595
-EBUILD mariadb-10.4.13.ebuild 33971 BLAKE2B 846198cd86fbd55e889617b96348dc7b7aacba8f90dc21d4356e2addc7d81217d56b90877378d9807247beb6f4e6fb6165f79190c1272d1df158c071168449f0 SHA512 7df1cc9d025256ade35ce265b78b7b86a4dab4e3d3e2ff046aedefe8affab800c55eff9ecbfd86355fb55182328b39e834b3ef09480b3b11f8e3e9acbae25c02
+EBUILD mariadb-10.4.13.ebuild 33970 BLAKE2B 6be42c206b9f722af28bf8ff31d47346645ccb782be933146d27d468c6b9bda99c700ea700dcc0f3063eba7ce15a929b506413de40bebc065e84ec341d9ea75f SHA512 7c1e6727c5d9ea9036652e65bcab7bfbc9403c7c0a92cfc5a1c2c7c8412ed6c14f5379b8bb1a6da1a246db35895c1fcd29128ad5248c3b78363223e3c7f75543
 EBUILD mariadb-5.5.66.ebuild 27209 BLAKE2B 837dad98c4e35a0e1ab4be51a0452531a33479098dd6706fb2991c617ae0bdb8cbd117f6c598c2eee0a0a63f5ae0b26f7e334d223548782cb5c4a47d31f5ff2d SHA512 be93e099475ca316318db96ba5437a491993440b42c638a52a215b3cc7d66ae14595d024a65efb032e26cf85130247f242d23e659509aa2a175fb6228b30bd3b
 EBUILD mariadb-5.5.67.ebuild 27209 BLAKE2B 80a419eded23bef53857b7554dc528e3196413ee9216c7341904af5d1590758a3017e006a4a67192a0fc37e6af70485f422ada200c99aa82714c08aaa9da8c01 SHA512 cdc301f9ae2cafd19919d10149a09d98f4bd9e106c521e398754e8cc1a770c3951432acec2e5ea19aed958c0233b4ec623bd28a573e085849b4dda860f35b26f
 EBUILD mariadb-5.5.68.ebuild 27216 BLAKE2B 67f60b5c4547a8e656931b76a4a74b87f03c92d0fc845f9258a165b3d001465e501c5cef5b1f4d2faac3e28d5a78e0cc3ec7b4d1fc8d92cdf9d56fdeadb4a06d SHA512 2e02a02cf904cadc4648380ff3c34ce2afbc238172299b76456cb88b5a956564e9256ee5c01421716c7380dbe373f04c12cdc41b3524fc80a8e701691a7d3032
diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild b/dev-db/mariadb/mariadb-10.1.45.ebuild
index 2c2d5872b3a6..8d4e32b0529e 100644
--- a/dev-db/mariadb/mariadb-10.1.45.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.45.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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/mariadb/mariadb-10.2.32.ebuild b/dev-db/mariadb/mariadb-10.2.32.ebuild
index 987b51c5e9b1..333c32b43468 100644
--- a/dev-db/mariadb/mariadb-10.2.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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/mariadb/mariadb-10.3.23.ebuild b/dev-db/mariadb/mariadb-10.3.23.ebuild
index f961b58f0295..91ca29e6fb06 100644
--- a/dev-db/mariadb/mariadb-10.3.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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/mariadb/mariadb-10.4.13.ebuild b/dev-db/mariadb/mariadb-10.4.13.ebuild
index 6ba79ae13794..b609ffd13bbd 100644
--- a/dev-db/mariadb/mariadb-10.4.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 84ea4df2c7ce..1aebe0ec3b27 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,4 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
-AUX mysql-workbench-6.3.10-i386-json.patch 7167 BLAKE2B 44a6e2446b24cd2f7f096d51b6cfdacfb485634a94733c4ef67a128ec903fec3736cb62ed45d6abbe7c7793b7d3ab668198f663a44b1bcc313f4d02ced4cd578 SHA512 992595df7719c4c958c98b5561f3fea04607213287c72daea6bb331392c417123d6fe5d1126c6dec128a857aa299908221f3a2c0ac08744241bf395e80a9574d
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
 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
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
deleted file mode 100644
index 31e789992d1c..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.10-i386-json.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Last-Update: 2018-03-05
-Forwarded: not-needed
-Origin: upstream, https://github.com/mysql/mysql-workbench/commit/fff08d9ec68de8215fc8f12fe0ee42e598e1cf75.patch
-Bug-Upstream: https://github.com/mysql/mysql-workbench/pull/14
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84886
-Bug-Upstream: https://bugs.mysql.com/bug.php?id=84951
-From: Christian Hesse <mail@eworm.de>
-Description: fixes FTBFS on 32bit architectures.
-
-~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:346:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
-       throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-                                                                               ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'const JsonParser::JsonValue& JsonParser::JsonArray::at(JsonParser::JsonArray::SizeType) const':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:361:79: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'JsonParser::JsonArray::SizeType {aka unsigned int}' [-Werror=format=]
-       throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-                                                                               ^
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp: In member function 'void JsonParser::JsonWriter::write(const JsonParser::JsonValue&)':
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1672:44: error: conversion from 'const JsonParser::JsonValue' to 'int64_t {aka long long int}' is ambiguous
-         _output += std::to_string((int64_t)value);
-                                            ^~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1001:3: note: candidate: JsonParser::JsonValue::operator bool() const
-   JsonValue::operator bool() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:981:3: note: candidate: JsonParser::JsonValue::operator double() const
-   JsonValue::operator double() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:950:3: note: candidate: JsonParser::JsonValue::operator size_t() const
-   JsonValue::operator size_t() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:939:3: note: candidate: JsonParser::JsonValue::operator ssize_t() const
-   JsonValue::operator ssize_t() const {
-   ^~~~~~~~~
-/<<BUILDDIR>>/mysql-workbench-6.3.10+dfsg/library/base/jsonparser.cpp:1675:45: error: conversion from 'const JsonParser::JsonValue' to 'uint64_t {aka long long unsigned int}' is ambiguous
-         _output += std::to_string((uint64_t)value);
-~~~~
-
---- a/library/base/jsonparser.cpp
-+++ b/library/base/jsonparser.cpp
-@@ -342,9 +342,9 @@
-    *         If no such data is present std::out_of_range is thrown.
-    */
-   JsonValue &JsonArray::at(SizeType pos) {
-     if (pos > _data.size())
--      throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+      throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
-     return _data.at(pos);
-   }
- 
-   //--------------------------------------------------------------------------------------------------
-@@ -357,9 +357,9 @@
-    *         If no such data is present std::out_of_range is thrown.
-    */
-   const JsonValue &JsonArray::at(SizeType pos) const {
-     if (pos > _data.size())
--      throw std::out_of_range(base::strfmt("Index '%lu' is out of range.", pos));
-+      throw std::out_of_range(base::strfmt("Index '%zu' is out of range.", pos));
-     return _data.at(pos);
-   }
- 
-   //--------------------------------------------------------------------------------------------------
-@@ -1667,14 +1667,16 @@
-         break;
-       case VDouble:
-         _output += std::to_string((double)value);
-         break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         _output += std::to_string((int64_t)value);
-         break;
-       case VUint64:
-         _output += std::to_string((uint64_t)value);
-         break;
-+#endif
-       case VObject:
-         write((JsonObject)value);
-         break;
-       case VArray:
---- a/library/forms/jsonview.cpp
-+++ b/library/forms/jsonview.cpp
-@@ -650,10 +650,12 @@
-   bool setData = false;
-   if (data != nullptr) {
-     std::stringstream buffer;
-     double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     int64_t number2 = 0;
-     uint64_t number3 = 0;
-+#endif
-     bool retBool = false;
-     auto &storedValue = data->getData();
-     switch (storedValue.getType()) {
-       case VDouble:
-@@ -663,8 +665,9 @@
-         buffer >> number;
-         storedValue = number;
-         setData = true;
-         break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         if (!base::is_number(value))
-           break;
-         buffer << value;
-@@ -679,8 +682,9 @@
-         buffer >> number3;
-         storedValue = number3;
-         setData = true;
-         break;
-+#endif
-       case VBoolean:
-         if (!base::isBool(value))
-           break;
-         buffer << value;
-@@ -1072,16 +1076,18 @@
-     case VDouble:
-       node->set_string(1, std::to_string((double)value));
-       node->set_string(2, "Double");
-       break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     case VInt64:
-       node->set_string(1, std::to_string((int64_t)value));
-       node->set_string(2, "Long Integer");
-       break;
-     case VUint64:
-       node->set_string(1, std::to_string((uint64_t)value));
-       node->set_string(2, "Unsigned Long Integer");
-       break;
-+#endif
-     default:
-       break;
-   }
-   node->set_data(new JsonTreeBaseView::JsonValueNodeData(value));
-@@ -1321,10 +1327,12 @@
-   JsonParser::JsonValue &storedValue = (!key.empty() ? ((JsonObject &)data->getData())[key] : data->getData());
-   if (data != NULL) {
-     std::stringstream buffer;
-     double number = 0;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     int64_t number2 = 0;
-     uint64_t number3 = 0;
-+#endif
-     bool retBool = false;
-     switch (storedValue.getType()) {
-       case VDouble:
-         if (!base::is_number(value))
-@@ -1334,8 +1342,9 @@
-         storedValue = number;
-         node->set_float(column, number);
-         _dataChanged(false);
- 	break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-       case VInt64:
-         if (!base::is_number(value))
-           break;
-         buffer << value;
-@@ -1352,8 +1361,9 @@
-         storedValue = number3;
-         node->set_float(column, (double)number3);
-         _dataChanged(false);
-         break;
-+#endif
-       case VBoolean:
-         if (!base::isBool(value))
-           break;
-         buffer << value;
-@@ -1611,14 +1621,16 @@
-   switch (value.getType()) {
-     case VDouble:
-       node->set_float(columnId, (double)value);
-       break;
-+#ifdef DEFINE_UINT64_T_FUNCTIONS
-     case VInt64:
-       node->set_long(columnId, (int64_t)value);
-       break;
-     case VUint64:
-       node->set_long(columnId, (uint64_t)value);
-       break;
-+#endif
-     default:
-       break;
-   }
- }
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 8b3090fc35fe..21cc3109f7c0 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -7,9 +7,11 @@ AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805ac
 DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333b1111cbd62ff2f22741984d SHA512 8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d
 DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6 SHA512 2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115
 DIST pgbouncer-1.12.0.tar.gz 567465 BLAKE2B 866a877478a417b3854e6e2a724fcd06c04bd94893e5d79f8bf250fa9391407c5b7cd00bf2771af18b162dfd2b7bdced00be15c44ba74cf842e3d98c561991e3 SHA512 017d150f865df231861cda4678963ad7e63a0cd238f5ece5679c920484e01c53ab27af63bf47e6227d66b7dc94b4d59ca41ac49c26f60aba74d40b43cad55664
+DIST pgbouncer-1.14.0.tar.gz 578955 BLAKE2B 49e1e22b2fa604410111ac19b7c0c2c15f6739274d642e7100a9988379e828e8546454766ae32edb65ab7299b82693bcec32938621923bfbf99d946f5dc17f4a SHA512 506810c9896a45d67fbc97c3027572278b3857635c222cfaa53b4f3893069cfbee2ec92facd6f387de217bb3170045410b88a7cea09a45686661a2d2ccc85271
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
 EBUILD pgbouncer-1.10.0.ebuild 1856 BLAKE2B edb6277234d85c6797c89c07fa68ffb50ec23949155a55a7dccd5c99d454028ee593bbd34770da51be3886e143d9a8241464db586fe0d79a46ff9101107de4ac SHA512 28ea2302c28e746cb4c31a3528cc7329007ac67fd5c860619c350663c731000cd51f4859a7635cbb77916c3a8c817a82931e25e0275ca8854f6790eb32a15a65
 EBUILD pgbouncer-1.11.0.ebuild 1859 BLAKE2B 63d383eb450a181d8cdd56c6c2dbfdf1a4e2c5ac66cc24c670fc57f80651b5540664bbfc7435b8f0424c78bab38b87422988157e79b93d1ea3d92596c5afff6e SHA512 bc14e6b213c905bd9db7b69943a3c49a6094e5fb62cfa17465c36336d8ba4f21197b3ddfff33ad43451974af4ff7107dd5ecfcccbaa44f8e5d80c442ca254194
 EBUILD pgbouncer-1.12.0.ebuild 1957 BLAKE2B c9f2064bc29a8bce4515ae635ec03039a5a52efa5d56608f3f1a12e6fe2e014a1b22dd73e57dfa261ed29215672f42abaebafda232e94c7291d85ea06e57c842 SHA512 dfe2ef2ea5190456b1eb8af6c66b52ed40fa1b35962ed5a9a630649ade19714fb4e91ed4574196edd47461d1a792318329d92749e7406bf08da80d2502514c28
+EBUILD pgbouncer-1.14.0.ebuild 1859 BLAKE2B 63d383eb450a181d8cdd56c6c2dbfdf1a4e2c5ac66cc24c670fc57f80651b5540664bbfc7435b8f0424c78bab38b87422988157e79b93d1ea3d92596c5afff6e SHA512 bc14e6b213c905bd9db7b69943a3c49a6094e5fb62cfa17465c36336d8ba4f21197b3ddfff33ad43451974af4ff7107dd5ecfcccbaa44f8e5d80c442ca254194
 EBUILD pgbouncer-1.9.0.ebuild 1859 BLAKE2B 2a734101531a115c4156a0528b0b5a3d3d82f6ee71b285ec588ce7ede59efaea92fac1eb7afce31e3a362f68162c7d87d950d75ce26946a775d1910e4b884cd1 SHA512 62b251daa6ecca0df80eff8893dddcea38807d48820e0d66a7021c49b413b6408616abb38a3aeccccf5a0fe7dc707a715153d6dbf10ef16fe035fbbbe79cb098
 MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/pgbouncer-1.14.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.14.0.ebuild
new file mode 100644
index 000000000000..65c33e53faad
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.14.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="https://pgbouncer.github.io"
+SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+c-ares debug doc pam ssl -udns"
+
+# At-most-one-of, one can be enabled but not both
+REQUIRED_USE="?? ( c-ares udns )"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0
+	>=sys-libs/glibc-2.10
+	c-ares? ( >=net-dns/c-ares-1.10 )
+	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
+	udns? ( >=net-libs/udns-0.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	enewuser pgbouncer -1 -1 -1 postgres
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/pgbouncer-1.11-dirs.patch"
+
+	default
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--enable-debug \
+		$(use_with c-ares cares) \
+		$(use_enable debug cassert) \
+		$(use_with pam) \
+		$(use_with ssl openssl) \
+		$(use_with udns)
+}
+
+src_test() {
+	cd "${S}/test"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+	use doc && dodoc doc/*.rst
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
+
+	insinto /etc
+	doins etc/pgbouncer.ini
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Please read the config.txt for Configuration Directives"
+		einfo
+		einfo "For Administration Commands, see:"
+		einfo "    man pgbouncer"
+		einfo
+		einfo "By default, PgBouncer does not have access to any database."
+		einfo "GRANT the permissions needed for your application and make sure that it"
+		einfo "exists in PgBouncer's auth_file."
+	fi
+}
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index af6cae475154..26d4af64f433 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,3 +1,3 @@
 DIST pgxnclient-1.3.tar.gz 51976 BLAKE2B 84ae5573588e6da0b01d5b05e296adc09f28a0b21ff81e5f2f14f3035a98ad5eb834d6793acf0a48a8b19190b989562e75094341f7c01b371028a0dd6a87b0f4 SHA512 fd9326107334d473db3466f776021186a5add389a93266b000c143131a0214b9773dd4cdd4688575cd720c8357afce1473838dea4aa5ff2564dcbc2c359de2dd
-EBUILD pgxnclient-1.3.ebuild 929 BLAKE2B 4f71c33bd21fc85c0c3ec4f7e9ace002669657f036a0ceeadabf101d5144b35561f91646b6b5336c5b88560d1574ef5eb6e3e10b5d25047ab6f92b36bb59baec SHA512 7ef32558533e7b719e18c08057979bc9754bf17340ce4782aac4ad264b93e15cd9d05c55ba1b00041af9bf2d75094dfd688932c218e1b02e3862dccf4598e9c5
+EBUILD pgxnclient-1.3-r1.ebuild 975 BLAKE2B a3fe17330a8488386d3c0b658db12ecbc7c3abfb388db490909540a67311484df405aeb14327e7c6ff5d8c56b1f7d2cf793bea14f1daed319a85d116a4adfe9f SHA512 9a431ba0a95cbb8abb96bb1cda59958f4588cfb2767c7c5ecc483f6ccd2659c56e985efd2150083a47f5474cae6c2bfc5a051238a21e81f92c7a46f1cab9e734
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.3.ebuild b/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild
index 586f7287262e..7b785a380af5 100644
--- a/dev-db/pgxnclient/pgxnclient-1.3.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -28,8 +28,10 @@ distutils_enable_tests pytest
 RDEPEND="dev-db/postgresql:*[server]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND+="${RDEPEND}
-	test? (	dev-python/mock[${PYTHON_USEDEP}] )
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )
 "
 
 src_prepare() {
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 6cdf3046db5d..40df5947f0f2 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -13,7 +13,6 @@ AUX redis-sentinel.initd 648 BLAKE2B eaea4a047dfa61a325fa2bfeb30b422220d4fad699a
 AUX redis.confd-r1 511 BLAKE2B 911e6f7ca70013d4feefb6ec7ee3f98220f303d48c95f27c2558efee00559cf2b9ae8c0303f85d2b081aac8f636de326b52e3493a9be2c027ec7d97114f856da SHA512 f041e6b1da2c579a7dcf40e411ff47bc4675e5931e04f4353888ed5864b7e0c94d53fc98faee982c65a69d0154ee1f624fbadbbcc3a324aec583eefee6fb7133
 AUX redis.initd-5 696 BLAKE2B 11b2a50a74c9aea57b01ee7be7d3e1d70ca21db994c35b6d386115eb4f9c329ad6f77b80ce46c17e026a440e532e976c3e1a1f7c550e9f50cc812ef557c5f8d9 SHA512 cd5ae1cb0beded7c70fc7ab0bcbfe378dbac5bf78235877fedb4599c01bfcffc36909e638b032b29c79c5a5c55da11795c58a845b6eadf4cc41174903070183d
 AUX redis.logrotate 105 BLAKE2B 1281fd86d399b40aaaa69d1fe170b2c49523c074e14b12907428b676b03d510b680363dd5041428d5fddecb91a510baf53dfa57df66d697ba4846f1e49ab59fe SHA512 9cbd27732c7f8270bf9b8563df0964af142d1ac4e97417e495fcb02e730e93fdfafac9370188a2fce040d55d6c3704e284a50b6300616a3f13a03a6e25c1ae49
-AUX redis.service-2 253 BLAKE2B 0b78b45eaed3c7adbc68703968e1c843eeff785261cf7f4636df215d742c717d6fe95bb24e0aa947d64962ad20adacd48a4dd59b98eae479e7a33c1a0f2af7e1 SHA512 b42b73bb54ccc0d16adafb91aabe010092f548ec7979d8a0ed1c4563d9fca378eeb74c0c556f7565a32199ed30ca8a13d6b610d9cda39fd23da1428a410f62cc
 AUX redis.service-3 249 BLAKE2B 92a6914601fa9b587f439e5cb30c9b00ed53d6dc9d18f7ca8f34075f3d77836b82018baf3d6e46ad27ab90ed5de5a553fd5ffe4305afadb7b173b56dcb328de3 SHA512 5af7d61282e90e72faa8b328c11c70bd2cb255265e3a29c4f2208795c4876a08f9e01cb473d2a537362ed0b282b22aa51612cb95e192f96fa9a7b974a99da369
 AUX redis.tmpfiles 61 BLAKE2B 1c3bf8aa105940c408163f61c63ed16b86de7a979cb5143d15700cac329970f351cb9b9377aa82e6f4dae377b00c1710a1e0f54334f007cfed64551f761034d4 SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738
 AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d465ce097765308c7b7ea729526404120d04a79b547e865df93f7bfce1e63341c73563496f1dce691 SHA512 3de050ce044b7daf71219ec61dee2bc31acef161319b87ec2963b23c72e8a4807f1302c4932897664a63ef94507449f6ab75ce18d59f5e1a4558c330a7042e43
diff --git a/dev-db/redis/files/redis.service-2 b/dev-db/redis/files/redis.service-2
deleted file mode 100644
index c36d7960ef71..000000000000
--- a/dev-db/redis/files/redis.service-2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=A persistent key-value database
-After=syslog.target network.target
-
-[Service]
-Type=simple
-PIDFile=/var/run/redis/redis.pid
-ExecStart=/usr/sbin/redis-server /etc/redis.conf
-User=redis
-Group=redis
-
-[Install]
-WantedBy=multi-user.target
-