gentoo resync : 29.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
commit: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree: 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-db
parent: abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
26 files changed, 13 insertions, 594 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 832e9a76cd0b..c414a2c385ca 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 640c3426f230..e9f6ce19f6ed 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,5 +1,3 @@
-DIST freetds-dev.1.00.558.tar.gz 3151542 BLAKE2B e7b7eb1d4bad1472a675e7657d524837a27ba18176cf410ebad6dcb949cd59bb50e932526790c816c05cf0ba02fb750a1cfbcda10073e5cbf8908bdc4ceb9cc5 SHA512 763f04ae36be8385f9be955defd2d91698389836e80e19019f0da0ee15515d8b7e3733f7659362a307b492dc83830f0a7f27d2a68cb5b56e2ef171ac1dcfeeca
 DIST freetds-dev.1.2.18.tar.gz 3406990 BLAKE2B f0134ee0a322cb9e7a7fefbf9e85c60b826318b546febde78e53d5ec22dc2c8e269b7e830da6d84267d16a2dc2cf367a54354765017a40e07af2c3c6be54676e SHA512 315f40ba0d97281f852ec99fac457ec4b2a30879a2384bfa2d7c680aad6c056b6ae23fc192c18db4fba75caff552ef86de7bbfc5d7b608ea5a12531bf9eadc4c
-EBUILD freetds-1.00.558.ebuild 1890 BLAKE2B f4fb4429996adf84235bc63c9cbe4544e41123e25457820357833e2d41de51fd36434dfd210d4b1a1a529bd5d921b74b86a7f0f1360c11763ba8f5f499f7a05b SHA512 ddd04c9cb5595d029a9ddd0462e5112f4493ebdc22def7ca7e23942e1dac3b6e007eb65e5a35a48a86dcc25749fd636bc2430d84715885a37e177dfc727d9a19
-EBUILD freetds-1.2.18.ebuild 1634 BLAKE2B 13b90106cbe5666c3202e6fa59897accd4077adb8868288cbc389e593cfceeddda9500decf7e7a955ed2d77c852a9a89d0018dec45bafe8ef2ccf4a9055e88bc SHA512 84f5965abfc6b4ae12d496e51ed8a6569936f054d3ba7040929f5e4eaf4e2c11a211179afba1c0a54763a4c81ccf7b7bb9bdfb1a3f6c41e24a6f39378bf58ef7
+EBUILD freetds-1.2.18.ebuild 1633 BLAKE2B ace457a04b580f5caef7d4cb2df82e09b702079fae48a4ff5f2a9ccc01b8626295f7300288f19604ebd8995385fb82881d641d6faebf1b7bb079727a02a3d36a SHA512 b28bca48dc9039598bdacc010e08cb2735879e5b44b3ebffe15e625a8281a9afea93d21ae422a2a29962cae9f439faeeb399ba0a40a8594f8cbfeda46af13f61
 MISC metadata.xml 251 BLAKE2B 632781bc9fafff55239abb98f5b98cd2dfb01f5f8949dec160ef1007a7cfd513ff9f630157acb90efa4d03183cf9fecd5965d79a46ceea694961ff120dc3486c SHA512 8b481bb37df703c67035739c99511a846fa86d497f4d2bb7a8b86a9409cabcfce2b4c0011828c9e42077234ac1ab4af96c2f0c01dd6e7e65ac93b6f75c0779a1
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
deleted file mode 100644
index 7cc9262c47d1..000000000000
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is from the "current" release series, because the "stable" series
-# is a little too stable for us (missing bug fixes, and so on).
-MY_PN="${PN}-dev"
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="https://www.freetds.org/"
-SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
-
-IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
-# iODBC and unixODBC are mutually-exclusive choices for
-# the ODBC driver manager. Future versions of FreeTDS
-# will throw an error if you specify both.
-REQUIRED_USE="?? ( iodbc odbc )"
-
-RESTRICT="test"
-
-# sed, grep, and awk are used by the build system and the osql script.
-COMMON_DEPEND="
-	sys-apps/sed
-	sys-apps/grep
-	virtual/awk
-	gnutls? ( net-libs/gnutls:= )
-	iconv? ( virtual/libiconv )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	odbc? ( dev-db/unixODBC )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-
-# bind-tools is needed because the osql script calls "host".
-# binutils is for "strings".
-RDEPEND="${COMMON_DEPEND}
-	sys-devel/binutils
-	net-dns/bind-tools
-"
-
-S="${WORKDIR}/${MY_PN}.${PV}"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable debug) \
-		$(use_enable iconv libiconv) \
-		$(use_enable kerberos krb5) \
-		$(use_enable mssql msdblib) \
-		$(use_enable static-libs static) \
-		$(use_with iodbc) \
-		$(use_with odbc unixodbc "${EPREFIX}/usr") \
-		$(use_with iconv libiconv-prefix "${EPREFIX}/usr") \
-		$(use_with gnutls) \
-		$(use_with ssl openssl "${EPREFIX}/usr")
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-db/freetds/freetds-1.2.18.ebuild b/dev-db/freetds/freetds-1.2.18.ebuild
index 1efdc86b1872..e8b1511db368 100644
--- a/dev-db/freetds/freetds-1.2.18.ebuild
+++ b/dev-db/freetds/freetds-1.2.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 
 IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 2b2fd7e95a15..0167c36c4567 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,7 +1,5 @@
-AUX mysql-connector-c-8.0.18-always-build-decompress-utilities.patch 874 BLAKE2B 1622ba22ebb68d8b72499efec3075bbbe157b1ceaab5651dbc6dea996c831159161878a859972119dd4d5c20bb631681efb00b8d9715b3097890def8016898f4 SHA512 02ae005e8ac710dcc75f07011006df63a6d22f030b4eff0c6d28f78b083b1d7385190c9080812b5c9c2a84ad66972594b7d79a1485285c9ad76245577d42e528
 AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f
 AUX mysql-connector-c-8.0.21-libressl.patch 13288 BLAKE2B 5aad519f99103e579356d89ae92dda1e2496268cebdfe8dd3797138a5efe03370365225581399bb2373b847f61e2b4be726d940cde624d3cdda94b5c69904a3a SHA512 f4d057ce159153133e100c71c65f75bd558ba1ea914cd878023dc4e4a628d63b60d0ac671a97d26863b3f48c3dc8984317bb09362378c3b96b8ed47f08c1f6ea
