summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-db
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin17810 -> 17986 bytes
-rw-r--r--dev-db/cdb/Manifest2
-rw-r--r--dev-db/cdb/cdb-0.75-r4.ebuild2
-rw-r--r--dev-db/clickhouse/Manifest16
-rw-r--r--dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-19.15.2.2.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild4
-rw-r--r--dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild4
-rw-r--r--dev-db/etcd/Manifest8
-rw-r--r--dev-db/etcd/etcd-3.3.19.ebuild78
-rw-r--r--dev-db/etcd/etcd-3.3.20.ebuild78
-rw-r--r--dev-db/etcd/etcd-3.4.5.ebuild73
-rw-r--r--dev-db/etcd/etcd-3.4.7.ebuild73
-rw-r--r--dev-db/freetds/Manifest2
-rw-r--r--dev-db/freetds/freetds-1.00.558.ebuild2
-rw-r--r--dev-db/influxdb/Manifest6
-rw-r--r--dev-db/influxdb/influxdb-1.5.1.ebuild2
-rw-r--r--dev-db/influxdb/influxdb-1.6.3.ebuild2
-rw-r--r--dev-db/influxdb/influxdb-1.6.4.ebuild2
-rw-r--r--dev-db/kyotocabinet/Manifest2
-rw-r--r--dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild2
-rw-r--r--dev-db/libdbi-drivers/Manifest4
-rw-r--r--dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild2
-rw-r--r--dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild2
-rw-r--r--dev-db/libdbi/Manifest2
-rw-r--r--dev-db/libdbi/libdbi-0.9.0.ebuild2
-rw-r--r--dev-db/libiodbc/Manifest2
-rw-r--r--dev-db/libiodbc/libiodbc-3.52.12.ebuild2
-rw-r--r--dev-db/lmdb/Manifest4
-rw-r--r--dev-db/lmdb/lmdb-0.9.23.ebuild2
-rw-r--r--dev-db/lmdb/lmdb-0.9.24.ebuild4
-rw-r--r--dev-db/m17n-db/Manifest4
-rw-r--r--dev-db/m17n-db/m17n-db-1.7.0.ebuild2
-rw-r--r--dev-db/m17n-db/m17n-db-1.8.0.ebuild4
-rw-r--r--dev-db/mariadb-connector-c/Manifest12
-rw-r--r--dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch48
-rw-r--r--dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch21
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild103
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild2
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild2
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild6
-rw-r--r--dev-db/mariadb-connector-c/metadata.xml11
-rw-r--r--dev-db/mariadb-connector-odbc/Manifest4
-rw-r--r--dev-db/mariadb-connector-odbc/files/odbcinst.ini4
-rw-r--r--dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild65
-rw-r--r--dev-db/mariadb-connector-odbc/metadata.xml12
-rw-r--r--dev-db/mariadb/Manifest10
-rw-r--r--dev-db/mariadb/mariadb-10.1.38-r1.ebuild2
-rw-r--r--dev-db/mariadb/mariadb-10.1.43.ebuild2
-rw-r--r--dev-db/mariadb/mariadb-10.2.22-r1.ebuild2
-rw-r--r--dev-db/mariadb/mariadb-10.2.29.ebuild2
-rw-r--r--dev-db/mariadb/mariadb-10.4.12.ebuild3
-rw-r--r--dev-db/mongodb/Manifest24
-rw-r--r--dev-db/mongodb/mongodb-3.6.13.ebuild4
-rw-r--r--dev-db/mongodb/mongodb-3.6.14.ebuild4
-rw-r--r--dev-db/mongodb/mongodb-3.6.16.ebuild4
-rw-r--r--dev-db/mongodb/mongodb-3.6.17.ebuild2
-rw-r--r--dev-db/mongodb/mongodb-4.0.12.ebuild4
-rw-r--r--dev-db/mongodb/mongodb-4.0.13.ebuild4
-rw-r--r--dev-db/mongodb/mongodb-4.0.14.ebuild4
-rw-r--r--dev-db/mongodb/mongodb-4.0.16-r1.ebuild173
-rw-r--r--dev-db/mongodb/mongodb-4.0.16.ebuild2
-rw-r--r--dev-db/mongodb/mongodb-4.2.1.ebuild1
-rw-r--r--dev-db/mongodb/mongodb-4.2.2.ebuild1
-rw-r--r--dev-db/mongodb/mongodb-4.2.3-r1.ebuild176
-rw-r--r--dev-db/mongodb/mongodb-4.2.3.ebuild1
-rw-r--r--dev-db/mycli/Manifest6
-rw-r--r--dev-db/mycli/mycli-1.19.0.ebuild42
-rw-r--r--dev-db/mycli/mycli-1.20.1.ebuild4
-rw-r--r--dev-db/mycli/mycli-9999.ebuild4
-rw-r--r--dev-db/mysql++/Manifest2
-rw-r--r--dev-db/mysql++/mysql++-3.2.5.ebuild2
-rw-r--r--dev-db/mysql-connector-c/Manifest4
-rw-r--r--dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild2
-rw-r--r--dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild2
-rw-r--r--dev-db/mysql-init-scripts/Manifest2
-rw-r--r--dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild2
-rw-r--r--dev-db/mysql-workbench/Manifest6
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.16-r1.ebuild109
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild109
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild2
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild109
-rw-r--r--dev-db/mysql/Manifest13
-rw-r--r--dev-db/mysql/mysql-5.6.44-r1.ebuild2
-rw-r--r--dev-db/mysql/mysql-5.6.45-r2.ebuild2
-rw-r--r--dev-db/mysql/mysql-5.7.26-r1.ebuild2
-rw-r--r--dev-db/mysql/mysql-5.7.27-r1.ebuild2
-rw-r--r--dev-db/mysql/mysql-5.7.29.ebuild2
-rw-r--r--dev-db/mysql/mysql-8.0.19-r1.ebuild4
-rw-r--r--dev-db/mysqltuner/Manifest2
-rw-r--r--dev-db/mysqltuner/metadata.xml9
-rw-r--r--dev-db/percona-server/Manifest6
-rw-r--r--dev-db/percona-server/percona-server-5.7.27.30.ebuild2
-rw-r--r--dev-db/percona-server/percona-server-8.0.18.9.ebuild2
-rw-r--r--dev-db/pgadmin4/Manifest4
-rw-r--r--dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild115
-rw-r--r--dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild4
-rw-r--r--dev-db/pgcli/Manifest4
-rw-r--r--dev-db/pgcli/pgcli-2.0.2.ebuild33
-rw-r--r--dev-db/pgcli/pgcli-2.2.0.ebuild4
-rw-r--r--dev-db/pgxnclient/Manifest4
-rw-r--r--dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild2
-rw-r--r--dev-db/pgxnclient/pgxnclient-1.2.1.ebuild2
-rw-r--r--dev-db/phpmyadmin/Manifest8
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild (renamed from dev-db/phpmyadmin/phpmyadmin-4.9.4.ebuild)2
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-5.0.2.ebuild (renamed from dev-db/phpmyadmin/phpmyadmin-5.0.1.ebuild)0
-rw-r--r--dev-db/postgresql/Manifest58
-rw-r--r--dev-db/postgresql/postgresql-10.10.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-10.11.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-10.12.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-10.9.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-11.4.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-11.5.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-11.6.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-11.7.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-12.0.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-12.1.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-12.2.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.22-r1.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.22.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.23.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.24.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.25.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.26.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.17-r1.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.17.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.18.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.19.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.20.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.5.21.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.13-r1.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.13.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.14.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.15.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.16.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.6.17.ebuild2
-rw-r--r--dev-db/pspg/Manifest2
-rw-r--r--dev-db/pspg/pspg-2.6.6.ebuild2
-rw-r--r--dev-db/qdbm/Manifest2
-rw-r--r--dev-db/qdbm/qdbm-1.8.78-r2.ebuild2
-rw-r--r--dev-db/qt5-sqlcipher/Manifest3
-rw-r--r--dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch14
-rw-r--r--dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild48
-rw-r--r--dev-db/redis/Manifest3
-rw-r--r--dev-db/redis/files/redis-5.0.8-ppc-atomic.patch19
-rw-r--r--dev-db/redis/redis-5.0.8.ebuild160
-rw-r--r--dev-db/sadisplay/Manifest2
-rw-r--r--dev-db/sadisplay/metadata.xml2
-rw-r--r--dev-db/spatialite/Manifest4
-rw-r--r--dev-db/spatialite/spatialite-4.3.0-r1.ebuild50
-rw-r--r--dev-db/spatialite/spatialite-4.3.0a.ebuild4
-rw-r--r--dev-db/sqlite/Manifest13
-rw-r--r--dev-db/sqlite/files/sqlite-3.31.0-full_archive-build.patch466
-rw-r--r--dev-db/sqlite/files/sqlite-3.31.1-full_archive-architectures.patch72
-rw-r--r--dev-db/sqlite/files/sqlite-3.31.1-full_archive-security_fixes.patch163
-rw-r--r--dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-architectures.patch20
-rw-r--r--dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-security_fixes.patch112
-rw-r--r--dev-db/sqlite/sqlite-3.29.0.ebuild2
-rw-r--r--dev-db/sqlite/sqlite-3.30.1.ebuild4
-rw-r--r--dev-db/sqlite/sqlite-3.31.1.ebuild392
-rw-r--r--dev-db/tinycdb/Manifest2
-rw-r--r--dev-db/tinycdb/tinycdb-0.77-r2.ebuild2
-rw-r--r--dev-db/unixODBC/Manifest5
-rw-r--r--dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch135
-rw-r--r--dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild65
-rw-r--r--dev-db/unixODBC/unixODBC-2.3.7.ebuild2
170 files changed, 2459 insertions, 1199 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d9ef707117cb..a37163a9aa1d 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/cdb/Manifest b/dev-db/cdb/Manifest
index 8f44efed2cc4..c1013753bd35 100644
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@@ -1,5 +1,5 @@
AUX cdb-0.75-errno.diff 243 BLAKE2B e0b2433529e8ade1c4802353017948fd709f47843f339d8e1f77f9c665ece80721613d2dce8c9e67b595ee03f9b7298b04f927a26ad0bf8b5e38a10836799c81 SHA512 03c64d2ab185c16d88f51aaa12d1ca06102444c3eed9d712fcd53e6b8eaeeeacbdf525d91c7fc3eb28bf88be776de4748157d596103b9fc7776a5bde05eef4c4
AUX cdb-0.75-stdint.diff 11423 BLAKE2B 85f0c3d1b2908c001ebdb055ebe4d7a79bf16a61d1d3ce8295e17cc9c0d5f1d7859465e3dba377a2857741ef082efb621c0cb77179bc6208b35120d390b71f53 SHA512 0308d25c6f9ee3b8fc49e75a2e69c7cdbf8cca7dbf165b3a107d5e2717051f6c68df04a962456295c56e6dde97ee0777944cf406c3eb48f4b7f39ecfaf56f877
DIST cdb-0.75.tar.gz 54162 BLAKE2B 7b488bf330b2aac88a1cca82a6a49e24d0fd953c77935231a31bd72cc0936a37628736b5b22ea0d58aaa77cd118976ab8aa82ccc080f99e190e3f1db5d51b622 SHA512 6faeab91a77457348b58f685e81000b83fb609691317198a06284c5c62dee1e4d6138f90be1e727021f279d740169c175a21b23c96adb39a654e3f7fafdf36c0
-EBUILD cdb-0.75-r4.ebuild 1384 BLAKE2B 80a0ccda04670d0c62b506a1e1686abf975df4b3ed46c461fa79f789dcb2ceda3dd8e3ac666795653b338347128247ea10538ed5f7aaeac8eb1e8a33c6fe6db1 SHA512 349b806f9a46317befe928b387d01aae08272e6d7e99b25bd9fb4ffbcf2181140c8cb354f87d4d5fe9c58588e32e307170ed8e60db5e8230cf03b912ff896eaf
+EBUILD cdb-0.75-r4.ebuild 1381 BLAKE2B 20d0626ed5c0733139d42681f7234da3dd20cb5260957eb004b7d2f9ae7f7eebe408aa498b292539a9f4f2ace9cd4762dd66fc6343c8c0a7657add0db199cb34 SHA512 39a770624daa402887b0086b8e21d7a981f01f4a73485c23a33f5692c3220130563b325ae7d5bc8f60cb70f2bdc0f218f8450b42dced8c831fff9071e00e7d7f
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index d920b71070be..fa8f808ad3a6 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
inherit eutils multilib toolchain-funcs
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index ad0486f11630..9732363848b4 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -10,12 +10,12 @@ DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945e
DIST clickhouse-19.15.2.2.zip 11425217 BLAKE2B 3a2288d771cd92dc283713a44df84df8c3c946ef92efd781d7619c8ffc0d7a3884f1a988c81f1703a7d373e78e413bdaea0fd100cebf7090be9bba16779209ff SHA512 029376b9d540c592d30a32457deb9e605d512fc448eb3dc6896b0ca48a5e92f390ef2dc3a4ea63ce19c264a8b2810ff952e95a6c7a8d4506f733ac6253c079d3
DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8
DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab
-EBUILD clickhouse-18.10.3-r1.ebuild 4903 BLAKE2B b08da02235154955956bdd8004b473ebe64266c7903dbdc8786cc4ab0d3b684f8c192022acb00e139652f94a9fc6809a912f4b843cf673c21e30499350f937ec SHA512 6d231780477d9813762205f575c6487b9a8c21857825110bf4e7ff5eb3f7d4b01cc15ffe61fa7bb360f63395e8330f5a3ba6ca3229de6b88b9c2c83dbd59af89
-EBUILD clickhouse-18.12.17-r1.ebuild 4900 BLAKE2B 51d336f09a8965d92ee1a7af42569e132e2ea8616cac8cd5c8ea799789313d0e9086b80016df46a88a475af70409948eed71f9ca7280021d77f559a612bc25ed SHA512 55dd35d6b7e8b4253fd121e8a0dd81e7f3ea0920d3e90c5017c27213e80f5ed303449baaded0f2bbc2ac576769d375a732beb9528ddcd4dc5b73d1eae760cadc
-EBUILD clickhouse-18.6.0-r1.ebuild 4891 BLAKE2B 58a513dc5cd17250a57b6c755622e44be79009cad991f278a7cf8bae7a9bdc8bcbf04c6a6120e4281688f5404cb102c95faebb6564f51e110e9ab07997a70bde SHA512 5f0b5c64cc45f2480418c82712da3f7834fd9f9bf82fbf4030d94126dec272d2b2db64ff20880d61e84120f44d05d4ec138e565625fb86f666396f410a608d54
-EBUILD clickhouse-19.13.1.11-r2.ebuild 5045 BLAKE2B 4de0bcc8934f8ca3c4c0e7d84b111cc33c4548ebcc956d4192ff7baf9954aeeb86d3f6f5f0e9bd77a34706b062b8e5fc50b001390bbd6bfebaa0ff5304e1e4cc SHA512 85b1bcf1bdcc4be4165ab12388131b9aa6ee5a21157d65f46feff81acad1aa68bb7ba8c463168d99dc75c62757b80ed0a4cf9144fba084f432d1125acce9a936
-EBUILD clickhouse-19.13.1.11-r3.ebuild 5135 BLAKE2B f59fe4374708c5209159b9aa5813fae504d8c87b355e9bf5cab335f3378ac061cc5fa87e7443f60b25bf262bb26332b4686524b8e4c82006c997d785aafc0027 SHA512 9492c6f531d18b908d675eab46725730f071be99bb9ed34d8fb6696b84650eb0805cb1b92ad2618c13d735e9fc229b5bf533cb048887df4faacefefcfe88e683
-EBUILD clickhouse-19.15.2.2.ebuild 5265 BLAKE2B a6d8745c1c086d9a15104c973ab11b5f50615563fde79c24f8fbf9c8004ff6e764a1ba74a4626f17eead1a10ae6bbb02cc252f3f53254d5a0b2d822ec4821dd7 SHA512 2ba280513ba408b698af825942ea58a525a048a0bc5cd94554576b4a300af1fc02b85069ce6cae1c86456c289899bfdca6e3d1b78e9e62b3b2bb7a3cc87bb47d
-EBUILD clickhouse-19.5.3.8-r1.ebuild 5026 BLAKE2B bf275fa427190db406e781721ec82db15f740178a96ffc8a1311bacd731286cb780d9d2602e618b5a2d6c344225c742c161d2f0828b6ecdb3b3aea7a8802eeed SHA512 656effd1d2147744426ace8272f6dec33e1460c4c8b3b6bad1c7d300e2e3f861754e38bf472e7d4cfdf78b1bf3e958c1dee97014c62267b97122f596ea5a57ae
-EBUILD clickhouse-19.9.5.36-r1.ebuild 5026 BLAKE2B bf275fa427190db406e781721ec82db15f740178a96ffc8a1311bacd731286cb780d9d2602e618b5a2d6c344225c742c161d2f0828b6ecdb3b3aea7a8802eeed SHA512 656effd1d2147744426ace8272f6dec33e1460c4c8b3b6bad1c7d300e2e3f861754e38bf472e7d4cfdf78b1bf3e958c1dee97014c62267b97122f596ea5a57ae
+EBUILD clickhouse-18.10.3-r1.ebuild 4903 BLAKE2B 9cb7ccd5890de60558174b1bbde464674bf37bff3ee6e8c40dd2d8c2f72053fca4ea5bde568178b847c1dedcd3c21c31d57bce688e4e5ee2e3d1e6174a2a0b00 SHA512 6ac6da034c8673a6957c6a57377a963b045ee7a9d25f5d69ec37f34c500d5a5cee66606b1e5964fd5f3131d2d85e33ac0bf5f889a299bb9a1b4ca6eb2cf6fbb5
+EBUILD clickhouse-18.12.17-r1.ebuild 4900 BLAKE2B 0ce87b58051aeef81c62e41246290cda4680a647ead0761cd58723cd1e269953a18e8f8ca66368c13860fe3b31aae308e79c4be3d6ab6440ed5cabb5a42f40cf SHA512 9602f6bf0092a5661ebd903dc1033d76cefdfe8b286f4363cc5d1de65252cf2b6b262d3a8aa6f33f79b345570593569e282c5e4101814799559de30f7d823968
+EBUILD clickhouse-18.6.0-r1.ebuild 4891 BLAKE2B 12f3ad5a0633b0ea65af7939083ed150460efacc420ac33605273b18e9ac9ae93a2930ae5b70cf98b06bbc32ba9a4e3d69f57885bca2bde5b21c8957efe5021c SHA512 753764286274f3403863fe9947fc60253f05d876b7278a7fee625c262ad1d2a5dcbc3ce7fb58fd44074eab6654528c4e93c74d4a931a027d52b62494058c8e07
+EBUILD clickhouse-19.13.1.11-r2.ebuild 5045 BLAKE2B 35b733010bb514bc27d74200ca86f72a275016ba8928b76066a09b1498c18e48af5cb6a901ad91fe0b74d3f32557d74b5264669d19af5de206227c63e7e7739a SHA512 c0d441c5abebb86339211d4cf56009bbebcb03d46d2d16034e21de6321a97270b80a567190f020e21348c937ce6fa8b1b80a799494956a720056480ae0c1d33c
+EBUILD clickhouse-19.13.1.11-r3.ebuild 5135 BLAKE2B 03e1a841aa058202ac43186b90d1f1fb63fb28c4f281c1458d624dc37d6fbcd13a81eca3c4fff3db326a7a02654b7d1871e190cf76908d114160f4ad44bb8d8f SHA512 edb341c9ac550e058088d90774f427f382eb09c72d4aca3528faf2d27ab3259ba6693136c0970e3cb6e96a9cf425cc64cc6eb2347e86205ab54c1da3040f65ab
+EBUILD clickhouse-19.15.2.2.ebuild 5265 BLAKE2B 11f57fba5525c51e0c41a08ab21a03dbaa2aa767efd5ae36c21b8cbbcec9228992c47fe45512acae7d013752ebed935a4b8c089f6cb25d99eca9723a0596aa33 SHA512 01a0f276651d18278ae1f8c993e94388876519d812ce9f8dbab995bed70a859cbd1c57aea15509b0380b61effa94effd787e837d57db9c9a5d2c35767bc1dd6d
+EBUILD clickhouse-19.5.3.8-r1.ebuild 5026 BLAKE2B 2bd7e6c85e282d9ba768b596539f2460783fec539be1f10b58ad139cef85e2b8fd8f85e8e0cea981997edd47c588381d446f343f4be7fd15c594daf97b32f40c SHA512 4f6e69e5b3cdb9de4b53f17887c8958e3286f2436a35c3c337a12ec884d439b08d0dbf732c750de21d3738836c8ae948b73edc2abb1e413ac6edf2e9e9a8eb19
+EBUILD clickhouse-19.9.5.36-r1.ebuild 5026 BLAKE2B 2bd7e6c85e282d9ba768b596539f2460783fec539be1f10b58ad139cef85e2b8fd8f85e8e0cea981997edd47c588381d446f343f4be7fd15c594daf97b32f40c SHA512 4f6e69e5b3cdb9de4b53f17887c8958e3286f2436a35c3c337a12ec884d439b08d0dbf732c750de21d3738836c8ae948b73edc2abb1e413ac6edf2e9e9a8eb19
MISC metadata.xml 657 BLAKE2B ea02627178df53a81cf2cb46f47e51ebf0437d5e70ec745a7d5d92d430e2055f3112280d3cbed5d7d7eccd1ce892ff1b184f042b850de1f9071716bda5176e82 SHA512 1a3810659c43b9191a8a37aac652c070fb05e663090575c4908e5dc248dfb1e20d9dd3d832a71b95c36b17a6f3a802dacbea2866f33c530c3d5d6c93f8a58690
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
index 1b7533460cc4..351b11c198be 100644
--- a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
|| (
dev-db/unixODBC
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
index 9e1192a2d424..fa18cc2e59f7 100644
--- a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
|| (
dev-db/unixODBC
@@ -71,7 +71,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
index e719a41a88a5..f5c30296ab3d 100644
--- a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
|| (
dev-db/unixODBC
@@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
index 7312dabfc20e..0184d7fe5a7c 100644
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
dev-libs/poco[odbc]
dev-libs/icu:=
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
index c000b8b3778c..aafc89dc7813 100644
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
dev-libs/poco[odbc]
dev-libs/icu:=
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
index e7161a38d1c3..22b038f2ebdd 100644
--- a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
dev-libs/poco[odbc]
dev-libs/icu:=
@@ -71,7 +71,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
index 7219e35cdb1c..80e66a29108b 100644
--- a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
dev-libs/poco[odbc]
dev-libs/icu:=
@@ -69,7 +69,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
index 7219e35cdb1c..80e66a29108b 100644
--- a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
+++ b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
- sys-libs/libunwind:7
+ sys-libs/libunwind:0
sys-libs/zlib
dev-libs/poco[odbc]
dev-libs/icu:=
@@ -69,7 +69,7 @@ DEPEND="${RDEPEND}
)
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
- sys-libs/libunwind:7[static-libs]
+ sys-libs/libunwind:0[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index ba42b6b5477d..c04004fa3d31 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -6,10 +6,18 @@ AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452
AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
DIST etcd-3.3.17.tar.gz 6507229 BLAKE2B e49b66a3a2bb5be254cb3400341d4f1454608a9923295826ce780fb5750b6182ec7ec35996ef538aa38863cacd0c0e3efd072ce5c3dae1e65509ce962964994d SHA512 73f8ddab1c27c77cedeb602201d01b433363c9550ec26b4729f2c5c114aefa4b90d444fd5a7696272c2cccdc8329e641f073ef9f39c7ea4e62837341dfc28641
DIST etcd-3.3.18.tar.gz 6508732 BLAKE2B cce52ac9fa005388bafacf3d0bf049f3930de12d0cb50cc863655fdbc35cae2d647f64eddb699cb1ef7b3736687a9978cd120d181b274b663a1ac2b7eb549729 SHA512 1146baa8c424a6ddb4a2a10494e2f82ba0c22def1fcd3e041b871c060ca915267f1a2e1c455b017eded1908300ddbd8a3849ee3c5dda93489d9eeaaa90baf254
+DIST etcd-3.3.19.tar.gz 6509566 BLAKE2B 0037858daa134e63c6629defe099cc772b758e220a093e719b2d41c2e519a2c2d923d26e8635fb1f7cabe2ec0a0250236293c838d9c34d1745673211dc4f526c SHA512 9f21692466bcb240bac042f4e7ee6f4575c05312542827c7349257b87c9d4a1a625b200fcbb0852c86c192624cd02e9a8d80caa194d25d4b63aa5e33b100eac1
+DIST etcd-3.3.20.tar.gz 6509856 BLAKE2B 49e0ae7a56ce9e84664cd4395a91518c01e42346edc83bd61a84883da013b6cfda15c17cdb6ce5c44760574ee2101e7d39c32aaf458ceb1b505aea5ae787f1b6 SHA512 66aee553b053dea732ab3716676a05f5357a38ff0cb3ef8b6be4b80f4f54f0720578db9438b31e88bdb61aa662443d6b7993fa37af639208618bff76285ea7f9
DIST etcd-3.4.3.tar.gz 8941589 BLAKE2B 127e4a8dd9495686ffc43099c3002e0e3c00ab661bce917ac298f69351e1226dff0efcaf9277c1e46449abafef965af8f612a127e1e30c381545073232a2ff50 SHA512 0bc1e857b707be1d348f5ab58a330d259dd30338c28580751142f643b2a081d1fe42a8859fa9463a734ff27f51929dc89f933f044b89d6e549a348add034d752
DIST etcd-3.4.4.tar.gz 8940682 BLAKE2B c165fbb61d87d4a42261742bf302e6a04daa67e6ebea6f12314b77a9a12afd0e6b02e642b827e8b14fa77eedd207fe32c047f19f0487f54aba1e0db6774673f2 SHA512 81de69c422c58c73df8812127f29e49e1d81dacf47e26fe4b8a332b6b19f0242086c5e3b52fdbbbf08d91abe6213400887dc72e837effeec73a182a8caca9d20
+DIST etcd-3.4.5.tar.gz 8943585 BLAKE2B 6df1538ec1e65c6f1a7fc41c0ceb29ca126efe797c8e6e029dfd45cdfeadacd322a46e18f627cac6defd78d8a17ddf09b5a0918fb454bfbafd450084de972c5a SHA512 cd8845433e208cbe1cf0e0a001ee503d42b73f44ac0e0578d9ee8692f95262929c0cec3a2622f9cd3ea8d393a136de47a7e0d0875b4e0cd9d8eeddd45ca3bea5
+DIST etcd-3.4.7.tar.gz 8943976 BLAKE2B 7dd81324e78ef53577055c54e851680b2421524aea1148449cd1003391029e110c90bd607730955ac4081c49e846da08159553f8db7d768e15dda51b8bf657ca SHA512 18851be0cbe8dabc6be8ba0c61d783f21b1fb9403256166016767926c731f1d95a1adebad9f36d43c57a424a7ac88c49b1d1ce01c2aa065e5bbbff847eb9234a
EBUILD etcd-3.3.17.ebuild 2003 BLAKE2B b17a2eb321060ae13b0fcd6ccc347b9449a3e113489431e95a96e3cec570c3f65adac65b446357eac95f0faaae0a2f33548fc51cd4bb05a37725a2529f076338 SHA512 41bdae1f83128670a89ab695a03a550d6ad29b29b977cf0e992c9c2a04d4110be651e7a15b615d34e83d1646a3573c8521b09a168d65069fb682846febb1f826
EBUILD etcd-3.3.18.ebuild 2004 BLAKE2B ebbf4469e049005dae059bd5207a834b99ae01aef51a395df2e39f2b6e56018072e4c5eecb52f8ffe9199d95e0c82ba629b17e10f490215711a6700ed4d839c5 SHA512 cffde362cc2300daf694d5b32c4b83ab4c6f57d47199b9a2ce62719606e1a384e6df977ac27863ffe9b271064be6e1aad67b7b62f4284dd2f73c92a7756a1e67
+EBUILD etcd-3.3.19.ebuild 2004 BLAKE2B 665bd307525157ab80a1791766c37aee07036f4e2f19c676b1d80b168b5390218b4f903988262a6d8afe45151dc6da01e7013729da78493f713ae2d1ebeb076d SHA512 62bd2f93cb5cadb3c3bbab62af92be758fa2235565dd42f0b33876e9fca375ad79807593e004ae40d2b38d748f0e47d3f51f117cbd2dcff577332f5bee35ceed
+EBUILD etcd-3.3.20.ebuild 1999 BLAKE2B 1c5c7212be7ccb34b0c13b2fa1c1ad6dea1390d83fe8170b1a8b33c1d1ecb1855f9257c5bac3f8b35d157618dc92a9bacf83401c1d4e14a99857daceb965ef47 SHA512 b9bdfe5a7142459426c0b0748ebd013a479e25fb56132c82d1fef82d6c43e25a8c492df6fc12cbc31df555ad54d289606efaf622d1b2f978b1aab7d7fe985d7f
EBUILD etcd-3.4.3.ebuild 2293 BLAKE2B 3e48ca6f1af6a37ee3bd15e3d2513638098def4fdc3bb409c18fe05eeb13ff20e3e32f0644d62e9bcc39c8ef06b4de73789ecda3dfcdceedbd5c349f7aec2378 SHA512 5efb197de44968897880100693bf16c213ffb59cdd51dd8abcc36eb57fdff31bed7d3850438a8511e23c28f370d8e3e1b49b810f3c58bab1cd150a2e22c11631
EBUILD etcd-3.4.4.ebuild 1886 BLAKE2B 8fd02659a857dc9d4f543e8224661646ba7f8afff19af3f0e789226c1b2e7b71faf27c8a99c4f9f12c7744e4a3fd78f6e5bd85909d915385a1ac96a2e3060395 SHA512 130e0153f58d02b762ad27f35dfa0447684f4d55559bf49a3e3d31055192f33514a5925afa2e5a30b87214e178375763e6aff62fe67d6bc48b61ac6b4d80dd06
+EBUILD etcd-3.4.5.ebuild 1886 BLAKE2B 5a4e4377940c0eee13a57a4fc2e431b420161ab31bf539b489f03c97d7608e45dd00cf04a486d4abb7d29a865f8b71467750248a6f01369a35f483442eb91947 SHA512 a1c04e0604c0881aa8e3e582697e08aeaaec5232118b459c106986bc112af7a8e720a9eb1904c67cd03397d5e1ea943a2fdd126e95e6aa81fb5fe0506bd19dd8
+EBUILD etcd-3.4.7.ebuild 1903 BLAKE2B fae6ee9aff8c6b63f0c3310b6cdee880ed353eb4f15cb653b164fbd28e6851d8c6245f5ddbcde971fde3975cae571d26ed6b48647ed6bcf898c2120aba4402bc SHA512 0fd2225388e381dd0854ee2d1b6120508dcc91eaceafa9041d66af67106fd7f69f23c87b211bced33bfbafdb3781153480aad0d4abb138d16bff4443be595269
MISC metadata.xml 573 BLAKE2B 48714fc34469739cf1fea338b8e686726692ee45be8f3b841e747cdb9f5f13f5e2964ced9423de8a2cde26fef9a0b9ee24e42c8ad6db43a4151194ee4b115029 SHA512 8162b96dd5984554115e7c889d3c6c015a5c07dc553baea6fd1d6263bde02b20bf0d9a411c93f06b537698958994f9d975782c8770cb33793776bf5fb7f999b7
diff --git a/dev-db/etcd/etcd-3.3.19.ebuild b/dev-db/etcd/etcd-3.3.19.ebuild
new file mode 100644
index 000000000000..be6c9f54d493
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.19.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+GIT_COMMIT=67da93f73
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+IUSE="doc +server"
+DEPEND=">=dev-lang/go-1.12:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+ default
+ sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+ -i "${S}"/src/${EGO_PN}/build || die
+ sed -e 's:\(for p in \)shellcheck :\1 :' \
+ -e 's:^ gofmt \\$:\\:' \
+ -e 's:^ govet \\$:\\:' \
+ -i "${S}"/src/${EGO_PN}/test || die
+ # missing ... in args forwarded to print-like function
+ sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+ -i "${S}"/src/${EGO_PN}/raft/logger.go || die
+}
+
+pkg_setup() {
+ if use server; then
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ fi
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #651934
+ export GOPATH=${S}
+ pushd src/${EGO_PN} || die
+ GO_BUILD_FLAGS=-v ./build || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin bin/etcdctl
+ use doc && dodoc -r Documentation
+ if use server; then
+ insinto /etc/${PN}
+ doins "${FILESDIR}/${PN}.conf"
+ dobin bin/etcd
+ dodoc README.md
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ keepdir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+ fperms 0700 /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ fperms 755 /var/log/${PN}
+ fi
+ popd || die
+}
+
+src_test() {
+ pushd src/${EGO_PN} || die
+ ./test || die
+ popd || die
+}
diff --git a/dev-db/etcd/etcd-3.3.20.ebuild b/dev-db/etcd/etcd-3.3.20.ebuild
new file mode 100644
index 000000000000..bb8da4b424e7
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.20.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+GIT_COMMIT=9fd7e2b80
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+ acct-group/etcd
+ acct-user/etcd
+ )"
+DEPEND=">=dev-lang/go-1.12:=
+ ${COMMON_DEPEND}"
+RDEPEND="!dev-db/etcdctl
+ ${COMMON_DEPEND}"
+
+src_prepare() {
+ default
+ sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+ -i "${S}"/src/${EGO_PN}/build || die
+ sed -e 's:\(for p in \)shellcheck :\1 :' \
+ -e 's:^ gofmt \\$:\\:' \
+ -e 's:^ govet \\$:\\:' \
+ -i "${S}"/src/${EGO_PN}/test || die
+ # missing ... in args forwarded to print-like function
+ sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+ -i "${S}"/src/${EGO_PN}/raft/logger.go || die
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #651934
+ export GOPATH=${S}
+ pushd src/${EGO_PN} || die
+ GO_BUILD_FLAGS=-v ./build || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin bin/etcdctl
+ use doc && dodoc -r Documentation
+ if use server; then
+ insinto /etc/${PN}
+ doins "${FILESDIR}/${PN}.conf"
+ dobin bin/etcd
+ dodoc README.md
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ keepdir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+ fperms 0700 /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ fperms 755 /var/log/${PN}
+ fi
+ popd || die
+}
+
+src_test() {
+ pushd src/${EGO_PN} || die
+ ./test || die
+ popd || die
+}
diff --git a/dev-db/etcd/etcd-3.4.5.ebuild b/dev-db/etcd/etcd-3.4.5.ebuild
new file mode 100644
index 000000000000..8848dd8b39f6
--- /dev/null
+++ b/dev-db/etcd/etcd-3.4.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=e784ba73c
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+ acct-group/etcd
+ acct-user/etcd
+ )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ !dev-db/etcdctl"
+
+src_prepare() {
+ default
+ sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+ -i "${S}"/build || die
+ sed -e 's:\(for p in \)shellcheck :\1 :' \
+ -e 's:^ gofmt \\$:\\:' \
+ -e 's:^ govet \\$:\\:' \
+ -e 's:^ govet_shadow \\$:\\:' \
+ -i "${S}"/test || die
+ # missing ... in args forwarded to print-like function
+ sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+ -i "${S}"/raft/logger.go || die
+
+ sed -e 's:TestGetDefaultInterface(:_\0:' \
+ -e 's:TestGetDefaultHost(:_\0:' \
+ -i "${S}"/pkg/netutil/routes_linux_test.go || die
+}
+
+src_compile() {
+ GO_BUILD_FLAGS=-v ./build || die
+}
+
+src_install() {
+ dobin bin/etcdctl
+ use doc && dodoc -r Documentation
+ if use server; then
+ insinto /etc/${PN}
+ doins "${FILESDIR}/${PN}.conf"
+ dobin bin/etcd
+ dodoc README.md
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ keepdir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+ fperms 0700 /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ fperms 755 /var/log/${PN}
+ fi
+}
+
+src_test() {
+ ./test || die
+}
diff --git a/dev-db/etcd/etcd-3.4.7.ebuild b/dev-db/etcd/etcd-3.4.7.ebuild
new file mode 100644
index 000000000000..2e8f38a668f5
--- /dev/null
+++ b/dev-db/etcd/etcd-3.4.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=e694b7bb0
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +server"
+
+COMMON_DEPEND="server? (
+ acct-group/etcd
+ acct-user/etcd
+ )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ !dev-db/etcdctl"
+
+src_prepare() {
+ default
+ sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+ -i "${S}"/build || die
+ sed -e 's:\(for p in \)shellcheck :\1 :' \
+ -e 's:^ gofmt \\$:\\:' \
+ -e 's:^ govet \\$:\\:' \
+ -e 's:^ govet_shadow \\$:\\:' \
+ -i "${S}"/test || die
+ # missing ... in args forwarded to print-like function
+ sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+ -i "${S}"/raft/logger.go || die
+
+ sed -e 's:TestGetDefaultInterface(:_\0:' \
+ -e 's:TestGetDefaultHost(:_\0:' \
+ -i "${S}"/pkg/netutil/routes_linux_test.go || die
+}
+
+src_compile() {
+ GO_BUILD_FLAGS="-mod=vendor -v -x" ./build || die
+}
+
+src_install() {
+ dobin bin/etcdctl
+ use doc && dodoc -r Documentation
+ if use server; then
+ insinto /etc/${PN}
+ doins "${FILESDIR}/${PN}.conf"
+ dobin bin/etcd
+ dodoc README.md
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ keepdir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+ fperms 0700 /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ fperms 755 /var/log/${PN}
+ fi
+}
+
+src_test() {
+ ./test || die
+}
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 565750283d73..1745c28a5580 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,3 +1,3 @@
DIST freetds-dev.1.00.558.tar.gz 3151542 BLAKE2B e7b7eb1d4bad1472a675e7657d524837a27ba18176cf410ebad6dcb949cd59bb50e932526790c816c05cf0ba02fb750a1cfbcda10073e5cbf8908bdc4ceb9cc5 SHA512 763f04ae36be8385f9be955defd2d91698389836e80e19019f0da0ee15515d8b7e3733f7659362a307b492dc83830f0a7f27d2a68cb5b56e2ef171ac1dcfeeca
-EBUILD freetds-1.00.558.ebuild 1892 BLAKE2B 4cee40bd2fff10227f55d3cf3d931a6b84c7459d4440f6a5ef3744218848be8d65bd6fa0ea7e6fa1bfba03c0e9352358e5345e9ff5cd24e0b78572bf83f062c1 SHA512 575397f3c0c16271e0887718fac5137fa044b7e0ae4098e93b8e9f46b342d493dd4d606edde4082b53c581361b4e9b9f3f6f0b01739163094410abae57ab0e4b
+EBUILD freetds-1.00.558.ebuild 1889 BLAKE2B 76db384f817af1789b015ccf6dd2eb02cfe0a8a245c74e7e11811377a193cac766d1b465c1ab15da08d682f5da44faa934e2db86c4649d060e433a6407de9500 SHA512 77f02fa05b7636728d1cc5c9abd358019819415f768db58566c25efb66f37a52a8985a6bd5408f80918f597835cab4e3a79449b66bae37c2e8fbea86fc2a5d0f
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
index 02a3bdc59d6d..6c97f90280e7 100644
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ b/dev-db/freetds/freetds-1.00.558.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 ~sh 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/influxdb/Manifest b/dev-db/influxdb/Manifest
index f40059e02bcc..be1f8528ec75 100644
--- a/dev-db/influxdb/Manifest
+++ b/dev-db/influxdb/Manifest
@@ -86,7 +86,7 @@ DIST github.com-xlab-treeprint-f3a15cfd24bf976c724324cb6846a8b54b88b639.tar.gz 6
DIST influxdb-1.5.1.tar.gz 1225941 BLAKE2B 6d3639f0c31b885f836e3e97ad943147ba206af4f7798389972f6880d111493633595251a92c540ae23fe0f8a57eb00befb19ddb3d229318b52baebf30301320 SHA512 d536bfd960c8d2145d275da934e1638f425ed168ca3c4b3987084f8dacb2f1b827082c635ad83ad3c3cf105efdbb8465d2f0f552215775f6eb321219280d626e
DIST influxdb-1.6.3.tar.gz 1506621 BLAKE2B e0594a6f9992cabbb7b44ca75b3054a97af22e02278c2b44262ec5c3a00fab35e17b48957625d0ba267e1ef924d7999feed34d2b215ea79067592f50e5dc5941 SHA512 a6bca52223ae084a7d3feef20574b0f6d96105547a17e4cb2713bee18beb0fb31d096779a908d14ceec1510db93841cba5bfd26bc5e6961538351069f1a7a728
DIST influxdb-1.6.4.tar.gz 1510337 BLAKE2B 6bd706101bb2776043d1ce0729276998e090cf57b24f4fbaa3156a673f3fd55b02b8deff3f3e0a1d8bbda446c8fe879633b51b6f52eb0f79bad5f9c19bed0e7e SHA512 19604a1cd33e5d9f81ed46f58ec32b99772077401b6d0789ad00813baaf8a1d488a9d84767fc6021f9f980f8f4e62a3bbe238037fa3a231e81eab8629d9e8838
-EBUILD influxdb-1.5.1.ebuild 4699 BLAKE2B 67ff0a2e348012e12de388cb2c3f548ff1604f6f35aa5c9b3e3ac563e596179eaa8877e16f2659e1a08b5c784748ca22fd7165b04c54d0d068533e078367a28d SHA512 8c67a4394b7d10f81bc969c6b321166019f030f68d4925c062b1afd4f7b937d9c5900617521cf45acacac5e529f73341921d08f491786a8997d2c9b85f0c8865
-EBUILD influxdb-1.6.3.ebuild 4699 BLAKE2B 67ff0a2e348012e12de388cb2c3f548ff1604f6f35aa5c9b3e3ac563e596179eaa8877e16f2659e1a08b5c784748ca22fd7165b04c54d0d068533e078367a28d SHA512 8c67a4394b7d10f81bc969c6b321166019f030f68d4925c062b1afd4f7b937d9c5900617521cf45acacac5e529f73341921d08f491786a8997d2c9b85f0c8865
-EBUILD influxdb-1.6.4.ebuild 5043 BLAKE2B 2ae1746f88ec693ac702a172f5256157f8eb2788d598ade59b77267414c1ee2f706f915450469c8035a8d0a74d2841f786df4b0cfe8ff153e7d0efd428f63597 SHA512 30678596d89262554b6f73ddb7e3f315790b194b0ffd4cab2bfaf16035f637d089f1d3393ccd377ea9a67dfdf6259f19308dbe1f43f251e38bb13c9fc21de05a
+EBUILD influxdb-1.5.1.ebuild 4761 BLAKE2B d9824094d3150e9641876c97cc1fb2001197dc054b563cfeaf822c1ceec75f09280e33b734493f50b2dd510750614b4c7ec48ecd7a7dd7646094ba44759daa17 SHA512 7fbd68bf32c2aba60dbf1f7256b4b75783c23d004a6d44eb51e774a8d854d552049fba4a8bfae54a5bd1d9da88a3ade9914b94bea386ad3b999d99a848cfb699
+EBUILD influxdb-1.6.3.ebuild 4761 BLAKE2B d9824094d3150e9641876c97cc1fb2001197dc054b563cfeaf822c1ceec75f09280e33b734493f50b2dd510750614b4c7ec48ecd7a7dd7646094ba44759daa17 SHA512 7fbd68bf32c2aba60dbf1f7256b4b75783c23d004a6d44eb51e774a8d854d552049fba4a8bfae54a5bd1d9da88a3ade9914b94bea386ad3b999d99a848cfb699
+EBUILD influxdb-1.6.4.ebuild 5105 BLAKE2B 5e2fa6c4b00acad90084e3ed280343953cdb81da586a83cc47154dc2b3867bffc7996c4d7a560b43121b7fd095d8db6938e2eee238b223b0d742bed97e4bb703 SHA512 681bd4cf91bfea48e74171bca39866efd138f8699eaf61bcec85961f481ec2015bceb2033b9d0bd217d1d95a49dd038474733c0d3e3ff80c2dbacbd0bec3c7fd
MISC metadata.xml 452 BLAKE2B b1c73f1e86864534f79c9b8e136691660014c6cffda6d92b89d6bf73cbaf17e28ba4989cbb3a48aa29cfd4587d02ac415406fdb49bccfa18c8129b8ae4cd146e SHA512 7100ef74e1dfbc09bf0accecedfeac01ddc257566fe1ea9138c0a0d1d491abe142ae677760704ba207a609d6a94e81367b515905aabd80ac1f78a4eba27d176b
diff --git a/dev-db/influxdb/influxdb-1.5.1.ebuild b/dev-db/influxdb/influxdb-1.5.1.ebuild
index c9076ff600e5..a7a75050d8ac 100644
--- a/dev-db/influxdb/influxdb-1.5.1.ebuild
+++ b/dev-db/influxdb/influxdb-1.5.1.ebuild
@@ -58,7 +58,7 @@ HOMEPAGE="https://www.influxdata.com"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
-LICENSE="MIT"
+LICENSE="MIT BSD Apache-2.0 EPL-1.0 MPL-2.0 MIT-with-advertising BSD-2 ISC"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
diff --git a/dev-db/influxdb/influxdb-1.6.3.ebuild b/dev-db/influxdb/influxdb-1.6.3.ebuild
index c9076ff600e5..a7a75050d8ac 100644
--- a/dev-db/influxdb/influxdb-1.6.3.ebuild
+++ b/dev-db/influxdb/influxdb-1.6.3.ebuild
@@ -58,7 +58,7 @@ HOMEPAGE="https://www.influxdata.com"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
-LICENSE="MIT"
+LICENSE="MIT BSD Apache-2.0 EPL-1.0 MPL-2.0 MIT-with-advertising BSD-2 ISC"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
diff --git a/dev-db/influxdb/influxdb-1.6.4.ebuild b/dev-db/influxdb/influxdb-1.6.4.ebuild
index 3ccd9f860ee4..aebd7bfb197c 100644
--- a/dev-db/influxdb/influxdb-1.6.4.ebuild
+++ b/dev-db/influxdb/influxdb-1.6.4.ebuild
@@ -63,7 +63,7 @@ HOMEPAGE="https://www.influxdata.com"
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
-LICENSE="MIT"
+LICENSE="MIT BSD Apache-2.0 EPL-1.0 MPL-2.0 MIT-with-advertising BSD-2 ISC"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 6001b0ccb4ba..563330af845c 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -2,5 +2,5 @@ AUX fix_configure-1.2.62.patch 1668 BLAKE2B 5a572607b5c848c3616fcccac1e936f9218a
AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 BLAKE2B 882c4897a40609bbfa1183cb97e80e5ed6d95d0035c30c836e3f252962db822249f8b48934923e816a720d3cbf64a6f47f80cef77528216f3171f332ca3a350b SHA512 4833cecd6c67515e0c59d7161be6891df290ae816593de1bf35718e9c9d8691db221bec5078c5dc7cf56e55b0086d61c415e148a7ee63b2a47ac4885f6d0960e
AUX kyotocabinet-1.2.76-flags.patch 894 BLAKE2B 50efb4b21f0101a942eb758213cf703460056a951617298057567d08b116c7e0a631d631eace992ff447bed5b74940d2b60a8adad373cb77fe42b8c40bfcc9fd SHA512 60a15c54994a5f338cf168feb831d858fdd2cadd16ea0c8001ef652e8502797f5920d3fed0a3ec4a6a2d817381b4690410878a18c7c859df34e26b033f48fe03
DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
-EBUILD kyotocabinet-1.2.77.ebuild 1529 BLAKE2B 589021c8a06e22a6ac3beb2609f50c42feeb4f86e9281dee68b8ca1bc1104a2a109665fe66f15f1e314a7d1aa9cab9c4ac4f4361fc6228e9596e48bdd28d4bb3 SHA512 6b792121518910ca86efacffd2391c922df8f595f6e8759282c61edf2dadbefc76bc2b5c9a6c07fb318d8f802842e1bbc905a8b16da485dbd668d641701d52b5
+EBUILD kyotocabinet-1.2.77.ebuild 1529 BLAKE2B b40c9b466053e4dffcecc960eb931591be72901e5cf3db13d29c6e1753e0baa214e0b6a5c934d45b4fa3a7728ddc8848c3d42e11ead75123f6f4d38af6bd0b05 SHA512 8f71fb92376dc973ffee55030fd10368f9c139465a48b492e53dcf87471fe6cc511af5c0129f8947c0be5e7ecc9d68da6cb9d15e997b1a1962bef511ffe286bc
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
index 0b831df71e97..43d1ea8aad85 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fallabs.com/kyotocabinet/pkg/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="debug doc examples +lzma +lzo static-libs"
DEPEND="sys-libs/zlib[static-libs?]
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index 41ba480e2399..8e8e5fa3560b 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,5 +1,5 @@
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 2174 BLAKE2B 92f7481db32c347bff51332350dc1aa76870991eef2ef3b4d3f41a2ddd829c84150b4d4d772350c61d03fb5af2cc24863041b404c6ef5cf5f060346f5769c10e SHA512 65ac0a6c08c5a094a013fc15092c0f9c6ae4917449069efc10203b8fe696e1e9de68f936360d8e6d75e7ffa26e04b206b9585a25685edf5df71f10563797c209
-EBUILD libdbi-drivers-0.9.0.ebuild 2126 BLAKE2B 7e1490f59aca5e0930b572e3b1678b26f73e011ef8b6f22702d10cdfcb8f62f24b3045b581455c9aac1a57a499caaefa16d98763f6d204121735384eee3dba1a SHA512 bd12e449015fb2f47f66574bc20c142cd1ae7e3351ebcd09623cc781b69f9c75e23fe769af2a65bb68ff4560ea740984fc9032e73c105d49ca8f123d52d90a0e
+EBUILD libdbi-drivers-0.9.0-r1.ebuild 2170 BLAKE2B d23188a0c9dcd7bbfb9b660eb929817e95f6278780fffc63b139b5e083954220ce6c5bb535f751b4ee60dce417fd58f51ba24f8cbb82d2277858d7ebd769933a SHA512 467d725bfb2db21fce95e4cea520a79cf99d99537af065e5acd3e1cab7b0999ee5701deaf7a3dae4a55a5c6416642bd0c976c2763e78ed51ba247dc432312879
+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-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 02765abf2797..c1a1aec221d5 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~sh sparc x86"
+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 )"
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
index c7be46520a84..6f3b490144fd 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0.ebuild
@@ -11,7 +11,7 @@ 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 sh sparc x86"
+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 )"
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index da86cd1da2f8..7b63dab9e3b9 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,5 +1,5 @@
AUX dbi.pc.in 244 BLAKE2B b42f4a78c39034fe1ff4f2cf1ffc8bd252eb17e68dc50e03fd47ecd9838c37d00d5c4eb4a4b5ae5b3dd66ad63ba2c313923203b5514bf1161e405cd21e4fa4ce SHA512 6865b37e8d84d7a95b0ae482d9b1cb486ab7abbe726e699099ea4368d418f64b6d8cb02ecd4d1473f643aa5d715c57817a9496bd8950461921d5db4ff4272ef9
AUX libdbi-0.9.0-doc-build-fix.patch 662 BLAKE2B 652bdba6b0e9b04bee87f48f0db1fba774bf153bd73f925b3d1111823c14e82ccf3202f8023736e3b0a91e00c28c6aca14ca5ffcad3126723c7f02cbc30a7049 SHA512 db18d3697be13ef416914843d0933caead3b1f57c13790373ec435318212f0ccfb599514f8bd6f1c603e09f13bd526b62322ff92e68512e43020b31f8d0dec55
DIST libdbi-0.9.0.tar.gz 1194284 BLAKE2B 36ee5d9ec0a9b088735173cfa9a85e30ee595d6781aafeb994271e7745d259dbe983bea037182c471dc35ae36486a5fb8690e9c716e2e08a4a3964d90abd64f0 SHA512 ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce
-EBUILD libdbi-0.9.0.ebuild 1351 BLAKE2B 2473d87c0cb0f0b9c89ae8d1dd449ef3eeef2ded0d2028068c587af06a3fd68b088af63e95b88067c43c1dbd976a87f2d599c6262a883a93ef005686f1e45d69 SHA512 fa0afa5fb0575e0bae005205ec16a662c648cdbaffdafcc0905bdd91f499420be89e4b4ad4a20f931839873ff885fbf54877088587330249466af99e8e6fda1b
+EBUILD libdbi-0.9.0.ebuild 1349 BLAKE2B 3af959099797bb99978d4c8ac66faf7027b73b95b7f97a8ae527ef4c515c2ee4d0038555cf33d465271938105360d26178269c51040a9d40acab7ffa7be57ea4 SHA512 897d331c3bb06c95720c7d1c74525ea407dacba7b90d70fcc781168e20a5f6687dbe851c60125e08b042b092c67b69b9180546e91dbc2234cfed4d1f266c9805
MISC metadata.xml 294 BLAKE2B 1d9ff5692cbe4272918f7c3a8a5f9f1e564fd2ac3d5e5878be44f916557ecdefb843ad3b56e778d2833361609ac8cc9dec2939c04bab59687b4a7d2c25f4c750 SHA512 acb2d7a1ab6206a1f489cc8999ae35f014453bc95764000c5a6492a4b8832f2e0cf83bc875aecf50a6a6beb6bedabddb74628a2599f6c84a2d4aded345a39cd1
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index d1248c13979a..b9bb90dc0920 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://libdbi.sourceforge.net/"
LICENSE="LGPL-2.1"
IUSE="doc static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
SLOT=0
DOCS="AUTHORS ChangeLog README README.osx TODO"
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index 03c94654202f..3599e7979fa8 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -4,5 +4,5 @@ AUX libiodbc-3.52.7-debian_bug501100.patch 408 BLAKE2B 6fb1e24cb2d4f32eca6cde6d5
AUX libiodbc-3.52.7-debian_bug508480.patch 577 BLAKE2B 0d605b754b6b4b970a15a236be6eebdc6e24dcb1231cacf10e859b22eb577ac49b26ffcdae437cf05de26850de33ed10cfbbffb9b54ab79fada2525a6de939a3 SHA512 2e3a0ab2284b0b302e2eb5d27e1cc952810c5ec2d123491047cda15d1e0b2aa651a1d3357fb330be24fa72ec855a89143eb88bd4b87ce079b469b6ab8647ce74
AUX libiodbc-3.52.7-unicode_includes.patch 432 BLAKE2B 3f9c833c223fb5d5dd94530501b5403732b88b420a6cf6a0453734d1cacd9eebdb0e69d7cf265b4ce2da4baa2faad32b467beffdf76d6c339316323b2ba9237c SHA512 b4bd56e88199ed06ec7ce64bbf53c3d792c501cdadee44a1c52d95336c36e93c2379d312b14c576a138210f2cf277e895ded18e80db4e5bb3f664ccb5695a305
DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
-EBUILD libiodbc-3.52.12.ebuild 1637 BLAKE2B 9740e4da80090bf094c1b3664b6b6f0d52585a272c1ec3df203fbb0d6a675b9f9cdb86c9d6cbb3f054d2df7b9ed67a2e6aaf4f107925d2881bc12f70aa8204da SHA512 258165f0049da29146220d40bcbb81741b99904a89421f070b33d3e394511ba32c5ff9291d01c2076c72f735f6115c4952de299b7038aa1b4b719a762e225dd8
+EBUILD libiodbc-3.52.12.ebuild 1635 BLAKE2B 33e84b45f1e80eb45b47ba4b0cea63ab9131c9db0bd5100feb837542386322a4a25c77e9f9f958436288e717a81ad77500135bbe520583d1b5a158ac0bb11a02 SHA512 c72beda1b707bc40a80cd0b3a13f9d7f49689c884f9c1e2188cbc0f13698488eb8a8b62c1ba98461613c9a00b3824377ed858cffc2cfb51bf82821961875448f
MISC metadata.xml 251 BLAKE2B de1fe040cd23515516e31a81c78089f5fb4b9240f43a659d0e6981665bec427ebfe5f68bbea534b92dd4352f42e366c2070d3ef3e7fc0d3beee880445d973bef SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
index c6527ce5381d..fd954d02ad93 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ODBC Interface for Linux"
HOMEPAGE="http://www.iodbc.org/"
SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
LICENSE="|| ( LGPL-2 BSD )"
SLOT="0"
IUSE="gtk"
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 49d80f858d14..4f95ef94b8c7 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,6 +1,6 @@
AUX lmdb.pc 295 BLAKE2B 29c1cc5a70eb3d7f5c9dc4b1646644045514929428f164894ece93a4fabf33ca464e1f116c8a803b499aabf28b6dec372b50c46a2fa4fc1eb65105208759f4ba SHA512 d0749849a0ca0593fbff0b4f8db7143177c588e342978bdb8331238761379f5d5bf686190e39506ff6b0abf6f9d668c96480da685c56d7ed44e7756f92f4e057
DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b6076599bbc79ef2c3f41459acb6ccbe5f6030c6a258fe30633c4c0568fa05fa6d46dc05bab3f93ee3aab16e6faa89 SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
DIST LMDB_0.9.24.tar.gz 143916 BLAKE2B f075ec5f4dfb77685188229e20f12c4febe8295c7d35ed15c3db492b68af68cc7f76741078e9bb524d2c38587839f542e964af1e5d6d984bb28bd602caabbb8d SHA512 c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1
-EBUILD lmdb-0.9.23.ebuild 2266 BLAKE2B 4f438302398a85a915b37d61ba6be50f3b10eb1a619b5d9cbb430320a906de2179a7a2737041505c2f8845b245deee233a6ac903fa92cd1a5049905168fa85cb SHA512 4b0fdbd8e1b1befc5d48c77dd7475f6a88d7c1c26b0ac75c64a7a955dabb9ff2ecf8717ec08fe778888ffd14bb2c78a9320d9c083c366113415931850a379ac1
-EBUILD lmdb-0.9.24.ebuild 2287 BLAKE2B 72934fcabbe1802d6ac95efcef46857a7fd6bb24c2817d4d8d94187c6731685047538e510f65d073f1981944b46bdb2a67db0cec6d467bf4df6c1e759a38f967 SHA512 91c57ddefb164689905df0864274057098925a89291895526a060aba96eb6f4686f2a592ab2ae298e7a8349bdce439f87555a981993cd1e3feb2909fe5f75825
+EBUILD lmdb-0.9.23.ebuild 2263 BLAKE2B f1f7d49007f6166011ffe6b488dba57526454f3dcd634259c1d6f8b5009b602e2c2a2e15ea52eaf9564a4a83932a211815d1c1193c28cfd52699c1f0396fa6a6 SHA512 71b92b02078e3028c3bea4ccd43a7b31bb0b5d6f76086f5f43d793cb83c8626fc337fbd490515463b5da340ec55b1124a76efd03060f592fd38d48744671eb9e
+EBUILD lmdb-0.9.24.ebuild 2283 BLAKE2B e4df761fd015bb85aaafac47803e65c3cbe1e1180e4e10cb7199b5b6c44809d955edfd889703d86bb0887d41d930410040f53c6308a8c9ad651dd3ebebaf94bd SHA512 396acf6fcf85928f6da6bd245454175fff00ced605b93153da0f978130453e6d5560f0e5088d18f08e7ad14df427c3abf95918f05e26fee90ceafd71530d5723
MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.23.ebuild b/dev-db/lmdb/lmdb-0.9.23.ebuild
index daa6fe22a3ae..a8ca0dd66dc1 100644
--- a/dev-db/lmdb/lmdb-0.9.23.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/lmdb/lmdb-0.9.24.ebuild b/dev-db/lmdb/lmdb-0.9.24.ebuild
index 722f6a866f10..3c22a2223a42 100644
--- a/dev-db/lmdb/lmdb-0.9.24.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/${MY_P}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 171e7692fbf2..a00ce3fb1dcb 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1,5 +1,5 @@
DIST m17n-db-1.7.0.tar.gz 1939608 BLAKE2B 1b79e6ad32336a9ce34e14a52907b4064c410f70e356797ef59b1c9b8c83180453d820475b4dfb486eb1eb1d063607274b561a5120a60db0e0cfccad53d67eca SHA512 02c3cb347e9f5c840a723de9ed85be84fc9fb5f86d4963f0d1c6b669045d37d10e5efcf5ac0e0c3cb7249fb391b0dd32bd50fbc3332455aaf0b49d96fc09b2f2
DIST m17n-db-1.8.0.tar.gz 1977364 BLAKE2B 303afaf8eb105b8cc034be96efc7790f774870c5cbb688dc33da02847b545b42b20fc041c3842d9fbf9d17417472815e8185df37b58f4d2d72fac762a2669272 SHA512 b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5
-EBUILD m17n-db-1.7.0.ebuild 566 BLAKE2B 1621dc976a632624e9ebaac744893d4869865a2b6da9725f18b751cc75f6695b452f7008e048df27f01d8944357cd95be89d51a504bdfcea2182f185bf81f4fa SHA512 71b170f4efc664adbc0deb28d0b528ac64ea2e7b4cb72ee3f9a9bee718e94ab76c37c78b3a19c6eff8854babe84096c8a3cc285b777aef650380c56a805d92a8
-EBUILD m17n-db-1.8.0.ebuild 578 BLAKE2B ce40b3461bd11662f6085b28e02f21de343a6b3329e2c025fad166462a2aa5d97b9c62cfce939b8985ea08c1dc1e8b6a081edc00ff9da0b4ad1a881102fd58e1 SHA512 408fcd5f2d56cd821ca94642773bc60ef889165d32d89d80b57bcfaf575d6012857f98ae9e53d7f5b7df06afb667ffb44dba03529c5bfa7662654661408fa841
+EBUILD m17n-db-1.7.0.ebuild 563 BLAKE2B a707950ad3bce274bc3a125581cea491e2f9ed259a5fd0e5ff0608c99573ff57087a14993ec4f90f67b51f53a6babca88258adc345bd5fb3c83299da347c1224 SHA512 aa1354e64056a9f9780c2af64d63c8f7b1aa4eeabb760389b95ce8796649a4f3527ab37ae0a6352df1ddcb04cdd6f7e8cc9aedd2c09f4c9bb64787dba5179862
+EBUILD m17n-db-1.8.0.ebuild 571 BLAKE2B 0b2ad70ff457150873590bee0a92724b24004092047335fb1144b904c62d502eee520d1c8a60e107a57e4050aa995d99690f4b57f228b2aa8ca236f248a25d3f SHA512 fb86200a91f8b4cd846d1a0d18a309a25c3f12d70ac9da762fe9d021bd2c30a0e559d09a58781b4d77e0deeffffe3cf6a5b4127aaa4ca90f604c2c5550665654
MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-db/m17n-db/m17n-db-1.7.0.ebuild b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
index cf08437e11d6..bbc775e8c613 100644
--- a/dev-db/m17n-db/m17n-db-1.7.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND="sys-devel/gettext"
diff --git a/dev-db/m17n-db/m17n-db-1.8.0.ebuild b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
index 634bd2d2a0ee..035eec6709df 100644
--- a/dev-db/m17n-db/m17n-db-1.8.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="sys-devel/gettext"
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 7ded94056bad..6076e25bac1a 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,12 +1,8 @@
AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
-AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d5815e818bb3cb08241b1629e7cb2e8c6b33d09e241db11cc7f18e73a8cbf40567fe47a613c420581f8487c39478bcbef22da4ba21b77a10f71e4b11ef SHA512 a3ec1a1702d2d5ae5ea6ef93e9bc7f01df548c65574b177a20e8b29694b078ebd67a409ed253467d1db38895e66285eaf73e604a507bfb09384bc3d15325cb60
-AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028
AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
-DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
DIST mariadb-connector-c-3.1.7-src.tar.gz 742923 BLAKE2B 641c3c49cf83af918e5dab06f9b8afecd59bd7b6486cc55b33749cd0ef317ab6cff86da9b85829b0309305a190e16f4ecc369210c54070e265387a5818c48ca1 SHA512 0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670
-EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2840 BLAKE2B e396e60fc1c2bc76071f1c904c14124328c4ca4f01f9eec658108fffd7ed6df85f4a921cc452d98914764919cca7fe1aea42e5e6b3616295fd90f9849157f71e SHA512 e8068e1fa6e9eab77f20d945f6162c09740cd9e7efd5cf8ef70948528290f982959b6719f005a4728e95a39d6023425b68733e19955e5952c06479681ec47414
-EBUILD mariadb-connector-c-3.1.6.ebuild 2336 BLAKE2B 7e4188ef07f2be6a61ad6d4e30d8e9db8d38e39434a5b4f60bfdd549123500cfce655c5f9efb436fad6a675f7205f7313e0abd18479a7dc1175a12d6a4ec86ae SHA512 863cc1fa1b4b8db12413e0da8a790399c1e12fffd58aeeb869ef8044fdeb9b8e79d34d51b6f64efaeb7504cd38028394b44dd94cf0135f9046c9619e131cfc4c
-EBUILD mariadb-connector-c-3.1.7.ebuild 2344 BLAKE2B 79c3848dc7578cb7355e38d44d1326e8cbcf30bbe8ff6ca4ab9f48caf95a389550623870c86576ea854e6936a68ee22cb5ddeb7bfc02a253e8bcd04f5cf4e6b6 SHA512 bd41ab2427ce94069be1ba44ea9bc9a50b5a8c535bca66aeb5fe57623826e479284e330e797a2e83b8e0b30eebbdf502a6dc5fe4c147f0cb001e2badff1a7f6f
-EBUILD mariadb-connector-c-9999.ebuild 2344 BLAKE2B 503e29dbd45777f693139c7febc843733c68b1c3c6151e7f69afd5b09fbe1767be464f912c2d7a8a082320a951952dca213ec1241b9fb7b2a2a3b2818bffbed9 SHA512 47a5d77dfb14bf5ffdad3bf849a3bb0df995a4c7db5b94704231ad70ff6e7529c5713e830e8c11c76d1cec0303496815d449390b84d91ca9687e312939883166
-MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
+EBUILD mariadb-connector-c-3.1.6.ebuild 2336 BLAKE2B f17769bbdc21d9a16c77f50699931b6b154f19a816a302700ef35c6668aa9145dcb68092a8fbdfc8c726655c391e905fa6836d3711171fac83a5ff7e6e21ac7c SHA512 51c996013e51d496d2225d3299977120ba297e58c48769c9ae644bb889ad4b9647c85584603949a0b05555420ea960c92d6b9f9136dd1c223c2af87733ca22b9
+EBUILD mariadb-connector-c-3.1.7.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
+EBUILD mariadb-connector-c-9999.ebuild 2351 BLAKE2B 1c1a5117a6615079960b336fe290a2623a31fe16e14c2407370c9f3c945d23b72eacdd193aa79035d7e3220d02a00c9a035727ec65df78e498ed40c999b7f465 SHA512 a66f34d61aa78d017e078abc060ab589aec28afcc318785439c430b73ebb8b8c47140c3c1fb3fa39f4ee0794d76c751a8ccab31b12360ad24d51a51dd83f1e0f
+MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
deleted file mode 100644
index 02bbefce3576..000000000000
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/mariadb_config/CMakeLists.txt
-+++ b/mariadb_config/CMakeLists.txt
-@@ -46,6 +46,8 @@ ENDIF()
-
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in
- ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY)
-
- ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
-
-@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
- INSTALL(TARGETS mariadb_config
- DESTINATION "bin"
- COMPONENT Development)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+ COMPONENT Development)
---- a/mariadb_config/libmariadb.pc.in
-+++ b/mariadb_config/libmariadb.pc.in
-@@ -1,19 +1,11 @@
--#
--# pkg_config.pc.in
--#
--# pkg_config configuration file
--# For a detailed description of options, please visit
--# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
--#
--
--includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
--libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
--prefix=@PREFIX_INSTALL_DIR@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
-
- Name: libmariadb
--Version: @LIBMARIADB_VERSION@
- Description: MariaDB Connector/C dynamic library
--Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
--Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
--
--
-+Version: @LIBMARIADB_VERSION@
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
-+Libs: -L${libdir} -lmariadb
-+Cflags: -I${includedir}/mariadb
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
deleted file mode 100644
index 1a16a2c01015..000000000000
--- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/mariadb_config/libmariadb.pc.in
-+++ b/mariadb_config/libmariadb.pc.in
-@@ -7,13 +7,12 @@
- #
-
- prefix=@CMAKE_INSTALL_PREFIX@
--includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
--libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
-+includedir=${prefix}/include
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-
- Name: libmariadb
- Version: @CPACK_PACKAGE_VERSION@
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
- Description: MariaDB Connector/C dynamic library
--Cflags: -I${includedir}
--Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
--
--
-+Cflags: -I${includedir}/mariadb
-+Libs: -L${libdir} -lmariadb
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
deleted file mode 100644
index 7d95dd884368..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="amd64 arm arm64 hppa ia64 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 mysqlcompat +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}
- mysqlcompat? (
- !dev-db/mysql[client-libs(+)]
- !dev-db/mysql-cluster[client-libs(+)]
- !dev-db/mariadb[client-libs(+)]
- !dev-db/mariadb-galera[client-libs(+)]
- !dev-db/percona-server[client-libs(+)]
- !dev-db/mysql-connector-c )
- !>=dev-db/mariadb-10.2.0[client-libs(+)]
- "
-PATCHES=(
- "${FILESDIR}"/gentoo-layout-3.0.patch
- "${FILESDIR}"/${PN}-3.0.6-provide-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)
- -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
- -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
- -DINSTALL_LIBDIR="$(get_libdir)"
- -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
- if use mysqlcompat ; then
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
- fi
-}
-
-multilib_src_install_all() {
- if ! use static-libs ; then
- find "${D}" -name "*.a" -delete || die
- fi
- if use mysqlcompat ; then
- dosym mariadb_config /usr/bin/mysql_config
- dosym mariadb /usr/include/mysql
- fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index 4618f61448e3..8367605fc546 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -12,7 +12,7 @@ else
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="amd64 arm ~arm64 hppa ia64 ~ppc ppc64 s390 sparc x86"
+ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
fi
inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild
index 63c6d2e6025d..91e9ba93b995 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild
@@ -12,7 +12,7 @@ else
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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
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 9b1a6789a00a..91e9ba93b995 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ else
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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
@@ -48,7 +48,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
- "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
+ "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
)
src_configure() {
diff --git a/dev-db/mariadb-connector-c/metadata.xml b/dev-db/mariadb-connector-c/metadata.xml
index 9c4d844e8798..357d7d00f109 100644
--- a/dev-db/mariadb-connector-c/metadata.xml
+++ b/dev-db/mariadb-connector-c/metadata.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
-<email>mysql-bugs@gentoo.org</email>
-<name>MySQL</name>
-</maintainer>
-<use>
-<flag name="mysqlcompat">Enable mysqlclient library symbolic links</flag>
-</use>
+ <maintainer type="project">
+ <email>mysql-bugs@gentoo.org</email>
+ <name>MySQL</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
new file mode 100644
index 000000000000..ddcb8338113b
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -0,0 +1,4 @@
+AUX odbcinst.ini 82 BLAKE2B 7c752f9500f2141886c798d9be4aa2e84ecb089589394c4f473712aba0279f2ff853ebc1ea75b7f007abea18e46289bf06c7408d3d69026faa6b638755c13e70 SHA512 40c056bac44dc5e521ec2e66dd046566f50fd8b2fe0d0d2beacc29a68d9ddbe75f8dfe012ee6957c4e2874d4365dbb096e20faebb2b26371b060c0a9fec205b2
+DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3 SHA512 ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d
+EBUILD mariadb-connector-odbc-3.1.6.ebuild 1687 BLAKE2B f10d044523edab365e7eb1def3224e76994d1c9275ee4a0cab7af01fa07d21396803e108bdd1521b992830f7b40d2a54d880e75f09dbe2793ce7379eed1e47cf SHA512 00b03502377deec9682807b115d25f76aa1659c92bde5e20fc2f529c683d971ae22a42281cf1bdbbddb700d0c68299eb631908dd3c88fbd09c60c2a808e04497
+MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/dev-db/mariadb-connector-odbc/files/odbcinst.ini b/dev-db/mariadb-connector-odbc/files/odbcinst.ini
new file mode 100644
index 000000000000..e196e032362f
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/files/odbcinst.ini
@@ -0,0 +1,4 @@
+[maodbc]
+Description=MariaDB ODBC Driver
+Driver=/usr/lib/libmaodbc.so
+Threading=0
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
new file mode 100644
index 000000000000..0ad95ec91dfa
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/"
+SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-ga-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ssl"
+
+S="${S}-ga-src"
+
+DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*
+ dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ cp "${FILESDIR}/odbcinst.ini" . || die
+ sed -e "s,lib/lib,$(get_libdir)/lib,g" -i "odbcinst.ini" || die
+}
+
+multilib_src_configure() {
+ append-cppflags $(mariadb_config --cflags || die)
+ local mycmakeargs=(
+ -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+ -DMARIADB_LINK_DYNAMIC=YES
+ -DUSE_SYSTEM_INSTALLED_LIB=YES
+ -DINSTALL_DOC_DIR="/usr/share/doc/${P}"
+ -DINSTALL_LICENSE_DIR="/usr/share/doc/${P}"
+ #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+ )
+ cmake_src_configure
+}
+
+multilib_src_install_all() {
+ insinto /usr/share/${PN}
+ doins odbcinst.ini
+}
+
+pkg_postinst() {
+ elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
+ elog "Alterantively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
+}
+
+pkg_config() {
+ [[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
+
+ if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
+ einfo "maodbc (MariaDB ODBC driver) has already been installed."
+ else
+ ebegin "Installing maodbc (MariaDB ODBC driver)"
+ /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
+ eend ${?} || die
+ fi
+}
diff --git a/dev-db/mariadb-connector-odbc/metadata.xml b/dev-db/mariadb-connector-odbc/metadata.xml
new file mode 100644
index 000000000000..64b17e08bff5
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 135f555c6b74..980c325568b4 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -19,16 +19,16 @@ DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae9
DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf SHA512 d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa
DIST mysql-extras-20200203-1749Z.tar.bz2 344999 BLAKE2B 46441f3c210c87b8ce1df89e9480d0bd5be216b0a1380c3ca330294e787bf2fb2b7078438f032dd0381363e756312d7634350a0b02c00b3145d4787a9ad65cad SHA512 210d240efef4d7bb64d356cae240039d9bd65e2bd4af47e01131ab5bf48779f4c0519e50d212d50db998e6b9bf9d73f1a03b0bbf4f7d6dc6f978660c8ac8a21f
-EBUILD mariadb-10.1.38-r1.ebuild 29426 BLAKE2B c431a24c4b1a13b8d4fdb975e9b337444daf850e05f1804f8ecf3f8baf0045c697392645384bde292a4781a8a12745c776534cde771f51faa84b651b7ba3f72c SHA512 c7f259e6b290716da285d4c25b6b15afb4b8fe9dc4e53f62cf009ca013cec2bd1fdfd9539bdca59fb64c1ccf23d83c3b825dec00a43ca128cce4c1bdc8179add
-EBUILD mariadb-10.1.43.ebuild 29829 BLAKE2B b89c1173f52c95cd5aa93e237615595e8794a943e3b5ee084e5979d1230f26e6bdd675c5bf7188b24e3db98653e9a2809aa4017c22d95b4e54b2d331c2f32071 SHA512 7189852b56eaf0ebfadde4e9e1439af300270048707e92de9609a7e4c3eedc84d584f9d940cdef13f816aed1643e4542355f0e280cbc62fdf925496d1f494f01
+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.ebuild 30002 BLAKE2B 7a94024bf9d1ba745be4d5f5d517b158cdca2f9d7ec9cae3f9260c9b6df716577f282aea7e14d65a5e2d6aa65d3f827f201e0470313119cd40d420f762573dc8 SHA512 cce6fc963dd50ff7924204d9811c1102a8b6053f2068366d6bf189a3cd7e6d85fcd11a7cb2393d81cc9e774567ab34c625d97d63ff0b0b91d3e7564607751d29
-EBUILD mariadb-10.2.22-r1.ebuild 32489 BLAKE2B 71ebadedb23a242d2dd2144754447898b0ed9d3fe40cacdfc7141b529656e171bebf952d66760356bf3ffe28fee3d00be703734cc5aacef584374b109eaa3171 SHA512 3b2b2087e147bfe16b66159c0a63b6e5fb3d4f4ef2ec3fb7f1a03b01a9e27dc77ed68dcb7b291eea9dc551d1fc4db433f9687fe90b0da290c30a305f68c364b7
-EBUILD mariadb-10.2.29.ebuild 33062 BLAKE2B 85f97953a75fea7fc59103fb02ae0d1d2b10e743353bbc07d70f9bba0e7025bd4714f75e04a48b70576354d7ea16953b91a4d5b4f2fcdb2784d369d0a09c56cc SHA512 63373958668c59af990942657df17c96d285765e0be3dd9bf9b3d1ed045aae7d64455c0b5ba8c6c6f1588fa34dd86a5edb4f9395ecea48277f0cfaaf064fb44a
+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.ebuild 33127 BLAKE2B c7d4a51476221139592143f04a2fa48f8edcc2824ebaeec8bc5fd15c9701f1a7c8abe503abe873fbb91a6e423c59ccecb34f9ce9d3e724b88922dc90daffb5a8 SHA512 64ac71051e3908ef6c1ece6b9b4ca3ca36396e6626daf51c47a0a5b88328999e51ea7dbaa74fe9cb5dc9d6c5d837474fe3d2dada8b403bd5a6e800f23014955d
EBUILD mariadb-10.3.20.ebuild 32690 BLAKE2B 35f9eb05a31fa3949464a77b044dc00561c016572a88fc028cb9ff58a1c149db72cd09d9cb0e1cb9e64b055881940adec0bcf990b3cbaa1bf9fb26a3d066ceda SHA512 861f3608796ab075c052e623cb8949adcea2bf49c97e81b70f9236ca8f67d6ca32602c7946f556763b7f421d275845c896f74db8e5ac966a387ccbcc69c29afd
EBUILD mariadb-10.3.22.ebuild 32751 BLAKE2B 1be469e4b50720e998278d6b2bb38500de348d3a85575ba06938a8a95e9156fb7e371871ce4783b32b13e002c0a79f072279de9d5e4364721954535194e72a04 SHA512 405fa45a1c08d4aa845842c20a6de52508e44ea11395f8d915a0e32f4dba03e7bc67ddbe8ede97d1d3157144272fe40cbca6679643679ea55ac4352c1865875a
EBUILD mariadb-10.4.10.ebuild 33342 BLAKE2B 8aa25f71b60b596994749905a9af6d0171a259bafba7ab76ff68e855d97de0363a687d4c603fe2ffb1d14196ff51ab5e8706c05d2c2a0dfdcb8f801001b1e0bf SHA512 ac6dcded63450f4a83e1bc41fd5a881bfe7f712cc4e31270d2d1b3015dd48e4a79876acc359e6bd6fd6f1c560a281fad96f4369965d9734b88165a27a5a1a70b
-EBUILD mariadb-10.4.12.ebuild 33367 BLAKE2B 5016d7af909be2856019759a33031e7a10eb6234360f23d90812bba7539e1e226dc71c82a30bfd13a62fa5396f2a6917171cb524298346c7182f463ff84e7839 SHA512 e144ae6f5aedbcd475f663cf70e3624a70858b0a09135d57ecbecfa6980b8e056509125d7ad1ed4d94823e7693eb790387f695e48b1937ec3207d56f67c188b1
+EBUILD mariadb-10.4.12.ebuild 33448 BLAKE2B a088a31f46fd353f6ab02fca328dcefff514f88b6c05e1dc63901fdc7ef319b19b203f138e645d2db7da1bdf0d71c887de27ee1fa114ad81de86afc2d7cea296 SHA512 f46d41eabbc220f7a0817f4246e9ee2872f4cf9748def3833e18704fd2a4b80dd9c91cbbc894b2867f9612a4491f2ee9a9b7c541b6c9eaaa833e30d101e6dd93
EBUILD mariadb-5.5.66.ebuild 27209 BLAKE2B 837dad98c4e35a0e1ab4be51a0452531a33479098dd6706fb2991c617ae0bdb8cbd117f6c598c2eee0a0a63f5ae0b26f7e334d223548782cb5c4a47d31f5ff2d SHA512 be93e099475ca316318db96ba5437a491993440b42c638a52a215b3cc7d66ae14595d024a65efb032e26cf85130247f242d23e659509aa2a175fb6228b30bd3b
EBUILD mariadb-5.5.67.ebuild 27209 BLAKE2B 80a419eded23bef53857b7554dc528e3196413ee9216c7341904af5d1590758a3017e006a4a67192a0fc37e6af70485f422ada200c99aa82714c08aaa9da8c01 SHA512 cdc301f9ae2cafd19919d10149a09d98f4bd9e106c521e398754e8cc1a770c3951432acec2e5ea19aed958c0233b4ec623bd28a573e085849b4dda860f35b26f
MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index b9ac00934060..41ed096c22fb 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -40,7 +40,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.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild
index f0637689455c..4ccb4cfa7329 100644
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -40,7 +40,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.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index e8976b996e16..4245acdc5024 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -42,7 +42,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.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild
index 0d9de25fccb9..bed0ab679d27 100644
--- a/dev-db/mariadb/mariadb-10.2.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.29.ebuild
@@ -42,7 +42,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.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild
index 0e5f5ec5df15..b355f9f09486 100644
--- a/dev-db/mariadb/mariadb-10.4.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.12.ebuild
@@ -325,6 +325,9 @@ src_configure() {
# Bug #114895, bug #110149
filter-flags "-O" "-O[01]"
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
append-cxxflags -felide-constructors
# bug #283926, with GCC4.4, this is required to get correct behavior.
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d683128cfc07..7490af8b9393 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -22,15 +22,17 @@ DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46
DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80
DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
-EBUILD mongodb-3.6.13.ebuild 4257 BLAKE2B 0643b2cca9c231b3b8093e1cc4d0e4b7ff2bd6504251f8c7dd706bd15f59548bb4f8462e5547b3e97da5aed385f0179807cef36060211bcf069feec4b251425e SHA512 edbc5d01e606bd324ea505e02d8216b68250bab78dc26b932203df625621d9f27847b8fefc5e0bf7256be67ccde8fe0a56d28ed59b5e0d79e3b68d454b454cf4
-EBUILD mongodb-3.6.14.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
-EBUILD mongodb-3.6.16.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
-EBUILD mongodb-3.6.17.ebuild 4243 BLAKE2B ab016ce9ee393d09e0e8067cd32c013745318342a9963cde20e7bb7dfcf171c120b06a2364446dd0e696bb5e73c268c3f1e1b97c31da0274173ef38049aef39a SHA512 29349128d64b2809c14b8cfc187a23828be4889096fc724f265284134ca124e43a2a05186396b1388168f721441706890722386b5d8464d7216d6535cbbd7966
-EBUILD mongodb-4.0.12.ebuild 4318 BLAKE2B be6dcb75ecb3654b980db1b893746ab6a33e537a9dac06b42e8f2defbd75aaab3b7d32b63f67cb97b886f79c74363199651377580c7b76160e2ecba993ab78fa SHA512 bf45a240826725c47dbd8475c01d24da966c44027cadb73b28b2fa536f45d9dfb714a50393b09040dc928f0c676b42a89d3ebace2d63e0a78443d434eb43b235
-EBUILD mongodb-4.0.13.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
-EBUILD mongodb-4.0.14.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
-EBUILD mongodb-4.0.16.ebuild 4244 BLAKE2B b85189caf3152d8ebe79f7e9dfa54f653c1e77b07345e3d55834578e8365d5092bb99cb2391c8681498afa4f68ea2f32e6e70bcb72a9a9339144e46e5265daee SHA512 bb312c91bb4e8931d97f3af5096850812de183c9997e8fa5e9f3d0e6f7c926b4c9eaf49edac686fbb7ee8e6d321cc46cdf015efd85861504b1f099d2725b2eb0
-EBUILD mongodb-4.2.1.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
-EBUILD mongodb-4.2.2.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
-EBUILD mongodb-4.2.3.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
+EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
+EBUILD mongodb-3.6.14.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
+EBUILD mongodb-3.6.16.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
+EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
+EBUILD mongodb-4.0.12.ebuild 4314 BLAKE2B 6e1d33a0d5e3948e2c6d7258379050b8b090a2debd04623f7f51a1e35a54fdf6fe3407eb6ff7afea121f8274f329564f192e26104d2173a08b5ad31ca52f669d SHA512 4509e201ec92554b3b5cc7c2f1d2daba1195357e8e064ad2f639667136194f2c683a420b95a69d086f8abc00da32daab64e33b921a5278eb4ea095022d2048e9
+EBUILD mongodb-4.0.13.ebuild 4240 BLAKE2B 70ef636c1c4d69adf066f0cdc5fb80417649bcde429c21ec67dc11c1ff72a1114778443fbf5758ea9f495cf654258568635b6f30de2ff81f478a8753072186b9 SHA512 604bb7090f98b5e8bb00d5daa7a6a9ec56a0e8a6fdbb46159eb721e5fd8bd47fe4ce7cf7fb9586b44b3c3225fd24c5df09fa9803fe03717afdb95e005c846749
+EBUILD mongodb-4.0.14.ebuild 4240 BLAKE2B 70ef636c1c4d69adf066f0cdc5fb80417649bcde429c21ec67dc11c1ff72a1114778443fbf5758ea9f495cf654258568635b6f30de2ff81f478a8753072186b9 SHA512 604bb7090f98b5e8bb00d5daa7a6a9ec56a0e8a6fdbb46159eb721e5fd8bd47fe4ce7cf7fb9586b44b3c3225fd24c5df09fa9803fe03717afdb95e005c846749
+EBUILD mongodb-4.0.16-r1.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
+EBUILD mongodb-4.0.16.ebuild 4240 BLAKE2B 70ef636c1c4d69adf066f0cdc5fb80417649bcde429c21ec67dc11c1ff72a1114778443fbf5758ea9f495cf654258568635b6f30de2ff81f478a8753072186b9 SHA512 604bb7090f98b5e8bb00d5daa7a6a9ec56a0e8a6fdbb46159eb721e5fd8bd47fe4ce7cf7fb9586b44b3c3225fd24c5df09fa9803fe03717afdb95e005c846749
+EBUILD mongodb-4.2.1.ebuild 4254 BLAKE2B 35a011623e2261aed880acfd81c2454917faab2fe5e670501bf8ee1f3d1b5a6c62352d4a3560373a63730c5860507835517f393a78742870c4d65678824a2488 SHA512 a7de46767a57975f898769488388024bc00b2dd145ede78fbdec3cb475d98721d2c1262ce09180e5850b95c4ef09568c929980cef1b0e9829f9c96b27a6a4b2f
+EBUILD mongodb-4.2.2.ebuild 4254 BLAKE2B 35a011623e2261aed880acfd81c2454917faab2fe5e670501bf8ee1f3d1b5a6c62352d4a3560373a63730c5860507835517f393a78742870c4d65678824a2488 SHA512 a7de46767a57975f898769488388024bc00b2dd145ede78fbdec3cb475d98721d2c1262ce09180e5850b95c4ef09568c929980cef1b0e9829f9c96b27a6a4b2f
+EBUILD mongodb-4.2.3-r1.ebuild 4708 BLAKE2B c40333f8e7e1bff7fbea449320fbc18f8ec6985d7569c7db84a4481678e7a740b440e534f80520ee896741f2ecbe8119347913660d7a7b6369da1552131d5de2 SHA512 ca73f93c8b31f5580bf4696e769c551ba15635647cad4896fbb2fa17b42a34c022d9871edd6cb103e96a0243271c5986a40035de0b23583f621566781bf47039
+EBUILD mongodb-4.2.3.ebuild 4254 BLAKE2B 35a011623e2261aed880acfd81c2454917faab2fe5e670501bf8ee1f3d1b5a6c62352d4a3560373a63730c5860507835517f393a78742870c4d65678824a2488 SHA512 a7de46767a57975f898769488388024bc00b2dd145ede78fbdec3cb475d98721d2c1262ce09180e5850b95c4ef09568c929980cef1b0e9829f9c96b27a6a4b2f
MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 88e6596fe833..85e64d7df806 100644
--- a/dev-db/mongodb/mongodb-3.6.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-3.6.14.ebuild b/dev-db/mongodb/mongodb-3.6.14.ebuild
index 346c4039a335..b5718c0c148c 100644
--- a/dev-db/mongodb/mongodb-3.6.14.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-3.6.16.ebuild b/dev-db/mongodb/mongodb-3.6.16.ebuild
index 346c4039a335..b5718c0c148c 100644
--- a/dev-db/mongodb/mongodb-3.6.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-3.6.17.ebuild b/dev-db/mongodb/mongodb-3.6.17.ebuild
index 8b60f64d9f55..b5718c0c148c 100644
--- a/dev-db/mongodb/mongodb-3.6.17.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.17.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index 1aac4e77094e..36602d5bac71 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.13.ebuild b/dev-db/mongodb/mongodb-4.0.13.ebuild
index ef4bca699aab..6bc6099a543d 100644
--- a/dev-db/mongodb/mongodb-4.0.13.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.14.ebuild b/dev-db/mongodb/mongodb-4.0.14.ebuild
index ef4bca699aab..6bc6099a543d 100644
--- a/dev-db/mongodb/mongodb-4.0.14.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.0.16-r1.ebuild b/dev-db/mongodb/mongodb-4.0.16-r1.ebuild
new file mode 100644
index 000000000000..651219492475
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.16-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3:=
+ >=dev-libs/boost-1.60:=[threads(+)]
+ >=dev-libs/libpcre-8.41[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+ "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+ ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.6-series. Then upgrade to 4.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+ fi
+ fi
+}
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+ return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/typing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.16.ebuild b/dev-db/mongodb/mongodb-4.0.16.ebuild
index 7542115d20f4..6bc6099a543d 100644
--- a/dev-db/mongodb/mongodb-4.0.16.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.16.ebuild
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
$(python_gen_any_dep '
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.2.1.ebuild b/dev-db/mongodb/mongodb-4.2.1.ebuild
index d566c1d609b2..0d28fbb07359 100644
--- a/dev-db/mongodb/mongodb-4.2.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.1.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
dev-python/cheetah3[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.2.2.ebuild b/dev-db/mongodb/mongodb-4.2.2.ebuild
index d566c1d609b2..0d28fbb07359 100644
--- a/dev-db/mongodb/mongodb-4.2.2.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.2.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
dev-python/cheetah3[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..84df690ae769
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+)]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+ return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+ has_version "virtual/python-typing[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+ ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.0-series. Then upgrade to 4.2 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.3.ebuild b/dev-db/mongodb/mongodb-4.2.3.ebuild
index d566c1d609b2..0d28fbb07359 100644
--- a/dev-db/mongodb/mongodb-4.2.3.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.3.ebuild
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
dev-python/cheetah3[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
')
sys-libs/ncurses:0=
sys-libs/readline:0=
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 3f8dc35f7317..a0aef261a3a5 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,6 +1,4 @@
-DIST mycli-1.19.0.tar.gz 263255 BLAKE2B 524190429476793af038c8302f43389884a6ee24a05b0b8c739f290dbfdebec3336bd14567eafff2ea3351430791e4844e16dfc5affb1b28bb57d3759b496350 SHA512 8c6003a09a888c2ac6f35a881ca072ba8972f66b13319cbff73f7a525d1f808b767dcef0121b6272a1b82eed1a02c8c417d5805e5a8ce0c141545f28ff3c3a33
DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d
-EBUILD mycli-1.19.0.ebuild 1293 BLAKE2B 16dd165a1a3790644c279cade189dd8405db90b154632320b22225033ff59998daa9de6317f47192d0ee5f80910b0b2bb34849158b59c6fd261723109e2de214 SHA512 5d3a8beab77b3a46e7e3ed46471ea4c60c6b7b271e6deba0605999101a0e53610a7f5d38f1c6e5e6e27ade3d7b85ec67cdea110de1a93252f58d4bd4b3321125
-EBUILD mycli-1.20.1.ebuild 1299 BLAKE2B 87914e6328a0cbd9ec149f6cc160b2a4ae7a395269aedc339fb44d39b6a063560ce5e2a88460ba9756e51c631ce87633a3fc2c2849b20d865c57fb5c96083681 SHA512 d6ab879fc945135548212e569e1f06adcb700ee8dd43a2fdf84a0f9b7258bf73524868cb8b553aa3b603477224b4031020d6defc2a050143473498be90335d95
-EBUILD mycli-9999.ebuild 1279 BLAKE2B 407cfb65eadae13e823fb2906d6cbcf87aa9ee28836e597550cf44b4c0e8382c793ba04c984e695e572b0d3ada856d988832dc12b692136c28b6f753dc3e724c SHA512 c96b4dbf8a5f21799674248fe71c9d723c031757be24e6275714e9cec8ea4d8323ccf67af758f793cb36c57100c1c56d2a9ce52947a2288c1b4f1ea3fba9c122
+EBUILD mycli-1.20.1.ebuild 1285 BLAKE2B fea26ada4e62c0d97237d8e28076d7ce4ccd818e6e3c38b32c6f4b36c35b0e4bebda5d53972120306a6f14d8d30aec13f4ecc4967b2871a154014a7621a2e034 SHA512 a85982ab2b7751ed4e2fe180920fb3edf8118cbabe37b255e689b6e40c9350d5674109c4d6dc4447b7e7cc295fc8c2e51e05d336464fcb3b8b48801964837b11
+EBUILD mycli-9999.ebuild 1265 BLAKE2B 697f31b84b19e2630147a5e354bf183e720d86d56ea8bd108c57b165f287003575d9433d2ec02aaef454eb04df8721589277d3ac8b277154f982bbbc6ef0d921 SHA512 9dd324eb4e345fe079a81b6a2720e1ad5a6048448d2fdb9b2561946b6ef48835a7a98650bd82f2dbc925181631e5d03db6dfefea0a273037b953c4b0fe37060c
MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/mycli-1.19.0.ebuild b/dev-db/mycli/mycli-1.19.0.ebuild
deleted file mode 100644
index 2927d8196bb5..000000000000
--- a/dev-db/mycli/mycli-1.19.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-
-HOMEPAGE="https://www.mycli.net"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh test"
-RESTRICT="!test? ( test )"
-RDEPEND="
- >=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/click-4.1[${PYTHON_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
- <dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
- ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )"
-
-python_test() {
- pytest --capture=sys \
- --showlocals \
- --doctest-modules \
- --doctest-ignore-import-errors \
- --ignore=setup.py \
- --ignore=mycli/magic.py \
- --ignore=mycli/packages/parseutils.py \
- --ignore=test/features
-}
diff --git a/dev-db/mycli/mycli-1.20.1.ebuild b/dev-db/mycli/mycli-1.20.1.ebuild
index b702b50548b0..9246bbf04576 100644
--- a/dev-db/mycli/mycli-1.20.1.ebuild
+++ b/dev-db/mycli/mycli-1.20.1.ebuild
@@ -23,8 +23,8 @@ RDEPEND="
>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
- <dev-python/python-sqlparse-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}]
ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )
"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 282b53f82e82..829a69b455bf 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -24,8 +24,8 @@ RDEPEND="
>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
- <dev-python/python-sqlparse-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}]
ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )
"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 09189020f224..cd91da2d9b43 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -12,5 +12,5 @@ DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b65964
EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
EBUILD mysql++-3.2.3-r1.ebuild 1559 BLAKE2B f5faa6065871e79a3b87eb9ed77ee1ae1274db27b8603f69e22c8fce93176556171a92bffd95e909e1a0d8bd13e1bc6cee418f9c4eefd273e38efb504ac78c1d SHA512 c30655c82d474252029bdc09b6c75a3c9c508fd705e1623b1d4dfc8ce2daf48644b8c4158d4af28c0b5ea3f1fbed272ab4c5a49665e412d7b25ac50dba3893b8
EBUILD mysql++-3.2.4.ebuild 1702 BLAKE2B 5b488b561b208e280ad4080a1d35786dbc79eaed1a6c130bcba2e82a8cf01144303b4cb9be5ce82dbb9c856896287d8d2739139e597111516c5ca6dbd7932bc6 SHA512 d7b0966941723d503fb8c05dfd91fa3ce0e0efbbbee469d2d036d616f499bbe2e17442deb05378f7b900824da0c4c76f144214ab93f4ce7e5af5401ec4b49401
-EBUILD mysql++-3.2.5.ebuild 1700 BLAKE2B 6e80c6fb1d08f062547e000583a3be3a23b089e108ffc0f1570b83f678693bd59ca658bee04eaffc4d45dec553637f096b726ed016ca3219123555393624e8e8 SHA512 958ed63189baba02f12059237fc25264274533d0c4ac2edeae31c06513bf9f29135ce94ffdcd669ace2fd6936e57c860c9819c9effe823c4fa9ae49522e7cbc5
+EBUILD mysql++-3.2.5.ebuild 1699 BLAKE2B 9193f99cab83e4b9d3c37c36fc612956972bce8a0523edbf1e15d1f3224ff1c900dda7e92b89a97ab1e15ab469324abc50fe36f014ab6ff4405bf9b8494c0274 SHA512 c3872fe3d94db81dc9b1a22f75e0d121b8406aa43e466569327ef3688839c70fffb6f43e4ae1401366c7034f35003b7298f7ca04a759fa73b285dac85fcf9a1c
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.5.ebuild b/dev-db/mysql++/mysql++-3.2.5.ebuild
index c30a8ee626e5..e54c1fe03b98 100644
--- a/dev-db/mysql++/mysql++-3.2.5.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0/3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index ce12b3f5223e..d61ffbe18e60 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -7,6 +7,6 @@ AUX mysql-connector-c-8.0.19-libressl.patch 10501 BLAKE2B 73a31afdbbb591cadd45f1
AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
-EBUILD mysql-connector-c-6.1.11-r2.ebuild 2290 BLAKE2B 1d8ecdb176053f70e69236793194e475ed32ae6852dc21b50a0d67cf383cf140e159525208e9cef0189942d7cf233e506dbf16aef3c8c422fe811f0dbcd64b4f SHA512 6e105afcb919b996b097e6be09b88429c503583c83388e3bc7e2c1641fc870bf0745db55c0360559d6554d59316f1c550056fb3a3beb85334d092529a835eb77
-EBUILD mysql-connector-c-8.0.19.ebuild 2933 BLAKE2B 0680c23c037d55b4574b19e8af0b58f70b991008858a99243be436a8c2e28a26a15e597af77d991f00c7e61ce17727b8a0927bddb7bb32f264cb4ac2da76bfee SHA512 684f705a966cb395b25d4207e7d6bc585ab913c13b1c93e62504dbef7e591797aed9399d0ddeadaae5f2d91c2489ee82311b586f321a6552229a8aec8fa239ca
+EBUILD mysql-connector-c-6.1.11-r2.ebuild 2287 BLAKE2B 831b0960af0f087357840434bf61ef773df2a98357fec736c9279fff8f44e9d68384aca45381aa9b332137f5ba6b3ab9478fb3c21169893a520f9017508ee827 SHA512 f06aef9d2d5e2bc0a607d66d10b7cd755e34cf5167f0fb2b2ed5595f50b8f8d6f41e839879c343ec272121f4c1c1d71ff6ada70e40f7cd9ea69b8fd385b85abd
+EBUILD mysql-connector-c-8.0.19.ebuild 2927 BLAKE2B 37b57beb51549b94d75bf1695b93914042303f933e5294e9b73804ab7a6bae986ac89db6e648f78e9b1fcf106cfab143f4942da76ed930cf71b5f14fde9c7709 SHA512 d6404f3558f254a08702dea0036d346155e83dc6695b1237e0da9d17cb5aa85e32a3c60195d461cf33d976be2ec9af2519abb16aab16a1b73c27c34e38bd88b2
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild
index f3cc45992f73..90eb839cd3e1 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
SUBSLOT="18"
SLOT="0/${SUBSLOT}"
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild
index c750d83c606b..b48adece2a67 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.19.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://dev.mysql.com/downloads/"
LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
SLOT="0/21"
IUSE="ldap libressl static-libs"
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 278384a6571c..464b09171568 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -9,5 +9,5 @@ AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8
AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.3-r3.ebuild 2036 BLAKE2B 3e32b853ae3df0da14748c0b75db0cc1ce327df875a2e9aea2884b0fd8d86efa7f6d529a0bd951d619a430a78274a52f732a6c2fd355c3681a48f52bfee980c6 SHA512 ccd9b8eb2501c71d7129f91e8141859d097eb79850578b1aaa7eee8e55c0ebaf8da715cfaa67704ad9c44ec38be519742b293ffa2a4dc1b6c9f05317b125f6f5
+EBUILD mysql-init-scripts-2.3-r3.ebuild 2033 BLAKE2B 3ac53b2e9225f7a2f85debd20b9575a3c6d849fb0ba02e5d2a78196e12278fc16a2c0ff558d631de80e5aca0f49f2d5862d3a0269b944b5874a66d0f48534833 SHA512 8c94bf4f513c529c95d78a70257a1db53877a4eeb559f372a5ca290ce4d76005c317ad1290225c37144a17bac10e8ee3ebeffcb126adc89a76ae18e72103d322
MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index dc9de6dbedae..b3dcfc9c0529 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 0f1b63ddce21..148cab61ecdc 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -2,10 +2,6 @@ AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c72
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.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9
DIST mysql-workbench-community-8.0.19-src.tar.gz 19391463 BLAKE2B f9374c234a75851784c940f8288a783ee1c02fe4be2973b174a0d3768a60dd5318ceea7d2dacb083376c83c33bed8fca02768bcf4f3b8ba6284ca78fc7910cfe SHA512 986a34328ec3b9aba1532cfd8792fb970fe3c71eda577988a17a6bca25e783a520878067acd097a74ca3f274f02d271af16d7d6beb6970bca48332721021eebc
-EBUILD mysql-workbench-8.0.16-r1.ebuild 2676 BLAKE2B 377f993e56f62686751e4d04911a9e75ee74f8e7c6d60bc37f4c1c47db30dbdff844f60549eced15e823f4f16762daca6b1b205a005123a995333d7eb19ffc71 SHA512 0d9011e5e6b35039c795028c838021e87de1f14a9c11163a9c3216b3f68dd32bbd9e38a256aa026e23eb98f4d61853b3a824fd54f79747506993df93d51bf7a4
-EBUILD mysql-workbench-8.0.16.ebuild 2645 BLAKE2B 0f8e55773d4ea4667107c822d2fe38f7de1890130d309a036521eacb4801038a583a74c2d652e7ed545228fae8a487270de4aa49503620d049e2392507b8267f SHA512 e066480349ca7afbf5892222463a44e205e20979cfd1ed44a523e7b9626412f08edec7b33767994d6348c68ba771b5ae1e176d082cf9a2ec7d9c7457f665ce33
-EBUILD mysql-workbench-8.0.19-r1.ebuild 2631 BLAKE2B eed9ced11fc2084b77cc110a51da3cfd0a9233c5bad55a307685655c48c4200f3c5c6ee13f9d4ec6818c2c42aa9fdb3d0dad070b815f660f9eed391054d5ee4e SHA512 3564b443fd07143c7875ddc20ecf89c26bf2f193afe2e29725d11ab53667d2c506a04812d8f0544c1da795ad5cc637ce0af4e4db86e952c76b7df719a440b997
-EBUILD mysql-workbench-8.0.19.ebuild 2600 BLAKE2B 58f0ee172565f13dd7a4ecb858ac60107f337f0bfecf55e214e47bf70af58045722be795ec328cfb776be9a6d7cc0a85b75691935d81742a70d59719c375de2e SHA512 164a4b3bbf8fede33675bf7454d35a969b43b89eced6625c1179ae7c53febf2af3f77a411011780e22b38e2252538a71c775e53836365dec66fea6a806a6ba7c
+EBUILD mysql-workbench-8.0.19-r1.ebuild 2629 BLAKE2B 3796fddc98646419abf3b497862b1e3eecbd3d846dc4654bb4629adab10679738d2434b48b5fbc221c3383bbc59cc94ef0bc25b22beb18a8cb73628a7560c26a SHA512 4ef8643322b88a123a0cac098f5835e64581ab21e1eefa339b92bc1d507f03a9976bfa67a75a14e58165e90cf8ad1aa16e259db32ccc22c172a82b7f15fe3df4
MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.16-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.16-r1.ebuild
deleted file mode 100644
index b291bb37d1ed..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.16-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 eutils 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 gnome-keyring"
-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.7.3[server]
- x11-libs/pango
- x11-libs/gtk+:3
- gnome-base/libglade:2.0
- >=x11-libs/cairo-1.5.12[glib,svg]
- 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[-mdb]
- 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 )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- 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}-6.3.10-i386-json.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.16.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.16.ebuild
deleted file mode 100644
index 93594d5f361b..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.16.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 eutils 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 gnome-keyring"
-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.7.3[server]
- x11-libs/pango
- x11-libs/gtk+:3
- gnome-base/libglade:2.0
- >=x11-libs/cairo-1.5.12[glib,svg]
- 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[-mdb]
- virtual/opengl
- || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
- dev-libs/tinyxml[stl]
- >=dev-db/mysql-connector-c++-1.1.8
- dev-db/vsqlite++
- || ( dev-db/libiodbc dev-db/unixODBC )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- 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}-6.3.10-i386-json.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.19-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
index 2b07cff38b1b..2db141fb63cb 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.19-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="debug doc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.19.ebuild
deleted file mode 100644
index 4303dbc9863d..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.19.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/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/Manifest b/dev-db/mysql/Manifest
index feeea543e5d3..cc3df14520cf 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,10 +13,11 @@ DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e528
DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
-EBUILD mysql-5.6.44-r1.ebuild 27092 BLAKE2B 039ba81aedece931325de45d9e4d64792be6d591e740745e12941416ec6ca754862f785f8047cc9c2cbb952e33d068cdb99ef04071517e15da5ccc4ec14f4ca2 SHA512 cff26c635ddea7f9aeeb16646e3ead6e9e9890f03149d2c1334701a1cfbd91f15cb2978257953601e19678fc1d1c4e3e84dfbe924098ec1109684bb0c6bec1e7
-EBUILD mysql-5.6.45-r2.ebuild 27039 BLAKE2B d332d3f799710e7aa6f7730eb68ef75742d809b11e356711283f5878b1e09927951b570446d637abdd581c20482ae0993fea9ccff8609c0a1c4c8e676abfd0ca SHA512 15cf4954bff58c1e43075322e466dac3efcec2c0a0bc1a758ff14a100f6701ecf2804c00a7171a1af77d985a49092f5f7d915ad4b041fd4ed1afa9d7913f99e0
-EBUILD mysql-5.7.26-r1.ebuild 31667 BLAKE2B 54dbdd5ed39f8c05fcefec667fd60177e1f9bf79968ef33e91b4cebd963883d565ec2b81ae3f429952277de75137e39a30c8e86e0d21063a1a892672893ae397 SHA512 7f7e3fb7efa3fc2b872cb663166f5a45a836fe3d0a8f7adf1115272daa2d1f4c10b3229204dd3a1db9cbe60da785f15f3f2acef5c1b2cbc618ed8107f72c3df0
-EBUILD mysql-5.7.27-r1.ebuild 31690 BLAKE2B 5c33a60b9e0efe08ba8ea3bcadc4d9590d27f7518e9238c7beeaa559b48d7ce9c1340af06792a2fb4bf78a6b88eabc94eebe8e379a603f7afc7b582565c28947 SHA512 71834b488c23cecb377fedb2e3f6ae073692619a341c72ec4ca788dbba377b177a9c877764897c79bc5c3fc8baca5134d1b33361a61443f897f3fd6640e5819f
-EBUILD mysql-5.7.29.ebuild 31563 BLAKE2B fbd1ad4d5b72b8ffe59a74c53398ef704b4aee9855404b6603522ed0035e6d538350fb907c13aed4fdb49797f1535a69e021a40a9ab422382ef1df5e06610bbb SHA512 3f5a56f0e6d6a53b601f2cd1536c2e8bcb3be2b812eed18d0310e6d42ea8c843af6d1beba24222a3af9cbbeb37471d523a4114619a1a3ec55044db023dd73b7e
-EBUILD mysql-8.0.19-r1.ebuild 36936 BLAKE2B 137f2b302200a14b3c6b4540d13b50b15fbbc5ab66ba6116218cbde6eebebd99aad65530e2b47a5971daf93a3d601deb297f6cdf01949a7dc0044ac267222a65 SHA512 33258dca7436a83cc87f96157f017b2e3a4559cc55b45c28f561fee1215609d86d88080f83fd12ccce92010088986a4a935357226d0a5d40476a784aac387cbe
+DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
+EBUILD mysql-5.6.44-r1.ebuild 27086 BLAKE2B a6f986c588ed2735a07368064795c877bddb9d9acf1fb13d6f28df0b935423cb33534b2f0dd3d5ef9acae16f2ba739b64fe35400159c3c53db0416c71264b285 SHA512 dce67ba1174c0eb8594450073110674e1905184389d40a0b83d3982b455f6914217d86c39f507a7bd31001f50276f1ae77a67952c64182f1b2bd8f0482061332
+EBUILD mysql-5.6.45-r2.ebuild 27033 BLAKE2B d1d7621c9b9535776e8acafa7a0a13923bfa19b28923a376769cb83f4d824913d192482efc8358549974ad454a036e480b695e584d45c90614ef82cb2682a3c0 SHA512 ba2d27d934f207fa9073946d650d0a709b491141f98410342d9491002cde51866126125b41356d86ba8387474f1a9c28ee6eff8d156e56828d3f67bbf10d6dd8
+EBUILD mysql-5.7.26-r1.ebuild 31661 BLAKE2B 863288a1f2b1578686980c9008892e12fe87a7ea1b773653106bccffd57e119302fe7567163dd8411640784b3c5bc8ed81008e151e0ba4c0b2ea5fa6de2c9096 SHA512 b92cb1cc37634c1311aead861f50c00e4083335fa1eb5c0d0285b469debcfc427ff299cb9ef9d932ea14e4f77939ea23a2313cb4babaacbf656eaf5841f46ecd
+EBUILD mysql-5.7.27-r1.ebuild 31684 BLAKE2B 9ff6937c77124bc8b6a01f6b56f23941599a517b1d89519045ede1c67312c78e594ece5ad0a0ce3fa2b93594dc6eaf811a85867e1c6a29c4e931f6b1c7000429 SHA512 725c6023e23d8341cc474b29c5929d920795abaa2d7d0af995eacbd4d7f8fef20bf054226f3756960e1be7f45c87242f331aa70add9af3cd43501b7dc9189148
+EBUILD mysql-5.7.29.ebuild 31555 BLAKE2B 9efa82e1aabf81d129dd79ded88f964f305c57f4fd15bdeb088455b051411a8479b498ac9962313dd0fdb0c2a2e45d84a4514b5bc3e53df7bdf98a4e2ff8d82f SHA512 9bb299bab54abb7667402530ef11c1290394c92337377c39583c1e1693c49fc138db1063006029eb5088d8ae4b553e3e79d434ad6d3c716433b1aee23aab6fbd
+EBUILD mysql-8.0.19-r1.ebuild 36935 BLAKE2B afc37e6a6c94834fc4ed5a3e9cab13a6e8e60ff45a02e3daeed1df58e85629ab2616307df7b0e8e5ae0cd82f8c8aa1a67b416acf8a748acbcfbd0c8b5718ed6c SHA512 b6007cdd5e224e2e2400eb34a5280c7cc0dee9b72cde8fd0340336a4569c1020c52ae836b4fdce48aaa34725a090d7a83de240d7d6d5690a479a5594740aa5c7
MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index beb0cfb51484..dd4f1b213a78 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~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-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 31f2e40e4ae7..18821fa038c7 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~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-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index 6a6d86bf27bc..bdb8fac53962 100644
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha 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-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 912e350a9125..39229edf0528 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha 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-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild
index 86a70707a833..dceca6a058f4 100644
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha 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.19-r1.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild
index 96e80ed37db6..d5d74638f768 100644
--- a/dev-db/mysql/mysql-8.0.19-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-MY_EXTRAS_VER="20200125-1945Z"
+MY_EXTRAS_VER="20200317-0103Z"
CMAKE_MAKEFILE_GENERATOR=emake
@@ -43,7 +43,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/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index b132b64a5c22..7f61b39bcf7d 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -7,4 +7,4 @@ EBUILD mysqltuner-1.6.18.ebuild 819 BLAKE2B 28fbddde037358d38eac70b778e77e255c3a
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 840 BLAKE2B 0afbbc1c5be8eb0000c95aed44b8213f24daca361ffafcca733f8a0a773d374d7d6db68974e7ed96d9b7309ac6710e08588d6058f395f6e13b827d2690ddbe89 SHA512 2e06dae8f0ffb9c11abbafefe1a2a46b6e93929aa7194c201a17e7f5ce4ac128cf54bc81ec9f3a24d985c08099907246c42350ea1262441d9459847f6c29fb58
-MISC metadata.xml 373 BLAKE2B 475b09852e48dea8abbad16dfe918d7cef776bbabe51814dcc4bb82d074480cd3cfd463fd23057c403464bdae86b6f411e1fad098888e29621eaf0da72f0d246 SHA512 68d62e37a26c89ab68afd24c6832553150b21ef6a2abe911f5de8169c52daf10e6e5ffd201e0124b4a5069b123aad0dbc7669420b8d1823423d98553c1a36e4d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/mysqltuner/metadata.xml b/dev-db/mysqltuner/metadata.xml
index 1b94d6737400..7a38bb900964 100644
--- a/dev-db/mysqltuner/metadata.xml
+++ b/dev-db/mysqltuner/metadata.xml
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hasan.calisir@psauxit.com</email>
- <name>Hasan ÇALIŞIR</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index b817c6456b03..c80e056de769 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -6,9 +6,9 @@ AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1f
DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
-DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
+DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
DIST percona-server-8.0.18-9.tar.gz 256867152 BLAKE2B 34c7b7b320f973313ecd95e658999a17748fc70ff46b1dc58144df02c17b7870cf33d68a555ee8aaaecb66c5b1003e6023154f7100a6f413514e89d495330dd2 SHA512 ce537a160b48e7c3dc35b15a293c39142a5b633111b5c9c5f9c1150476f0faa5e9cf81b34c9ca85286463455e3ae3fce7a200d253d880e3b67b3c71eefdbdcd4
-EBUILD percona-server-5.7.27.30.ebuild 37223 BLAKE2B 438eaececb04e1df5d0c40fb120b6e82567d3d398f8aa92fe3d39febc39a70ec89114bf8ce1ed34c337ef8be230bd72c2a8b1291f43d94df397f7c887783398d SHA512 a9ea3b1403382368c48bd8604a57d76a244eb72fa8a8e02e9b4fc7826d0281aa2aa3b6cebf4c239d625037c397e23b5484102f99961855a7eabc418fe9131945
-EBUILD percona-server-8.0.18.9.ebuild 37721 BLAKE2B 98d70d94d2806abe593e573970534aa3b3664cf753fe6b51c9785c0e9378f1c8459a6de844e50ad0f00524b85d5942845fee17dc422abf4e0d7ea4268f693f9c SHA512 684f64e9ad1f5cd34c8b4788244dee62ab801e5bcca29c23d29999e524fef9e30d3af96c122ed36c7f718712392f3ad4e1c1a29cfdf4f118db74193c314f4a39
+EBUILD percona-server-5.7.27.30.ebuild 37216 BLAKE2B 980cf1ea9aeb005335ea7f7fe8d373b8b0b5c663525cfa69b6df043baa7a4e669e4c1b94d4d9b220290654761f33115ec477ac45f1a482af2baa6ee15a1e5200 SHA512 673a01611f23a5b47be6eebf42c8654d9863b167a1ec7fd35deee59336386021a4fe11391e892e68f50dd44cb2b2025f1187726ad586443ba2992027c8eb2866
+EBUILD percona-server-8.0.18.9.ebuild 37721 BLAKE2B 717ce0fbb72b33c377379c3e6ac38b771585c145b52d0ce9fdbfda887a78d64871cc81461a6e4654d40cbdf47b2deacea3e8eae4229600cf765e48c5647d038a SHA512 82c9781982d4c66213c7f362c4233eb90a6cf539d6dce3413f1b82fe1197c1b784fee5ea1f48354d89cdebe7dab1f39d34fc43476a402946bcac28074446443e
MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2
diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
index 200a7c0f7436..300c67c70366 100644
--- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~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/percona-server/percona-server-8.0.18.9.ebuild b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
index 55c42cf99f54..8cfab4888b92 100644
--- a/dev-db/percona-server/percona-server-8.0.18.9.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-MY_EXTRAS_VER="20200125-1945Z"
+MY_EXTRAS_VER="20200317-0103Z"
CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 276d7233190c..d4da52e20a2f 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,7 +1,5 @@
AUX pgadmin4-4.17-python-3.8.patch 595 BLAKE2B 695b133a61d2a54939a3bd8fa3c8fe3ea52ca0b00de141e936602dd06e64db736a182dd015bc31aef17dca0f3ad5746833270b551285fde416ebac30c1705577 SHA512 c5500b8f2d071663073d727c7c69ac72e3566c789de999f198cd43c71c155eb273bc2ad7eab8d69f1911dfbd5cf741989c70ad179b61c67c9a93bdb6591c8972
AUX pgadmin4.desktop 298 BLAKE2B 9048ee03c9f8e05807f2907fd7dcfda9d76bb3cd3b2567676cf6bc9acebdf8d2b4de1626f9fe57c4940422766fa7e6fa9111a5bc9c252e34f72af2850813b158 SHA512 a083c525cf49543751dcf4f98a9e2607ce06c35a573c5a97d4088b21b41dc260ea0fcbb139ce153f0e1deb6bd8e6e75e69a6fe08ff2f4aa563d7398bd52553b2
-DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707
DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f
-EBUILD pgadmin4-4.13-r1.ebuild 3065 BLAKE2B 8d4cb29606b3f434f825eb0a72414d3fddc4cc0b8e0f0a8b99b895ac871176a062ecae0cd483f12baa2257f61493f4df26ebdc55a6e36daee758c8ad19524fa8 SHA512 289a99a97bdfd6209c9e73c4a59121a3803f3756844ce97b41d777373a43cc2ff805ae6db299869c2373cf57d8d558522ec1504b6132d946610e9a0d65dfdfff
-EBUILD pgadmin4-4.17-r1.ebuild 3316 BLAKE2B 1866620faf43c9e668f3aec4fb126e923f8bebdd55bb5f82cbcaac6021ddd7d37302bc61bdde27e93ccbafbaab0cfd8338bcb0b5a35045d08086a43ce3d3132c SHA512 96385cc09e2b4567c36ac4f41b1465e8e9664609a78728d73d1d1b3aae3026f6cd48ecc268ee90258f4ee397f8f35c701fb48d0d21e36367cedbdd7384095407
+EBUILD pgadmin4-4.17-r1.ebuild 3307 BLAKE2B 2f4dab13a9365051abc89e66101bf6b8c93400b3eefb34f53033feb9d6d49321f9e2fcb7c3f58340ab21b1d358006d0a1846a08ce6a26048bde0a4a779cdf131 SHA512 4c80f4f5f243a25aee956ee3230ff6ee9a55e1dce19fcd1c1da91b00b4f16942fdc64815559bfbc873a67f99b6676f463cf923987d7fe039ed8d027b7a64b51a
MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
deleted file mode 100644
index f044276c737a..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 qmake-utils
-
-DESCRIPTION="GUI administration and development platform for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# libsodium dep added because of 689678
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-libs/libsodium[-minimal]
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
- ')
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
- >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
- >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
- >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
- >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
- >=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
- ')
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
- cd "${WORKDIR}"/${P} || die
- default
-}
-
-src_configure() {
- eqmake5
-}
-
-src_compile() {
- default
- if use doc; then
- cd "${WORKDIR}"/${P} || die
- emake docs
- fi
-}
-
-src_install() {
- dobin pgAdmin4
-
- cd "${WORKDIR}"/${P} || die
-
- local APP_DIR=/usr/share/${PN}/web
- insinto "${APP_DIR}"
- doins -r web/*
- cat > "${D}${APP_DIR}"/config_local.py <<-EOF
- SERVER_MODE = False
- UPGRADE_CHECK_ENABLED = False
- EOF
- python_optimize "${D}${APP_DIR}"
-
- local CONFIG_DIR="/etc/xdg/pgadmin"
- dodir "${CONFIG_DIR}"
- cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
- [General]
- ApplicationPath=${APP_DIR}
- PythonPath=$(python_get_sitedir)
- EOF
-
- if use doc; then
- rm -r docs/en_US/_build/html/_sources || die
- insinto /usr/share/${PN}/docs/en_US/_build
- doins -r docs/en_US/_build/html
- fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
index 1a5bd03bedb6..7a651a4aa6be 100644
--- a/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
LICENSE="POSTGRESQL"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -55,12 +55,12 @@ RDEPEND="${COMMON_DEPEND}
>=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
>=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
>=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
>=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
')
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 4c356a63797c..dbf2c0b8dfd9 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,5 +1,3 @@
-DIST pgcli-2.0.2.tar.gz 432325 BLAKE2B 5cbe2be05910d9bfa64e7ac908d636a39ed11f994e0e81cd06afce97510e02be335837b2587653df716beee0d30076f07489ac8e4fb05fbc579bceee8636a470 SHA512 5681effcb36101ce408f7c4dcc881984686d63a6e593bd4f5c2bb3b2d870362c787094895ece027a3ba27d3a4524498b27082da0f25b1b77f23e54b2df6c0501
DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
-EBUILD pgcli-2.0.2.ebuild 1166 BLAKE2B 7ec709b9786fdaa95d63d6d2aba44221004a09c20e8f0344eed1cc584ecd56a0f3a6b81293e939c314addaf6682a0fe452f7152b7e99fab5ebd7ba713ae54996 SHA512 e68ddbdf0f52fc3ce4d52e5d4f089dd843ceb23c99d79a5bb9785ff6bec93912c46949d15f22719a43db826667a88a0cad3db6600df68356114f520016b14ba5
-EBUILD pgcli-2.2.0.ebuild 1241 BLAKE2B 0d153daa0628c9ba1eb7f029005590f83e7cca599ff04a1576ca11eb87bf22db7002907f4d845eb5d7bccf2a7a9a2d6cddc278ee882881959520220d4e3ef707 SHA512 f3e2444373d3f8b50a61a62221ad574747a6de4a2c5acab2b9250170b7b0175257047b043f37e7a487a49a3395ae3976f895781af70cf310eae9dc01053815a3
+EBUILD pgcli-2.2.0.ebuild 1227 BLAKE2B 70cb370b11af8c0a9865aad9331998813bc0fcacdbe6f70230c72dac5fa411e343f4026a8f976db2ecbe2edf6ab881d5b2936401563bbc40d60c3707000af8a4 SHA512 d9e70578ed9bec3e0af2d3705742bb770f436ee6b26bdcedc9894095f05994d9538e9df5c84444542c219e5bc3638535075e05d36570a3d0dc6b34bb160ae937
MISC metadata.xml 463 BLAKE2B 10d06fec98bb18e1a546d7d87eba57353797600a2d11ad02980a4b8cff329821bedc3da990d5f9e0d5fa453ae3876de314c8c74cc09c97d567fcd8e4bbac1195 SHA512 44fc53f5a20d0c64bdbd8605feb964c1d345e471f589d8eed347b2ca632fb2a61ea511eff4e03c4fce3790721b47ef1b701a37e964941651ff1d7b77e587eed5
diff --git a/dev-db/pgcli/pgcli-2.0.2.ebuild b/dev-db/pgcli/pgcli-2.0.2.ebuild
deleted file mode 100644
index efae77fb995d..000000000000
--- a/dev-db/pgcli/pgcli-2.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- <dev-python/prompt_toolkit-2.1.0[${PYTHON_USEDEP}]
- <dev-python/psycopg-2.8[${PYTHON_USEDEP}]
- <dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/click-4.1[${PYTHON_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
- >=dev-python/keyring-12.2.0[${PYTHON_USEDEP}]
- >=dev-python/pgspecial-1.11.5[${PYTHON_USEDEP}]
- >=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
- >=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild
index 88ee56547f8b..fbeeff21ca54 100644
--- a/dev-db/pgcli/pgcli-2.2.0.ebuild
+++ b/dev-db/pgcli/pgcli-2.2.0.ebuild
@@ -19,8 +19,8 @@ RDEPEND="
>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
<dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
>=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
- <dev-python/python-sqlparse-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}]
>=dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}]
>=dev-python/click-4.1[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index cd51b6e21df4..c8c37e4625ba 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,5 +1,5 @@
DIST pgxnclient-1.2.1.tar.gz 87275 BLAKE2B 794ee6201988ba523cdcb4ee5a6287625cb3dd8a30ad750266d7adb739792b7f8e852d5d01f746fb6b05b54c98d677854dceacc57e41b05efba094efabc6a129 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf
DIST pgxnclient-1.2.tar.gz 86436 BLAKE2B 796191d31000ff75360e0990bb20ca88af0fb1b908aac9ca7a6b7309b5420c56d045a67c775e8d5dda166f37ad956314f65bd2032c114cac7414bef9ad1a0d8e SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb
-EBUILD pgxnclient-1.2-r1.ebuild 792 BLAKE2B 44f7a61a2032fcd2ef57c1d53720931987617506328993c0b426bfffb9e4c895e17424be7778920aaab1f598b542c66aa72d181c6e46b5f338489ce08108c897 SHA512 39a7802dc822288ef48470d4341dc5d74bf700a00fbbd55e322bed3dc0b9d8eda55774680f9bd7e928c128f99b2b354d3f5acab87ef801f94687c3cd3bd44af7
-EBUILD pgxnclient-1.2.1.ebuild 798 BLAKE2B 553c3c2267e268b33b28eb8af4a7d033546526d935423f556aafd5e382752c45e61bcc6215474b6201d9ad127e2088e66fb5dbca5dbdf3c5f83c98895cef329f SHA512 6a006b13765ce47bbd3430cbf8eba507a3fd093d2b29fc49ac6f31bd51d240ab89e4dc614b7e4e242a6d6aa45f26c0ad5d7e887725f5750e6d6332f7f2a8bb66
+EBUILD pgxnclient-1.2-r1.ebuild 788 BLAKE2B 6d10568406f8432c8773efc91d1a8b5662309c378d77f05175751cf8360bb59f39f87fbf2395656470384be6cf81621f46c376e3145dd4320642a7e94ed6d292 SHA512 84c19cd6a55d077484bdfa5674fce3da340f9a181987df8b5da99ed80da9f0353dab681bbc32b326e5525356b31e56f5a3384c3c7f4b81125e1e9ebe7c69a29c
+EBUILD pgxnclient-1.2.1.ebuild 794 BLAKE2B fea89e9123fcb002da0a5c519b2d320c057e4a0d9f37d683dc5e598edfb3c57299a4442abb360eb44f40b533d094fd4c2b25c6321f520b031f1419766885bbb1 SHA512 ce4fdd3c2283ef90062cca24e711030d4499595ad98c9f23ae4e4490811f3d199a97f54be55e77658f43cc5a780328f54e5c101c6787c5fe0af027f64264757f
MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 641d88b40242..476f29b4530d 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PostgreSQL Extension Network Client"
HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index 91d190c091db..3ab85dc3dcf8 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PostgreSQL Extension Network Client"
HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index fe53f377aceb..2c5177d68efa 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,8 +1,8 @@
AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
DIST phpMyAdmin-4.9.2-all-languages.tar.xz 6118472 BLAKE2B 07093982aebf83017a1773a1cd1acac8b7a4cc9bf666f7c62fdef4b3b46441f5ee1da37746610b0ed6b92a67296d908dbf24ba1ea546c1b573c3593a02b90088 SHA512 426689c31f963a9cbe34b2116888aa0264801aa5ef18fb0e4b89811b032d4018c770538e823bccb684fb066ed27fcf6dc6e0fb4198d1e082e7eea15595b67727
-DIST phpMyAdmin-4.9.4-all-languages.tar.xz 6134852 BLAKE2B 4ba7d4a45a3fb7d84f6b227a2d2fc0ffc530498e74c1c412bbf631ca78ba5c874f9f21220d34e2179666253bde4fa222838962e6c9d48d514cf80c5c8370cee3 SHA512 3ddab59725d59bcbe99457a1717f12b53bbd251f0bfcea1582288abfbb4507e50351e3ed0e76961026b0ad351abc806deed4a97f0fa882b34ee095ef314aaf37
-DIST phpMyAdmin-5.0.1-all-languages.tar.xz 8130464 BLAKE2B a4b859c73ece7537db1bc4a14df8c5c8f0ab39106b9e3ccbbc30c1f97fa4dc40617db3b00c432b24aa9865ed45595805fa4b43db92b5794794621d0c7df54f3a SHA512 576323a5e63438fe9e57e6165697c5e03e5291346f3786c84d5d6c4cd6851713cb10b2eed4b0c7e9ab6445dad9b06cbded6c03711fcc2942e999f2b5e7ab446b
+DIST phpMyAdmin-4.9.5-all-languages.tar.xz 6138948 BLAKE2B 63631e8207d1cfb71a2299752bb10ab55d13f630ee0d913a4ed6bdf0a16320fa72945bc7c8a63e0e705eb45a569c60fffd48c204eabe1b980a33ab93fac7c798 SHA512 555f07f087d8bcddd114df0b86fa21872f14f45c31e0f63eea499e76fdebdfd8abebcc88662887418e80ddebfea73d6aaac17856cf433d1855423b5145865d1a
+DIST phpMyAdmin-5.0.2-all-languages.tar.xz 8018752 BLAKE2B c7ceb9257cacae61a674b986fcdfacbcf8f77e2ec9f31dd0fc679f748d9042301d8a5d37803c0b1c796095c038e8ac9701b7c5e497ee92331aa672f5044de4d4 SHA512 242770cc468ebcb3ec9c57bce16607a258621014513568b1a96cfea1df4786506c3922250c69f87e058dbf0dd69cf37efda1a810ade88c05d5ef37591cc1b225
EBUILD phpmyadmin-4.9.2.ebuild 1542 BLAKE2B d5a89c66b89c72c8989da4e7d1bf6f749c9f5d3dc763460c01dbbe84abade5422b50978f0d20064a92d2dea8cfeb7db5ef0b6532c19cac5f7fddd9fe72cfa55f SHA512 9994be872214e99297337c8b8dc3235806d2acf440e7c80cd11b95debfe6e1c9b23c8fbc224bc36083d575338361d6bd0f1919467a7e2e45be0ff880189bab4a
-EBUILD phpmyadmin-4.9.4.ebuild 1547 BLAKE2B 97cbdc0dea2aad9b615b7b9811bfe0adc3719bdf2f27008cb71d7cf5ce9dc6f37f8c589f08efe823c4f8f99a38b241ed9ae8b50df71f54f2b3b17d97a1300237 SHA512 d650ab41059be4931cc16f7a161788666d255fcce71295102c5b8dfdfa3df2abd446d0c96f35ecc10638872c496489cec0f79f701a90a7b7c6e084c4dcac1986
-EBUILD phpmyadmin-5.0.1.ebuild 1553 BLAKE2B df0e530374749ea3d27d81bf9b7636d8f79c525a789ecf34a31c3462de6b2056de5bd6484e166e2bb38b23fb15d9d58ee6d61aff69e02cff8ba20f8f95d1c32d SHA512 916f9600cdc5d93f05f8e260069c1abe10d4dee1552f031092114cf051e1835ef52df2c21a323c493cd46dc60daad843f0ad737ec26a1e32c081d8765b48d799
+EBUILD phpmyadmin-4.9.5.ebuild 1542 BLAKE2B af6cb3f93f86e2648711b1de713438d200488d355a6e28be6ae44c26a39a47dd9d5aabbb08976b6aaa18535ee6c9c3b2de74d9bf16bd656783977100d1aa1677 SHA512 b40bce5ca7ab774e1cdae3c4978081d42446d6fb610658e9859551919cb606e4d8e827156b8c10d3b2443e75c6068754eb2fa3103bdbae4bdce7116fa8c1dacd
+EBUILD phpmyadmin-5.0.2.ebuild 1553 BLAKE2B df0e530374749ea3d27d81bf9b7636d8f79c525a789ecf34a31c3462de6b2056de5bd6484e166e2bb38b23fb15d9d58ee6d61aff69e02cff8ba20f8f95d1c32d SHA512 916f9600cdc5d93f05f8e260069c1abe10d4dee1552f031092114cf051e1835ef52df2c21a323c493cd46dc60daad843f0ad737ec26a1e32c081d8765b48d799
MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild
index b44663d57514..c8b5d687674b 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.9.4.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.9.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.0.2.ebuild
index bcfb741fefec..bcfb741fefec 100644
--- a/dev-db/phpmyadmin/phpmyadmin-5.0.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.0.2.ebuild
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 4d937a2e6610..fdea7222817a 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -36,34 +36,34 @@ DIST postgresql-9.6.14.tar.bz2 18787744 BLAKE2B be5a0d90fe1cd5ea682d8446e5122711
DIST postgresql-9.6.15.tar.bz2 18799121 BLAKE2B 5dee0fac7592cecf4412deaef54cedbd86eb6081fc268b6ef8a5f01c31af930747749fb54a77d766e1d6ef705bab5d550a7bace25c86d201f25ed69163d920fc SHA512 cc35a059bf59ea3487c17a8432b791ca2a19afaa24b07403a8d33904b3a97ebe601e3036ca8ec766c54cb87a7def7d4618a425a4446e6832391185d7c71117db
DIST postgresql-9.6.16.tar.bz2 18806372 BLAKE2B f5d7287264b05ab6bd157adf05d78597c7e7281ef40d4616ad66f2434a686c68845ad21883bcc97f6ea299a785109e1541d6c75e40ba383d80e9703331d9c624 SHA512 7083d670883b203946f68bcf1216dd1cbd904220b4c95e25855f9a8904334fd7e87509c905f589398ad7b165869b75288c2e4f49b14263ce4891347ecd4485b4
DIST postgresql-9.6.17.tar.bz2 18812282 BLAKE2B 0bb48445201aae1d6b4f5a77652aefaaa629799a019c3b81a14e554a88167530002931c2b0d658731b26a38bd09487f79a6ef514b0955982d6037b383c021819 SHA512 a76f328523517f664e4fc59a4d27e476bc6300e49370712030caae40aa160acb1e6aecc7cd3b3440125713069932df812eb8d75377a3df63e59c9292419c2aa8
-EBUILD postgresql-10.10.ebuild 13845 BLAKE2B 2bd7abe4f5b564e238a371c10b53fb08f2fcbe210f3ce14380dc01183aac8ea2eb4e5f649b9a3c735a780343775fcc661804df2efc92d111524c4d70a79aff35 SHA512 bbee63a0a7f78f23e9231e1f32d8b41a7ca4c4abcb2cf1e49109523190d06bed1bf959689a39de8d15591776efba8721ba91e8d5d02bb8ab1ab15fc2cfdf3970
-EBUILD postgresql-10.11.ebuild 13836 BLAKE2B a5ccbfc39b4e3b08095cc53a9b10340c4d05e1bb8c78cf46f6e4b9ee31f1330ba808afd853c021cf1755378b4c22e63c660322436c91c446be85de7fc64138ab SHA512 adc671ed1a92e3b4a11dd92dd6db1033c91d1093badfa51256b79ae0e82b994725bd5db32879c9e09098d1aca1d635770bbea57d7e6deaa4a35ceedb575a207f
-EBUILD postgresql-10.12.ebuild 13838 BLAKE2B 39f44c6de4a519344a675d0054edb32fca4a58b76d11429f5e48d1b3df4a4de456ed9ebb62b1fd6a557f36ad9e9f245535864c805e286b6cc67ea4031311d4e5 SHA512 a4f001351e75e5c4155e1faf99ec4eb51d919ad8d853bae3b9bc57635f425641f2773b51de3a02da55f6af15399f1ae02714aa15e5eda218d4d7e053bbabc0df
-EBUILD postgresql-10.9.ebuild 13838 BLAKE2B e798a3221cf95b0b1ffbb20d5676f38b524bd23b14f53806251cfec996657caf2ca77d2fb47f522284b81f9f02823ac170dcbedcec86a014cd19106a0a0bb669 SHA512 96b9f313873f7933b602d9069c60f0f3fa66aba147ed981cca9ba1eec856ff52fec18cb7b4b108144280bb546dd43447896b90219b8d04650ac145cf3f25a774
-EBUILD postgresql-11.4.ebuild 13964 BLAKE2B 9fb9f63f75a9c9752322564811f259ed4cc58f4a2bff35a165a43ca764fef410ed0d17f087d36fcd103a4e9f02af42f29929eab2779fb53265a90c77c00f0a64 SHA512 9f6d6e3b826c8779657e01b7853abedb38ce956a4ee8a6275b2668682b5d44b40ba854ea12aeb5877a52a7f6748060bcb113c31890f3d763091ebf350bb72a28
-EBUILD postgresql-11.5.ebuild 13972 BLAKE2B 612836037eb0124d0d2e1e3e40b5dd15809f5c5f4bfff1a914eb1a7ea0381eccf11e8500c030a789b0f40a2e16ed9735672413909c964c5d9667570620d6c2a3 SHA512 b00b3d70a9ce64bfe3c8c283ab3c89253f8127c3df505baa988124c46b5dfff98419e20c120525b997e2145e5b9bd469887f267ad1197ac867ecbef0a5d98a52
-EBUILD postgresql-11.6.ebuild 13963 BLAKE2B d159deb70795fa2bbc584850c098a89e5b5ba7327da046307c554ff472549c94649ac03b82953f75c6eabb1a85f1658202e05dcea66e59fcb7e2ce97580fc678 SHA512 c51e08e0fc476ec8ba32bbfed7cbb71d2607bbc2670ad094c6d7e1180d7296e8f99855352f83711e506b771771f443c2939007677eb69bb7a2fdf23829e320b1
-EBUILD postgresql-11.7.ebuild 13965 BLAKE2B 23b4e4d59ff0b78dab3ead2a83469e603a3ae92004d0ba8eb7167bebbd2dde2abda2cc52092e8ef4fdd3c93628fde8fe292c2dacab33a39a3e1d96745a399d4c SHA512 177577e91f683e44dd6fca203d6b5e613b16a8003b7546d2d16b8a77487a2ee112e80e7c724e72d47a379e1005d14213f94c62b6f1fb6cc745f66cf0f37ce22c
-EBUILD postgresql-12.0.ebuild 13948 BLAKE2B 1c10a7f17167689682f6901ab6d99957640ef1e6a39ed131a4d9844e79274b84e650ce261c2fe370c61aa654f6ebf61979a572707c2484e92c41cb6c89570b15 SHA512 a71e0ed566428ea060501b53bd6959f1ab5a63ae3eb032128128183b0905128a5cd512ae540197f6e9740708dd83555a4116e0d42664e4499b5e32d06932dddc
-EBUILD postgresql-12.1.ebuild 13935 BLAKE2B b925d621fa766561bdfd99a85f6ea70e267a437f550d26ab63a1741341df068b9dc081d12cc794b1044a6e10c64c9319f90ed5bbc3d287e7b772f4b0a9c9984d SHA512 be431742b3034fcb182b82f2fe358823e29f96255b1b2b9d4a72b440daba1cb0419162b557a92f5d7980e9e19a68ffa5009611660c30c0e974f9417e3f6d4e09
-EBUILD postgresql-12.2.ebuild 13937 BLAKE2B 0f8df249a0f376482f1381c4996151b8a31b393594934726197bf79e3b2f1703715e58a3935b34f20302949f1e81f36ae7f846aeee8df3914d1b3e689d4e1e30 SHA512 b54327ae337305175228352b36c471d56ea91248edd9cf9ac871bb4733dbbf27dde1460de7e1007c9e685a254f389bc8c1d5c85e3dd08740a81371d3df8c757b
-EBUILD postgresql-9.4.22-r1.ebuild 14439 BLAKE2B 6782d0c19c00ffec5c3395c5a793395f6c58decd353c9ddad26c15b12beac7aa8d3ae6f1f9305c2a5cf9e529637947b340252dbdcc7246efda382467002ce4e3 SHA512 e4594218a2e04894038faa49930ef18b11fa9a04f9c13281dc9ee0ee65571f283d24d30656a158f5495ca6bc6c2b6395697175fae9a53e58664be73d37f023ce
-EBUILD postgresql-9.4.22.ebuild 14302 BLAKE2B 33931ce8fac9c1ac1aa3a24a3e7223be4c97032ba41a37d43a8e455bfb5c3dda01c17f1f93c9145b37134de3bebcfe8d145733fd2e643dc5e23612c8d8462d7a SHA512 431f2c4b6a1e869a3bdfe7dadcbc2ea3b4769de0ded623482b00db161828c3c45304e0468bbb1f6676c1dbe16f1a74ae50d43fb702e87b47f309e36e84a8eca3
-EBUILD postgresql-9.4.23.ebuild 14431 BLAKE2B 0a85cf07dc33ea432786329ed683b93608c88a03c9cbee1c77abe8af32729f45ddd1170487eb6ac50c6cbe805f4c116f326dc120a8934ff11901f8d71bd77359 SHA512 b05227d8b6f50c96608b301d35d1f2c223a7b2d4194d75678bd0a7cbe7519fc64874cac45b302624a069f82f234e3adc8e324453025da977532fa6794977766e
-EBUILD postgresql-9.4.24.ebuild 14439 BLAKE2B 6782d0c19c00ffec5c3395c5a793395f6c58decd353c9ddad26c15b12beac7aa8d3ae6f1f9305c2a5cf9e529637947b340252dbdcc7246efda382467002ce4e3 SHA512 e4594218a2e04894038faa49930ef18b11fa9a04f9c13281dc9ee0ee65571f283d24d30656a158f5495ca6bc6c2b6395697175fae9a53e58664be73d37f023ce
-EBUILD postgresql-9.4.25.ebuild 14437 BLAKE2B 65ccae4597a6da3b646173f4337d8b9238f263e57a3e8d904be7c3b1364b09e701593764fea20c1e77ad8f56bb76bee097b39b35876b758a3d19134e0a878c74 SHA512 d7bbf476f269842114ad9418bcedd8fb9ab402cfa795c71f6f7cacc0b9c431fc29a4983cc404005c46267e4d091439983e7cf2f6d5970a37ac16a72c5ff0dc17
-EBUILD postgresql-9.4.26.ebuild 14446 BLAKE2B cbec6f148ac126e6c9e4e8e6bea12a9054baf4b16833ef0271376532a8dd300ebc3144fbb713d0dcb800074e253c389d0b246341e14fdd4a3ae8d0ed1c621f84 SHA512 1577254696e3cd328356b651e66e0da0e18f82fa2e2aa41796ef4bebacbbf435233a1343490eb0c35e101f7088165db9e7cfe8d8d37453c823eb34a8cafe4963
-EBUILD postgresql-9.5.17-r1.ebuild 14667 BLAKE2B 512a31de8147b6ee6c25b6a37725ab7bd7fce68be503a07e536e183f8b0b2639b22f13b3940af476e4dba1357b9a70b37ba305f841cd533b02c7b823ccfc9ecf SHA512 523ce6dbc25833eae18d8329037af12dd15e9ce85faacc8ced4855ebbdf24a1bc0cc75a895d7d0236602a02a80a17fde684f3899e1ab8757c539118975a31b03
-EBUILD postgresql-9.5.17.ebuild 14530 BLAKE2B 754edfa6f89110d1d8df93dd876edce230124e1eb07ab54ad71519731f7e463d92e286ac3d27995ebd6a0dcce5c85359e82c0032e280b2e28d7d248dbc110422 SHA512 1a7bdbd156d59a717be84259af8636da3c9e4f4037e8ac49f2a50bd06e8533e29136d9ef03c09e355d97de0d66913f586d1864acbc87d197a1b8a581d273f821
-EBUILD postgresql-9.5.18.ebuild 14659 BLAKE2B 5ec336ef9fae7e8d7dde902a68e6e29cf7b6b54e642e9fd95626dffb9856d6219d843a0db79552c2fb003a135c73ecd4be6e2195d8a3d8d68d593183ab6b3139 SHA512 4696ce18b6fe38b0bbc02248d6344d91a738320871f6166a226f42649f870299a8f1e1d52444e7138912d2749989c85da03efe992e57872e7e9ea72e548c9f92
-EBUILD postgresql-9.5.19.ebuild 14667 BLAKE2B 512a31de8147b6ee6c25b6a37725ab7bd7fce68be503a07e536e183f8b0b2639b22f13b3940af476e4dba1357b9a70b37ba305f841cd533b02c7b823ccfc9ecf SHA512 523ce6dbc25833eae18d8329037af12dd15e9ce85faacc8ced4855ebbdf24a1bc0cc75a895d7d0236602a02a80a17fde684f3899e1ab8757c539118975a31b03
-EBUILD postgresql-9.5.20.ebuild 14658 BLAKE2B 527f7bf0b40114d46c29560fae5e8e488c847dcb38d54fac49fcb3792810d79d553693b59eb6085a98de46044897f39f7344ffd8cc20e51f975c963d9d583a55 SHA512 dbe076413dba4e435771a34bb5dc534794559abe00d609a7fb9640fef2c57c3bb0b471da3dc9d2a3a7618733a6a1f1725efcf3c33aac32b67953bc10fba62920
-EBUILD postgresql-9.5.21.ebuild 14667 BLAKE2B 512a31de8147b6ee6c25b6a37725ab7bd7fce68be503a07e536e183f8b0b2639b22f13b3940af476e4dba1357b9a70b37ba305f841cd533b02c7b823ccfc9ecf SHA512 523ce6dbc25833eae18d8329037af12dd15e9ce85faacc8ced4855ebbdf24a1bc0cc75a895d7d0236602a02a80a17fde684f3899e1ab8757c539118975a31b03
-EBUILD postgresql-9.6.13-r1.ebuild 14900 BLAKE2B e7be6d66dfaebafba48a7a9d6d5e1c4bd15a90b2951a1b210a5fa959f43513105467b7dae04c23dca618aa0dd2fca00f4ddfc1abfba38df4af141641e076d335 SHA512 98fcc0ea08a1d16254b9d64f6c9639e79fc7c0d0ef5cc86ea5ae3f3625d6d011bef4efdf0b688aadd927607318f8ac7e26e1dfa7ed7dfbb89124abbe059e95e7
-EBUILD postgresql-9.6.13.ebuild 14763 BLAKE2B 28edbc0df81d7449a031cf1bab2f646f6a2de50cb9bffb30d0c505eac944ec39fa72b771d094f36cf13c2b4d1aef95b3fcb99bd9aee355a0bcb2676696ea5b91 SHA512 ef3ace660649d939a51111b6e21e2cbe6564dfd01f83a1eb4019079e54ab41704a39d7ea02cf6bdbe7a91ba134aa98f4164d5e912629c8efd5e48c97e20997d1
-EBUILD postgresql-9.6.14.ebuild 14892 BLAKE2B fb9b81dd4bcc94858cb015ddf2e3e3c19802f6dbd3d8d487f6413c0f57217a88a96eedf60c48c6649f5f03febb3be89554f04af5dac9e378adb5bd0efa97e371 SHA512 87e76b9c76c5681dce638f991c6e71faf89ce0aa535b45b0529ba3e2e85e054b81d1e3342d800968366d795ffa3ee827692a721e0ba38567db7feab1ac5682a4
-EBUILD postgresql-9.6.15.ebuild 14900 BLAKE2B e7be6d66dfaebafba48a7a9d6d5e1c4bd15a90b2951a1b210a5fa959f43513105467b7dae04c23dca618aa0dd2fca00f4ddfc1abfba38df4af141641e076d335 SHA512 98fcc0ea08a1d16254b9d64f6c9639e79fc7c0d0ef5cc86ea5ae3f3625d6d011bef4efdf0b688aadd927607318f8ac7e26e1dfa7ed7dfbb89124abbe059e95e7
-EBUILD postgresql-9.6.16.ebuild 14891 BLAKE2B 8654a484115c3db38ed4579dd639e694a8fda41722e126764e3d11c32751f83d7feff9b718e1049b0065f263541307ebd5472f68ad1862d41d85da91d520f9c4 SHA512 9197bdc22a7292bda7e45a4650c4624df8cb9ffe9df7b8e2bf4085ca47bba09ac764f23c26c34b03aa623d2a520028c0e371a18de4af9e81ef9b4d24c3d66073
-EBUILD postgresql-9.6.17.ebuild 14893 BLAKE2B ec6d210f5c51402dda313189411ed49c975d59fc2912f641da5780f70e4050b4e0ecb645d323d5501204365d930152ce197661d27c83a2f90f9499ab7857618e SHA512 aeb698d69e45a81e0f0d6d2c48169b369828e0086fcbeca32667bf1e7d282a817e4e41e3ce13b9834bd58e4c10a5dac806286a48f74488995354eba4dea43779
+EBUILD postgresql-10.10.ebuild 13841 BLAKE2B df3d99500bc7e22187705433dd3c3407736b78c7af7071e8859cc61d568b2cd253294c9284e15b39304424886e174107396f69b0525d97f266c975850545f4f3 SHA512 923ad584ce13e6c86776b6efec47815926ff52636c154b9737abe9ecbfb90dedcf123218395959be8ad81b3dd303b3834c76c025f230496a64a69c1769f90b5e
+EBUILD postgresql-10.11.ebuild 13833 BLAKE2B c255fd95d1948451496a85e44ab1853697a6d5adc6d85e442e2589acd21880c00b7e9b1ad31ad3a8a53ed33935b56e0ae418035521773ed2bd82c8380bac6204 SHA512 14a1e4cb181ded8e6689b4c3adf3717c8ae259284863dc676874244a1928af5ea5559243d27dd9d271b433dada172fa75368eaddc218c1a12786dedac79240c7
+EBUILD postgresql-10.12.ebuild 13833 BLAKE2B c255fd95d1948451496a85e44ab1853697a6d5adc6d85e442e2589acd21880c00b7e9b1ad31ad3a8a53ed33935b56e0ae418035521773ed2bd82c8380bac6204 SHA512 14a1e4cb181ded8e6689b4c3adf3717c8ae259284863dc676874244a1928af5ea5559243d27dd9d271b433dada172fa75368eaddc218c1a12786dedac79240c7
+EBUILD postgresql-10.9.ebuild 13835 BLAKE2B 66ec0377c8952fe693499a65e4e4ba4c939249ef7096df53a4a32fd16a4d45a58f4a27fe1ccde862f5c8c58c6b4fd5038de5a9a93aee29b5d9c55793c7c7418b SHA512 1da2584d17c178e89484f03f0194d160e18de09632fc864c57d944e15c1065d66027420ccf2ff17ec7a11ff27ed64da8ac79e12b72a29d1951ff1669ece1e3e7
+EBUILD postgresql-11.4.ebuild 13961 BLAKE2B f7a7767959b1c4c0566ff87a0d9ad3602a2672cf7da4f9bbd197bf954baaf8153e491d66ff53133abe822ec05d491f1b16280e6b0c6f4aef0ad766531df1890d SHA512 7f6c43843c1f67829bbab0301324c984ee4e47c4e1963de0f2724cc72a70835be85c40542503209c8cc7f12bc75b19d4e16f3c912bba4bb46d9c11cd14247910
+EBUILD postgresql-11.5.ebuild 13968 BLAKE2B 13409d72f5e57b360de6fee668fa9b1d50cc679ea0be44baaf03489f83560685fbeabb139f2ea0fd8b147e49b75a51e4bdbc5494c95c9828b2b4f78f03f980ef SHA512 f8dcfda29e435d2e24d47c204a122f8664c4e37b58ca1034d787a7200038c81d0cad0cc23eaac1c2fde9e3384859556e8acb35ab5df7184c472c1f99f3ad65e2
+EBUILD postgresql-11.6.ebuild 13960 BLAKE2B ac5f232278ecfc2d832089b0707f69665fd96a9db916a06e72d75151b906d6d593e78f4348437da9cadd8a7b822707b1c2ad26774317287fa01abae4ec76adb8 SHA512 656589314ae0f79586e1f2cdbc12511f8e5bd29cb726706fd22ac6d1df7500b713488b344feb150f7ea2aadec690756fcea2b9f3637fdd9871a26c58799e1106
+EBUILD postgresql-11.7.ebuild 13960 BLAKE2B ac5f232278ecfc2d832089b0707f69665fd96a9db916a06e72d75151b906d6d593e78f4348437da9cadd8a7b822707b1c2ad26774317287fa01abae4ec76adb8 SHA512 656589314ae0f79586e1f2cdbc12511f8e5bd29cb726706fd22ac6d1df7500b713488b344feb150f7ea2aadec690756fcea2b9f3637fdd9871a26c58799e1106
+EBUILD postgresql-12.0.ebuild 13944 BLAKE2B ba51e934f5c1b5dd16c2812956f1bf6201033ee3defbd253254b117bdc43e4911500fce8792adfb01210d84d7468e7fe69d9decabba94d1c98922879e8cabf07 SHA512 45c5d08817bddc5d1ea56c0fee37411a6d10645eccebf7aaa48689b5660b212bf93d6618413fc118033d1b98dae47b2323920f12287854644035d8270bcb1fd0
+EBUILD postgresql-12.1.ebuild 13932 BLAKE2B 8c1819ee06822a77a149cc69f9749ae0163cb2408f237eb241d26f99e7f2873002be1b89fd54f0f977f34812f39bf3fcdcc280880b5bfd140867e094df1c61e9 SHA512 f1490ef4217484bf337637dad1d34affab95657d5160e5c6a1e8d403fc9618a84cc0593fbe4842711b539c7b2ebea41f95806ad15909b95b67587967ba178180
+EBUILD postgresql-12.2.ebuild 13932 BLAKE2B 8c1819ee06822a77a149cc69f9749ae0163cb2408f237eb241d26f99e7f2873002be1b89fd54f0f977f34812f39bf3fcdcc280880b5bfd140867e094df1c61e9 SHA512 f1490ef4217484bf337637dad1d34affab95657d5160e5c6a1e8d403fc9618a84cc0593fbe4842711b539c7b2ebea41f95806ad15909b95b67587967ba178180
+EBUILD postgresql-9.4.22-r1.ebuild 14435 BLAKE2B 1df38eb7790bfb7bbe7f70cfc07f439fe6ba55d957a5a1d28508a867dc3f66df41c9c285a2034e95f950cb4c6c8ef2310d138ff00e4f7b4ecc6e76afab3b06fe SHA512 4bc15ff815ae2c19d09f9cbb4eb98da95201fa800b864724a657633b7ece79139529a8741c7936bf7f8e89d3223215f3c868294265705a02c325e0580cc2fc22
+EBUILD postgresql-9.4.22.ebuild 14299 BLAKE2B eacd329211742be4d5ea5049936d302b6e1e3171eed051d0f9340d85ce0702cbc8589ac8121f4e6e4fe0f3076f1cb989ab64b1a3ae9b6e6cbaec079e620fd117 SHA512 e9c53dc3c59b2438071579a601670d8246e38a5a0775b4e779d3597b83aba0f30fdeb91c5c096c63a31c517b1455e31c5bc1316db811941f7a5fa7f87a89e992
+EBUILD postgresql-9.4.23.ebuild 14428 BLAKE2B 455ff868fad6799eacf6420f3aa30427e870221041770dcb0ae16498c6e9da83dd42a8feebcdcc1471ab877b00ac2e2d476e29d30cfe60084f3de7d9be703a3f SHA512 eb0bac6200ce852296aaecd7d1ee5abc4ae2e5e588c5ac85039e25554940022f8da0d6be85d17cf5bebda376dfd6215187023e5b488c99b974163ef50783d1b2
+EBUILD postgresql-9.4.24.ebuild 14435 BLAKE2B 1df38eb7790bfb7bbe7f70cfc07f439fe6ba55d957a5a1d28508a867dc3f66df41c9c285a2034e95f950cb4c6c8ef2310d138ff00e4f7b4ecc6e76afab3b06fe SHA512 4bc15ff815ae2c19d09f9cbb4eb98da95201fa800b864724a657633b7ece79139529a8741c7936bf7f8e89d3223215f3c868294265705a02c325e0580cc2fc22
+EBUILD postgresql-9.4.25.ebuild 14434 BLAKE2B 580507e33bebd4f3de486bfe2d42b6967ff151d8f22b988df1b14f0ab58a1a24b73453519e51a97d5d0ebabb2cd102ad56da351186c1883080a22d717471caad SHA512 50e4a6c3851a0f2b4ef16affcc740058d42201054505416935d55b21f3ca19e6cc3a25e15937f992a327e5836d48a9e1365c0917e55d12aab61bf37115b5df2c
+EBUILD postgresql-9.4.26.ebuild 14442 BLAKE2B 3d7727934b37c4263ea29c2f652ee083e01bb28749e11c4598b7fcb7c81568bd204851c7e3a5973796cb7b2a7df308174f80c8b44a34e7eb4f9d51b844b34408 SHA512 0c74f61263a4a24a5f4d8a5f501e524e30d40de07391ec03dfa937888ad4c16508888716bb39f6adb6403c0fc3a78b1cfee58e152be6f4b91e9a425487d95310
+EBUILD postgresql-9.5.17-r1.ebuild 14663 BLAKE2B 6aa2e866fc214566a521e7cfefc29f7aa60e83015e665219166b8fd8da88233b1284748084b92c36683bcb4acf1be5a86897d51ae0af40ee1aee249b9f68203b SHA512 6438248a3901f1497d1e0a3e6fc4e14966a66cf388f7445d81d0f288ae5c4b7fb074d85af0dde509963b476eccdbdf030ecbb2b6c6e27aaf6149d5b1a479a462
+EBUILD postgresql-9.5.17.ebuild 14527 BLAKE2B c6109f14d2093d03c4746713765ab3c60f42e35420dceca8a1a103c547aaeb189cb295b7ab85605dc9271c6baa1bad6f9370790a54a4003468a51efee85fcd83 SHA512 372c2eaa21a35df5165e9fe05756562c210089433089dc717a5cd491fb3796bb11b9e5187b0a4a894db7862d0d2cf67b2fedaa45cd855fc7d164a76a267600a6
+EBUILD postgresql-9.5.18.ebuild 14656 BLAKE2B 82fbae6377935143e39de5828c05477d683df4126a5573d9278a5fa78b8ad9212873cfd614590775462e9bdbb67f69a7c385ef8419f50a48d2a10244e7367369 SHA512 2129c293eb8904267e62ad80a1f4b23dd81a73459dc12899bc5def842342e69489560c7acfa012783aef79d2449cb5314231dc8f73ec1f5e3f6bef648b081010
+EBUILD postgresql-9.5.19.ebuild 14663 BLAKE2B 6aa2e866fc214566a521e7cfefc29f7aa60e83015e665219166b8fd8da88233b1284748084b92c36683bcb4acf1be5a86897d51ae0af40ee1aee249b9f68203b SHA512 6438248a3901f1497d1e0a3e6fc4e14966a66cf388f7445d81d0f288ae5c4b7fb074d85af0dde509963b476eccdbdf030ecbb2b6c6e27aaf6149d5b1a479a462
+EBUILD postgresql-9.5.20.ebuild 14655 BLAKE2B 8505dcafc0aa6a0d3b117f9970eae034cef29258476c30a9bcc36553854570d2436d5c9c0f682f2587aff667450433749cc1eb102af1c5e65b1c58d4ef14e634 SHA512 ce02b47d341aa7102b643310a9effdef2701f9554b683bb09ffde52567baf20b64b10e9cab1ad7480b6804d78cd2089f950ab2462dd18e2bc1938f912775c8f5
+EBUILD postgresql-9.5.21.ebuild 14663 BLAKE2B 6aa2e866fc214566a521e7cfefc29f7aa60e83015e665219166b8fd8da88233b1284748084b92c36683bcb4acf1be5a86897d51ae0af40ee1aee249b9f68203b SHA512 6438248a3901f1497d1e0a3e6fc4e14966a66cf388f7445d81d0f288ae5c4b7fb074d85af0dde509963b476eccdbdf030ecbb2b6c6e27aaf6149d5b1a479a462
+EBUILD postgresql-9.6.13-r1.ebuild 14896 BLAKE2B 7655a38de43f61c2b4c5af8dc0aef4987811e2093f41fc040d27fb9b821579331794a9443ff3f60f7cf8ea8f37f130ff5ee08ba02a1ef37fa2bd96b177f069b2 SHA512 b42557aea44ae1412704d2822569b0ebc082324568c2614140b398d99b08e267115dd7e4fc6257923f04e586ccc1620924a4a1da0701299d194585bc513b90b4
+EBUILD postgresql-9.6.13.ebuild 14760 BLAKE2B a188767a1307221eb73f5f8b7eabd423dc04512940bf2ec104c7d483edbe39c4690f1f47979992cd25275432629176948a534d86fe17499d4c5da756c27a6feb SHA512 cbb98e084914bc2e6616014414258bbb35a15c108468dd0099235c5868b7d3691d3e950eb101b127a665c89019487415c205843ef21d6fae3915dcc1be58ca60
+EBUILD postgresql-9.6.14.ebuild 14889 BLAKE2B aee8bc4a80bf06e31b1d7248470e370471e52e9e808e879292b488a6734468bdec481d5cd0c43925de7aa21e8b64e8abd7c816c726f21fc0d389903165a80254 SHA512 0e2fe1cc9a4566e0bdc78c3cc5c3a36e86abc2462c3d8c6c67a82b2a5b50b6c798b1d7d1cfdefe4a2c871f34c0bf113e543b2d022116f91e5238b2da8889c762
+EBUILD postgresql-9.6.15.ebuild 14896 BLAKE2B 7655a38de43f61c2b4c5af8dc0aef4987811e2093f41fc040d27fb9b821579331794a9443ff3f60f7cf8ea8f37f130ff5ee08ba02a1ef37fa2bd96b177f069b2 SHA512 b42557aea44ae1412704d2822569b0ebc082324568c2614140b398d99b08e267115dd7e4fc6257923f04e586ccc1620924a4a1da0701299d194585bc513b90b4
+EBUILD postgresql-9.6.16.ebuild 14888 BLAKE2B 1abd6b1f1e1281f3ef0f9cd00aacd6122efa9122f671299a43d6185dacabd0169f6aed87dcd3d96bc2bcfe155253a6332391a9ec8863e9f05935e41a0e9012e8 SHA512 660409283c196fa0e53ebe3e2f96cd680d2025071d134dc0dca33cd9501baf7ef211f85ace18919b2a122ee13b9aeb857de74d2b6290979dfc731a3e1a26e120
+EBUILD postgresql-9.6.17.ebuild 14888 BLAKE2B 1abd6b1f1e1281f3ef0f9cd00aacd6122efa9122f671299a43d6185dacabd0169f6aed87dcd3d96bc2bcfe155253a6332391a9ec8863e9f05935e41a0e9012e8 SHA512 660409283c196fa0e53ebe3e2f96cd680d2025071d134dc0dca33cd9501baf7ef211f85ace18919b2a122ee13b9aeb857de74d2b6290979dfc731a3e1a26e120
EBUILD postgresql-9999.ebuild 14401 BLAKE2B a660542da171012b67ad0c7fe61135d1a4357fca8c7fdba2c51d1149b758d27ad0efc2250bb95d4fc0399f2c78449cea9cdd0cae8f983dcc5881a9896e4571df SHA512 33fab6f657b833451d54230fa2c9c20604ab7b7a55667021390debb1d78acf98f017a971392decc7e5551df5d545cde4f3d421e6d1a5c061a19d078f5f0a28ed
MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild
index 6c03bb2241b7..2153cb49c70f 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild
index 9f3d5ddf5736..3f23e213da83 100644
--- a/dev-db/postgresql/postgresql-10.11.ebuild
+++ b/dev-db/postgresql/postgresql-10.11.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-10.12.ebuild b/dev-db/postgresql/postgresql-10.12.ebuild
index 8d355f5a8bc0..3f23e213da83 100644
--- a/dev-db/postgresql/postgresql-10.12.ebuild
+++ b/dev-db/postgresql/postgresql-10.12.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index 940433efaf45..444c162dfcba 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index cf90681a368b..22f96c8c2410 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index 8ebae4b309d4..7ecfb7bea1f4 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index e702844d73e0..372964685b53 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.7.ebuild b/dev-db/postgresql/postgresql-11.7.ebuild
index 9e657108a976..372964685b53 100644
--- a/dev-db/postgresql/postgresql-11.7.ebuild
+++ b/dev-db/postgresql/postgresql-11.7.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild
index 08c2785b3cc8..49dd313ec7ed 100644
--- a/dev-db/postgresql/postgresql-12.0.ebuild
+++ b/dev-db/postgresql/postgresql-12.0.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index 2bd65b5c4eb3..57f10573d891 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.2.ebuild b/dev-db/postgresql/postgresql-12.2.ebuild
index 866fd32fca65..57f10573d891 100644
--- a/dev-db/postgresql/postgresql-12.2.ebuild
+++ b/dev-db/postgresql/postgresql-12.2.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index f2d7377aa7aa..2f5d0dd70e4f 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 823e2994450d..fe382d533a60 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index c15fb2d13353..c0f771cbb877 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index f2d7377aa7aa..2f5d0dd70e4f 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild
index cd7aa335a25c..32bc19186d1e 100644
--- a/dev-db/postgresql/postgresql-9.4.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.25.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.4.26.ebuild b/dev-db/postgresql/postgresql-9.4.26.ebuild
index f324c7f92bf1..b89c51a5f516 100644
--- a/dev-db/postgresql/postgresql-9.4.26.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.26.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index e6b0669554f3..2616c4614cc5 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index 354fc7b272ef..a9941bde026e 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index 41d7c9a608c3..0c24bf6a2e3f 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index e6b0669554f3..2616c4614cc5 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild
index d0f85a5e61be..00537608230f 100644
--- a/dev-db/postgresql/postgresql-9.5.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.20.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.5.21.ebuild b/dev-db/postgresql/postgresql-9.5.21.ebuild
index e6b0669554f3..2616c4614cc5 100644
--- a/dev-db/postgresql/postgresql-9.5.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.21.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index 89c5a79f5bad..800e0b2727ef 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index f5aa0ed6754f..a47ab55a70b8 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index 93826bb9f959..6d2db4730007 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index 89c5a79f5bad..800e0b2727ef 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild
index d8d9249313a9..db31e5a8233d 100644
--- a/dev-db/postgresql/postgresql-9.6.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.16.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.17.ebuild b/dev-db/postgresql/postgresql-9.6.17.ebuild
index 7bb5802b392f..db31e5a8233d 100644
--- a/dev-db/postgresql/postgresql-9.6.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.17.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index ca37a99333d2..11f5b87d1aec 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -7,5 +7,5 @@ EBUILD pspg-1.6.5.ebuild 375 BLAKE2B 1eb56e1d31c91e2766faf5f196d3c7498cc7006b071
EBUILD pspg-1.6.8.ebuild 377 BLAKE2B 59e6f8cefb4a9347304231161958a8915a8cf375dd2096b4d1fdc19b00d3fa4093780ac7b33a78814673191514fbb5d965f5d7c5904b63a9abeab6a9f82819a2 SHA512 589f39286408970b9118c3cad7a343278adbd1c539d42e92bd293cf549c8ba5064a77a23649e55d60559e5a1380e77a92647ebb7a25716cbf7cb28a5389bc26c
EBUILD pspg-2.5.4.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
EBUILD pspg-2.5.5.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
-EBUILD pspg-2.6.6.ebuild 417 BLAKE2B e546c8ac11ad8abeb004a3471ef1aa09c8c75c14d84e8598d1743227183c9bba787280aad2c168e8db72ff5b0fdf6517e9941179de55b47bbb0756338bc16d34 SHA512 59a6ae7ac90bc01e5628133110a63f00ab5bdde45c8b21d886efc1a9e7209dee24ebc2f1e30a63fdabb06ab04242c4bc16df2b7fa34086de52d1d3fac3171f6f
+EBUILD pspg-2.6.6.ebuild 415 BLAKE2B b60c5abaf49da08566e205a33fa33030a041b3df0882348dc5eb0ea3a0b90fcb885c4ac2f41ffb054ee80bd105c9f707f4f576bff71c2e4dca3e80a4ad0ed594 SHA512 243e3124bd436d36081aa7a7b0250329a2c772b94d55438faefcb6d4c4e923a9e5c102c37ab5011cd2e057c3b24535d11822a862956a8d0e59f92ea929e9a6ec
MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-2.6.6.ebuild b/dev-db/pspg/pspg-2.6.6.ebuild
index e802ac47a294..c9506ef83e56 100644
--- a/dev-db/pspg/pspg-2.6.6.ebuild
+++ b/dev-db/pspg/pspg-2.6.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="sys-libs/ncurses:*
dev-db/postgresql:=
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index b18f03dd479f..b5339325299a 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -3,5 +3,5 @@ AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253
AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7
AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452
DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037
-EBUILD qdbm-1.8.78-r2.ebuild 3340 BLAKE2B f9e21e95c672e0dd13e8d117921a2925503e4d62e5fdac8fecc1fb3bb580a4f97a27f10dace946c58e9ee2c59f184d4905e7c199ef3cf3b2703084a74a3ebffc SHA512 1c51ec08bac545c9deba6d4cbd2504730ef2d12ecc384f7dc6519600ea7fc5e16686bf1ba90df0ebbc3728ef33855aeaa11244afaa4adbaf95d8ca2a8b03f366
+EBUILD qdbm-1.8.78-r2.ebuild 3338 BLAKE2B 52c7b47ff2005a8676a00f2a7f50c6568981c9cda90f9dfa0cc848cd5a867251f058d4ecf593c1a0e7f67ea7296adad73682bcf59815c22e082d622506e64158 SHA512 392db2b680d34a6eff986e77d7144c51503aaec30f4219c691ff9d620dff271026c74d2b4542edacfb9b96201158a10d946940e33dbd2a8daa5ebd86e94d01b5
MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index fd4bb34bf1c4..dc3d6dfc8c02 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
IUSE="bzip2 cxx debug java lzo perl ruby zlib"
RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 7b4de52d42e3..e6c63f1b2a36 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,5 +1,8 @@
+AUX qt5-sqlcipher-1.0.10-install-path.patch 566 BLAKE2B e2d5d854ebe12233c55dbc213df033dbf0d26ebe0ec8c87bc41a1d8aa1d9775331a8080d6263fccd6de14cfa0d7dbacfa005109d2f69de987cac339b1e652322 SHA512 f07d7d1659fc120ae00bc1bb6256895fcdfddee7054c77b5f25793945921e1d9f95dc26088edd57af3488728df857d1f567e0a9c4ecb61a21c7db055f77eda06
AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13
DIST qt5-sqlcipher-1.0.1-qt-5.14.0.tar.xz 8248 BLAKE2B 0cc717deecf2ff1d212a5b510be0c57d5cdac6abf9dc5db8f5d69762adb2a0d79298aa0e2f453417a5aa5b242637094e7ebaf6d7fe777539e0f8896f6adc3709 SHA512 a61231756967f0596b3903db1ca40937f1140a3d06ff9b6b6f6a6195650c170e0d4f42a3d51ac3f3cb35f4e173b78986a8fb31ed7a7e01e125ae78c7dd851246
+DIST qt5-sqlcipher-1.0.10.tar.gz 245054 BLAKE2B edb36a47881e2d5801cf07cc9b6094ea53b9e0e595c0078d3a09b493979222a6ad655b074b015c0a152073e0f39d1e31ecb9e2021f7788dda04a0547cd47eddd SHA512 1a23da7d7c6de020ee0739154abe83f94208a3a6d385fd58eff38d3ea27ce51b37a66994e8ad0ff5102525c3573134f9b9362accf2032b7386ea174b12ea1338
DIST qt5-sqlcipher-1.0.1_p20191025.tar.gz 200293 BLAKE2B 5a0c6401353bc1c9dc511ac585ebce8556742278c303032b3434116c5a778034df01a5133913f8eaac187863b91ef8432b20184b75882c738ed6d850682ac765 SHA512 9e5294ff4c25dc18ef83ecec6c7ef985fec73744f36b27d21591983eb9976b8a13151ef0a31ce3af9767ee3f6388b8f008404002345d328bf0094d03ca4dd8d0
+EBUILD qt5-sqlcipher-1.0.10.ebuild 1213 BLAKE2B 043a9bffc8f3973066220edb6bea8fa4aa5203dd6e351e1b6d3eae9bc6e741a521bb362dd3dcbcd7cf61f3d09847b4de3b5b28603e80ee545879931cdff7d816 SHA512 4d5d1a7f41998f60429cc1b9dddbeff1531651f474bbbbcb9c3da217f29998e386549c77cd78de7c4ad4bcf3a9175577b7013e439111072531f5a35de8fc06db
EBUILD qt5-sqlcipher-1.0.1_p20191025-r1.ebuild 1416 BLAKE2B 19c8479a8f3817b3b3493f1b11bd47c0ec069f6bda93c43341e1f66c125445c5e11cd7395aaccd5c453620982565b41e0e965488773943816e4a77ab3802181b SHA512 c26b6b985db7d5f3980ddc799de0c39355fef69609c49638359893e83a719cdc016a03794fc2b75e6e600c1f4266797e0d252c8f8395e4c472b7e727c2b81764
MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch b/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch
new file mode 100644
index 000000000000..5485ae942408
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/files/qt5-sqlcipher-1.0.10-install-path.patch
@@ -0,0 +1,14 @@
+--- qt5-sqlcipher-1.0.10-orig/CMakeLists.txt
++++ qt5-sqlcipher-1.0.10/CMakeLists.txt
+@@ -197,10 +197,7 @@
+ endif()
+ else()
+ message(WARNING "Packaging is not set up for this platform, either submit a ticket or change/add pathes yourself, if packaging is required.")
+- INSTALL(TARGETS qsqlcipher DESTINATION sqldrivers)
+- if (QSQLCIPHER_BUILD_TESTS)
+- INSTALL(TARGETS qsqlcipher-test DESTINATION bin)
+- endif()
++ INSTALL(TARGETS qsqlcipher DESTINATION @LIBDIR@/qt5/plugins/sqldrivers)
+ endif()
+ else()
+ INSTALL(TARGETS qsqlcipher DESTINATION sqldrivers)
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild
new file mode 100644
index 000000000000..2e1c4834cc6c
--- /dev/null
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Qt SQL driver plugin for SQLCipher"
+HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
+SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1" # version 2.1 only
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-db/sqlcipher-3.4.1
+ >=dev-qt/qtcore-5.12.3:5=
+ >=dev-qt/qtsql-5.12.3:5=[sqlite] <dev-qt/qtsql-5.15:5=[sqlite]"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-install-path.patch
+ sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
+
+ local v=$(best_version dev-qt/qtsql:5)
+ v=$(ver_cut 1-3 ${v#*/qtsql-})
+ [[ -n ${v} ]] || die "could not determine qtsql version"
+ if ! [[ -d qt-file-cache/${v} ]]; then
+ local vc
+ case $(ver_cut 1-2 ${v}) in
+ 5.12) vc=5.12.5 ;;
+ 5.13) vc=5.13.2 ;;
+ 5.14) vc=5.14.1 ;;
+ *) die "qtsql-${v} not supported" ;;
+ esac
+ elog "qtsql-${v} not in cache, using ${vc} instead"
+ cp -R qt-file-cache/${vc} qt-file-cache/${v} || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./qsqlcipher-test || die
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 44e85050671f..1a4c2a3ff87c 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -4,6 +4,7 @@ AUX redis-4.0.1-shared.patch 866 BLAKE2B 55531d6437ba89e37674377795ed8f7b4a34982
AUX redis-4.0.1-sharedlua.patch 2568 BLAKE2B dc943602aba26455b94536571ee6be2969cbdf04da63805db0da0de5c5da3eb5fe16bb3c9e282020cf5a0d2cb9ac02244614fb8929847ce930c2ed25f4c4b8ff SHA512 c7c08b67c09425876da513bbeb52667fe5917b56a43749a914dac356fa37c091b696765eabca100f2506cf461107abdbf22bce075879a8aa82a0e8d54f696fee
AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa84bcb7209344b79b3bfc4c6f8df5224c8ae0e5d9ee8dbd62d9e288e90934809e91fd6f63c7d1dd4a518170a9 SHA512 f1d1e37a4786a84e9543956e21644a1dcfdc52742299119ba1547b9fb56a92fdef3ca518d94a1db8a88222b661ac7849a4db0bf7ba38b1ae65f286e7df90f0c1
AUX redis-5.0-sharedlua.patch 2642 BLAKE2B f86d3c932a8c0f05e2d65725037a0780152b95835f88395cc74765902c3184a4e1ed0a3802f54345e91a70b6ac013419c6d3412df8fd2397ed300ff1e7210724 SHA512 971944ff03563bcc91c9f29316af2b0eb691c9d0e27d9e4f3fad30dc4e4afe34c077ccdbf5f93ebd78ea6571f809a801721376059780a30467274a7be5ca6425
+AUX redis-5.0.8-ppc-atomic.patch 495 BLAKE2B a995c1b1e327416705151dd888b98fe02fdea8126359f3ffa2cce4d5794d7677ffc4dc7f628d076bc0ed341dac4010ffb9409ee25113fe9cac2298658e94802e SHA512 f4f2c2aad5d09e9fafa58946fdc79aa49d8f16ce6d389dd653522295dc397796c58c87f4fb92016af8c261aa4b00a7eab09d33a19eded496807444d234a9abd9
AUX redis-sentinel-4.0.6-config.patch 285 BLAKE2B 97b8fb6c2af74e6d2736e9dcdd9faa579800fecec53752168fc5e5e43c509fc00a1192215b5fef89af915456e5ab0d7c438df51e2b214399a4482f7683525a8b SHA512 12fd77b38fbcc3bf4b25f519a8f40e43c5d2f32be341155f5e6d08f2a4513043917452d45a20608dc56c0e92e324cef8480d42d670752056c821b4ffca93e2b1
AUX redis-sentinel-5.0-config.patch 706 BLAKE2B 0fa0166bbb3460e783e85b90acf4c606b83e271d8e9828bb5b3a39b623508b21dac33369ac25b645169271822e9c5deb6ea7294e40fc8d1a5ceec5129c174505 SHA512 2dee5666d50fc5d9b6021735a95c9a9647ba99c562e348785381d5a05f1388c3fb9e8c4a15b0de771cf73fb80e5e29f1df25805df749457a2ce4f2e3f2e0e9e8
AUX redis-sentinel.confd 470 BLAKE2B f77fd7e35c753e35aafa6e773dcc00d2779bc29d8579334078bd6124aab436dff671ae790c0b0e3cefdd4082fe212b4b71501b529176cb0a1e5f8c8cdcf1387e SHA512 ea455f8c73c21bc46127ea5c7b99dc5707ad41160e5fd61367555dd2e3fd5c1518026257651e7d371a60a64b682b6839dd37580f75308c73239edeba49d6b372
@@ -19,8 +20,10 @@ DIST redis-4.0.14.tar.gz 1740967 BLAKE2B d9122565ba890416d8936db936bc1410af840cc
DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
DIST redis-5.0.5.tar.gz 1975750 BLAKE2B 3a0463685ae30f9d38e96d7324ae624474f02311e22e186460834920babc35ff343d84e8cb78a2cee0d45d9ba1c01944c783c88892b6580d83bc1cdec64a3e94 SHA512 78215ec02b7184e05788c7a368146ea53095a877a0e09174b4c9f175aeb9ba9174023c19e33bf62e4513b848e1841538d398e7c0a651c5c947255c1691cb4586
DIST redis-5.0.7.tar.gz 1984203 BLAKE2B a4e65784ae5d673833d1a6df73800d95ca4d8db7ec045c166027d0c372291e2f5fa2ccc4fe8d4a081b7a967c154fcf03d4b097c5d7b05755a52b465e441ad7ee SHA512 75c1d4bcca3e28d80f6b6942f0153ff33538d706339c69bddd2646c36f88b901c77dde09fba5629ba90ace00077e45d37b0a822a863f9f737ef9a79eb7093d9d
+DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa71efa78dd50830e1bc1d83261f78ed6ff75b789b238709d9f72d5d401be2f2dd698bd19c41c091d10e0baf47 SHA512 106a74ab910267472fb418fdeb4f39e29efe9d73ed5af78b7847c91eaabd473dd729a63078e72d8e87c842169502946e9a0a97c42dea415db82732864c7c46dc
EBUILD redis-4.0.14.ebuild 4641 BLAKE2B 970a3440789c6bc964339b0de7df7c7882a492e259e503a65f0182aa77c7e54b2d477903f623dda0f1526de8e9985075a658a2050952484a3070a04ddfa49c60 SHA512 0ec94984ce74d537d13028d64d1a503f7de7cd5514f25a57d89872e6389a69d8cc747e1e9448f13e8395faed6e7d733c5183174029cb10af8d7b27320c659670
EBUILD redis-4.0.2-r1.ebuild 3831 BLAKE2B aac2861849f335334acf0efec4277da58268ab76da7f1258c7a2da9c455411c07e0fed1c60873ce896ee95e6457f9f94ae0b7fa4035bc9bf7c3b5fa002671782 SHA512 e7728e0c6958d5ff2039513d919efea3d9edbf272f2e56aa5a6df9610079a5c70a3cefd1850894519042dec877c65775f7b04c02a8002aaf0d3dd5bed3e38c04
EBUILD redis-5.0.5.ebuild 4643 BLAKE2B 97b14d1e266889a7cceef8ffc8e23ad64a45118a7845a404f13b0b40ce25bfe4298b3f9ade9679fb37958505a386ba4f60bfc28b4118fcb864148dc9e16206b5 SHA512 1371edf66967441555392448ccfe1671dad3535468160ec8797e480088c9b19b64ad0df9fd79fc5845ee180b2c58f8c7a0119f721c25e7c40424851ef31f49f1
EBUILD redis-5.0.7.ebuild 4627 BLAKE2B 64de46492e9a087d38fb4ccba73c6685a8f9d5116b8689b4a9d31a0ada04aee282fa46c0fb184d884978aad2c0a9661c37b6338d350853fc444d03af0e8f3460 SHA512 2de0c542f5ea3be6e16cd556715c7a725178de1339c71732c39626a04b154244da97fb2e35258d15ef1214da60afd9fe8e7415480b98abb076a2795be4d8fb0b
+EBUILD redis-5.0.8.ebuild 4670 BLAKE2B 50c9fa61224453be6a8196121f82feb8c1a5896f66d57e2400235061bcf5767a8f89cef89020975b060af2ecebaf69a880dfb8e21ad6e4b3aedbe2d1771ae445 SHA512 d82e7f2408c47d5966d400c56846e07ea8b75e604b13afd7afcbec76e6d77d764945f9e3ab9d9a0569fb1fc4e59d34250733b9627e1dc0f4681e500606df4e13
MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/files/redis-5.0.8-ppc-atomic.patch b/dev-db/redis/files/redis-5.0.8-ppc-atomic.patch
new file mode 100644
index 000000000000..61a4cc721eb1
--- /dev/null
+++ b/dev-db/redis/files/redis-5.0.8-ppc-atomic.patch
@@ -0,0 +1,19 @@
+diff --git a/src/Makefile b/src/Makefile
+index 4b2a31c..4ef853b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -77,6 +77,14 @@ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
+
++ifneq (,$(filter powerpc ppc,$(uname_M)))
++ FINAL_LIBS+=-latomic
++else
++ifneq (,$(findstring ppc,$(uname_M)))
++ FINAL_LIBS+=-latomic
++endif
++endif
++
+ # Linux ARM needs -latomic at linking time
+ ifneq (,$(filter aarch64 armv,$(uname_M)))
+ FINAL_LIBS+=-latomic
diff --git a/dev-db/redis/redis-5.0.8.ebuild b/dev-db/redis/redis-5.0.8.ebuild
new file mode 100644
index 000000000000..61a50565cc94
--- /dev/null
+++ b/dev-db/redis/redis-5.0.8.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value and data structures database"
+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-macos ~x86-solaris"
+IUSE="+jemalloc tcmalloc luajit test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+# Redis does NOT build with Lua 5.2 or newer at this time.
+# This should link correctly with both unslotted & slotted Lua, without
+# changes.
+COMMON_DEPEND="
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
+ tcmalloc? ( dev-util/google-perftools )
+ jemalloc? ( >=dev-libs/jemalloc-5.1:= )"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ acct-group/redis
+ acct-user/redis"
+
+BDEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( dev-lang/tcl:0= )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.3-config.patch
+ "${FILESDIR}"/${PN}-5.0-shared.patch
+ "${FILESDIR}"/${PN}-5.0-sharedlua.patch
+ "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch
+ "${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+)
+
+src_prepare() {
+ default
+
+ # Copy lua modules into build dir
+ cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+ cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+ # Append cflag for lua_cjson
+ # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+ append-cflags "-DENABLE_CJSON_GLOBAL"
+
+ # now we will rewrite present Makefiles
+ local makefiles="" MKF
+ for MKF in $(find -name 'Makefile' | cut -b 3-); do
+ mv "${MKF}" "${MKF}.in"
+ sed -i -e 's:$(CC):@CC@:g' \
+ -e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+ -e 's: $(DEBUG)::g' \
+ -e 's:$(OBJARCH)::g' \
+ -e 's:ARCH:TARCH:g' \
+ -e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+ "${MKF}.in" \
+ || die "Sed failed for ${MKF}"
+ makefiles+=" ${MKF}"
+ done
+ # autodetection of compiler and settings; generates the modified Makefiles
+ cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+ # Use the correct pkgconfig name for Lua
+ if false && has_version 'dev-lang/lua:5.3'; then
+ # Lua5.3 gives:
+ #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+ LUAPKGCONFIG=lua5.3
+ elif false && has_version 'dev-lang/lua:5.2'; then
+ # Lua5.2 fails with:
+ # scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+ # Because lua_open because lua_newstate in 5.2
+ LUAPKGCONFIG=lua5.2
+ elif has_version 'dev-lang/lua:5.1'; then
+ LUAPKGCONFIG=lua5.1
+ else
+ LUAPKGCONFIG=lua
+ fi
+ # The upstream configure script handles luajit specially, and is not
+ # effected by these changes.
+ einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}"
+ sed -i \
+ -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+ -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+ -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
+ configure.ac || die "Sed failed for configure.ac"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with luajit)
+
+ # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+ # also, don't define ANSI/c99 for lua twice
+ sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+ tc-export CC AR RANLIB
+
+ local myconf=""
+
+ if use tcmalloc; then
+ myconf="${myconf} USE_TCMALLOC=yes"
+ elif use jemalloc; then
+ myconf="${myconf} JEMALLOC_SHARED=yes"
+ else
+ myconf="${myconf} MALLOC=yes"
+ fi
+
+ emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
+}
+
+src_install() {
+ insinto /etc/
+ doins redis.conf sentinel.conf
+ use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
+ fperms 0644 /etc/{redis,sentinel}.conf
+
+ newconfd "${FILESDIR}/redis.confd-r1" redis
+ newinitd "${FILESDIR}/redis.initd-5" redis
+
+ systemd_newunit "${FILESDIR}/redis.service-3" redis.service
+ systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+ newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel
+ newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+ dobin src/redis-cli
+ dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+ fperms 0750 /usr/sbin/redis-benchmark
+ dosym redis-server /usr/sbin/redis-sentinel
+
+ if use prefix; then
+ diropts -m0750
+ else
+ diropts -m0750 -o redis -g redis
+ fi
+ keepdir /var/{log,lib}/redis
+}
diff --git a/dev-db/sadisplay/Manifest b/dev-db/sadisplay/Manifest
index 8dfa77d47d0e..720875de226e 100644
--- a/dev-db/sadisplay/Manifest
+++ b/dev-db/sadisplay/Manifest
@@ -1,3 +1,3 @@
DIST sadisplay-0.4.8.tar.gz 9063 BLAKE2B a6b965d6703102000510ae6100a6bb4d0ad5b42543408aea520476128897bf8f38fda276ea39ac066e9b6621ecf2634d20e82ca21543b8c0bb472ac5d804b2a1 SHA512 c3707f90a20028fdb164caa3037f4ffff3da3f4bc763c400f8204dae4d7d71862e65902892d8ad0fe3bbe636cf87e4f96a475e01e8ce0ac55bed4e17073e3308
EBUILD sadisplay-0.4.8.ebuild 674 BLAKE2B d88e1541ceb6d567a328040d6fecb0d309bf5da32d9b31afa643c6a511c49fd795b4fe316d47919a2c1ad9977b518af47cec60c6a4af118021b0fce702d6d5e6 SHA512 c788738ca4f31b57d73329c0382e146e8905c7b900f356b3e782bd34c626752abc7010b4ed761ba10c971a67044bedc97f9f9b88afca828fd9a6a5e35e05d226
-MISC metadata.xml 731 BLAKE2B f661d037e9ab428af2c3033ccd1ea68578e66200ceb5cda2318b23c87b1a98fa36ccc4941c38ccfeaf4718395df81f1fc3dc6eb793068372f7ced968954b9b2b SHA512 c05e53460ae66a3c52b3a17ec0547962338bd7beb07b9d8f79d43184ff8fd433eb8eaf4bafbb288555016b33f6b296715fcaf2eb73f571dfffdc593773ffbf74
+MISC metadata.xml 723 BLAKE2B b68188d1029ee8525109cbfe77acc40eb086ca55d1a6dd7dbb09ecba629d6b212535f130d52248c04010e7723c1a0e6fb85a0936d1ce1376331c1da9719b6180 SHA512 956c5292c44d4c4567bc000e81a5469e6cf31e38eb6e4f4f66ef7a4def68f919708d6a4fa974d087f0550756e52af1a27c1c35e73d8c3e958106c25b7e95cb84
diff --git a/dev-db/sadisplay/metadata.xml b/dev-db/sadisplay/metadata.xml
index 5e098e138e88..fb7b2ca77d10 100644
--- a/dev-db/sadisplay/metadata.xml
+++ b/dev-db/sadisplay/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>horea.christ@gmail.com</email>
+ <email>chr@chymera.eu</email>
<name>Horea Christian</name>
</maintainer>
<maintainer type="project">
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index 81d4f46f521d..ec718e02c98a 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,3 @@
-DIST libspatialite-4.3.0.tar.gz 4439538 BLAKE2B f3bbda3b9d6099197691eb85e20c693d5cbc3a8958c8f23bd1ba57add9d8676895163d845a4aadd690650244ffa7ae2a02ce86e844e032b815fe4c94f30fb4b8 SHA512 b686766ed90711a41efbf219a8942ead8aefda8784a9cabc59233f107e0e10eda949d022152af1064a169975aa6a47515f6064589166418b853427dde5779ecc
DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0
-EBUILD spatialite-4.3.0-r1.ebuild 1087 BLAKE2B fa255b48b12ce9f52fee369e08ff14e5d178de0692506165128e357fe8544d5296dbb88e4288142bf755616a475ceb2bc6f3e040e916698ef1a031b0023ed38a SHA512 70cc5be58b571bfa42295b080ff789b0a223422ede1af0e5652d7c02e98c7f5d860b1e4f9a23f28ec01063952541143b42dbd5aa9ef4a7eeccb924ce9228e44e
-EBUILD spatialite-4.3.0a.ebuild 1235 BLAKE2B ac9586a36cf87717194c777373b988e534b41c6c0e1ec6dac4c83ab3388219495ed41381972ac2dc705cec7a5eb0d57a1dcca2089dafae91c0ee46588de5ebc4 SHA512 52780f2e597b73f3c2098b1476223699bcd81d292378df3c9ac2ea96902cec3603c8790db54eeb52842b0ceb4132a667d842b47d72e264d51de4560d3fa0a92b
+EBUILD spatialite-4.3.0a.ebuild 1234 BLAKE2B 13526ec828adbe85fb5e53e0b9e48142c8d26d48ef78b6d070e149da0ee86cc3d4b5cd6b8338377f1ea207d609e33f860b3550650957f22f6bcc2e12fd0f24f2 SHA512 4ed7d7af559d2a779aae76f7bf5a3f91717376ff694eb6b3de6bdeaf7d5414fca5129cec39bd5fdef3673e26129c19ef40db413eb8ee1862618ab3e4e8888de8
MISC metadata.xml 559 BLAKE2B b128c4425723bb652063fd3ebebcd83de75a44c7a01e5a8b6c6596cad0bcd1a5f86977f4e3b49d2f1945ea83f12f9761ba712d5f1d919338996c7ddf18bc4a66 SHA512 a21438d83d828b52e4fc16f91edd29e6ace87ada9b697cf233b847a6d3a9f5196135769993873f23409f98548bf852a4e89645c2b0eaf57bd8427ff6dcc36111
diff --git a/dev-db/spatialite/spatialite-4.3.0-r1.ebuild b/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
deleted file mode 100644
index fc885a9624fa..000000000000
--- a/dev-db/spatialite/spatialite-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="lib${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
-HOMEPAGE="https://www.gaia-gis.it/gaia-sins/"
-SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="+geos iconv +proj test +xls +xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-db/sqlite-3.7.5:3[extensions(+)]
- sys-libs/zlib
- geos? ( >=sci-libs/geos-3.4 )
- proj? ( sci-libs/proj )
- xls? ( dev-libs/freexl )
- xml? ( dev-libs/libxml2 )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( iconv )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- econf \
- --disable-examples \
- --disable-static \
- --enable-epsg \
- --enable-geocallbacks \
- $(use_enable geos) \
- $(use_enable geos geosadvanced) \
- $(use_enable iconv) \
- $(use_enable proj) \
- $(use_enable xls freexl) \
- $(use_enable xml libxml2)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild
index ccd7a6e07707..e745b55a7969 100644
--- a/dev-db/spatialite/spatialite-4.3.0a.ebuild
+++ b/dev-db/spatialite/spatialite-4.3.0a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="+geos iconv +proj test +xls +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 06a8156ee659..2f3d6d987a96 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,12 +1,21 @@
AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668
AUX sqlite-3.29.0-full_archive-build.patch 15915 BLAKE2B ccc439a441bede4d6b380cae77b97929d342a54f0fc3ee4ac000ca52b1d8d3d63a86e0d9c89dbf3f3a9235ed03ad51c29cbde27a6929e4fe25fb2304977affb9 SHA512 a551bd1c54a7fe7e1581c2682cc0a76f16a00d8513386d85d939ffd1494f29ee266fbe3bc97db74f72435616f30855d14b76dfd4e205c61c5c91c7af3eb97851
AUX sqlite-3.29.0-full_archive-tests.patch 4122 BLAKE2B e41f62e1efa354c8b5dda6f79328384f0c19f40830e71268e2a3741961248db5c3ca6159deca9bd47983d8ca47ce0caf2fcc8b406cf2f1bc1ff21910fa51d9d6 SHA512 f8cf5f8fc6a53459187cec92823f0982d0d48d9f0b0ab75bcaf713f5486a40193578d187cbc7272371e868b95990a48c794efe300b18a63b9ae273cfcc2f8757
+AUX sqlite-3.31.0-full_archive-build.patch 15642 BLAKE2B c07992c52f1e67d5d5eae1b0cfc0fe20b26e4405ccd8f6c7ece75ea3908f9699e67520c3d27b614b01d20b5758b2b85a8f3b66aa1675cc8fd248d7742fc55ec9 SHA512 14727ab43911f810a22b3aa2a48ce8074422ad38898d0064b7ec4b9a226b27a781ac342a60f32ae1edbaae155bdf142456f66faf8d5adcd33b902b77c3607f72
+AUX sqlite-3.31.1-full_archive-architectures.patch 2993 BLAKE2B 252d92ec087482b062e0dae0b223e0c0dee6f5857765c6babb857922eb97183a1c72b4ba196685e6b1e1631990123bc8cd71a4e26eabe317741cdc19ac54c201 SHA512 d65475759e2ae663094803d7c74e62fe233630afcf7bd287e77a613144889efb09d57e9f9fa8dce634872e37f1ae53134793fbcfd3d7bd260fc6d774bf5e8aad
+AUX sqlite-3.31.1-full_archive-security_fixes.patch 5388 BLAKE2B c2740e47d2aab8b99c9d8ae9f346f51f0dca8cdff7d3b991346aff5e94553af1c523b48d33490abb83ecc77be9ae075580dc095b827b348c657b9d5082ec5fe3 SHA512 53894b3bdf5e4a61c58b23758867a63db73b49b856f696a32c6c6d0224d54359927db635abec770e84b111dbf0fbb48b9742809be05504e12854385c58024819
+AUX sqlite-3.31.1-nonfull_archive-architectures.patch 826 BLAKE2B a506bc0a44477c7b5ad85ad2144871a4d1311d84e8da7b8958a73762662caf11734a3152984430b2c48120d1bfa1099b8a740f9a5c23ee8de1292d7ac1ffcea6 SHA512 041f0d4e07315c48ddce9d1576329647daa787fdcc76d2590fa2bbfb33a13f1b86707379a73b7db35619731c2df0e094b26879648e4b6a9b40696dbd39c7bffa
+AUX sqlite-3.31.1-nonfull_archive-security_fixes.patch 4099 BLAKE2B bc07ee47164abeefc8d802741e68d77ce339209bc2d143246287e7d2743a57f13a84c08d048c1e72cee84a3ecc2e323a316f7b231352558f28cbd4259c5f8f8b SHA512 b8f18b4895168036cb5958dade34060b2cfee7aeaf61f20fa741f6d9e61856f643597324313e7e0cd1732346099da78111cf44171e355aa7f13ef8a6350845d6
DIST sqlite-autoconf-3290000.tar.gz 2833613 BLAKE2B b68a4f9bfe90653f5ce9dbf94b44cecc843fbb639883a7be9dd40150749f8d2eca0c231b215137d2f8da78d33356d72640a943ba06516c6d7c10ebd04cae4766 SHA512 85dcaa72cc2476c628e801d4ce46cf10ed8997f56cb0334062df5553f18c29d607883a1049bf75258204f2f53a29a02a01f014dcca383b05dfac1e2123778024
DIST sqlite-autoconf-3300100.tar.gz 2848951 BLAKE2B 3a541a2b07ebbaf7ddca4693b71765e2ecd11974dd64b4a7a19eaee4eea8a17a6004c69f3b2163213fe7568480152709745e029107711813d4bdd41052763cd1 SHA512 9ec0283c417fb0323b0e43550af2a49e9a63988e4212c27ea62cc9da3534caa6faf5bdc7e051b6772c4ce61560a433b3d3288b68e05e9ba8495f61a3bcebda3e
+DIST sqlite-autoconf-3310100.tar.gz 2887243 BLAKE2B ef5d40b6e6c59a51ae95368eb9f6a938188813f89d5328ea1c1180ef35f124c14b3e83b0832ae5c2fa24cc2df352f1b0ea5f20b64d0762d50a700d9895f9a12e SHA512 d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617
DIST sqlite-doc-3290000.zip 9415641 BLAKE2B 97fef1f01d3e7730e5220541ad9ccdf9f8538aa43939c0f513919c8505b3a4f4b4c89eb2e04fddae80b7eeed440eb0f06f7cfd93cd56f0539bd6fdd5f47e1ff7 SHA512 ca856cf250e395d9c7e9817337adb5a16b1d96a20548a4010f5137188d35bb9d49a4a6da47bf2a696deffa68d2976dbb35a036adce19b8320e0e286876ac094f
DIST sqlite-doc-3300100.zip 9485342 BLAKE2B bf5e3909a327c773106d4990b3e3be5dd63db2dbc1a7f8a7c1bd16f39bec83a6b2a98c4c56ded3b58f4087dcdcc934e542db36e142bf338a411ed7115d67d6b3 SHA512 373e843015307071443a0db5fb930f9120718f6118cc2e21b506fdc8535fbe6996e9889e8b5809ffb91257addfe778bdf3412a81e11f6bced2c5e0330337d00d
+DIST sqlite-doc-3310100.zip 9600405 BLAKE2B 324fb7a0a38bc56476e41504c14996e9d5d83ac659403991515413d49f5ee3aad064ccece25f52b6041ef26bf23f320a9be1b6b02c5fbe96c36372107f54fc2e SHA512 5572e2c2dac30c014ef9cd60a620b7a7bb610f91a47e2890c0641540d39b9d5ce0e914ee697583130317633918b7827e2612a7cbc024f5bd6aa22ad28a78b56b
DIST sqlite-src-3290000.zip 12557725 BLAKE2B b1aeb80734a2cb7d45c6f2e278bad2996b56ecaf792a8f26322bf50aeaa430eea267f23edb1721bb80ecb6e0c8e14c7a5d8f26178d056fd23efb52f496cc03e1 SHA512 575398fbe20c6471ee2abcbde170b8d48efbb3cb2716a65f42f05c52429a45d14e8046e50c59bbf75bfe2d8f151c34abd50b440c50af571f19e19f3290b230df
DIST sqlite-src-3300100.zip 12648162 BLAKE2B bb239bac9115c74778de0347b4f4e24a82f149f55fe7dea8b89eb859bfe4cf6f6c2f065f5e1741c40624bb88ecd395140064a41d475a1c64a0188990fd6248e7 SHA512 f40236d0bb25f3ea01a1192dace3b6732fb671fbdabb7cfa8d0cc2b99d21aef00ae380999fdee904501cb03304644cddfb2506951f36a2f6a83693f311c3c11d
-EBUILD sqlite-3.29.0.ebuild 12011 BLAKE2B e3985dc5f3dbd4f8654f7a7087ad06b3d68f4f2194a439da61313341dd1b5e4bccca2dc74402e5b53b89b544537e0a34ce13af5afcba7895be069a29725f24b8 SHA512 c08d45d8b7eaee80d35d2a42ec7e6a203458398bf73b66703a24d22ef1c97ec497d5c78c28b6f3bdb2ba9423d35fe247532cc4c2ac62c03ae9fb0138cb872fae
-EBUILD sqlite-3.30.1.ebuild 11655 BLAKE2B af9bc868f98f33c8464715d135ed37f4868b85e11c26db71bc030e6e3d1d41fc53911b2bf19a70ea5616ea02e114d31528fcbd4306139be8ab2b2d2cb8485405 SHA512 c919660e483a4e8a1d7defb305737b5ba2b3624f7b4903477e4b98b6b457b3d67f2b77a01fffaee6d2220fa2bd28397e03ced50877032d64ee831165505ac0de
+DIST sqlite-src-3310100.zip 12510166 BLAKE2B a856695e8552b8b4dcb28452fdbd48305fdb9072f9d6587f4b1f4445daf386e920eb936dcb50fdfe41a49f84b26a7c5fedcffea5acf3ba3fa935c36695d4b8ee SHA512 af92a00877bcd90372d6f83a27fea12b4fe8d1155b223a6bccbccc31bb8e3d2269cd9e68f329bc55f70d1068ccbf220ff5abccea6f593fd7a3a4bdd732d1cdbe
+EBUILD sqlite-3.29.0.ebuild 12009 BLAKE2B 6212dfb7017d32cac9b082ffdae7d869a5eadb1519d228e0a98f6f61d21306c75852134d42bcfac19f66b33416adea377c1e6c055c9ca8db44ff0d706bb47db4 SHA512 79dba2a363556251458230c6296e7f8e4b3dac46239f9aaecba1b6919a59489bf09e26a1f3716226b57e7a0a682c81c4dd2c2cad7511c76295715c162c0909bd
+EBUILD sqlite-3.30.1.ebuild 11652 BLAKE2B 34109ae969ac7cb25f8a327c4bf4f6f29cae0907889f0667c852f40275e1cfbcbf2aca684cf6128b7ddb570509008ab808bee71db8ed6609cc61ee28a4e7c421 SHA512 a4df38b537c98e4ed1da335cfef7f27a003d8732b97a79f457f48de5032e4512f69b0fce5f85fe35e43064286919156db8362318c16f00586a1319fdb5a61495
+EBUILD sqlite-3.31.1.ebuild 11936 BLAKE2B ffb1297a2df474acaaf030e2a29ee297e19133db11276a09cc0507b913ace9502bc3a22efdb55e4e935727ed3a6a785c4132b8b54663015475d3801ab16adf0c SHA512 2e91be4abb03493654561005a1edf8d5cbbce5740adc15205331b881271e8e605c570948b7576f98cdb0bccf1aae1f3d37f2c4b6bb188b5c46e06aed5a107788
MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
diff --git a/dev-db/sqlite/files/sqlite-3.31.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.31.0-full_archive-build.patch
new file mode 100644
index 000000000000..9ff44c0fe7ce
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.31.0-full_archive-build.patch
@@ -0,0 +1,466 @@
+Move some code to libsqlite3.so to avoid duplication.
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- /Makefile.in
++++ /Makefile.in
+@@ -311,6 +311,9 @@
+ # Source code for extensions
+ #
+ SRC += \
++ $(TOP)/ext/expert/sqlite3expert.c \
++ $(TOP)/ext/expert/sqlite3expert.h
++SRC += \
+ $(TOP)/ext/fts1/fts1.c \
+ $(TOP)/ext/fts1/fts1.h \
+ $(TOP)/ext/fts1/fts1_hash.c \
+@@ -363,8 +366,12 @@
+ $(TOP)/ext/rbu/sqlite3rbu.h \
+ $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
++ $(TOP)/ext/misc/appendvfs.c \
++ $(TOP)/ext/misc/dbdata.c \
+ $(TOP)/ext/misc/json1.c \
+- $(TOP)/ext/misc/stmt.c
++ $(TOP)/ext/misc/sqlar.c \
++ $(TOP)/ext/misc/stmt.c \
++ $(TOP)/ext/misc/zipfile.c
+
+ # Generated source code files
+ #
+@@ -435,7 +442,6 @@
+ # Statically linked extensions
+ #
+ TESTSRC += \
+- $(TOP)/ext/expert/sqlite3expert.c \
+ $(TOP)/ext/expert/test_expert.c \
+ $(TOP)/ext/misc/amatch.c \
+ $(TOP)/ext/misc/carray.c \
+@@ -461,7 +467,6 @@
+ $(TOP)/ext/misc/totype.c \
+ $(TOP)/ext/misc/unionvtab.c \
+ $(TOP)/ext/misc/wholenumber.c \
+- $(TOP)/ext/misc/zipfile.c \
+ $(TOP)/ext/userauth/userauth.c
+
+ # Source code to the library files needed by the test fixture
+@@ -639,25 +644,25 @@
+
+ libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+ $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
++ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ -rpath "$(TCLLIBDIR)" \
+ -version-info "8:6:8" \
+ -avoid-version
+
+-sqlite3$(TEXE): shell.c sqlite3.c
+- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+- shell.c sqlite3.c \
+- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
++sqlite3$(TEXE): shell.c libsqlite3.la
++ $(LTLINK) $(READLINE_FLAGS) -o $@ \
++ shell.c libsqlite3.la \
++ $(LIBREADLINE)
+
+-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
+- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
++sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+
+-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
+- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
+
+-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
+ $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
+- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
++ $(TOP)/ext/misc/scrub.c libsqlite3.la
+
+ srcck1$(BEXE): $(TOP)/tool/srcck1.c
+ $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -767,7 +772,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo: sqlite3.c
+- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
++ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1064,14 +1069,9 @@
+ # Source files that go into making shell.c
+ SHELL_SRC = \
+ $(TOP)/src/shell.c.in \
+- $(TOP)/ext/misc/appendvfs.c \
+ $(TOP)/ext/misc/shathree.c \
+ $(TOP)/ext/misc/fileio.c \
+ $(TOP)/ext/misc/completion.c \
+- $(TOP)/ext/misc/sqlar.c \
+- $(TOP)/ext/expert/sqlite3expert.c \
+- $(TOP)/ext/expert/sqlite3expert.h \
+- $(TOP)/ext/misc/zipfile.c \
+ $(TOP)/ext/misc/memtrace.c \
+ $(TOP)/src/test_windirent.c
+
+@@ -1239,11 +1239,11 @@
+
+ # Fuzz testing
+ fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+- ./fuzzcheck$(TEXE) $(FUZZDATA)
++ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+
+ valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
++ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+
+ # The veryquick.test TCL tests.
+@@ -1274,24 +1274,23 @@
+ smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
+ ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
+
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
++ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+
+-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
+
+-sqltclsh$(TEXE): sqltclsh.c
+- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
++ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
+
+-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
++ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
+
+ CHECKER_DEPS =\
+ $(TOP)/tool/mkccode.tcl \
+- sqlite3.c \
+ $(TOP)/src/tclsqlite.c \
+ $(TOP)/ext/repair/sqlite3_checker.tcl \
+ $(TOP)/ext/repair/checkindex.c \
+@@ -1302,36 +1301,36 @@
+ sqlite3_checker.c: $(CHECKER_DEPS)
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
+
+-sqlite3_checker$(TEXE): sqlite3_checker.c
+- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
++ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
+
+-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
+ $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
+- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
++ $(TOP)/ext/misc/dbdump.c libsqlite3.la
+
+-dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
+- $(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
++dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
++ $(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c
+
+-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
++showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+
+-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
++showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+
+-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
++showjournal$(TEXE): $(TOP)/tool/showjournal.c
++ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+
+-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
++showwal$(TEXE): $(TOP)/tool/showwal.c
++ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
+
+ showshm$(TEXE): $(TOP)/tool/showshm.c
+ $(LTLINK) -o $@ $(TOP)/tool/showshm.c
+
+-index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
+- $(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
++index_usage$(TEXE): $(TOP)/tool/index_usage.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la
+
+-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
++changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+
+ changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo
+ $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
+@@ -1356,11 +1355,11 @@
+ kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
+ $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
+
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
+- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
++rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
++ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+
+-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
+
+ # This target will fail if the SQLite amalgamation contains any exported
+ # symbols that do not begin with "sqlite3_". It is run as part of the
+--- /configure.ac
++++ /configure.ac
+@@ -587,6 +587,9 @@
+ if test "${enable_load_extension}" = "yes" ; then
+ OPT_FEATURE_FLAGS=""
+ AC_SEARCH_LIBS(dlopen, dl)
++ if test "${ac_cv_search_dlopen}" = "no" ; then
++ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
++ fi
+ else
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
+--- /ext/misc/sqlar.c
++++ /ext/misc/sqlar.c
+@@ -14,6 +14,8 @@
+ ** for working with sqlar archives and used by the shell tool's built-in
+ ** sqlar support.
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <zlib.h>
+@@ -121,3 +123,5 @@
+ }
+ return rc;
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/misc/zipfile.c
++++ /ext/misc/zipfile.c
+@@ -24,6 +24,8 @@
+ ** * No support for zip64 extensions
+ ** * Only the "inflate/deflate" (zlib) compression method is supported
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <stdio.h>
+@@ -2186,3 +2188,5 @@
+ (void)pzErrMsg; /* Unused parameter */
+ return zipfileRegister(db);
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/repair/sqlite3_checker.c.in
++++ /ext/repair/sqlite3_checker.c.in
+@@ -2,6 +2,7 @@
+ ** Read an SQLite database file and analyze its space utilization. Generate
+ ** text on standard output.
+ */
++#define SQLITE_CORE 1
+ #define TCLSH_INIT_PROC sqlite3_checker_init_proc
+ #define SQLITE_ENABLE_DBPAGE_VTAB 1
+ #define SQLITE_ENABLE_JSON1 1
+@@ -14,7 +15,7 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ INCLUDE $ROOT/ext/misc/btreeinfo.c
+ INCLUDE $ROOT/ext/repair/checkindex.c
+--- /src/shell.c.in
++++ /src/shell.c.in
+@@ -61,6 +61,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include "sqlite3.h"
++#include "ext/expert/sqlite3expert.h"
+ typedef sqlite3_int64 i64;
+ typedef sqlite3_uint64 u64;
+ typedef unsigned char u8;
+@@ -127,6 +128,10 @@
+ # define SHELL_USE_LOCAL_GETLINE 1
+ #endif
+
++#ifdef SQLITE_HAVE_ZLIB
++#include <zlib.h>
++#endif
++
+
+ #if defined(_WIN32) || defined(WIN32)
+ # include <io.h>
+@@ -939,18 +944,7 @@
+ INCLUDE ../ext/misc/shathree.c
+ INCLUDE ../ext/misc/fileio.c
+ INCLUDE ../ext/misc/completion.c
+-INCLUDE ../ext/misc/appendvfs.c
+ INCLUDE ../ext/misc/memtrace.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE ../ext/misc/zipfile.c
+-INCLUDE ../ext/misc/sqlar.c
+-#endif
+-INCLUDE ../ext/expert/sqlite3expert.h
+-INCLUDE ../ext/expert/sqlite3expert.c
+-
+-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+-INCLUDE ../ext/misc/dbdata.c
+-#endif
+
+ #if defined(SQLITE_ENABLE_SESSION)
+ /*
+@@ -4173,10 +4167,13 @@
+ sqlite3_shathree_init(p->db, 0, 0);
+ sqlite3_completion_init(p->db, 0, 0);
+ #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
++ extern int sqlite3_dbdata_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_dbdata_init(p->db, 0, 0);
+ #endif
+ #ifdef SQLITE_HAVE_ZLIB
++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_zipfile_init(p->db, 0, 0);
++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_sqlar_init(p->db, 0, 0);
+ #endif
+ sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
+@@ -6176,6 +6173,7 @@
+ goto end_ar_command;
+ }
+ sqlite3_fileio_init(cmd.db, 0, 0);
++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_sqlar_init(cmd.db, 0, 0);
+ sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
+ shellPutsFunc, 0, 0);
+@@ -10354,6 +10352,7 @@
+ #endif
+ }
+ data.out = stdout;
++ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_appendvfs_init(0,0,0);
+
+ /* Go ahead and open the database file if it already exists. If the
+--- /test/sessionfuzz.c
++++ /test/sessionfuzz.c
+@@ -700,42 +700,6 @@
+ #include <assert.h>
+ #include "zlib.h"
+
+-/*
+-** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
+-**
+-** Parameter SZ is interpreted as an integer. If it is less than or
+-** equal to zero, then this function returns a copy of X. Or, if
+-** SZ is equal to the size of X when interpreted as a blob, also
+-** return a copy of X. Otherwise, decompress blob X using zlib
+-** utility function uncompress() and return the results (another
+-** blob).
+-*/
+-static void sqlarUncompressFunc(
+- sqlite3_context *context,
+- int argc,
+- sqlite3_value **argv
+-){
+- uLong nData;
+- uLongf sz;
+-
+- assert( argc==2 );
+- sz = sqlite3_value_int(argv[1]);
+-
+- if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){
+- sqlite3_result_value(context, argv[0]);
+- }else{
+- const Bytef *pData= sqlite3_value_blob(argv[0]);
+- Bytef *pOut = sqlite3_malloc(sz);
+- if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){
+- sqlite3_result_error(context, "error in uncompress()", -1);
+- }else{
+- sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT);
+- }
+- sqlite3_free(pOut);
+- }
+-}
+-
+-
+ /* Run a chunk of SQL. If any errors happen, print an error message
+ ** and exit.
+ */
+--- /tool/mksqlite3c.tcl
++++ /tool/mksqlite3c.tcl
+@@ -117,6 +117,7 @@
+ rtree.h
+ sqlite3session.h
+ sqlite3.h
++ sqlite3expert.h
+ sqlite3ext.h
+ sqlite3rbu.h
+ sqliteicu.h
+@@ -403,6 +404,11 @@
+ sqlite3session.c
+ fts5.c
+ stmt.c
++ appendvfs.c
++ dbdata.c
++ sqlar.c
++ sqlite3expert.c
++ zipfile.c
+ } {
+ copy_file tsrc/$file
+ }
+--- /tool/sqlite3_analyzer.c.in
++++ /tool/sqlite3_analyzer.c.in
+@@ -14,9 +14,6 @@
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+ #define SQLITE_OMIT_LOAD_EXTENSION 1
+-#ifndef USE_EXTERNAL_SQLITE
+-INCLUDE sqlite3.c
+-#endif
+ INCLUDE $ROOT/src/tclsqlite.c
+
+ const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
+--- /tool/sqltclsh.c.in
++++ /tool/sqltclsh.c.in
+@@ -27,19 +27,17 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
+-INCLUDE $ROOT/ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE $ROOT/ext/misc/zipfile.c
+-INCLUDE $ROOT/ext/misc/sqlar.c
+-#endif
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+
+ const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
+ (void)interp;
++ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
+ sqlite3_appendvfs_init(0,0,0);
+ #ifdef SQLITE_HAVE_ZLIB
++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
+ #endif
+
diff --git a/dev-db/sqlite/files/sqlite-3.31.1-full_archive-architectures.patch b/dev-db/sqlite/files/sqlite-3.31.1-full_archive-architectures.patch
new file mode 100644
index 000000000000..a0cf7514d0f7
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.31.1-full_archive-architectures.patch
@@ -0,0 +1,72 @@
+https://sqlite.org/cgi/src/info/04885763c4cd00cb
+https://sqlite.org/cgi/src/info/b20503aaf5b6595a
+
+--- /ext/fts5/test/fts5matchinfo.test
++++ /ext/fts5/test/fts5matchinfo.test
+@@ -500,14 +500,18 @@
+ INSERT INTO t1 VALUES('c', 'd');
+ }
+
++if {$tcl_platform(byteOrder)=="littleEndian"} {
++ set res {X'02000000'}
++} else {
++ set res {X'00000002'}
++}
+ do_execsql_test 15.1 {
+ SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
+-} {X'02000000'}
+-
++} $res
+ do_execsql_test 15.2 {
+ DELETE FROM t1_content WHERE rowid=1;
+ SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
+-} {X'02000000'}
++} $res
+
+ fts5_aux_test_functions db
+ do_execsql_test 15.3 {
+@@ -517,4 +521,3 @@
+ }
+
+ finish_test
+-
+--- /src/insert.c
++++ /src/insert.c
+@@ -2170,12 +2170,14 @@
+ x = *sqlite3VdbeGetOp(v, addrConflictCk);
+ if( x.opcode!=OP_IdxRowid ){
+ int p2; /* New P2 value for copied conflict check opcode */
++ const char *zP4;
+ if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
+ p2 = lblRecheckOk;
+ }else{
+ p2 = x.p2;
+ }
+- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
++ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
++ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
+ sqlite3VdbeChangeP5(v, x.p5);
+ VdbeCoverageIf(v, p2!=x.p2);
+ }
+--- /test/fts4aa.test
++++ /test/fts4aa.test
+@@ -229,13 +229,18 @@
+ # 2019-11-18 https://bugs.chromium.org/p/chromium/issues/detail?id=1025467
+ db close
+ sqlite3 db :memory:
++if {$tcl_platform(byteOrder)=="littleEndian"} {
++ set res {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
++} else {
++ set res {X'0000000200000000000000000000000E0000000E00000001000000010000000100000001'}
++}
+ do_execsql_test fts4aa-6.10 {
+ CREATE VIRTUAL TABLE f USING fts4();
+ INSERT INTO f_segdir VALUES (77,91,0,0,'255 77',x'0001308000004d5c4ddddddd4d4d7b4d4d4d614d8019ff4d05000001204d4d2e4d6e4d4d4d4b4d6c4d004d4d4d4d4d4d3d000000004d5d4d4d645d4d004d4d4d4d4d4d4d4d4d454d6910004d05ffff054d646c4d004d5d4d4d4d4d3d000000004d4d4d4d4d4d4d4d4d4d4d69624d4d4d04004d4d4d4d4d604d4ce1404d554d45');
+ INSERT INTO f_segdir VALUES (77,108,0,0,'255 77',x'0001310000fa64004d4d4d3c5d4d654d4d4d614d8000ff4d05000001204d4d2e4d6e4d4d4dff4d4d4d4d4d4d00104d4d4d4d000000004d4d4d0400311d4d4d4d4d4d4d4d4d4d684d6910004d05ffff054d4d6c4d004d4d4d4d4d4d3d000000004d4d4d4d644d4d4d4d4d4d69624d4d4d03ed4d4d4d4d4d604d4ce1404d550080');
+ INSERT INTO f_stat VALUES (0,x'80808080100000000064004d4d4d3c4d4d654d4d4d614d8000ff4df6ff1a00204d4d2e4d6e4d4d4d104d4d4d4d4d4d00104d4d4d4d4d4d69574d4d4d000031044d4d4d3e4d4d4c4d05004d6910');
+ SELECT quote(matchinfo(f,'pnax')) from f where f match '0 1';
+-} {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
++} $res
+
+ # 2019-11-18 Detect infinite loop in fts3SelectLeaf()
+ db close
diff --git a/dev-db/sqlite/files/sqlite-3.31.1-full_archive-security_fixes.patch b/dev-db/sqlite/files/sqlite-3.31.1-full_archive-security_fixes.patch
new file mode 100644
index 000000000000..c0bb7144a67b
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.31.1-full_archive-security_fixes.patch
@@ -0,0 +1,163 @@
+https://sqlite.org/cgi/src/info/9d0d4ab95dc0c56e
+https://sqlite.org/cgi/src/info/abc473fb8fb99900
+https://sqlite.org/cgi/src/info/5aeb5a2d295e10d5
+https://sqlite.org/cgi/src/info/a67cf5b7d37d5b14
+https://sqlite.org/cgi/src/info/14d14eb537075c6a
+https://sqlite.org/cgi/src/info/c431b3fd8fd0f6a6
+
+--- /src/expr.c
++++ /src/expr.c
+@@ -5463,19 +5463,25 @@
+ case TK_LT:
+ case TK_LE:
+ case TK_GT:
+- case TK_GE:
++ case TK_GE: {
++ Expr *pLeft = pExpr->pLeft;
++ Expr *pRight = pExpr->pRight;
+ testcase( pExpr->op==TK_EQ );
+ testcase( pExpr->op==TK_NE );
+ testcase( pExpr->op==TK_LT );
+ testcase( pExpr->op==TK_LE );
+ testcase( pExpr->op==TK_GT );
+ testcase( pExpr->op==TK_GE );
+- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
+- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
++ /* The y.pTab=0 assignment in wherecode.c always happens after the
++ ** impliesNotNullRow() test */
++ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
++ && IsVirtual(pLeft->y.pTab))
++ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
++ && IsVirtual(pRight->y.pTab))
+ ){
+- return WRC_Prune;
++ return WRC_Prune;
+ }
+-
++ }
+ default:
+ return WRC_Continue;
+ }
+--- /src/resolve.c
++++ /src/resolve.c
+@@ -1051,7 +1051,7 @@
+ assert( !ExprHasProperty(pExpr, EP_Reduced) );
+ /* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE",
+ ** and "x IS NOT FALSE". */
+- if( pRight->op==TK_ID ){
++ if( pRight && pRight->op==TK_ID ){
+ int rc = resolveExprStep(pWalker, pRight);
+ if( rc==WRC_Abort ) return WRC_Abort;
+ if( pRight->op==TK_TRUEFALSE ){
+--- /src/select.c
++++ /src/select.c
+@@ -2806,6 +2806,7 @@
+ /* Generate code to take the intersection of the two temporary
+ ** tables.
+ */
++ if( rc ) break;
+ assert( p->pEList );
+ iBreak = sqlite3VdbeMakeLabel(pParse);
+ iCont = sqlite3VdbeMakeLabel(pParse);
+@@ -5148,7 +5149,7 @@
+ pNew = sqlite3ExprListAppend(pParse, pNew, pExpr);
+ sqlite3TokenInit(&sColname, zColname);
+ sqlite3ExprListSetName(pParse, pNew, &sColname, 0);
+- if( pNew && (p->selFlags & SF_NestedFrom)!=0 ){
++ if( pNew && (p->selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){
+ struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
+ sqlite3DbFree(db, pX->zEName);
+ if( pSub ){
+--- /src/sqliteInt.h
++++ /src/sqliteInt.h
+@@ -2153,8 +2153,11 @@
+ */
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+ # define IsVirtual(X) ((X)->nModuleArg)
++# define ExprIsVtab(X) \
++ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
+ #else
+ # define IsVirtual(X) 0
++# define ExprIsVtab(X) 0
+ #endif
+
+ /*
+--- /src/whereexpr.c
++++ /src/whereexpr.c
+@@ -377,7 +377,8 @@
+ ** MATCH(expression,vtab_column)
+ */
+ pCol = pList->a[1].pExpr;
+- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++ if( ExprIsVtab(pCol) ){
+ for(i=0; i<ArraySize(aOp); i++){
+ if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
+ *peOp2 = aOp[i].eOp2;
+@@ -399,7 +400,8 @@
+ ** with function names in an arbitrary case.
+ */
+ pCol = pList->a[0].pExpr;
+- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++ if( ExprIsVtab(pCol) ){
+ sqlite3_vtab *pVtab;
+ sqlite3_module *pMod;
+ void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
+@@ -422,10 +424,12 @@
+ int res = 0;
+ Expr *pLeft = pExpr->pLeft;
+ Expr *pRight = pExpr->pRight;
+- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
++ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
++ if( ExprIsVtab(pLeft) ){
+ res++;
+ }
+- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
++ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
++ if( pRight && ExprIsVtab(pRight) ){
+ res++;
+ SWAP(Expr*, pLeft, pRight);
+ }
+--- /test/altertab.test
++++ /test/altertab.test
+@@ -613,4 +613,21 @@
+ SELECT sql FROM sqlite_master;
+ } {{CREATE TABLE t0 (c1 INTEGER, PRIMARY KEY(c1))}}
+
++# 2020-02-23 ticket f50af3e8a565776b
++reset_db
++do_execsql_test 19.100 {
++ CREATE TABLE t1(x);
++ CREATE VIEW t2 AS SELECT 1 FROM t1, (t1 AS a0, t1);
++ ALTER TABLE t1 RENAME TO t3;
++ SELECT sql FROM sqlite_master;
++} {{CREATE TABLE "t3"(x)} {CREATE VIEW t2 AS SELECT 1 FROM "t3", ("t3" AS a0, "t3")}}
++do_execsql_test 19.110 {
++ INSERT INTO t3(x) VALUES(123);
++ SELECT * FROM t2;
++} {1}
++do_execsql_test 19.120 {
++ INSERT INTO t3(x) VALUES('xyz');
++ SELECT * FROM t2;
++} {1 1 1 1 1 1 1 1}
++
+ finish_test
+--- /test/windowfault.test
++++ /test/windowfault.test
+@@ -263,4 +263,15 @@
+ faultsim_test_result {0 {}}
+ }
+
++do_faultsim_test 11 -faults oom* -prep {
++} -body {
++ execsql {
++ VALUES(false),(current_date collate binary)
++ intersect
++ values(count() not like group_concat(cast(cast(0e00 as text) as integer) <= NULL || 0.4e-0 || 0x8 & true ) over () collate rtrim);
++ }
++} -test {
++ faultsim_test_result {0 {}}
++}
++
+ finish_test
diff --git a/dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-architectures.patch b/dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-architectures.patch
new file mode 100644
index 000000000000..79f6f07e0ef7
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-architectures.patch
@@ -0,0 +1,20 @@
+https://sqlite.org/cgi/src/info/04885763c4cd00cb
+
+--- /sqlite3.c
++++ /sqlite3.c
+@@ -121302,12 +121302,14 @@
+ x = *sqlite3VdbeGetOp(v, addrConflictCk);
+ if( x.opcode!=OP_IdxRowid ){
+ int p2; /* New P2 value for copied conflict check opcode */
++ const char *zP4;
+ if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
+ p2 = lblRecheckOk;
+ }else{
+ p2 = x.p2;
+ }
+- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
++ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
++ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
+ sqlite3VdbeChangeP5(v, x.p5);
+ VdbeCoverageIf(v, p2!=x.p2);
+ }
diff --git a/dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-security_fixes.patch b/dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-security_fixes.patch
new file mode 100644
index 000000000000..3bbbbf7c8dde
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.31.1-nonfull_archive-security_fixes.patch
@@ -0,0 +1,112 @@
+https://sqlite.org/cgi/src/info/9d0d4ab95dc0c56e
+https://sqlite.org/cgi/src/info/abc473fb8fb99900
+https://sqlite.org/cgi/src/info/5aeb5a2d295e10d5
+https://sqlite.org/cgi/src/info/a67cf5b7d37d5b14
+https://sqlite.org/cgi/src/info/c431b3fd8fd0f6a6
+
+--- /sqlite3.c
++++ /sqlite3.c
+@@ -17428,8 +17428,11 @@
+ */
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+ # define IsVirtual(X) ((X)->nModuleArg)
++# define ExprIsVtab(X) \
++ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
+ #else
+ # define IsVirtual(X) 0
++# define ExprIsVtab(X) 0
+ #endif
+
+ /*
+@@ -97816,7 +97819,7 @@
+ assert( !ExprHasProperty(pExpr, EP_Reduced) );
+ /* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE",
+ ** and "x IS NOT FALSE". */
+- if( pRight->op==TK_ID ){
++ if( pRight && pRight->op==TK_ID ){
+ int rc = resolveExprStep(pWalker, pRight);
+ if( rc==WRC_Abort ) return WRC_Abort;
+ if( pRight->op==TK_TRUEFALSE ){
+@@ -104133,19 +104136,25 @@
+ case TK_LT:
+ case TK_LE:
+ case TK_GT:
+- case TK_GE:
++ case TK_GE: {
++ Expr *pLeft = pExpr->pLeft;
++ Expr *pRight = pExpr->pRight;
+ testcase( pExpr->op==TK_EQ );
+ testcase( pExpr->op==TK_NE );
+ testcase( pExpr->op==TK_LT );
+ testcase( pExpr->op==TK_LE );
+ testcase( pExpr->op==TK_GT );
+ testcase( pExpr->op==TK_GE );
+- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
+- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
++ /* The y.pTab=0 assignment in wherecode.c always happens after the
++ ** impliesNotNullRow() test */
++ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
++ && IsVirtual(pLeft->y.pTab))
++ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
++ && IsVirtual(pRight->y.pTab))
+ ){
+- return WRC_Prune;
++ return WRC_Prune;
+ }
+-
++ }
+ default:
+ return WRC_Continue;
+ }
+@@ -130673,6 +130682,7 @@
+ /* Generate code to take the intersection of the two temporary
+ ** tables.
+ */
++ if( rc ) break;
+ assert( p->pEList );
+ iBreak = sqlite3VdbeMakeLabel(pParse);
+ iCont = sqlite3VdbeMakeLabel(pParse);
+@@ -133015,7 +133025,7 @@
+ pNew = sqlite3ExprListAppend(pParse, pNew, pExpr);
+ sqlite3TokenInit(&sColname, zColname);
+ sqlite3ExprListSetName(pParse, pNew, &sColname, 0);
+- if( pNew && (p->selFlags & SF_NestedFrom)!=0 ){
++ if( pNew && (p->selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){
+ struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
+ sqlite3DbFree(db, pX->zEName);
+ if( pSub ){
+@@ -142593,7 +142603,8 @@
+ ** MATCH(expression,vtab_column)
+ */
+ pCol = pList->a[1].pExpr;
+- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++ if( ExprIsVtab(pCol) ){
+ for(i=0; i<ArraySize(aOp); i++){
+ if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
+ *peOp2 = aOp[i].eOp2;
+@@ -142615,7 +142626,8 @@
+ ** with function names in an arbitrary case.
+ */
+ pCol = pList->a[0].pExpr;
+- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
++ if( ExprIsVtab(pCol) ){
+ sqlite3_vtab *pVtab;
+ sqlite3_module *pMod;
+ void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
+@@ -142638,10 +142650,12 @@
+ int res = 0;
+ Expr *pLeft = pExpr->pLeft;
+ Expr *pRight = pExpr->pRight;
+- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
++ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
++ if( ExprIsVtab(pLeft) ){
+ res++;
+ }
+- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
++ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
++ if( pRight && ExprIsVtab(pRight) ){
+ res++;
+ SWAP(Expr*, pLeft, pRight);
+ }
diff --git a/dev-db/sqlite/sqlite-3.29.0.ebuild b/dev-db/sqlite/sqlite-3.29.0.ebuild
index 95cb4a1db817..bd920b71adf7 100644
--- a/dev-db/sqlite/sqlite-3.29.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.29.0.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/sqlite/sqlite-3.30.1.ebuild b/dev-db/sqlite/sqlite-3.30.1.ebuild
index 23589edb9171..554790b13d06 100644
--- a/dev-db/sqlite/sqlite-3.30.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.30.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -25,7 +25,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/sqlite/sqlite-3.31.1.ebuild b/dev-db/sqlite/sqlite-3.31.1.ebuild
new file mode 100644
index 000000000000..50984a94d7b8
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.31.1.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+ DOC_PV="${SRC_PV}"
+ # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="doc? ( https://sqlite.org/2020/${PN}-doc-${DOC_PV}.zip )
+ tcl? ( https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip )
+ test? ( https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip )
+ tools? ( https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip )
+ !tcl? ( !test? ( !tools? ( https://sqlite.org/2020/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+ PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+ BDEPEND=">=dev-lang/tcl-8.6:0
+ dev-vcs/fossil"
+else
+ BDEPEND="doc? ( app-arch/unzip )
+ tcl? (
+ app-arch/unzip
+ >=dev-lang/tcl-8.6:0
+ )
+ test? (
+ app-arch/unzip
+ >=dev-lang/tcl-8.6:0
+ )
+ tools? (
+ app-arch/unzip
+ >=dev-lang/tcl-8.6:0
+ )"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+ icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+ tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+full_archive() {
+ [[ "${PV}" == "9999" ]] || use tcl || use test || use tools
+}
+
+pkg_setup() {
+ if [[ "${PV}" == "9999" ]]; then
+ S="${WORKDIR}/${PN}"
+ else
+ if full_archive; then
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+ else
+ S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+ fi
+ fi
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ addwrite "${distdir}"
+ mkdir -p "${distdir}/fossil-src/${PN}" || die
+
+ mkdir "${WORKDIR}/${PN}" || die
+ pushd "${WORKDIR}/${PN}" > /dev/null || die
+ if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite.fossil" ]]; then
+ einfo fossil clone --verbose https://sqlite.org/src sqlite.fossil
+ fossil clone --verbose https://sqlite.org/src sqlite.fossil || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${PN}/sqlite.fossil" . || die
+ einfo fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src
+ fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src || die
+ echo
+ fi
+ cp -p sqlite.fossil "${distdir}/fossil-src/${PN}" || die
+ einfo fossil open --quiet sqlite.fossil
+ fossil open --quiet sqlite.fossil || die
+ echo
+ popd > /dev/null || die
+
+ if use doc; then
+ mkdir "${WORKDIR}/${PN}-doc" || die
+ pushd "${WORKDIR}/${PN}-doc" > /dev/null || die
+ if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" ]]; then
+ einfo fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil
+ fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" . || die
+ einfo fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc
+ fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc || die
+ echo
+ fi
+ cp -p sqlite-doc.fossil "${distdir}/fossil-src/${PN}" || die
+ einfo fossil open --quiet sqlite-doc.fossil
+ fossil open --quiet sqlite-doc.fossil || die
+ echo
+ popd > /dev/null || die
+ fi
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ if full_archive; then
+ eapply "${FILESDIR}/${PN}-3.31.0-full_archive-build.patch"
+ eapply "${FILESDIR}/${PN}-3.31.1-full_archive-architectures.patch"
+ eapply "${FILESDIR}/${PN}-3.31.1-full_archive-security_fixes.patch"
+
+ eapply_user
+
+ # Fix AC_CHECK_FUNCS.
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+ sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+ else
+ eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
+ eapply "${FILESDIR}/${PN}-3.31.1-nonfull_archive-architectures.patch"
+ eapply "${FILESDIR}/${PN}-3.31.1-nonfull_archive-security_fixes.patch"
+
+ eapply_user
+
+ # Fix AC_CHECK_FUNCS.
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+ sed \
+ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+ -i configure.ac || die "sed failed"
+ fi
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+ local options=()
+
+ options+=(
+ --enable-$(full_archive && echo load-extension || echo dynamic-extensions)
+ --enable-threadsafe
+ )
+ if ! full_archive; then
+ options+=(--disable-static-shell)
+ fi
+
+ # Support detection of misuse of SQLite API.
+ # https://sqlite.org/compile.html#enable_api_armor
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+ # Support column metadata functions.
+ # https://sqlite.org/c3ref/column_database_name.html
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+ # Support sqlite_dbpage virtual table.
+ # https://sqlite.org/compile.html#enable_dbpage_vtab
+ append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+ # Support dbstat virtual table.
+ # https://sqlite.org/dbstat.html
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+ # Support sqlite3_serialize() and sqlite3_deserialize() functions.
+ # https://sqlite.org/compile.html#enable_deserialize
+ # https://sqlite.org/c3ref/serialize.html
+ # https://sqlite.org/c3ref/deserialize.html
+ append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+ # Support comments in output of EXPLAIN.
+ # https://sqlite.org/compile.html#enable_explain_comments
+ append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+ # Support Full-Text Search versions 3, 4 and 5.
+ # https://sqlite.org/fts3.html
+ # https://sqlite.org/fts5.html
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+ options+=(--enable-fts5)
+
+ # Support hidden columns.
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+ # Support JSON1 extension.
+ # https://sqlite.org/json1.html
+ append-cppflags -DSQLITE_ENABLE_JSON1
+
+ # Support memsys5 memory allocator.
+ # https://sqlite.org/malloc.html#memsys5
+ append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+ # Support sqlite3_normalized_sql() function.
+ # https://sqlite.org/c3ref/expanded_sql.html
+ append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+ # Support sqlite_offset() function.
+ # https://sqlite.org/lang_corefunc.html#sqlite_offset
+ append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+ # Support pre-update hook functions.
+ # https://sqlite.org/c3ref/preupdate_count.html
+ append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+ # Support Resumable Bulk Update extension.
+ # https://sqlite.org/rbu.html
+ append-cppflags -DSQLITE_ENABLE_RBU
+
+ # Support R*Trees.
+ # https://sqlite.org/rtree.html
+ # https://sqlite.org/geopoly.html
+ append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+ # Support scan status functions.
+ # https://sqlite.org/c3ref/stmt_scanstatus.html
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+ # Support sqlite_stmt virtual table.
+ # https://sqlite.org/stmt.html
+ append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+ # Support Session extension.
+ # https://sqlite.org/sessionintro.html
+ options+=(--enable-session)
+
+ # Support unknown() function.
+ # https://sqlite.org/compile.html#enable_unknown_sql_function
+ append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+ # Support unlock notification.
+ # https://sqlite.org/unlock_notify.html
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+ # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+ # https://sqlite.org/compile.html#enable_update_delete_limit
+ append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+ # Support soundex() function.
+ # https://sqlite.org/lang_corefunc.html#soundex
+ append-cppflags -DSQLITE_SOUNDEX
+
+ # Support URI filenames.
+ # https://sqlite.org/uri.html
+ append-cppflags -DSQLITE_USE_URI
+
+ # debug USE flag.
+ if full_archive; then
+ options+=($(use_enable debug))
+ else
+ if use debug; then
+ append-cppflags -DSQLITE_DEBUG
+ else
+ append-cppflags -DNDEBUG
+ fi
+ fi
+
+ # icu USE flag.
+ if use icu; then
+ # Support ICU extension.
+ # https://sqlite.org/compile.html#enable_icu
+ append-cppflags -DSQLITE_ENABLE_ICU
+ if full_archive; then
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ else
+ sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ fi
+ fi
+
+ # readline USE flag.
+ options+=(
+ --disable-editline
+ $(use_enable readline)
+ )
+ if full_archive && use readline; then
+ options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+ fi
+
+ # secure-delete USE flag.
+ if use secure-delete; then
+ # Enable secure_delete pragma by default.
+ # https://sqlite.org/pragma.html#pragma_secure_delete
+ append-cppflags -DSQLITE_SECURE_DELETE
+ fi
+
+ # static-libs USE flag.
+ options+=($(use_enable static-libs static))
+
+ # tcl, test, tools USE flags.
+ if full_archive; then
+ options+=(--enable-tcl)
+ fi
+
+ if [[ "${CHOST}" == *-mint* ]]; then
+ append-cppflags -DSQLITE_OMIT_WAL
+ fi
+
+ if [[ "${ABI}" == "x86" ]]; then
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+ append-cflags -mfpmath=sse
+ else
+ append-cflags -ffloat-store
+ fi
+ fi
+
+ econf "${options[@]}"
+}
+
+multilib_src_compile() {
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+ if use tools && multilib_is_native_abi; then
+ emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+ fi
+}
+
+multilib_src_test() {
+ if [[ "${EUID}" -eq 0 ]]; then
+ ewarn "Skipping tests due to root permissions"
+ return
+ fi
+
+ local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+ if use tools && multilib_is_native_abi; then
+ install_tool() {
+ if [[ -f ".libs/${1}" ]]; then
+ newbin ".libs/${1}" "${2}"
+ else
+ newbin "${1}" "${2}"
+ fi
+ }
+
+ install_tool changeset sqlite3-changeset
+ install_tool dbdump sqlite3-db-dump
+ install_tool dbhash sqlite3-db-hash
+ install_tool dbtotxt sqlite3-db-to-txt
+ install_tool index_usage sqlite3-index-usage
+ install_tool rbu sqlite3-rbu
+ install_tool scrub sqlite3-scrub
+ install_tool showdb sqlite3-show-db
+ install_tool showjournal sqlite3-show-journal
+ install_tool showshm sqlite3-show-shm
+ install_tool showstat4 sqlite3-show-stat4
+ install_tool showwal sqlite3-show-wal
+ install_tool sqldiff sqlite3-diff
+ install_tool sqlite3_analyzer sqlite3-analyzer
+ install_tool sqlite3_checker sqlite3-checker
+ install_tool sqlite3_expert sqlite3-expert
+ install_tool sqltclsh sqlite3-tclsh
+
+ unset -f install_tool
+ fi
+}
+
+multilib_src_install_all() {
+ find "${D}" -name "*.la" -type f -delete || die
+
+ doman sqlite3.1
+
+ if use doc; then
+ rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} || die
+ (
+ docinto html
+ dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+ )
+ fi
+}
diff --git a/dev-db/tinycdb/Manifest b/dev-db/tinycdb/Manifest
index 873b0ae45285..130938bb92c4 100644
--- a/dev-db/tinycdb/Manifest
+++ b/dev-db/tinycdb/Manifest
@@ -2,5 +2,5 @@ AUX tinycdb-gentoo.patch 711 BLAKE2B a1f6a43fb9903784d3cc4dfdbd2b3d1b5b5532801b6
AUX tinycdb-uclibc.patch 328 BLAKE2B 20dacb9fc08d7e02c0b138c445d91ecbdcb1993d4b6709081bd4f8c81ce92ba5124c8e6dc8e59644bce8823d0fd0a16e3f7ae543d3dc9c093768114f55ec23a6 SHA512 b58656fbcdcd21d46ace85ba50fcbc9a85b3c0d02fe3c7ba048276e6a22e2d8a91dce6fe5f853a3516071e33fc9513216148b0e92ebe13b75b201881e73f127f
AUX tinycdb-umask.patch 215 BLAKE2B b64bd33a9a47c6a1d2ba0ea0354a79f608d8990b66033ec711790fd93f90471a722d7f0f7a00db7c968fdd644d7d68462690c93f85d911972724e27500ae3d79 SHA512 57eae9200d7ea13ae5d761f0c4575b0d438f24f696bd0c2d29c720f27a706bf5dba94f34fb0c93213ee5c6dbd12af449e2fbcc11ec1872e8ecc4a9a66c9d0905
DIST tinycdb_0.77.tar.gz 37728 BLAKE2B bebcc6128b253fa9e64438ed2671488153d70cf452bd0686a90ebd5360b725ab784b4537b25fe2ea9de0281cb1bb2fa29beb5f3515aed90fd7e2965f7e5e38bd SHA512 cfc830578a9be49781a1dbade97b64ec13293853093719aeb9a403c128245f157fd1d2d7e6941966bdea00b472127f10f11672583ba06ccc6e49151b22bf4c9a
-EBUILD tinycdb-0.77-r2.ebuild 1074 BLAKE2B fb6c8f0ef3deb516c976ef9f35d97dfcbd6a1567312d6b17a7a25db15ebab5236913b7735e11752f6e4ba3451d695666380cd3a898cb8ea1136c6a5cffc76d47 SHA512 d00b4eb0a1b5b6a881639b0a53b0a34a770a8a366418ad996f9943b52217869010e8c1f2df74201ad2dd45abe16bca9ddc4a091aacbbc36ef99a53fc63ed4dfe
+EBUILD tinycdb-0.77-r2.ebuild 1075 BLAKE2B c766e55311606357e16143f19b3921ca4d7ebad29500910b53b19f7ab33bdd4cf869f29e004399dd007e5485fd0573e9f142b2bfd78aea33e8225ef0a42398b3 SHA512 782ce72b7b27feaa4b0ebe098233b43f8507c2c56156c989ea150bde5f8d039bbf1aa0233f1c79c326e9a653c79a2b3f200df7219bab28080cb8d96dc0571553
MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
index 2e942b3bbef4..0a67604c842e 100644
--- a/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.77-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.corpit.ru/mjt/${PN}/${P/-/_}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc x86"
+KEYWORDS="amd64 ~arm64 hppa ~ia64 ~mips ppc x86"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 27c53a2d5e70..830b9073d73e 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,3 @@
-AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0591786800e14f22d7fb4c7ef5005e0630b95453a319d9254bf3f5e423e74ae36c6a7bd097f3193869757b2bea34f8974e358 SHA512 a4d5dfafe75ea0e85feed76cf18474a89fcf6719ee58d0b56d57959526db2511df2df691bf9af2e1a34c716d2d90f6d274b48a11cfb7add74df799d1f1f67387
-DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
-EBUILD unixODBC-2.3.5-r1.ebuild 1797 BLAKE2B 2fe6813cbc5430bf3c76e917437ca7c60a21eeb172a594cba9b58c007dbabf2ae8266659d5dee6ed75db0b32a0e38926d0f8d29bfe21e346fdf598f68e242495 SHA512 124d96f591fbf86bfa8d6e7c3097ca164ebd026cc4535dabc80319e6238b53adf7ab284bb6e3eb71b20cc0639dee589a05ddc3f2f1a138c5f09a65f6053e77a9
-EBUILD unixODBC-2.3.7.ebuild 1756 BLAKE2B 607e1144f67df15513540fcdaf13f3e56c7d8c683bd31ac33339610b4987d03b1f6c41cac5f41e8a2c66227715d046e5e16b75b22626c4cd35d805b253957936 SHA512 043f0dce97a1078f023ffc9789d7c01f392421739fd1d16ecb62f469964dfeca93716a4c6328b63d8884c727a9c460fd79f393bb8f67af05f4020afbb0a701be
+EBUILD unixODBC-2.3.7.ebuild 1752 BLAKE2B e82a6a3037cdf7568aafa03e5d8c1792af8ea94213b7658eb23e5680ffeb79e5ba834ec7a928a535727625a736c3826203013fcd90f0e1a2db65193bab95311b SHA512 ca30504d325086e1d8093cac9f44163cb2c77a17a85e4e3d0365566d0646f457fd02f8836217f23d1dc7b3fe3e52c31d84c3f2d65e16da073c589bd6e6cd9072
MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch b/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch
deleted file mode 100644
index 2c4178cda48f..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.3.5-CVE-2018-7485.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 45ef78e037f578b15fc58938a3a3251655e71d6f Mon Sep 17 00:00:00 2001
-From: Nick Gorham <nick@lurcher.ink.org>
-Date: Mon, 8 Jan 2018 11:12:39 +0000
-Subject: [PATCH] New Pre Source
-
-diff --git a/DriverManager/SQLGetDiagRecW.c b/DriverManager/SQLGetDiagRecW.c
-index a6368d7..be89120 100644
---- a/DriverManager/SQLGetDiagRecW.c
-+++ b/DriverManager/SQLGetDiagRecW.c
-@@ -98,6 +98,8 @@
-
- static char const rcsid[]= "$RCSfile: SQLGetDiagRecW.c,v $";
-
-+extern int __is_env( EHEAD * head ); /* in SQLGetDiagRec.c */
-+
- static SQLRETURN extract_sql_error_rec_w( EHEAD *head,
- SQLWCHAR *sqlstate,
- SQLINTEGER rec_number,
-diff --git a/DriverManager/SQLSetDescField.c b/DriverManager/SQLSetDescField.c
-index 333d786..0e2f67c 100644
---- a/DriverManager/SQLSetDescField.c
-+++ b/DriverManager/SQLSetDescField.c
-@@ -306,7 +306,7 @@ SQLRETURN SQLSetDescField( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_COUNT && (SQLINTEGER)value < 0 )
-+ if ( field_identifier == SQL_DESC_COUNT && (intptr_t)value < 0 )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_07009, NULL,
-@@ -315,9 +315,9 @@ SQLRETURN SQLSetDescField( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_PARAMETER_TYPE && value != SQL_PARAM_INPUT
-- && value != SQL_PARAM_OUTPUT && value != SQL_PARAM_INPUT_OUTPUT &&
-- value != SQL_PARAM_INPUT_OUTPUT_STREAM && value != SQL_PARAM_OUTPUT_STREAM )
-+ if ( field_identifier == SQL_DESC_PARAMETER_TYPE && (intptr_t)value != SQL_PARAM_INPUT
-+ && (intptr_t)value != SQL_PARAM_OUTPUT && (intptr_t)value != SQL_PARAM_INPUT_OUTPUT &&
-+ (intptr_t)value != SQL_PARAM_INPUT_OUTPUT_STREAM && (intptr_t)value != SQL_PARAM_OUTPUT_STREAM )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_HY105, NULL,
-diff --git a/DriverManager/SQLSetDescFieldW.c b/DriverManager/SQLSetDescFieldW.c
-index 5e066ac..45125ff 100644
---- a/DriverManager/SQLSetDescFieldW.c
-+++ b/DriverManager/SQLSetDescFieldW.c
-@@ -288,7 +288,7 @@ SQLRETURN SQLSetDescFieldW( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_COUNT && (SQLINTEGER)value < 0 )
-+ if ( field_identifier == SQL_DESC_COUNT && (intptr_t)value < 0 )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_07009, NULL,
-@@ -297,9 +297,9 @@ SQLRETURN SQLSetDescFieldW( SQLHDESC descriptor_handle,
- return function_return_nodrv( SQL_HANDLE_DESC, descriptor, SQL_ERROR );
- }
-
-- if ( field_identifier == SQL_DESC_PARAMETER_TYPE && value != SQL_PARAM_INPUT
-- && value != SQL_PARAM_OUTPUT && value != SQL_PARAM_INPUT_OUTPUT &&
-- value != SQL_PARAM_INPUT_OUTPUT_STREAM && value != SQL_PARAM_OUTPUT_STREAM )
-+ if ( field_identifier == SQL_DESC_PARAMETER_TYPE && (intptr_t)value != SQL_PARAM_INPUT
-+ && (intptr_t)value != SQL_PARAM_OUTPUT && (intptr_t)value != SQL_PARAM_INPUT_OUTPUT &&
-+ (intptr_t)value != SQL_PARAM_INPUT_OUTPUT_STREAM && (intptr_t)value != SQL_PARAM_OUTPUT_STREAM )
- {
- __post_internal_error( &descriptor -> error,
- ERROR_HY105, NULL,
-diff --git a/exe/iusql.c b/exe/iusql.c
-index aac5329..484a889 100644
---- a/exe/iusql.c
-+++ b/exe/iusql.c
-@@ -413,7 +413,6 @@ static int ExecuteSQL( SQLHDBC hDbc, char *szSQL, char cDelimiter, int bColumnNa
- if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
- fprintf( stderr, "[ISQL]ERROR: Could not SQLExecDirect\n" );
- SQLFreeStmt( hStmt, SQL_DROP );
-- free(szSepLine);
- return 0;
- }
- }
-diff --git a/odbcinst/SQLCreateDataSource.c b/odbcinst/SQLCreateDataSource.c
-index a9fa735..83a1e9e 100644
---- a/odbcinst/SQLCreateDataSource.c
-+++ b/odbcinst/SQLCreateDataSource.c
-@@ -26,7 +26,7 @@ char* _multi_string_alloc_and_copy( LPCWSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 || in[ len + 1 ] != 0 )
-@@ -55,7 +55,7 @@ char* _single_string_alloc_and_copy( LPCWSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 )
-@@ -83,7 +83,7 @@ SQLWCHAR* _multi_string_alloc_and_expand( LPCSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 || in[ len + 1 ] != 0 )
-@@ -112,7 +112,7 @@ SQLWCHAR* _single_string_alloc_and_expand( LPCSTR in )
-
- if ( !in )
- {
-- return in;
-+ return NULL;
- }
-
- while ( in[ len ] != 0 )
-diff --git a/odbcinst/SQLWriteFileDSN.c b/odbcinst/SQLWriteFileDSN.c
-index c2f987b..e225796 100644
---- a/odbcinst/SQLWriteFileDSN.c
-+++ b/odbcinst/SQLWriteFileDSN.c
-@@ -21,7 +21,7 @@ BOOL SQLWriteFileDSN( LPCSTR pszFileName,
-
- if ( pszFileName[0] == '/' )
- {
-- strncpy( szFileName, sizeof(szFileName) - 5, pszFileName );
-+ strncpy( szFileName, pszFileName, sizeof(szFileName) - 5 );
- }
- else
- {
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
deleted file mode 100644
index 3686943d6ce1..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
- || (
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
- )
- >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
- >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.5-CVE-2018-7485.patch"
-)
-
-multilib_src_configure() {
- # --enable-driver-conf is --enable-driverc as per configure.in
- myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc/${PN}
- --disable-static
- --enable-iconv
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable !minimal drivers)
- $(use_enable !minimal driverc)
- $(use_with unicode iconv-char-enc UTF8)
- $(use_with unicode iconv-ucode-enc UTF16LE)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use odbcmanual ; then
- # We could simply run "make install-html" if we'd not had
- # out-of-source builds here.
- docinto html
- dodoc -r doc/.
- find "${ED%/}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
- fi
-
- use prefix && dodoc README*
- prune_libtool_files
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
index 5a39d6440f66..9be7c7f26a22 100644
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
RDEPEND="