-AUX mysql-connector-c-8.0.21-survive-malformed-charset-files.patch 580 BLAKE2B 76ea04058e14dce1cdd057b51e17d358ff582c82f27a537fb47aa66d58c88327231ca10755a6e02d0c1dab5c67d6eb92d9e9d5d74038595a203b65d3372d4577 SHA512 d8075a712bf12697499b1da2df7f43662bcce073113193e4b29261f965f10af43b1d529f1fe14ffed6c7c9bda3d3b0a61a2b3462e865724496d3d80f10c5264e
 AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af
 AUX mysql-connector-c-8.0.23-libressl.patch 13374 BLAKE2B 991f1e921c3f06937c682ed5f111f1cc94a763010120c5b779bed3f4246b598e6cc7d514c6c7ce0e1783b160afd27b081ab13cfd94aa99dd43d6c4b3f32a6164 SHA512 936a9b5861c08afc4ab7db069a0dbe586ce364b0581508d726a4fb98a687badcf027f45805e0dfe82cc007f0c6c380f7f4436cb3d9023a01d797bbcf71646616
 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch
deleted file mode 100644
index af0b31e89a3e..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/utilities/CMakeLists.txt
-+++ b/utilities/CMakeLists.txt
-@@ -110,21 +110,16 @@ MYSQL_ADD_EXECUTABLE(perror
-   DEPENDENCIES GenError
-   LINK_LIBRARIES mysys
-   )
--IF(BUILD_BUNDLED_LZ4)
--  MYSQL_ADD_EXECUTABLE(lz4_decompress
--    lz4_decompress.cc
--    COMPONENT Server
--    LINK_LIBRARIES ${LZ4_LIBRARY} mysys
--    )
--ENDIF()
--
--IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
--  MYSQL_ADD_EXECUTABLE(zlib_decompress
--    zlib_decompress.cc
--    COMPONENT Server
--    LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
--    )
--ENDIF()
-+MYSQL_ADD_EXECUTABLE(lz4_decompress
-+  lz4_decompress.cc
-+  COMPONENT Server
-+  LINK_LIBRARIES ${LZ4_LIBRARY} mysys
-+  )
-+MYSQL_ADD_EXECUTABLE(zlib_decompress
-+  zlib_decompress.cc
-+  COMPONENT Server
-+  LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
-+  )
- 
- # All targets below belong to COMPONENT Server and depend on InnoDB.
- IF(WITHOUT_SERVER)
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
deleted file mode 100644
index 72799f009c89..000000000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.21-survive-malformed-charset-files.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: don't crash on malformed charset files
-Origin: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1877504/comments/19
-Bug: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1884809
-Bug: https://bugs.gentoo.org/737002
-Forwarded: workaround, not needed
-
---- a/mysys/charset.cc
-+++ b/mysys/charset.cc
-@@ -922,7 +922,7 @@ size_t escape_quotes_for_mysql(CHARSET_I
- 
- void charset_uninit() {
-   for (CHARSET_INFO *cs : all_charsets) {
--    if (cs && cs->coll->uninit) {
-+    if (cs && cs->coll && cs->coll->uninit) {
-       cs->coll->uninit(cs);
-     }
-   }
- 
diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index 8fece49da219..93723fa8b776 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -6,5 +6,5 @@ DIST mysqltuner-1.7.17.tar.gz 213429 BLAKE2B 166ed3d657a529ce7c8e92648bcbf6da91f
 EBUILD mysqltuner-1.6.18.ebuild 819 BLAKE2B 28fbddde037358d38eac70b778e77e255c3a2fcc812652ed42bd3482bca055c81beabd4bdb879d08b05cb15c6b9a5d036a2db0ecdc032fefbfcca8d5b7de1a48 SHA512 097e8b3cecb29cfc084d73befee963c656b017202f048fcd04d8b2a7880218500fd8f52a7b72edbf5f4fa8f8d3780924d8fe954a254c048d6b4f8264f9107dea
 EBUILD mysqltuner-1.7.13.ebuild 825 BLAKE2B 0a4c896905040f43d559161fece619065e9da1392a9cc9814743cf6170a0d279a781a224174f9621884c52db36345766b62826442268af3f06ac5dc085fe7d36 SHA512 3496115cd682c512e34d46fd5f5db623a78618737b5c23e400e7dedd0f96b6ab1b641abf6fbd394e7d283f00025971f58e9fe3a6c8b371d92824076a3cb4bc17
 EBUILD mysqltuner-1.7.15.ebuild 954 BLAKE2B c769e561ab9abbcb314394bca95314e8f1c41464187c8b77952cec9e4e13c20f47f03b0feecc360a6b6a235576fc4b498c05fadfdb0f87eff0e705205fe0347a SHA512 cf78ab7498b00bf8a696b589e22d624fcfb72a1354637e01e36506b54d386abb79e66971ba8c69d3517b7dd699934a9292ee84bcfc10d6bb946391f6196868b5
-EBUILD mysqltuner-1.7.17.ebuild 839 BLAKE2B 4d2a3472151d27aaa5b5a6a7363d5ff635b850b7b77e5db30296cc9e080ad6837e0635d65668197a6da39ed29e092a0d2fefb4c2fce242b176fba41191e121c3 SHA512 92c1de87b8e62e95cf772aa6ca80fbe3d8aa7fbf2096910bb3e76e98d4c3dc98e94090ac8c64556d18035992873b5b869c2a2199b705f1cb4001fc6b239c13b8
+EBUILD mysqltuner-1.7.17.ebuild 838 BLAKE2B 59e548168964bc5f6225910aa28c03bd4ac4942fb14178e1815ced456dddea553932a35c1e0c7a1b97eee674ba74859c6ec2ba5551222cceb3f0917f12d0ef7c SHA512 c8415c8975f047b37aa5c638c303131c64d537a656e59d955d79e3d36d636178c5aaa8d9da9fca4347d3af92b81a2f93da5cf39c2140a30a5c7a94ff8e849359
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild b/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild
index 732f4a0e5036..511d0291d647 100644
--- a/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild
+++ b/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index 05bc1d9eb48c..f893272aed14 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -1,6 +1,3 @@
-AUX mytop-1.6-getopt-long-2.38-fixup.patch 578 BLAKE2B fc50dbdf44099cb812dc5610f22cada2010d684fd0914b544beaacf62478b3c3f1f179ebdc9ff9f7da07fe2764a2fdf32e43827e17b7bab1e8809a614e4cfb09 SHA512 a6f6bc9757112acc8cdeeb19e89487ad2ca79524c8d7a577b84c288addc283547837f390a7d7f43317d878e5be796be9d875fd57f548637a3d52aa1cabc5f3a8
-AUX mytop-1.6-global-status.patch 3694 BLAKE2B 68b2f93f74d4038d5e0527df65061a5b8b37efbfaffcbb31ead0e2cb0d36f939da3449e90c39d942d09316afea803a98ddb59bdb5e47450a71000737a4e33ce7 SHA512 bf33682ed457acac751390f757b4b284cf68cae1facdc5d9f3980abae3a3a6580b0558cd114569e79cab2b4ede430fba1c8b426d8b6d500fe0edf833b74d17ab
-AUX mytop-1.6-queries-vs-questions-mysql-5.0.76.patch 3365 BLAKE2B b28c2855e90201e1c7e5c94a76036b751f7428b3726fcc9d69b5848eb4fd8fe6c0cd538b80f901eef95586aa965485c64571439884f3fdda41a66f230355aba7 SHA512 a2735b157b81f702af09d6ee38003e4d15b6f901bc8f5e7013e8c73a1bd9ee798d0ed00ac0578b7e8ef36e5d4ddcc65489325937e9c2074004d2f69fb81fdcfb
 AUX mytop-1.9.1-global-status.patch 3459 BLAKE2B 338dffab012e3026d1c4e5edf241cf15a4bc2d67b1a29f4770aeb20b952d5d171e9fd805e21a963652eb601a4ed3bb5ddf3dd35fd310f66ce4fb89eee7257f9c SHA512 68052535131147a446133fbc155e04e13c5f0195c8fd111059b2bc266aa7a79f72cb25ec1f453e051651783760e212349dc7c50e1de2768d45281d25582a0cc9
 AUX mytop-1.9.1-queries-vs-questions-mysql-5.0.76.patch 3431 BLAKE2B 4d1d18cd3c9f9f74df49ab1958e68b50e286700619e28c8fc3e701a51eb4e95b5a1a8da2bae0e671f458f163d17ee163a30b697cc02219d118f0a05ecc00498f SHA512 50f5373dda953ea7ac18aff65b1319999fe0c53471ebef548309e49e2c6f762d5d98f105280a2c58a324731ff3c1c1af123114acf09f6bb3c99e4580e6041473
 DIST mytop-1.9.1.tar.gz 22095 BLAKE2B d0281fce93d9165593d5a94229a5de0d2b18d38b02e69329322e62611b5d9546d08626ea60ea7ede4d6ee88fc7df08c733cb5437fb47c468e0d591d7dde00595 SHA512 e6d38812dd69f5e330e5fe9206abe7e00c9e08dd61ba52a9dbd18a823bb09715832d27fb8db6fe1146d78eb56845cc0a7e2a72989ee56267d6482238fee84bc5
diff --git a/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch b/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch
deleted file mode 100644
index b911f9067baa..000000000000
--- a/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Getopt-Long-2.38 is stricter about what it allows.
-
-diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop
---- mytop-1.6.orig/mytop	2009-04-10 00:47:31.007111359 -0700
-+++ mytop-1.6/mytop	2009-04-10 00:50:39.875391905 -0700
-@@ -153,7 +153,7 @@
-     "idle|i"              => \$config{idle},
-     "resolve|r"           => \$config{resolve},
-     "prompt!"             => \$config{prompt},
--    "long|!"              => \$config{long_nums},
-+    "long!"               => \$config{long_nums},
-     "mode|m=s"            => \$config{mode},
-     "sort=s"              => \$config{sort},
- );
diff --git a/dev-db/mytop/files/mytop-1.6-global-status.patch b/dev-db/mytop/files/mytop-1.6-global-status.patch
deleted file mode 100644
index ae75ac7867af..000000000000
--- a/dev-db/mytop/files/mytop-1.6-global-status.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Use GLOBAL STATUS instead of implicit session status.
-
-As of MySQL-5.0.72, many of the status variables split for session and global
-variants. Importantly, the Com_* and Questions ones did, and this broke the
-statistics at the top of mytop.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-MySQL-Bug: 41131
-MySQL-Bug-URL: http://bugs.mysql.com/bug.php?id=41131
-
-diff -Nuar --exclude '*~' mytop-1.6.orig/mytop mytop-1.6/mytop
---- mytop-1.6.orig/mytop	2007-02-16 20:57:46.000000000 -0800
-+++ mytop-1.6/mytop	2008-11-30 15:18:05.818845253 -0800
-@@ -98,7 +98,7 @@
- my %qcache = ();    ## The query cache--used for full query info support.
- my %ucache = ();    ## The user cache--used for full killing by user
- my %dbcache = ();   ## The db cache.  This should be merged at some point.
--my %statcache = (); ## The show status cache for GetShowStatus()
-+my %statcache = (); ## The show global status cache for GetShowStatus()
- 
- my (%STATUS, %OLD_STATUS); # header stuff.
- 
-@@ -710,7 +710,7 @@
-     ##
-     if ($config{header})
-     {
--        my @recs = Hashes("show status");
-+        my @recs = Hashes("show global status");
- 
-         ## if the server died or we lost connectivity
-         if (not @recs)
-@@ -755,7 +755,7 @@
- 
-         ## Query Cache info
-         ##
--        ## mysql> show status like 'qcache%';
-+        ## mysql> show global status like 'qcache%';
-         ## +-------------------------+----------+
-         ## | Variable_name           | Value    |
-         ## +-------------------------+----------+
-@@ -1064,7 +1064,7 @@
- 
- sub GetQPS()
- {
--    my($data) = Hashes('SHOW STATUS LIKE "Questions"');
-+    my($data) = Hashes('SHOW GLOBAL STATUS LIKE "Questions"');
-     my $num   = $data->{Value};
- 
-     if (not defined $questions) ## first time?
-@@ -1126,7 +1126,7 @@
-     }
- 
-     # Variable_name and Value pairs come back...
--    my @data = Hashes("SHOW STATUS LIKE 'Com_%'");
-+    my @data = Hashes("SHOW GLOBAL STATUS LIKE 'Com_%'");
-     my %cmd_data;
-     my %cmd_delta;
-     my %cmd_pct;
-@@ -1216,7 +1216,7 @@
- sub GetShowStatus()
- {
-     Clear() unless $config{batchmode};
--    my @rows = Hashes("SHOW STATUS");
-+    my @rows = Hashes("SHOW GLOBAL STATUS");
- 
-     printf "%32s  %10s %10s\n", 'Counter', 'Total', 'Change';
-     printf "%32s  %10s %10s\n", '-------', '-----', '------';
-@@ -1543,7 +1543,7 @@
- 
- And you obviously need access to a MySQL server (version 3.22.x or
- 3.23.x) with the necessary security to run the I<SHOW PROCESSLIST> and
--I<SHOW STATUS> commands.
-+I<SHOW GLOBAL STATUS> commands.
- 
- If you are a Windows user, using ActiveState's Perl, you can use PPM
- (the Perl Package Manager) to install the MySQL and Term::ReadKey
-@@ -1599,7 +1599,7 @@
- notice features from each of them here.
- 
- B<mytop> will connect to a MySQL server and periodically run the
--I<SHOW PROCESSLIST> and I<SHOW STATUS> commands and attempt to
-+I<SHOW PROCESSLIST> and I<SHOW GLOBAL STATUS> commands and attempt to
- summarize the information from them in a useful format.
- 
- =head2 The Display
-@@ -1817,7 +1817,7 @@
- 
- =item B<c>
- 
--Show "command counters" based on the Com_* values in SHOW STATUS.
-+Show "command counters" based on the Com_* values in SHOW GLOBAL STATUS.
- This is a new feature.  Feedback welcome.
- 
- =item B<d>
-@@ -1904,7 +1904,7 @@
- 
- Some performance information is not available when talking to a
- version 3.22.x MySQL server. Additional information (about threads
--mostly) was added to the output of I<SHOW STATUS> in MySQL 3.23.x and
-+mostly) was added to the output of I<SHOW GLOBAL STATUS> in MySQL 3.23.x and
- B<mytop> makes use of it. If the information is not available, you
- will simply see zeros where the real numbers should be.
- 
diff --git a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch b/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch
deleted file mode 100644
index f1e139fe7471..000000000000
--- a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-In MySQL 5.0.72 the Questions variable was changed to only contain the number
-of client-initiated queries, NOT the number of overall queries. This caused
-problems with the select/insert/update/delete percentages because Com_* was
-still based on the overall queries.
-
-MySQL 5.0.76 introduced a new variable 'Queries' with the behavior of the old
-Questions variable.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-MySQL-Bug: 41131
-MySQL-Bug-URL: http://bugs.mysql.com/?id=41131
-
-====
-Revision 2:
-The first revision missed changing the instances of $OLD_STATUS{Questions}.
-
-diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop
---- mytop-1.6.orig/mytop	2009-02-14 17:28:38.696187159 -0800
-+++ mytop-1.6/mytop	2009-02-14 17:36:31.192890507 -0800
-@@ -800,8 +800,15 @@
- 
-         ## Queries per second...
- 
--        my $avg_queries_per_sec  = sprintf("%.2f", $STATUS{Questions} / $STATUS{Uptime});
--        my $num_queries          = $STATUS{Questions};
-+        my ($num_queries, $old_num_queries);
-+        if(defined($STATUS{Queries})) {
-+            $num_queries = $STATUS{Queries};
-+            $old_num_queries = $OLD_STATUS{Queries};
-+        } else {
-+            $num_queries = $STATUS{Questions};
-+            $old_num_queries = $OLD_STATUS{Questions};
-+        }
-+        my $avg_queries_per_sec  = sprintf("%.2f", $num_queries / $STATUS{Uptime});
- 
-         my @t = localtime(time);
- 
-@@ -820,25 +827,25 @@
- 
- 
-         printf " Queries: %-5s  qps: %4.0f Slow: %7s         Se/In/Up/De(%%):    %02.0f/%02.0f/%02.0f/%02.0f \n",
--               make_short( $STATUS{Questions} ),  # q total
--               $STATUS{Questions} / $STATUS{Uptime},  # qps, average
-+               make_short( $num_queries ),  # q total
-+               $num_queries / $STATUS{Uptime},  # qps, average
-                make_short( $STATUS{Slow_queries} ),    # slow
- 
-                # hmm. a Qcache hit is really a select and should be counted.
--               100 * ($STATUS{Com_select} + ($STATUS{Qcache_hits}||0) )    / $STATUS{Questions},
--               100 * ($STATUS{Com_insert} +  $STATUS{Com_replace} ) / $STATUS{Questions},
--               100 * ($STATUS{Com_update} )  / $STATUS{Questions},
--               100 * $STATUS{Com_delete} / $STATUS{Questions};
-+               100 * ($STATUS{Com_select} + ($STATUS{Qcache_hits}||0) )    / $num_queries,
-+               100 * ($STATUS{Com_insert} +  $STATUS{Com_replace} ) / $num_queries,
-+               100 * ($STATUS{Com_update} )  / $num_queries,
-+               100 * $STATUS{Com_delete} / $num_queries;
- 
-         $lines_left--;
- 
-         if ($t_delta)
-         {
--          my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} );
--#          print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions}  / $t_delta = $q_diff\n");
-+          my $q_diff = ( $num_queries - $old_num_queries );
-+#          print("q_diff: $num_queries - $old_num_queries  / $t_delta = $q_diff\n");
- 
-           printf("             qps now: %4.0f Slow qps: %3.1f  Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n",
--                 ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta,
-+                 ( $num_queries - $old_num_queries ) / $t_delta,
-                  ( # slow now (qps)
-                   ($STATUS{Slow_queries} ) ?
-                   ( $STATUS{Slow_queries} - $OLD_STATUS{Slow_queries} ) / $t_delta :
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 541f670a2dab..d1df417f6d7a 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,8 +1,6 @@
 AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782
 AUX my.cnf-8.0.distro-client 749 BLAKE2B b01b39c85430714b5a4bfb9923c9ed1df99cdcef0583b25f28c2ebeee264732f4402198b1918e5ec5b4b1091dbda2d321baf31fe87eae00792b20042260969b3 SHA512 62aa589833126c2b78528e103f2de11ba0e339615cb00170a0f9f53bbb123a4bf99f2041819440297ab6cc34cf57333488e6ae12082fa5dcbe1b0ddef5f6108d
 AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc250990a9c432800dbe25b5c31be08d8e3895666b57f21606ffb69e704c57ed2692fd94696b9d325a4442596587 SHA512 82d35b7bc944e5690e1f2670a3d5674845610c2d11d6d8b1c5784ccb3877c6298de70eced3d7c497c0bcaecfa9e339ac43ce0534a97e7d976e950bb1a7f5c75d
-AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
-AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST percona-server-8.0.21-12.tar.gz 522004727 BLAKE2B bc6bf77d862a4827839d1942f58e4124f4692abfa9298eaa7cebdaaa7a6cff036247edda51d9cbb878b0e79858e54cbe5326bc30479b1d5977a655240df438fd SHA512 66076a6774cf18af1111b83aa8977a55e1a2d634c30e190d3bd8e82ba079fb772ac2a2402356be0b79677b54ca0b24c441d87444b68d1e66cd298ca6a0108d31
diff --git a/dev-db/percona-server/files/my.cnf.distro-client b/dev-db/percona-server/files/my.cnf.distro-client
deleted file mode 100644
index a5a0dcb0c16a..000000000000
--- a/dev-db/percona-server/files/my.cnf.distro-client
+++ /dev/null
@@ -1,21 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/50-distro-client.cnf: The global mysql configuration file.
-
-# The following options will be passed to all MySQL clients
-[client]
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-character-sets-dir				= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-loose-default-character-set=utf8
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[mysqldump]
-quick
-max_allowed_packet			= 16M
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
diff --git a/dev-db/percona-server/files/my.cnf.distro-server b/dev-db/percona-server/files/my.cnf.distro-server
deleted file mode 100644
index d4ed30c1f089..000000000000
--- a/dev-db/percona-server/files/my.cnf.distro-server
+++ /dev/null
@@ -1,28 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/50-distro-server.cnf: The global mysql configuration file.
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server				= utf8
-user						= mysql
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysql.pid
-log-error					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir						= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir						= @DATADIR@
-skip-external-locking
-lc_messages_dir					= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages					= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address					= 127.0.0.1
-
-log-bin
-server-id					= 1
-
-# point the following paths to different dedicated disks
-tmpdir						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update					= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 571fa6258f2b..9f0d063c4067 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -2,6 +2,6 @@ DIST pgrouting-2.6.2.tar.gz 6065517 BLAKE2B e27e28cf988040de1e894a857e3d210bc767
 DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
 DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
 EBUILD pgrouting-2.6.2-r1.ebuild 1224 BLAKE2B d1f10f219e584e2167fbb3351cc35424fb35f10def7e7ba115aa4bec54c259f43e771e47f52d7fddf19c838117d0d265252d4886599ec401020287f590223d35 SHA512 6087d2e8e20c815defe78c440d5ba58e30de353e8ee0722b7347bff79c32ae7abc1d46d48b95c32c0b28db55043f198609217053012134dbfe27b1e879c06eb4
-EBUILD pgrouting-3.1.1.ebuild 1091 BLAKE2B d1505071d8f2f29eb5fae861ba5b621a66f7c8290476b118f879b6b9fd0d909b4a7b7f9f23fc17fed1fccdc648bb11b47d658ad81423d3731767fa58d175be35 SHA512 9f3f6c6d9f0511b868293f3c7e68d3e0e635e91187b4d25812d0e2bfbbf4a58e355ad802a99320bd9fe19a2348a4e33ce2d43c7a162b995f9b2a54f985fab38a
+EBUILD pgrouting-3.1.1.ebuild 1090 BLAKE2B 2a96e7c7baf0b80eb28a2fa633f7c18959f386d4591f07de8e2408fab21b69cce775dd5d8c78c85afc8fb7cf0b52b01d27fcc219a569aa91abff180b28f2a4ac SHA512 fbc6ce99d23055041951490da633ddf8c5467a76b8399e760079a3bf3882dc511104cd6914e99760e39ba7143bc2d545c4af639164ea8aa0040cf9de8bcfacb2
 EBUILD pgrouting-3.1.2.ebuild 1056 BLAKE2B 1fa30057f61f0d7857ddd0e98b577b93321326ef9b6b0a81409c6b5f6d0de621b6f73d7c7c98a61872620ac7fd7d3332421d4f82aeb946f4db0b57af57268606 SHA512 2aeb113d2e83966939215772762645edc9bd607c65735d3edfd54174ed6cca3b9367e7e68cc54a8a33cdb2b3ff5696e372da8e05309b2d35960eb409554a7903
 MISC metadata.xml 457 BLAKE2B d2432768e9244c7648720e1569195498ffa3bda4f862a5b5a2edbbd4383d3ca0ab83063c1004680ea6eb662d74f13c2ec4991baa25365ae9ae8f513b93c973b1 SHA512 bbfc5eec69256ba3addfe5c3158b11b4561b347682474ac2f5ac4cb3be8ca30df130957c751f09d761d3a3d8ad62cf3e59193414a31a9b46d793084285c9406d
diff --git a/dev-db/pgrouting/pgrouting-3.1.1.ebuild b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
index 0742615d5496..0c0d27fd5710 100644
--- a/dev-db/pgrouting/pgrouting-3.1.1.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 74d291176ada..99a6ab8f2e48 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -18,7 +18,7 @@ DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38
 DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
 EBUILD redis-5.0.10.ebuild 4733 BLAKE2B 16dff9009b44aff40a0d8b00c6d9885fd26bbd7265a57f09b57060acedb083d15ccbf593015bf66fdd0b0d05b8ce84cfc3805000b7f0aa9a5d7209773046d476 SHA512 f25cf0346af69b39075537a5fc8ee547c1bc3d1c3bd77e9ea6ab7c44fcbfd13e4e23ed5126f37fa86ecf5637c8a6619d864c69cfe3a5b5879464c04c1f7d9261
 EBUILD redis-5.0.9-r1.ebuild 4727 BLAKE2B 691271bcb72643dd3b1b0adb6f1a374967b7172437c2049fbc6cfdb01b19ee2cbd104f0baa96fce3b6b6983704f49922863f45677727b4d4ee573694d6897336 SHA512 bf5edded12de21673a5095ea034a344de05b5e54070dbbe698b8ca591d576af209f38df9c3715c21e38e877ae79a9b57b894142a55f2c475e933f72e4dc95222
-EBUILD redis-6.0.9-r1.ebuild 5127 BLAKE2B 26563847dfdddf0348d766cd21ac03aa740383690db8a42545e3ab5982da3bd99a9196e78bf5f010c5adefe21d7480667dff37328815438cdb39fa58923d81de SHA512 87ffa2f1bc28a4092103f0a845f7cec6f8ed81bf317dd9f69e3fd74717b4ecebf27d3c4dad8908ae37e158d456caf1a5c7f6222d9532715331eced4a38f5223f
-EBUILD redis-6.0.9-r100.ebuild 4575 BLAKE2B ec7c086c04e86f54ce4e8faa851cee2dd074aabeeeef1aa569aff498d43e829dc8bd1f73e2ca5885c8bdc1630044e11639cce20ac5e04ed236f21b0f25837baf SHA512 417248f9d33ec0959a789f0c1fd4d300662121ec51dec53088d6b27b0ba9b53b9553b2f174c77656e1cea9d1c9e34e2cbf45590379171d31468d29cd72e2e984
+EBUILD redis-6.0.9-r1.ebuild 5134 BLAKE2B f4d6b5ad302758c835ccb80e949cce0d62c4284ff8c7fcdd59ac40d59fff0b8ad8c4f280dc5f2333732efe38381dd160e665374e043f2bed3efe33675f42d657 SHA512 658510b533a6b8d015ba04b5a600e24600678ce0172998cf2117a8ed8d970b8e3f7d7a0e84cf00bb77e9646982c3ec61214e51f97f584fee9560c89aaf2aed6d
+EBUILD redis-6.0.9-r100.ebuild 4569 BLAKE2B 48495bfafcb136622355a82d124eba794756934767aca2785a72cae537f69a711764d6975690e90733f8ad1c128b3c70ae453cd0214bc391b064b0a75a2252e3 SHA512 1f814c38ba21dec646d87560d25791fabb2610d6aaf9f56466915bb322603f5db7d56a30b8f342459ebb2ac2ce3f61b9890ae6b5786f2c4c70f87d7a3c9dc4c1
 EBUILD redis-6.0.9.ebuild 4943 BLAKE2B 89a87cd49796bcb9ddb1f46390a6bea48a4fd2b6df7e8f2bd4c22587e6a6c7f3035316800641a0c2a7b4bf1ec76a66927fe72b721f3a141c2c3886d96b899efe SHA512 e827cc5a7db240e1569be7e05da01385e4039ba98a7d96857bfc7a0360a698512a950c29e2d20b7a6bad830641b1c5b53a932def18d00e273d5ee86f53199294
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-6.0.9-r1.ebuild b/dev-db/redis/redis-6.0.9-r1.ebuild
index 4674c4fe7093..399e7163e310 100644
--- a/dev-db/redis/redis-6.0.9-r1.ebuild
+++ b/dev-db/redis/redis-6.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc luajit ssl tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/redis/redis-6.0.9-r100.ebuild b/dev-db/redis/redis-6.0.9-r100.ebuild
index 289257d67305..28abcc4e6591 100644
--- a/dev-db/redis/redis-6.0.9-r100.ebuild
+++ b/dev-db/redis/redis-6.0.9-r100.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 2f4b200b99fb..a7b458c8f306 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -2,14 +2,5 @@ AUX slony1.conf 249 BLAKE2B ec214fb9a7d51bcaa58dc191d7e943c0d07be85c0f31dadbf199
 AUX slony1.init 615 BLAKE2B f1b3fc27ad3c4087713cceb6c2bb9451004b70e87c0347274c75e1c3ed8d439bb99f51d5e6e904d3957150e62760272312423a47235ff4e76792e0661b683bb3 SHA512 d450bba5f65372509e542f138d297202371bcaf78332ba13de72ddf937fcffe419083dddc5032c7bafd51993fbc677b37262e1b1e938e9e3c927e130c0a7c693
 DIST slony1-2.2.10-docs.tar.bz2 1445193 BLAKE2B 071f5faf2f7cae822b484f13ede6a8ede5278a065c55d2199f38e2dd195922cbc78982633316792978b968295d69e36651ae0367682ad45afab295e61e5329fa SHA512 d603abccc1ec7922fe8025ab178e6d12b28ffc763848be8d1f9fc93519b9928aa65ed6bcc1d678f2ad9f79818de06da39ec1f69d60de61c5e6fe42137c7c3112
 DIST slony1-2.2.10.tar.bz2 1464652 BLAKE2B a07a830501be13f33fc189128851cee02c8d8ca51a8a54f6b97028d65eb17937817c9ab6b5ebbcaa092e96fb00f57959806e5003e016df5e7034583de601084c SHA512 1b41addb7a0be0a130c2efcab1b241e3158d10a5a6e203d83f28353e303dd524e224ab9c04a7e37a0f89cd944237b90feeb8910eb35f717926aa3ad28dbe2d0f
-DIST slony1-2.2.6-docs.tar.bz2 1450956 BLAKE2B 949d0736eb9ab021767b80b4240e30a8cd11daa218cac6d722827a8db98f2b54cc093031e02d0cd14cb1eb60d56dc160dcd1c2e0708e7228fdac31ef26d2fcf4 SHA512 b5a870d5688ca24c0a9012d7da539917c74ee697f1b1ae663ead3cb1032345c0d8f5fc5bddc2ca2fec5d738fb9ca74822343cce8739b3b4b478928f26d214a0d
-DIST slony1-2.2.6.tar.bz2 1465709 BLAKE2B 87e581638aab5ac9f51437fc43b65f200c29e012fa2b5331d4a7972359bb345c8d5aec9917fbc348ce8338115f8270d6e55025905aa5aba642090a8486d0a3fc SHA512 5aeadb9ed72b83d303596e4f8513409a1f826f25fe283ca6aa969a7563172bbc5f5360f876fa87780f6a6fc70cb55688a2daf678b9cf91972a3c403cb76184b8
-DIST slony1-2.2.7-docs.tar.bz2 252020 BLAKE2B 315d54c008fca121fac12385602e729c7bb6a7a90db502165625c1138da6b87f147410555ca6bc315ba766fd6fed22b6c5dcbe06c9481dd37b9e9c8832209b02 SHA512 7735aae634788acae77eb2cc64f51a851e3b804fb1ca860eddc237734aa6182bd7dfcdae485cd89682c413f55003ea67d91c4c24922b4fdef79ac34793022e56
-DIST slony1-2.2.7.tar.bz2 1464923 BLAKE2B aee11f92d634a6c2eaf84dd48faf6cac7a27956474aaa9070f1d4fad3e70b0af09475abda149e096f1b238d68237c0b43b18880440bd4c2d66f5c0f4ad789e99 SHA512 22700e1574c91d4a4be5b78aac967eebc039440897364780891c2c76ed5b8e07c03205f0fbcd4870ee7c620d62b175987c46c43750524c6e5f9009044cc24f9a
-DIST slony1-2.2.9-docs.tar.bz2 1445251 BLAKE2B eafd17370e333a706fd563440b7948513db19a05e23f6a0a118e0f8927b5b52c99f46953c3c9ce2d8e9f04371a35ff390e0e542f295f4e926b7002642fc913b0 SHA512 88d1c26d668b4a021c7b53cb5c2a9b140485595460d1444997ae49e4b77910f58860d603777f1836fdfa1231d2e44ad5cdf8e82c0a03df5278c9de7de3101c5b
-DIST slony1-2.2.9.tar.bz2 1464548 BLAKE2B 6a2f3e21679ed1542066016bdc9e97aa7b5885fe15770d5015f26deb16e4d9634b930d9f13a8dbba6b1e89bf28cdcc28b3181f12efbf9b549a75c6e62755c099 SHA512 c42d7604ae2eda9b83bfa608ca13a4a25b2a4b77301a591b9308eda964d263490a02acdfd5b1a7e7751c24b2a7cb5d9410c58deaf82bdb3c422456af65c2b3f5
-EBUILD slony1-2.2.10.ebuild 1939 BLAKE2B 5764f809e2b293bcf9fff457f5d3d5bfb03b4f20c0fb363ed9dca4768199a13d6d34e360cdbc41c85a108db2950afea04af4b81cb45a2c5e40428bb3c571ab88 SHA512 201b3d07398457eeea215cb075a8b0d2e931cb743378da4570f8b38cccd07a698c65f21581db008db04fba1ed4831a46f33302392e30ac114d374d9fe2c6698f
-EBUILD slony1-2.2.6.ebuild 1643 BLAKE2B f9c9cce6671b1a5c613a6950ee34df5627db305c83709af4a1a76d25b8f0520ee73d679db0d974531062f83d4bb085f65165ba0ca46059908839de639385d41a SHA512 9ee213f0628031c5b670a0a8533c19c43b45694e64bfd7c23ddf5a9d8a09d9d048898214536cde6303b81134504c0e11412e9e28705abe649982e2d4bb69841c
-EBUILD slony1-2.2.7.ebuild 1635 BLAKE2B c3d2307c14aaec2a9ae999e31ef5ec3b090857d59e50eb09e17c175b4d92f92ba12e15b6a43823a79c9e95d0be94f31218b17ca17f8dfc0c966b87fdb713932a SHA512 767988ade2ba9f7203b1142767d43dfb8fb11f34d9555fc86dec8a2c2360bd423112aaae4a5632b44b8e01610a0f8dbfd3af23a8972adb5d686b9b38eb7d56ea
-EBUILD slony1-2.2.9.ebuild 1941 BLAKE2B 6e10b4c4952f637f2a79adbd8487e09bfb1333d07adbdf0391a014a352e9b43a26b1a8c03ffc4741a868ae4e6ed1a8f3adcb600a5ff26bd5ea4ccca1306aaf31 SHA512 dfcfd92604100b4934dc270fd74be4f239c2adaef6e999509ce3af9f8798033b30766273093731c876c7dcb3655baa788daa29b58b3712f7ef4d854f6f411ce0
+EBUILD slony1-2.2.10.ebuild 1938 BLAKE2B e47508220871260fa72833a401670f57becbed07747ab94b8e4cb84b0b99d7dec3dc904134125e2b4cb3a218003cbfd905b45c830408be472026249e86e657c5 SHA512 a85caea7734ee11806abaec688dfee2628c7cdfb44ad3e7473cc4e6ebf1feb260ef8d79ca6adb067f80ce82bce08c1666936d1b09730b33e3f0d19c625a40dcb
 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/slony1/slony1-2.2.10.ebuild b/dev-db/slony1/slony1-2.2.10.ebuild
index 6c562ce7b40e..944ca9c71151 100644
--- a/dev-db/slony1/slony1-2.2.10.ebuild
+++ b/dev-db/slony1/slony1-2.2.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="${POSTGRES_DEP}
 		perl? ( dev-perl/DBD-Pg )
diff --git a/dev-db/slony1/slony1-2.2.6.ebuild b/dev-db/slony1/slony1-2.2.6.ebuild
deleted file mode 100644
index 6ea02b10d27b..000000000000
--- a/dev-db/slony1/slony1-2.2.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{5..6} 10 )
-POSTGRES_USEDEP="server,threads"
-
-inherit eutils postgres-multi versionator
-
-IUSE="doc perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-
-# ${P}-docs.tar.bz2 contains man pages as well as additional documentation
-MAJ_PV=$(get_version_component_range 1-2)
-SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
-		 http://main.slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="${POSTGRES_DEP}
-		perl? ( dev-perl/DBD-Pg )
-"
-
-RDEPEND=${DEPEND}
-
-REQUIRE_USE="${POSTGRES_REQ_USE}"
-
-RESTRICT="test"
-
-src_configure() {
-	local slot_bin_dir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/bin"
-	use perl && myconf=" --with-perltools=\"${slot_bin_dir}\""
-	postgres-multi_foreach econf ${myconf} \
-						   --with-pgconfigdir="${slot_bin_dir}" \
-						   --with-slonybindir="${slot_bin_dir}"
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-
-	dodoc INSTALL README SAMPLE TODO UPGRADING share/slon.conf-sample
-
-	if use doc ; then
-		cd "${S}"/doc
-		dohtml -r *
-	fi
-
-	newinitd "${FILESDIR}"/slony1.init slony1
-	newconfd "${FILESDIR}"/slony1.conf slony1
-}
-
-pkg_postinst() {
-	# Slony-I installs its executables into a directory that is
-	# processed by the PostgreSQL eselect module. Call it here so that
-	# the symlinks will be created.
-	ebegin "Refreshing PostgreSQL $(postgresql-config show) symlinks"
-	postgresql-config update
-	eend $?
-}
diff --git a/dev-db/slony1/slony1-2.2.7.ebuild b/dev-db/slony1/slony1-2.2.7.ebuild
deleted file mode 100644
index d0edb6f89da5..000000000000
--- a/dev-db/slony1/slony1-2.2.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-POSTGRES_COMPAT=( 9.{5..6} {10..11} )
-POSTGRES_USEDEP="server,threads"
-
-inherit eutils postgres-multi versionator
-
-IUSE="doc perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="http://slony.info/"
-
-# ${P}-docs.tar.bz2 contains man pages as well as additional documentation
-MAJ_PV=$(get_version_component_range 1-2)
-SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
-		 http://main.slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="${POSTGRES_DEP}
-		perl? ( dev-perl/DBD-Pg )
-"
-
-RDEPEND=${DEPEND}
-
-REQUIRE_USE="${POSTGRES_REQ_USE}"
-
-src_configure() {
-	local slot_bin_dir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/bin"
-	use perl && myconf=" --with-perltools=\"${slot_bin_dir}\""
-	postgres-multi_foreach econf ${myconf} \
-						   --with-pgconfigdir="${slot_bin_dir}" \
-						   --with-slonybindir="${slot_bin_dir}"
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-
-	dodoc INSTALL README SAMPLE TODO UPGRADING share/slon.conf-sample
-
-	if use doc ; then
-		cd "${S}"/doc
-		dohtml -r *
-	fi
-
-	newinitd "${FILESDIR}"/slony1.init slony1
-	newconfd "${FILESDIR}"/slony1.conf slony1
-}
-
-pkg_postinst() {
-	# Slony-I installs its executables into a directory that is
-	# processed by the PostgreSQL eselect module. Call it here so that
-	# the symlinks will be created.
-	ebegin "Refreshing PostgreSQL $(postgresql-config show) symlinks"
-	postgresql-config update
-	eend $?
-}
diff --git a/dev-db/slony1/slony1-2.2.9.ebuild b/dev-db/slony1/slony1-2.2.9.ebuild
deleted file mode 100644
index 0e854d2ba2ca..000000000000
--- a/dev-db/slony1/slony1-2.2.9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 9.{5..6} {10..13} )
-POSTGRES_USEDEP="server,threads"
-
-inherit postgres-multi
-
-IUSE="doc perl"
-
-DESCRIPTION="A replication system for the PostgreSQL Database Management System"
-HOMEPAGE="https://slony.info/"
-
-MAJ_PV=$(ver_cut 1-2)
-SRC_URI="https://slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
-	doc? ( https://slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2 )
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="${POSTGRES_DEP}
-		perl? ( dev-perl/DBD-Pg )
-"
-RDEPEND=${DEPEND}
-
-REQUIRE_USE="${POSTGRES_REQ_USE}"
-
-# Testing requires a more complex setup than we benefit from being able
-# to perform.
-# https://slony.info/documentation/2.2/testing.html
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-
-	if use doc ; then
-		# The docs tarball will unpack over the source directory. So, we
-		# clear the adminguide directory now to make it easier to
-		# install later.
-		rm ${P}/doc/adminguide/* || die
-		unpack ${P}-docs.tar.bz2
-	fi
-}
-
-src_configure() {
-	local slot_bin_dir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/bin"
-	use perl && myconf=" --with-perltools=\"${slot_bin_dir}\""
-	postgres-multi_foreach econf ${myconf} \
-						   --with-pgconfigdir="${slot_bin_dir}" \
-						   --with-slonybindir="${slot_bin_dir}"
-}
-
-src_install() {
-	postgres-multi_foreach emake DESTDIR="${D}" install
-
-	dodoc README SAMPLE TODO UPGRADING share/slon.conf-sample
-	use doc && postgres-multi_forbest dodoc -r doc/adminguide
-
-	newinitd "${FILESDIR}"/slony1.init slony1
-	newconfd "${FILESDIR}"/slony1.conf slony1
-}
-
-pkg_postinst() {
-	# Slony-I installs its executables into a directory that is
-	# processed by the PostgreSQL eselect module. Call it here so that
-	# the symlinks will be created.
-	ebegin "Refreshing PostgreSQL $(postgresql-config show) symlinks"
-	postgresql-config update
-	eend $?
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
commit	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree	1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-db
parent	abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)