summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
commit6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree25413d1cb3a0cbfe36029db32398c0f333609215 /dev-db
parent9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
gentoo resync : 14.12.2020
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin17112 -> 17114 bytes
-rw-r--r--dev-db/mongodb/Manifest6
-rw-r--r--dev-db/mongodb/mongodb-4.2.11.ebuild175
-rw-r--r--dev-db/mongodb/mongodb-4.4.1.ebuild2
-rw-r--r--dev-db/mongodb/mongodb-4.4.2.ebuild176
-rw-r--r--dev-db/mycli/Manifest5
-rw-r--r--dev-db/mycli/files/mycli-1.22.2_p20201026.patch470
-rw-r--r--dev-db/mycli/mycli-1.22.2_p20201026.ebuild53
-rw-r--r--dev-db/mycli/mycli-9999.ebuild30
-rw-r--r--dev-db/mysql-connector-c++/Manifest2
-rw-r--r--dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild2
-rw-r--r--dev-db/mysql/Manifest2
-rw-r--r--dev-db/mysql/mysql-8.0.22.ebuild2
-rw-r--r--dev-db/mytop/Manifest2
-rw-r--r--dev-db/mytop/mytop-1.9.1.ebuild4
-rw-r--r--dev-db/pg_top/Manifest3
-rw-r--r--dev-db/pg_top/pg_top-4.0.0-r1.ebuild25
-rw-r--r--dev-db/pg_top/pg_top-4.0.0.ebuild2
-rw-r--r--dev-db/pgadmin4/Manifest2
-rw-r--r--dev-db/pgadmin4/pgadmin4-4.26.ebuild2
-rw-r--r--dev-db/pgagent/Manifest2
-rw-r--r--dev-db/pgagent/pgagent-4.0.0-r1.ebuild2
-rw-r--r--dev-db/pgbadger/Manifest2
-rw-r--r--dev-db/pgbadger/pgbadger-11.4.ebuild24
-rw-r--r--dev-db/pgcli/Manifest2
-rw-r--r--dev-db/pgcli/pgcli-3.0.0.ebuild2
-rw-r--r--dev-db/pgtap/Manifest2
-rw-r--r--dev-db/pgtap/pgtap-1.1.0.ebuild31
-rw-r--r--dev-db/pgxnclient/Manifest2
-rw-r--r--dev-db/pgxnclient/pgxnclient-1.3.1.ebuild39
-rw-r--r--dev-db/plr/Manifest2
-rw-r--r--dev-db/plr/metadata.xml25
-rw-r--r--dev-db/postgresql/Manifest2
-rw-r--r--dev-db/postgresql/postgresql-9999.ebuild2
-rw-r--r--dev-db/psqlodbc/Manifest4
-rw-r--r--dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild (renamed from dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild)11
-rw-r--r--dev-db/qdbm/Manifest3
-rw-r--r--dev-db/qdbm/files/qdbm-1.8.78-darwin.patch28
-rw-r--r--dev-db/qdbm/qdbm-1.8.78-r2.ebuild42
-rw-r--r--dev-db/slony1/Manifest3
-rw-r--r--dev-db/slony1/slony1-2.2.9.ebuild74
41 files changed, 1194 insertions, 75 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 15c2da70eb8b..213ad946c0cf 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b93fd15516dd..77b083204e6f 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -21,13 +21,17 @@ DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb45742
DIST mongodb-src-r4.0.19.tar.gz 50126414 BLAKE2B 2691e2a9c8833ff9a086b28fd137bc8e8f10d58570117657c7cc01edbf61568ae62f58440d72e8711de98b9fc6868c1095b4ee88eb7b0eb63ea45ce19e842edd SHA512 57032a009ea7e79de4cac496a2d1266b83b99cc45eb9f1169be2fcdca1ed2003a659ceedf9eafbd4aa7fc5b3b0513066a5d712af7666cee5a897b2a2d7dd30cb
DIST mongodb-src-r4.0.20.tar.gz 50160192 BLAKE2B 3395399791b0620d3852b5d0a2ab2419f08127d909fac52035dd2624eb22660069401e71b036f449d8fd46be03b9e48ee548fb0c327b67c1eecc72a6ee9045b8 SHA512 dc18216d9096520b309ff769898fb65cf26f765eb74e5e0517617bdb0732c456620bbce351be5ad9f89bc72fea0b6d3afe13bd4cffe2c2b4ea06c9cb2b3b1696
DIST mongodb-src-r4.2.10.tar.gz 61800545 BLAKE2B 773f3da589107d932808c30ee3bd09ec006b1c570884fbe6929ea4767581e951fd32b1771e9adf1e392ef97bd4c0e2b4ce5ce30c8bbbfbd63aa36b6ebaa8cbe4 SHA512 3947b2880bc0aaa958f26dfddfe79c7878f389eeeb8d0783360667124d3b253928ef746433c260bf395a219d650a6907bbf712ef61da6137ab85e4e1ba38fcbd
+DIST mongodb-src-r4.2.11.tar.gz 61829417 BLAKE2B cc989d6ea87a48b7402d119dda4678a966cf96cec0da5d00d792faf06ecb6fbe4bc426069e1a72548410adcbd26162038ec7201e76036ac599af5f53029c0e66 SHA512 ff398a9d3a012e0eb860c2139967e163b8b0ac045c1c47f2c0c5584ba7c60a1403bb423ce8c6e8b3900fdcad1164a84c6da79276f897fd640366e3f80cf54316
DIST mongodb-src-r4.2.8.tar.gz 61730247 BLAKE2B f1d98b8ac8f62c0c7aff100ef663bb20345de0e77e0ff420817db0843fe735b58af8075578a7f8d83cc9dc4e597c95ae09f89ce7a21cf8146ff15bcb11eba924 SHA512 163fce480762bd377d6c78b661bfe51fc883223a5309a68f9556e1bafb99e26e476d81dbe6de825d90469e835442be097be630ca9678e54b9d09091e0b5d67c4
DIST mongodb-src-r4.4.1.tar.gz 49644743 BLAKE2B 7d84998c69b9b55164ebab04b49c38a4113a0f58d431612389ec37eb044fba1adf9284e9d4454bd40bb7a071fd042308a5cd350129d6d52480412cf6b868ec2b SHA512 16aa66995ea8cfe0cc47b96c1c5643a28ab47fc9f27bd93404cf572944ab30492df7c9255553f918b353cd7157a6ccde9ac6f58bfba322fb52c2d7409c6fb9b0
+DIST mongodb-src-r4.4.2.tar.gz 49816559 BLAKE2B 0e51302e7e414de9fef74872e44c8de1f5682cb3cac0aa7a02e3c1ee3084669ea647d1e574e8a76a3b6b2f34aa4ef693c8d1f3fa025ec3072eff7b7c408b94e5 SHA512 bbf59ed97a8718576c469c696d5331c122f63528dad950fd415b00269c2fa5e6949b372c575e2504c2a58b145bae485172b25000000481662e6543bc3127252a
EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
EBUILD mongodb-4.0.19.ebuild 4592 BLAKE2B 7e2feeb4abdfdd2eebe27265665576ea7c899cdb06bf5d5a70e8ac54a227815a93e79d5a58538effd1732b3e8e9e08d9ed38d7a3e6a463c4c21c5f3850ccd77d SHA512 f37ef841a74cb6b9b9f7adf6879977352d94be11e583b8ff475e3610f4c016203ffcad06ce45808734e93a1fff4aee067b29a9e828961abeca59e15e0396604a
EBUILD mongodb-4.0.20.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
EBUILD mongodb-4.2.10.ebuild 4787 BLAKE2B cf0502f0cea2c86387b3ba176a1178f58f5e7c0afd6e804c29ece21b4bcb043456612b2739b7e1faa063a5c850dda9c72705ac55728c3449a8796e5a39f4ea5f SHA512 493750ca11273d0ac744086425fa759059ba45c5580818527f2f669ae4d5f6336b763169553f19ea32f7c6c9f7e611be36e4f3cae5d8d27bf12ea89838760790
+EBUILD mongodb-4.2.11.ebuild 4788 BLAKE2B 3f349ec20ebe7c493f8c35f9b6849acc3e1880da17623a71f94bda1860f0d1003e7a9afdf607691ec0c50426fefcd7552d086efde527100e807dad22809be4d2 SHA512 b494549fb51885fcf077b30024ed9da1efb16cd1172be4a0b52337c7e012e089d03191e67c9f50e4413c0728d9cac5e8bf872bc03c769445775bbcda42522acc
EBUILD mongodb-4.2.8.ebuild 4785 BLAKE2B 882ce4365612621348c851383ea19a20db880a11c4b7eb38ac3e7e4508a231d3c4bfca90615425eb9801cee85885c2cccfa61aeef1c26b5f22c4971cc8f31c5c SHA512 3c3fa9e7698f8853f9310bab8890e8e30c1bbc095eb2ede1f6196accaaf770cf1bec94b1bfaf019fdf727f9f1243f0dc2dfcaacbfd651187e852d4aa171e04ce
-EBUILD mongodb-4.4.1.ebuild 4874 BLAKE2B 1a2f557b5515a9a3c8f858c60f32de615a4fdc6163a0994a16aef5fa936a66937cb753d6b0a80f68478d8e573fc65944eaf111bb27d3611d255f7b0449430ee0 SHA512 da771a1b349f030ef86fd9cb7fd338eedb6a7daae4346ba4b7e38a4cf476207e4b0cecc3b2cdc0534830861c594b6db75fd8ee904bb084aa4f573c779c459c98
+EBUILD mongodb-4.4.1.ebuild 4873 BLAKE2B 238cd0ded14cccbb88e5b0fd9c9ae391bd3c0a17c8aa7f8bfd12f3916a725c576df7cfb4849c0735301d13cb895f86858e5e72b9d7d3805dbc257bdcd7e4b89a SHA512 190549c03ad957d79dbfdaf96be0f9c2b2abeb86159750a4f771345774dbb08037481d0145cf517ecb56ce8051cd7229ae15a94e8a54ce478ce98644e206246c
+EBUILD mongodb-4.4.2.ebuild 4828 BLAKE2B 269b1275bfc3bf57ef3dd3036a5cdcf0c8b51327e26e366450d9cd0172bd7b0dca94714fed4c48332b7c55aff1c0f2aa8d42ffed0d5a6978902cce435a333398 SHA512 e6b8c5b1eb5b075906f062b8c89e0884028ea839721944ce8ec30d7cddd4b511342645035e185407e1f3f8bef052fcbd1e8312eba30d5eb91300abf7de81b3ed
MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-4.2.11.ebuild b/dev-db/mongodb/mongodb-4.2.11.ebuild
new file mode 100644
index 000000000000..981a003b2a26
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.11.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+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 ~arm64"
+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-python/requests[${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}]
+ ')
+ 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.2.10-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${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}]"
+}
+
+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() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+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.4.1.ebuild b/dev-db/mongodb/mongodb-4.4.1.ebuild
index de14d8bf32c7..19f0e9216dd1 100644
--- a/dev-db/mongodb/mongodb-4.4.1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0 SSPL-1"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
IUSE="debug kerberos libressl lto ssl test +tools"
RESTRICT="!test? ( test )"
diff --git a/dev-db/mongodb/mongodb-4.4.2.ebuild b/dev-db/mongodb/mongodb-4.4.2.ebuild
new file mode 100644
index 000000000000..d10d21e79f9e
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.4.2.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..9} )
+
+SCONS_MIN_VERSION="3.3.1"
+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 ~arm64"
+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(+),nls]
+ >=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-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.4.1-no-compass.patch"
+ "${FILESDIR}/${PN}-4.4.1-boost.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${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}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
+ ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.2-series. Then upgrade to 4.4 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+ fi
+ fi
+}
+
+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-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() {
+ PREFIX="${ED}"/usr escons "${scons_opts[@]}" --nostrip install-core
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ ewarn "Tests may hang with FEATURES=usersandbox"
+ "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ dobin build/install/bin/{mongo,mongod,mongos}
+
+ 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/mycli/Manifest b/dev-db/mycli/Manifest
index 40c01344cd89..42a538341038 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,7 +1,10 @@
AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
+AUX mycli-1.22.2_p20201026.patch 17058 BLAKE2B b9e436fab98be62fae2b4ff549914d9431520a179af946db8a48255d1f7c2e36f90b91d4adc698c7b84095d00483f14a22f5e0c99ab022a1ad6364601482db63 SHA512 0e7b5cd9e687056514447e50df1310090d04f50666455c87ae32cf2ffb2935e923d93a8343d44adb2393d696238cdda5f215535267dca45e9861a8d86a0a21c3
DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d
DIST mycli-1.21.1.tar.gz 267646 BLAKE2B e0678974949ae219236b89fbe9ebdacfee9c1efc8f92853c937150dbb841680664432e9f5c79181545df8b3321480cf784e45a83139351cc93256d26dcdd66f0 SHA512 beb3888ff8abc2a79e591516d7f0f76d0c18f186bd0dca3b4aadcf93b3045de53ac7f135553ad509273c85ea364e81df5dcadf9eacf1dbef8ceff7345aa5ed6d
+DIST mycli-1.22.2_p20201026.tar.gz 269338 BLAKE2B 42f4349e65a43829691fd7fa0fa1a57968cf34ffba04156ae221d7a2713179826fc09903e45b6f05fbf05688f956a9cd95e87393179992378766b3a3a6ef9c6e SHA512 70d68d7517322b28783c324d463664c2794ba26cc78e0eee056891ce43dbce57c4dd9c13982ac2976af07ff1fa3d4552cb22bf42b9c7885c93483ba86b873636
EBUILD mycli-1.20.1.ebuild 1285 BLAKE2B fea26ada4e62c0d97237d8e28076d7ce4ccd818e6e3c38b32c6f4b36c35b0e4bebda5d53972120306a6f14d8d30aec13f4ecc4967b2871a154014a7621a2e034 SHA512 a85982ab2b7751ed4e2fe180920fb3edf8118cbabe37b255e689b6e40c9350d5674109c4d6dc4447b7e7cc295fc8c2e51e05d336464fcb3b8b48801964837b11
EBUILD mycli-1.21.1-r1.ebuild 1579 BLAKE2B 374463b3c1671a25868ef4cf0e58496e0c15912088b225518eb8d36cb009b12245dcab81e7c9e92a6fd1a924eee6e979a4999f3169ec73aeb918d64a393e732a SHA512 e1ed0950ee2bd525623c59e8a4b2e7abc96baec3ce0bf400ee8dd26075da2b622ba6f628ecbc4e649abbe54af588477312feba6b2beed7521ca8c37feee2fb2b
-EBUILD mycli-9999.ebuild 1560 BLAKE2B 624da8139f363002c3ffd6f045a349cec30a7e3d8917bf4b2a482969eaf8b594da7996f7f164ac1883ce44819e67733fc9ac6e91e8f3a3c8a95a28caa879fcfc SHA512 84f246aba80728a62e11267ea415c00e898a3ac1041eaa8508f05672f029157cf459e2199a25ce104aa8cbbd16e1f36560046e3381f42a2e89f1166b15f3dfcd
+EBUILD mycli-1.22.2_p20201026.ebuild 1663 BLAKE2B 3d543f3b947bcff069a5ff4153610ee03cd8fe6eb8a8d23276151e957a22a0f8bb6c5390ade1069d6a26fc45d753e4b24d29547b0c51768b9f7859c2bee8cee5 SHA512 a785dd24754d587311eb130579ebd7be908ba39ed75f7a9f95a6f35a66cff9b20842c7739a413ae83aee6661813abad63cf1e923a3602bbe649cc22a1d9b9f68
+EBUILD mycli-9999.ebuild 1545 BLAKE2B 2893ca77c6badba2f7654a87af386a01e40609ca3c8e927b1b38dfbb6652f8b64a96f018f53c339c767fccc5672c6ba9f5fbe4205a3693c84cbec4bcbcc3e3fa SHA512 4217c8e9723544d5d423ffb065803e941b88dd0976714cd19de26c3d8a18b6ab8a27177e26664f3262c94d2fc16738b2b603469adac17084a666f5a3333111ba
MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/files/mycli-1.22.2_p20201026.patch b/dev-db/mycli/files/mycli-1.22.2_p20201026.patch
new file mode 100644
index 000000000000..3e7c719bf396
--- /dev/null
+++ b/dev-db/mycli/files/mycli-1.22.2_p20201026.patch
@@ -0,0 +1,470 @@
+diff --git a/.travis.yml b/.travis.yml
+index 0afb5cc..182dea7 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -12,7 +12,7 @@ matrix:
+
+ install:
+ - pip install -r requirements-dev.txt
+- - pip install -e .
++ - pip install --no-cache-dir -e .
+ - sudo rm -f /etc/mysql/conf.d/performance-schema.cnf
+ - sudo service mysql restart
+
+diff --git a/README.md b/README.md
+index efe804d..d5a0687 100644
+--- a/README.md
++++ b/README.md
+@@ -96,6 +96,7 @@ $ sudo apt-get install mycli # Only on debian or ubuntu
+ --local-infile BOOLEAN Enable/disable LOAD DATA LOCAL INFILE.
+ --login-path TEXT Read this path from the login file.
+ -e, --execute TEXT Execute command and quit.
++ --init-command TEXT SQL statement to execute after connecting.
+ --help Show this message and exit.
+
+ Features
+diff --git a/changelog.md b/changelog.md
+index a4fea35..508c801 100644
+--- a/changelog.md
++++ b/changelog.md
+@@ -1,9 +1,22 @@
++TBD
++===
++
++Features:
++---------
++
++* Add an option `--init-command` to execute SQL after connecting (Thanks: [KITAGAWA Yasutaka]).
++
++Bug Fixes:
++----------
++* Fixed compatibility with sqlparse 0.4 (Thanks: [mtorromeo]).
++
+ 1.22.2
+ ======
+
+ Bug Fixes:
+ ----------
+-* Make the `pwd` module optional.
++
++* Make the `pwd` module optional.
+
+ 1.22.1
+ ======
+@@ -18,6 +31,11 @@ Features:
+ * Add an option `--list-ssh-config` to list ssh configurations.
+ * Add an option `--ssh-config-path` to choose ssh configuration path.
+
++Bug Fixes:
++----------
++
++* Fix specifying empty password with `--password=''` when config file has a password set (Thanks: [Zach DeCook]).
++
+
+ 1.21.1
+ ======
+@@ -28,6 +46,7 @@ Bug Fixes:
+
+ * Fix broken auto-completion for favorite queries (Thanks: [Amjith]).
+ * Fix undefined variable exception when running with --no-warn (Thanks: [Georgy Frolov])
++* Support setting color for null value (Thanks: [laixintao])
+
+ 1.21.0
+ ======
+@@ -768,3 +787,6 @@ Bug Fixes:
+ [François Pietka]: https://github.com/fpietka
+ [Frederic Aoustin]: https://github.com/fraoustin
+ [Georgy Frolov]: https://github.com/pasenor
++[Zach DeCook]: https://zachdecook.com
++[laixintao]: https://github.com/laixintao
++[mtorromeo]: https://github.com/mtorromeo
+diff --git a/mycli/AUTHORS b/mycli/AUTHORS
+index b3636d9..a1204b0 100644
+--- a/mycli/AUTHORS
++++ b/mycli/AUTHORS
+@@ -72,6 +72,10 @@ Contributors:
+ * Jakub Boukal
+ * Takeshi D. Itoh
+ * laixintao
++ * Zach DeCook
++ * kevinhwang91
++ * KITAGAWA Yasutaka
++ * Massimiliano Torromeo
+
+ Creator:
+ --------
+diff --git a/mycli/clistyle.py b/mycli/clistyle.py
+index c94f793..293f0f4 100644
+--- a/mycli/clistyle.py
++++ b/mycli/clistyle.py
+@@ -34,6 +34,7 @@ TOKEN_TO_PROMPT_STYLE = {
+ Token.Output.Header: 'output.header',
+ Token.Output.OddRow: 'output.odd-row',
+ Token.Output.EvenRow: 'output.even-row',
++ Token.Output.Null: 'output.null',
+ Token.Prompt: 'prompt',
+ Token.Continuation: 'continuation',
+ }
+diff --git a/mycli/main.py b/mycli/main.py
+index 03797a0..dffd724 100755
+--- a/mycli/main.py
++++ b/mycli/main.py
+@@ -98,7 +98,7 @@ class MyCli(object):
+ xdg_config_home = "~/.config"
+ system_config_files = [
+ '/etc/myclirc',
+- os.path.join(xdg_config_home, "mycli", "myclirc")
++ os.path.join(os.path.expanduser(xdg_config_home), "mycli", "myclirc")
+ ]
+
+ default_config_file = os.path.join(PACKAGE_ROOT, 'myclirc')
+@@ -152,7 +152,7 @@ class MyCli(object):
+ c['main'].as_bool('auto_vertical_output')
+
+ # Write user config if system config wasn't the last config loaded.
+- if c.filename not in self.system_config_files:
++ if c.filename not in self.system_config_files and not os.path.exists(myclirc):
+ write_default_config(self.default_config_file, myclirc)
+
+ # audit log
+@@ -363,7 +363,7 @@ class MyCli(object):
+ def connect(self, database='', user='', passwd='', host='', port='',
+ socket='', charset='', local_infile='', ssl='',
+ ssh_user='', ssh_host='', ssh_port='',
+- ssh_password='', ssh_key_filename=''):
++ ssh_password='', ssh_key_filename='', init_command=''):
+
+ cnf = {'database': None,
+ 'user': None,
+@@ -396,7 +396,7 @@ class MyCli(object):
+ port = port or cnf['port']
+ ssl = ssl or {}
+
+- passwd = passwd or cnf['password']
++ passwd = passwd if isinstance(passwd, str) else cnf['password']
+ charset = charset or cnf['default-character-set'] or 'utf8'
+
+ # Favor whichever local_infile option is set.
+@@ -420,7 +420,7 @@ class MyCli(object):
+ self.sqlexecute = SQLExecute(
+ database, user, passwd, host, port, socket, charset,
+ local_infile, ssl, ssh_user, ssh_host, ssh_port,
+- ssh_password, ssh_key_filename
++ ssh_password, ssh_key_filename, init_command
+ )
+ except OperationalError as e:
+ if ('Access denied for user' in e.args[1]):
+@@ -429,7 +429,7 @@ class MyCli(object):
+ self.sqlexecute = SQLExecute(
+ database, user, new_passwd, host, port, socket,
+ charset, local_infile, ssl, ssh_user, ssh_host,
+- ssh_port, ssh_password, ssh_key_filename
++ ssh_port, ssh_password, ssh_key_filename, init_command
+ )
+ else:
+ raise e
+@@ -1051,6 +1051,8 @@ class MyCli(object):
+ help='Read this path from the login file.')
+ @click.option('-e', '--execute', type=str,
+ help='Execute command and quit.')
++@click.option('--init-command', type=str,
++ help='SQL statement to execute after connecting.')
+ @click.argument('database', default='', nargs=1)
+ def cli(database, user, host, port, socket, password, dbname,
+ version, verbose, prompt, logfile, defaults_group_suffix,
+@@ -1058,7 +1060,8 @@ def cli(database, user, host, port, socket, password, dbname,
+ ssl_ca, ssl_capath, ssl_cert, ssl_key, ssl_cipher,
+ ssl_verify_server_cert, table, csv, warn, execute, myclirc, dsn,
+ list_dsn, ssh_user, ssh_host, ssh_port, ssh_password,
+- ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host):
++ ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host,
++ init_command):
+ """A MySQL terminal client with auto-completion and syntax highlighting.
+
+ \b
+@@ -1182,7 +1185,8 @@ def cli(database, user, host, port, socket, password, dbname,
+ ssh_host=ssh_host,
+ ssh_port=ssh_port,
+ ssh_password=ssh_password,
+- ssh_key_filename=ssh_key_filename
++ ssh_key_filename=ssh_key_filename,
++ init_command=init_command
+ )
+
+ mycli.logger.debug('Launch Params: \n'
+diff --git a/mycli/myclirc b/mycli/myclirc
+index 534b201..ba3ea1e 100644
+--- a/mycli/myclirc
++++ b/mycli/myclirc
+@@ -111,6 +111,7 @@ bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold'
+ output.header = "#00ff5f bold"
+ output.odd-row = ""
+ output.even-row = ""
++output.null = "#808080"
+
+ # Favorite queries.
+ [favorite_queries]
+diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
+index 2b19c32..3cff2cc 100644
+--- a/mycli/packages/completion_engine.py
++++ b/mycli/packages/completion_engine.py
+@@ -2,7 +2,6 @@ import os
+ import sys
+ import sqlparse
+ from sqlparse.sql import Comparison, Identifier, Where
+-from sqlparse.compat import text_type
+ from .parseutils import last_word, extract_tables, find_prev_keyword
+ from .special import parse_special_command
+
+@@ -55,7 +54,7 @@ def suggest_type(full_text, text_before_cursor):
+ stmt_start, stmt_end = 0, 0
+
+ for statement in parsed:
+- stmt_len = len(text_type(statement))
++ stmt_len = len(str(statement))
+ stmt_start, stmt_end = stmt_end, stmt_end + stmt_len
+
+ if stmt_end >= current_pos:
+diff --git a/mycli/sqlexecute.py b/mycli/sqlexecute.py
+index c68af0f..7534982 100644
+--- a/mycli/sqlexecute.py
++++ b/mycli/sqlexecute.py
+@@ -42,7 +42,7 @@ class SQLExecute(object):
+
+ def __init__(self, database, user, password, host, port, socket, charset,
+ local_infile, ssl, ssh_user, ssh_host, ssh_port, ssh_password,
+- ssh_key_filename):
++ ssh_key_filename, init_command=None):
+ self.dbname = database
+ self.user = user
+ self.password = password
+@@ -59,12 +59,13 @@ class SQLExecute(object):
+ self.ssh_port = ssh_port
+ self.ssh_password = ssh_password
+ self.ssh_key_filename = ssh_key_filename
++ self.init_command = init_command
+ self.connect()
+
+ def connect(self, database=None, user=None, password=None, host=None,
+ port=None, socket=None, charset=None, local_infile=None,
+ ssl=None, ssh_host=None, ssh_port=None, ssh_user=None,
+- ssh_password=None, ssh_key_filename=None):
++ ssh_password=None, ssh_key_filename=None, init_command=None):
+ db = (database or self.dbname)
+ user = (user or self.user)
+ password = (password or self.password)
+@@ -79,6 +80,7 @@ class SQLExecute(object):
+ ssh_port = (ssh_port or self.ssh_port)
+ ssh_password = (ssh_password or self.ssh_password)
+ ssh_key_filename = (ssh_key_filename or self.ssh_key_filename)
++ init_command = (init_command or self.init_command)
+ _logger.debug(
+ 'Connection DB Params: \n'
+ '\tdatabase: %r'
+@@ -93,9 +95,11 @@ class SQLExecute(object):
+ '\tssh_host: %r'
+ '\tssh_port: %r'
+ '\tssh_password: %r'
+- '\tssh_key_filename: %r',
++ '\tssh_key_filename: %r'
++ '\tinit_command: %r',
+ db, user, host, port, socket, charset, local_infile, ssl,
+- ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename
++ ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename,
++ init_command
+ )
+ conv = conversions.copy()
+ conv.update({
+@@ -110,12 +114,16 @@ class SQLExecute(object):
+ if ssh_host:
+ defer_connect = True
+
++ client_flag = pymysql.constants.CLIENT.INTERACTIVE
++ if init_command and len(list(special.split_queries(init_command))) > 1:
++ client_flag |= pymysql.constants.CLIENT.MULTI_STATEMENTS
++
+ conn = pymysql.connect(
+ database=db, user=user, password=password, host=host, port=port,
+ unix_socket=socket, use_unicode=True, charset=charset,
+- autocommit=True, client_flag=pymysql.constants.CLIENT.INTERACTIVE,
++ autocommit=True, client_flag=client_flag,
+ local_infile=local_infile, conv=conv, ssl=ssl, program_name="mycli",
+- defer_connect=defer_connect
++ defer_connect=defer_connect, init_command=init_command
+ )
+
+ if ssh_host:
+@@ -146,6 +154,7 @@ class SQLExecute(object):
+ self.socket = socket
+ self.charset = charset
+ self.ssl = ssl
++ self.init_command = init_command
+ # retrieve connection id
+ self.reset_connection_id()
+
+diff --git a/requirements-dev.txt b/requirements-dev.txt
+index 8e206a5..7a38ed5 100644
+--- a/requirements-dev.txt
++++ b/requirements-dev.txt
+@@ -3,8 +3,8 @@ pytest!=3.3.0
+ pytest-cov==2.4.0
+ tox
+ twine==1.12.1
+-behave
+-pexpect
++behave>=1.2.4
++pexpect==3.3
+ coverage==5.0.4
+ codecov==2.0.9
+ autopep8==1.3.3
+diff --git a/setup.py b/setup.py
+index 156cd1a..fbab22e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,7 @@ install_requirements = [
+ 'sqlparse>=0.3.0,<0.4.0',
+ 'configobj >= 5.0.5',
+ 'cryptography >= 1.0.0',
+- 'cli_helpers[styles] > 1.1.0',
++ 'cli_helpers[styles] >= 2.0.1',
+ ]
+
+
+@@ -65,7 +65,7 @@ class test(TestCommand):
+ def initialize_options(self):
+ TestCommand.initialize_options(self)
+ self.pytest_args = ''
+- self.behave_args = ''
++ self.behave_args = '--no-capture'
+
+ def run_tests(self):
+ unit_test_errno = subprocess.call(
+diff --git a/test/features/environment.py b/test/features/environment.py
+index 1a49dbe..cb35140 100644
+--- a/test/features/environment.py
++++ b/test/features/environment.py
+@@ -16,7 +16,7 @@ def before_all(context):
+ os.environ['LINES'] = "100"
+ os.environ['COLUMNS'] = "100"
+ os.environ['EDITOR'] = 'ex'
+- os.environ['LC_ALL'] = 'en_US.utf8'
++ os.environ['LC_ALL'] = 'en_US.UTF-8'
+ os.environ['PROMPT_TOOLKIT_NO_CPR'] = '1'
+
+ test_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+@@ -118,11 +118,12 @@ def after_scenario(context, _):
+ host = context.conf['host']
+ dbname = context.currentdb
+ context.cli.expect_exact(
+- '{0}@{1}:{2}> '.format(
++ '{0}@{1}:{2}>'.format(
+ user, host, dbname
+ ),
+ timeout=5
+ )
++ context.cli.sendcontrol('c')
+ context.cli.sendcontrol('d')
+ context.cli.expect_exact(pexpect.EOF, timeout=5)
+
+diff --git a/test/features/steps/crud_database.py b/test/features/steps/crud_database.py
+index a0bfa53..be6dec0 100644
+--- a/test/features/steps/crud_database.py
++++ b/test/features/steps/crud_database.py
+@@ -64,15 +64,13 @@ def step_see_prompt(context):
+ user = context.conf['user']
+ host = context.conf['host']
+ dbname = context.currentdb
+- wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
+- user, host, dbname), timeout=5)
+- context.atprompt = True
++ wrappers.wait_prompt(context, '{0}@{1}:{2}> '.format(user, host, dbname))
+
+
+ @then('we see help output')
+ def step_see_help(context):
+ for expected_line in context.fixture_data['help_commands.txt']:
+- wrappers.expect_exact(context, expected_line + '\r\n', timeout=1)
++ wrappers.expect_exact(context, expected_line, timeout=1)
+
+
+ @then('we see database created')
+@@ -96,10 +94,7 @@ def step_see_db_dropped_no_default(context):
+ context.currentdb = None
+
+ wrappers.expect_exact(context, 'Query OK, 0 rows affected', timeout=2)
+- wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
+- user, host, database), timeout=5)
+-
+- context.atprompt = True
++ wrappers.wait_prompt(context, '{0}@{1}:{2}>'.format(user, host, database))
+
+
+ @then('we see database connected')
+diff --git a/test/features/steps/wrappers.py b/test/features/steps/wrappers.py
+index 565ca59..de833dd 100644
+--- a/test/features/steps/wrappers.py
++++ b/test/features/steps/wrappers.py
+@@ -88,7 +88,7 @@ def wait_prompt(context, prompt=None):
+ user = context.conf['user']
+ host = context.conf['host']
+ dbname = context.currentdb
+- prompt = '{0}@{1}:{2}> '.format(
++ prompt = '{0}@{1}:{2}>'.format(
+ user, host, dbname),
+ expect_exact(context, prompt, timeout=5)
+ context.atprompt = True
+diff --git a/test/test_main.py b/test/test_main.py
+index 3f92bd1..707c359 100644
+--- a/test/test_main.py
++++ b/test/test_main.py
+@@ -492,3 +492,37 @@ def test_ssh_config(monkeypatch):
+ MockMyCli.connect_args["ssh_host"] == "arg_host" and \
+ MockMyCli.connect_args["ssh_port"] == 3 and \
+ MockMyCli.connect_args["ssh_key_filename"] == "/path/to/key"
++
++
++@dbtest
++def test_init_command_arg(executor):
++ init_command = "set sql_select_limit=1000"
++ sql = 'show variables like "sql_select_limit";'
++ runner = CliRunner()
++ result = runner.invoke(
++ cli, args=CLI_ARGS + ["--init-command", init_command], input=sql
++ )
++
++ expected = "sql_select_limit\t1000\n"
++ assert result.exit_code == 0
++ assert expected in result.output
++
++
++@dbtest
++def test_init_command_multiple_arg(executor):
++ init_command = 'set sql_select_limit=2000; set max_join_size=20000'
++ sql = (
++ 'show variables like "sql_select_limit";\n'
++ 'show variables like "max_join_size"'
++ )
++ runner = CliRunner()
++ result = runner.invoke(
++ cli, args=CLI_ARGS + ['--init-command', init_command], input=sql
++ )
++
++ expected_sql_select_limit = 'sql_select_limit\t2000\n'
++ expected_max_join_size = 'max_join_size\t20000\n'
++
++ assert result.exit_code == 0
++ assert expected_sql_select_limit in result.output
++ assert expected_max_join_size in result.output
+diff --git a/test/test_tabular_output.py b/test/test_tabular_output.py
+index 7d7d000..c20c7de 100644
+--- a/test/test_tabular_output.py
++++ b/test/test_tabular_output.py
+@@ -16,7 +16,7 @@ from pymysql.constants import FIELD_TYPE
+ @pytest.fixture
+ def mycli():
+ cli = MyCli()
+- cli.connect(None, USER, PASSWORD, HOST, PORT, None)
++ cli.connect(None, USER, PASSWORD, HOST, PORT, None, init_command=None)
+ return cli
+
+
diff --git a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
new file mode 100644
index 000000000000..45cb7e841de6
--- /dev/null
+++ b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+MY_PV=$(ver_cut 1-3)
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+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${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssh test"
+RESTRICT="!test? ( test )"
+RDEPEND="$(python_gen_cond_dep '
+ >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+ <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+ ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" "${FILESDIR}/mycli-1.22.2_p20201026.patch" )
+
+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 \
+ --ignore=mycli/packages/paramiko_stub/__init__.py
+}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 9fcacbc962c2..baad31d4a090 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
DISTUTILS_SINGLE_IMPL=yes
DISTUTILS_USE_SETUPTOOLS=rdepend
EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
@@ -19,24 +19,23 @@ KEYWORDS=""
IUSE="ssh test"
RESTRICT="!test? ( test )"
RDEPEND="$(python_gen_cond_dep '
- >=dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}]
- >=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}]
- <dev-python/prompt_toolkit-4.0.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}]
- >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}]
- <dev-python/sqlparse-0.4.0[${PYTHON_MULTI_USEDEP}]
- ssh? ( dev-python/paramiko[${PYTHON_MULTI_USEDEP}] )')
+ >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+ <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+ ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
"
DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
distutils_enable_tests pytest
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )"
-
PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
python_test() {
@@ -47,5 +46,6 @@ python_test() {
--ignore=setup.py \
--ignore=mycli/magic.py \
--ignore=mycli/packages/parseutils.py \
- --ignore=test/features
+ --ignore=test/features \
+ --ignore=mycli/packages/paramiko_stub/__init__.py
}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 1876ea3b262a..ae992e29152b 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -13,5 +13,5 @@ EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1636 BLAKE2B e0e977f956845c46bc99a00
EBUILD mysql-connector-c++-8.0.19.ebuild 1067 BLAKE2B 8407348e0e4da0ea8acca8ec0caa33a0c2e863c9a95d6951ce500b6306b77687e76ca867eeeb580dc5e9b8a9df3dff7ca0a8cb8ae95403a9a117d50d2dc8d869 SHA512 83d72ab1104a0ebd014d8b3e1f475944f16a18dc4836386e3ebf7b16df547f35cf7db42c586411fcef80ec6273f15a0f9531b197eaecb991a62301d9a9d3ff4b
EBUILD mysql-connector-c++-8.0.20.ebuild 1070 BLAKE2B bd6b438aa0a660bc19a50695ed77fa5f952aabfb6ff1996244eed5846476bb0c725cf2d4899105c88f1409725ebe80970655ac4f51b7012d1fccc3539a69a062 SHA512 d54363d3172c98ef6d500a336fc98c8d8abdd28e443e09e2ce50e85353c374cdd95739b9d6ab636d4aad3a8647bca1eb99329a761a10ff3ffb2040c1ec3796e8
EBUILD mysql-connector-c++-8.0.21.ebuild 1055 BLAKE2B 7a85e4631367e2a34989a8fc998d80d87c5b6b0220296e7f2f75121766db9c10f66b8838e633c0fc51b43c8314e3521a7cbc1fc0ed2a6fec87e67a6a18b0e91c SHA512 7661f1404a55a3342d90c26fbc36e0f1dc060301f82aadf4b814eedfdeeb7a9698f05e3ab8c552b1be03490e6a4591ac36ca28a7a60604a98844a9136ae063cc
-EBUILD mysql-connector-c++-8.0.22.ebuild 1058 BLAKE2B efed1a027f679d5b996712167ffc1d9ebda0f41846c4603c613cb6796967e28877a29de56e1dbd0c0b615d3af3634df4ac417ccd4a3c9ad2da944fb0de8d630e SHA512 91439f289265c9ed7b048280ae86990c9768b5b70e3509fb4503ffc551f6b04e0c96c04ad0ce24aa6208d227f9c0ef1ce121c13d335d4ab8f034c46fd202c4c9
+EBUILD mysql-connector-c++-8.0.22.ebuild 1056 BLAKE2B 1e1ab96e6aef2ebc122b6234ade2ae7463b4bd0fe78aa15317e3045246e561e09516b5d08396453cb2f7f92fd4c20ae41f93b0517e1201b23bcff89c958fcfe5 SHA512 293337b5b82fc9dbcfb9af999bfbb3a1bdcd8e30455d9cb24deb827491f84c0f2ad98fa6c6a812c61efa122e26f16c64146552df2b7aa6c57540330fdda52bf5
MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
index 5abc5913d53f..e72e5f0274e1 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
LICENSE="Artistic GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="+legacy libressl"
RDEPEND="
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5d35733d681d..3d85fb54a9cb 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -29,5 +29,5 @@ EBUILD mysql-5.7.32.ebuild 37598 BLAKE2B 467bc83326192f67778dd41e25687ff0af4c821
EBUILD mysql-8.0.19-r2.ebuild 37949 BLAKE2B c0ae41237387d4c58bac1f0f218fa467eba25a79e44605489f3835a1508c94423ea31c7d7d3f39e00f91a56a2320ffcca4fd968a425a3f898c9b7c2b9713f902 SHA512 434b40517a183a8bbb877ad79661ccc3ee1a89d40a374823c8778d87f75593f295c7a635496be1cb6376036da9c3acd5f82bfa2b62a88165b9c4b4b0ffd6469f
EBUILD mysql-8.0.20-r1.ebuild 37217 BLAKE2B 2aef6bce1bd7f8e5e55b64caa304b427c84fcd365e265a6ce0d2458491349cd8c04c17a50644d1be7fca9218e17ad748b9307fe7b32270c6ba936077e2746d9b SHA512 ca65ad63a374696e4adc2d73176de71a0b27e267b91dfba20641303c4b9e8cfa1241375c7cd69af660b2d2632c629ab0658d1ed6e2454032a689f2995a2c505c
EBUILD mysql-8.0.21-r1.ebuild 38168 BLAKE2B 7fd4dcb6e42c5d1dc4131c0de51e077fdd130012f9a25ef09731cdb15c6c72ae10063a431a8146934b1a19fdde4de21ea4b32b58190f88b03a4a91ace322acfe SHA512 2539cb667afe19ad476ef73fe30878fc98f04d63b6edac0b201cdd7b48ef48e5eb8125a87e1c021e7e53c0d2e6142abfe8743d26ed6f7c88ad7ae6565cd346f2
-EBUILD mysql-8.0.22.ebuild 37603 BLAKE2B f71796fa1cb09a47e2b723e0b7038de270e5e8b25197a0437fb78126312a319a67775cbc143a81ac17547eb4a7bceeb53dd0b05119999a211cf5c72514def7e2 SHA512 851615011ce1241b1203c3724d35f0f9a0109b87ee34f44e88f2cc421c03755376935287ebac8d4c29d8d024430912274c90f3d77df85c610185fc03061c4a6b
+EBUILD mysql-8.0.22.ebuild 37611 BLAKE2B 3d7f59692f1065cdbdce8b62ab47322f7a17cb19f8cf640b9f7c8076fcb8f021e4d5039149583a671d46a5033cbe2f092fc2aa2190039f50ddac036de42d17be SHA512 52563da07ab306b38e58666cb07140607ae41e767a444ba59fb044088383f4fd9d900345c6790bdbab16751aacccea94cbd886effb87e90f4ec03604685f30af
MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-8.0.22.ebuild b/dev-db/mysql/mysql-8.0.22.ebuild
index b6a594d1a817..721ce231c3a6 100644
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@@ -54,7 +54,7 @@ COMMON_DEPEND="
!libressl? ( >=dev-libs/openssl-1.0.0:0= )
server? (
dev-libs/icu:=
- dev-libs/libevent:=[ssl]
+ dev-libs/libevent:=[ssl,threads]
>=dev-libs/protobuf-3.8:=
net-libs/libtirpc:=
cjk? ( app-text/mecab:= )
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index 3575055fcf32..f0ace263f7a7 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -6,5 +6,5 @@ AUX mytop-1.9.1-queries-vs-questions-mysql-5.0.76.patch 3431 BLAKE2B 4d1d18cd3c9
DIST mytop-1.6.tar.gz 19720 BLAKE2B c7cd4e75283a52e505e09ee3f1618877832be16154e2d313f3a9a71c53a604f67180c892b13209b85c584db0c67c66461064b9c5c99352685518a65f2d3cefc5 SHA512 672209d828c70fd740a791f2e4dfac1e4c594adff197b8bc43322249f03f6c7b18a750da0892c1519fe29e24b661e41d40cdad3a29b546dec4b3a747155566e2
DIST mytop-1.9.1.tar.gz 22095 BLAKE2B d0281fce93d9165593d5a94229a5de0d2b18d38b02e69329322e62611b5d9546d08626ea60ea7ede4d6ee88fc7df08c733cb5437fb47c468e0d591d7dde00595 SHA512 e6d38812dd69f5e330e5fe9206abe7e00c9e08dd61ba52a9dbd18a823bb09715832d27fb8db6fe1146d78eb56845cc0a7e2a72989ee56267d6482238fee84bc5
EBUILD mytop-1.6-r4.ebuild 895 BLAKE2B 86cc5ec6b0b390c1270daef2ead374f51ced6102cd50cc3cb5b4fb03dffdb6843ca705396c5b8d264c6c921b5535ebf41e194eb72b7836f1563748cdcfa3d2d4 SHA512 6e55cb2898e98fc3d363af7ee8c36b232d8c3b1bf5321893b11343a0e60897e135f6ad39d796e4c7872e6a934eb5e4c2921e04c21590a7067b47aeaa4b105378
-EBUILD mytop-1.9.1.ebuild 825 BLAKE2B 7b112fd1a6a91e248d6f007b8782949fcc180fe807c825a41fbede2b9390ba7c2f5a54a734e0f6fd5082ed6a59ffa42870f60860814a5ae78b82d19c6a9566f2 SHA512 26d7b172c52e3056184a48feb381462c1094872aa23168cb3f9cdf9c9b69e4756b1313893c53ad1383438e867ecaa889a0a2fc27c33c9ce868c2cd35baf777e6
+EBUILD mytop-1.9.1.ebuild 819 BLAKE2B 875526378cde5b771663733fb81be9d2a63d2ae60178aef424c055c23772365a874566daa0dde3911be2c46c74482b226c2156e4e4fcc4a5d7b573e4e0ff28da SHA512 59e2bc37d7ac1861a21a090c2e493fecdbe68a047686a9e361b98f70fdc04e659470b31253c1d9bb652584a0a481c7a1ded24dcc4789b2c7f12546d77fece892
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mytop/mytop-1.9.1.ebuild b/dev-db/mytop/mytop-1.9.1.ebuild
index 050fb8117112..abf078984e41 100644
--- a/dev-db/mytop/mytop-1.9.1.ebuild
+++ b/dev-db/mytop/mytop-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.mysqlfanboy.com/mytop-3/"
SRC_URI="http://www.mysqlfanboy.com/mytop-3/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ppc sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest
index 1d8ca7daecd1..b7f3e56d1ce7 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -2,5 +2,6 @@ AUX pg_top-3.7.0.patch 749 BLAKE2B 26d3d391e33a55b5af857ec3262b5f37e97a64262c050
DIST pg_top-3.7.0.tar.bz2 236076 BLAKE2B 87a29d0237aad48b683c17ba56fdbc4a90f854f4f497057ffc978be1797d978f02694781e83d296fca82e03c8bc737f7cfd74e996987eea0bd8d6a66ae433ce0 SHA512 509cd3ce65a9b549097eaab5ae27106fa469cdeb4f37950564654f3df01390e1a771c8fa4f5858c3e4c1e76470b6c0fd9b07e8268564f59285e30bf824d7c4ec
DIST pg_top-4.0.0.tar.xz 117920 BLAKE2B 5c13fd868804492ccce3b660875602df958f065126f9dc17f45ebcac7961384cd1d3d3313da49832a1219ea7e86ae78cbbdb975467b13b32d5f836f5cd33a443 SHA512 b7a016137495ceecdcf0ac0e95c73b7eca20b57264f7b63b0a38c3f31db742c704ed0094e07f6df051bce9bc26214f5a8f66ced1e923bb66e0c86fff1e2ffc19
EBUILD pg_top-3.7.0.ebuild 621 BLAKE2B 3f411c73e55bdbe3db445d6cb23de24d478d7edeb18e8657da639f73400655eb1dfd95036f469b014ca8e467b02438640a0495ab60697478896735004f15d1f1 SHA512 b78758656bc4e2a1fa702bf2e03f108aa91c7815db10da22a16ca1e6f8939e443577b82d4458f741c991d8742c5d8ebfbf22ca977a638b9e224d1dc425b61564
-EBUILD pg_top-4.0.0.ebuild 402 BLAKE2B ec320225f0864aec216f400496be18d09dbbfa5aa0b8d53fb5f0404e8f3958e5d5b72615011ba611aa2f1b3579f3ec119efe8758c09ae762947360f2de44fd68 SHA512 c7d50617778104a838c287466d374549a73d6a581317043e300805fa6f56b7669e40551866b1a8b34f560f34f1cd024a953825dbc5e715a5473812268c6e09b7
+EBUILD pg_top-4.0.0-r1.ebuild 503 BLAKE2B 63696aa64d340b27d60fa544cf064dfaacf1e3f710aa86042068cea7cf30b040779f2b147f250cc7b019ffe74cc0ccd92d539fa5bac9b39dc0711e4b45190f9c SHA512 ada49d5653fd5c2e722f1e26ff1f7a7cc75f0191140b2f2383318baf01f397d484693080e769dc284f4ad92e719646cb25404b80f0a101685122ff268a2d3796
+EBUILD pg_top-4.0.0.ebuild 401 BLAKE2B 5df7c89bac799f355746deae2b915d1572b0e4292f062a1dde7f7c99c44ae03141042689b2606964cfc7dc3ab9c4c170d2d91757443391c9024843a71299dfcd SHA512 34d7e8a2e95e14046e8ed55861ffe0bb6b2b837860a03df1163757da75671052d92562354fca5187ef0146e8fc2023cf4a8c3aa74a3f0e980262971bf6a8a4cd
MISC metadata.xml 461 BLAKE2B e6f8d76b546b6b6b6cb13dc1158f71d20f3c68fc9ecc9b37ccf8d8581ec8699e5faab5bd4b10100a0897f668e04449e8f67622e3e3eeb3fdbc54023af536ec0a SHA512 ef6740e37b9d51eb8d303e393d826c91519e8fbd2fe66930486bfbf16bf3bfe09f1a90040a044428841ed61dd6885eefefa2fc9bc43a08e6d4e2dec4a67ba9fc
diff --git a/dev-db/pg_top/pg_top-4.0.0-r1.ebuild b/dev-db/pg_top/pg_top-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..bb38e3056d70
--- /dev/null
+++ b/dev-db/pg_top/pg_top-4.0.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="'top' for PostgreSQL"
+HOMEPAGE="https://pg_top.gitlab.io/"
+SRC_URI="https://pg_top.gitlab.io/source/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}"
+
+DOCS=( HISTORY.rst README.rst TODO Y2K )
+
+src_prepare() {
+ sed 's/set(CMAKE_C_FLAGS "-Wall")//' -i CMakeLists.txt || die
+ cmake_src_prepare
+}
diff --git a/dev-db/pg_top/pg_top-4.0.0.ebuild b/dev-db/pg_top/pg_top-4.0.0.ebuild
index f0d4e2ea16a6..28d2942c81e7 100644
--- a/dev-db/pg_top/pg_top-4.0.0.ebuild
+++ b/dev-db/pg_top/pg_top-4.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pg_top.gitlab.io/source/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="dev-db/postgresql:="
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 659e0dce1fd0..5b1d13d86fd4 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -6,6 +6,6 @@ DIST pgadmin4-4.26.tar.gz 33525278 BLAKE2B 2a4061f59299bc48b029a4a93f410538170b6
DIST pgadmin4-4.28.tar.gz 35386627 BLAKE2B 6cbee6ccadf3b35e1b0aece2e8fc4b9e35dd04ed70436a3b74d69c09e887499c3a2ab8710d16df3327cd848c3c5ee1fac2cde06facbdc5605673b04a4a4fc434 SHA512 b9e8946e8133b382b9d69126c1ec6fc07a4b2051316c2151c339f15652900fa2bdf0a07811e052548c3f8699e382d8c16d187e89409b194e491148123558522e
EBUILD pgadmin4-4.17-r1.ebuild 3307 BLAKE2B 2f4dab13a9365051abc89e66101bf6b8c93400b3eefb34f53033feb9d6d49321f9e2fcb7c3f58340ab21b1d358006d0a1846a08ce6a26048bde0a4a779cdf131 SHA512 4c80f4f5f243a25aee956ee3230ff6ee9a55e1dce19fcd1c1da91b00b4f16942fdc64815559bfbc873a67f99b6676f463cf923987d7fe039ed8d027b7a64b51a
EBUILD pgadmin4-4.25.ebuild 3545 BLAKE2B 3e716cd6cb3f4fe19d2ffe6f6f8581f6ce9b558df9291c21eec36de684e766373fac11e610585d416911eb097d13310804320fe82985428a14f5fcbfb3c6acaf SHA512 46b1e593c9d10d4d69df656656bd1a5d020698a6e799e06b63f8f27358dfbcac2501ce2d34c55d2448d274aacf6a1a85eb89dea43f6e6113b74f02c6ee77bd8e
-EBUILD pgadmin4-4.26.ebuild 3797 BLAKE2B 37f2b12586c1c12d0485673af2f63b5434e79271630c32e7da611d2edcfa044262424387be8449af46548750c084087968bf724991238704f48d25958f0cedf4 SHA512 9b175c0ec000a9d3801093294378004deb289d7c08fae35944d2128fd3b2aa3a2d2979200b684d7f2275fc5383163cdf32676a8f2f04d8801e190797d5d87c6e
+EBUILD pgadmin4-4.26.ebuild 3796 BLAKE2B 4ab6ed9b8e922936ad19c8968300616a70910f5080e396e8f581c3666421f96511ce0d3311273f599cc3ff44eff14bb2d0bdcfa44be4d7a67c369aa9a8fa9e09 SHA512 c774d2c53b6bb431a60eec11b74f6458f8d7cf090dc603bc1f6d2f8ed9908c067f4e70b6cca62a252b08a01d9ca5b5066a9dde595357003e516b15b3f9fb24c9
EBUILD pgadmin4-4.28.ebuild 3924 BLAKE2B fea400403695aeb1507ba07615ebde52cd9bd8b23e05eafd734c4b6eb9e837e170777c9af29b0fde2e0e04f351183acbba50970e9e44f267acaa2046859d00ae SHA512 353570463deffe5a45926dac13389d137267b3b642f79ccc46fdf0be243d2162f2b18a7ff407996bb84181d11b2377a13fc5712c86e4ddcf046f1ef603a0536b
MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.26.ebuild b/dev-db/pgadmin4/pgadmin4-4.26.ebuild
index 239acf0a8228..a4ab5c78e5e5 100644
--- a/dev-db/pgadmin4/pgadmin4-4.26.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.26.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}"
diff --git a/dev-db/pgagent/Manifest b/dev-db/pgagent/Manifest
index e3b308980f1a..f8f4b90cbb99 100644
--- a/dev-db/pgagent/Manifest
+++ b/dev-db/pgagent/Manifest
@@ -9,6 +9,6 @@ AUX save-stderr-jobstep-output.patch 2626 BLAKE2B 8a0eb06fecb9450e027219f2ede7b9
DIST pgAgent-3.4.0-Source.tar.gz 45081 BLAKE2B 81f074213285253743127188d9e203cb01d8492ce502dc5215279c7c557fdd7f532fa383a4578a8d9cc8ea46668ea971015e4cc5989d1b8022ed8924a92b988b SHA512 3b068fc6f5e51ff20604f8cec3e067d04b5b1537229da15ee442000f5fe834697a4eae86be0e9a58b8ee5da24cc985c8c9804d71cb2a50e93ec4cf9a424a4ff0
DIST pgAgent-4.0.0-Source.tar.gz 63561 BLAKE2B 1731e748a6a5e76cd8b177162eb5b82ae633d1b507739e3193a8857a0eee0fe775fdaadb871eb5d708c0f7e80558680b5d7d246f4cb5d2bc1c10955bdf9cc09e SHA512 df2d6f5817d83d4cf60f0f1106718225870bcfd2f5b882765e5fd459e1614208225f90b29de492bec5284f3727f3d4be9f724b92ef503fea08029fab22a8fbb4
EBUILD pgagent-3.4.0-r3.ebuild 2059 BLAKE2B 3ecbee255f034b6d9f8110a951148fe30175ea680b12991a9a7924d9b703f7323935ba0378c2168bc490b99f0d6ea41e065a59f2f96d09dccca5ef27b6bedf39 SHA512 c1c7a60dca4cfbd71eaf3af8fd05737b06274e9575846db33ec062de9c6f8e766866dfc3b9f5d4642543eb8b243e8e967185ad51fadf61b520eee28a0c566ea4
-EBUILD pgagent-4.0.0-r1.ebuild 1241 BLAKE2B caf410239957bdc9fc092d5f04bcafab7901e1776f698facf5a124e5d24ee56c313193219d2dd501a2f512ed9c9082b6a3ac2a0160b5bcb011190c92f7b02535 SHA512 a85f44df66d2fe976d8b606853d5cbe68b03d2a9fa79fad6140d0c020a2eeab4366db5733069ba138bd02fb4aee676ca4b6bf77b1f801671f2b9da915c946311
+EBUILD pgagent-4.0.0-r1.ebuild 1240 BLAKE2B 29669c503503e31f3553eb4011653ff36f8e068f3add1722c9ed5b6ab82ecbb45ffd4246ce901d2aa2eb6ba7e51987f29fc839eee57d7598947aa9728deaadf8 SHA512 07c544c2f6823186d341584b75b80c195d817bcc64aa036bc4f22a5e7a5dacc29afc19969604e89e08410a7801e8c643a75413b7b3a043ef68c83276f0ee71d7
EBUILD pgagent-4.0.0.ebuild 1177 BLAKE2B 8db48f73f87790fa3fde33b846bb62093757ae6b70735743081b36eddd99bbdd7d8f4a094546d889362bb2f00c13b49a266776d6828547db4853b078c48c52f1 SHA512 2a732df46d076d08a9934d73a4ed1ee15d0de5e1f94b141f0a64eb80fcd77800c06db4baaec333da36a509a7ec7ed5e59d57e673fadc25d5b64d6da8da700ff1
MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pgagent/pgagent-4.0.0-r1.ebuild b/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
index fe9014a136f6..588908c4b242 100644
--- a/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
+++ b/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils user
MY_PN=${PN/a/A}
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
HOMEPAGE="https://www.pgadmin.org/download/pgagent-source-code/"
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index 666de4956386..1a1e51b473d5 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1,5 +1,7 @@
DIST pgbadger-11.0.tar.gz 1661028 BLAKE2B d83be01017d69b83cf288b23fe5066d5c691b630ce748fe42b33514346183f7b8f18efceeefe0533e534c669e986c30388a6df5b620ea654ae89b3dc3c08d342 SHA512 167534d61cb28df6cb7eae7efe788d3f6bbad1c614468e905a9b678a76b3a2dfc0eb192b595ac4dc332cd694e820f1603b79d83bc934b7dfe3d226019f6a9c15
DIST pgbadger-11.3.tar.gz 2297407 BLAKE2B 7e0814c570a3e5fbf79132c99e3134ee944c8239b956d4638a144c551a45b1903a27ee730f93e0dd040c3b8b8c3ec7d1b22228bf2390fa1585f8e4907cb9ae90 SHA512 0af40e68391d6cc783c5895eea01d266bdb22672bd9142e6029ec428f68ee13e0d0deaced4cb80ccd5b608bf04a72a9964c95d2cc9ad933c7412dbf888fc788a
+DIST pgbadger-11.4.tar.gz 2299574 BLAKE2B bb18cd73117ac58330cca2a5f3b525f962d7c0d30a0c28881ff977424dc1ee84f7754a1d4bae200739e60b51015ccad0552573b98d06a3e5932af0056c01ed9f SHA512 c945d6b6fd564640ef9f13fc0927acbed12c4329d05a44e12858a944b3df97677af8c92e62c4572b5e02279ee5d0ce84cf9e66d294f909b4cfcf311e86ba7557
EBUILD pgbadger-11.0.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4edbc4e7ed251421c8962223e8357955da642b525b5dea3fa6ae498c46232502a628df04373b28b52b7da6f8f SHA512 f1140736e8be887d864e7579e0da07b5f4f774ad4ed8bb7993c29173ff87735f02e168be4a1d955cfed9dad795b051f5d65eb773b856c35e613096ce26cc2fce
EBUILD pgbadger-11.3.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
+EBUILD pgbadger-11.4.ebuild 455 BLAKE2B 6b62920d5031e260e17dd2dc7618af09820cb336614ee9b24c3686f56bbd663f6ef5bb89ac28485b832477736eaf0e7e94759bfaa598206828b3e4b5f6fdc1d9 SHA512 d0948c53992a47f919c65c87a7c9f41c40e69e920659e7569519bb2a9d3ed891c762e6bfbf1ec7108917d7c5f1cfd4a3e959e9e9e6ad0fdc9a27575fef20b84f
MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
diff --git a/dev-db/pgbadger/pgbadger-11.4.ebuild b/dev-db/pgbadger/pgbadger-11.4.ebuild
new file mode 100644
index 000000000000..012c11ef5f76
--- /dev/null
+++ b/dev-db/pgbadger/pgbadger-11.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="pgBadger is a PostgreSQL log analyzer."
+HOMEPAGE="https://pgbadger.darold.net/"
+SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-perl/JSON-XS
+ dev-perl/Text-CSV_XS
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ prove || die
+}
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 36d59e9fabbb..49d67b4514a2 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,5 +1,5 @@
DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262
EBUILD pgcli-2.2.0.ebuild 1227 BLAKE2B 08be8bcd8eda124c8255abce36cf761a4e3f3575895ecc74d07d1a502db90b8e8d7342f659582b8bf178ad3eda913aba8ebe1e9996ab4eaa41241dc066debb21 SHA512 cc67eeb6889411784bd79f226d8a000fb54f040b25be2f5a1dbffb39331b28a92d9385c09cb5129638e44a3610492b399ea58754a5ff858fb37706d9d2fb5ff7
-EBUILD pgcli-3.0.0.ebuild 1191 BLAKE2B 464b0c076ad1fea19cd3379956e0acde58320a014dee948c00322c5867fa2263b60133e1c6fbefa1d8e0ff9df3ca60ab866cb393bd078cfe292463e8ad905393 SHA512 f191bc82ff307655109f8101dca5eaf7e7a46bf91bd326a0fcc281f9c3be35b110acf41b7e75e0d9b73a0061fd3712223c4ac46d5513579dd746138cfa9c7d13
+EBUILD pgcli-3.0.0.ebuild 1190 BLAKE2B 5372491093076a14591371c22fe76f4f267a3cf33a3ee4bec09987b343ab1ca427007aee6120859af33e1bc6e8296971b483d3cb1732db67050fa7298acae38f SHA512 c4e5711dfc90fd80d3b3327d8381e5aae7e1a07757b1bff9c4163d7827398b42b29b8ea7f12117a07b6a1588aa516c0a9e99049ef9eeefa6463f9bc94b6f438e
MISC metadata.xml 460 BLAKE2B c6dc837776eb72ba61b0b0e00cd3f3adc022b70385204346eb2aa0eb8229636ab230be67b194993b22e18cda08b4f968ff02b96d390b8782aac2a4f4de92d7ee SHA512 a3b44f66861c5f8b66cda0fcac6b1d3418bf04835e7ed202ae22faca50ee22187fda785c6e7e7c0848f31b88e1cd9c8c6b4be1999eb600d48965edff2e959c35
diff --git a/dev-db/pgcli/pgcli-3.0.0.ebuild b/dev-db/pgcli/pgcli-3.0.0.ebuild
index ea2e13b936ea..b5da66f7a3dd 100644
--- a/dev-db/pgcli/pgcli-3.0.0.ebuild
+++ b/dev-db/pgcli/pgcli-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="
>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index 86b020d7ad41..fc6201c09e79 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,3 +1,5 @@
DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
+DIST pgtap-1.1.0.zip 306590 BLAKE2B efde91e26fafc8300fa39b80d90eef134ebf3a309fca3248f61e2b8beb76b94d83b035d76c789509297f0bec48f35b5947b49e2da211826cd9d828145783607d SHA512 1cade794d738fc6b78d53a0feceff4e6c0e988fbcfe8cd9e8dbf62e2bea25d2e714baac55575e99f6d74ae0b7e5277770a69c8af7dbb5714913ea7435cf493fc
EBUILD pgtap-0.99.0.ebuild 589 BLAKE2B 9c9a64f61ba3c47eafe05eba813cda3dd2c73e4d192096d89bb075c2bcaf85b7fa7324cd8054503adefc9abc257c31a3246423a6e6f1ab708640099eef88e5a5 SHA512 79319d9dbd3c9dc9cac54fb55f0e087b91fde987fdc844f4ea0ab5adad2cacf433b504aedef0c79bfc05ebcb2675885f619f33453d01eaffc48cb993672c2501
+EBUILD pgtap-1.1.0.ebuild 643 BLAKE2B 04763b0033952d3e725ee8303eb9c7a0c71003e12a7097fcecb95f2f01d4ba28655db5d913426b61e02e9fa15ec9ddef901ea639c5f8fcc4cb4eaf8c46e4e208 SHA512 efaeb58169b02654b6976c32e0167c66acd87f0c533bdbf4f8c30ef26fa584a4df75e88bd79e078885817f4fc2c3e8b01d2abcd5ac3942fbd7c78ca89ea1a1f3
MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/pgtap-1.1.0.ebuild b/dev-db/pgtap/pgtap-1.1.0.ebuild
new file mode 100644
index 000000000000..ca1636c707c5
--- /dev/null
+++ b/dev-db/pgtap/pgtap-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+
+inherit postgres-multi
+
+DESCRIPTION="Unit testing for PostgreSQL"
+HOMEPAGE="https://pgtap.org/"
+SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${POSTGRES_DEP}
+ app-arch/unzip
+ dev-perl/TAP-Parser-SourceHandler-pgTAP
+"
+RDEPEND="${DEPEND}"
+
+# Tests requires a running database that match up with the current
+# testing slot. Won't run from ${ED}, want's to install too early.
+RESTRICT="test"
+
+src_configure() {
+ :
+}
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 69ac61303ff4..4f19d9fb8f81 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,3 +1,5 @@
+DIST pgxnclient-1.3.1.tar.gz 80554 BLAKE2B 0f63d3ee94de623b32d990a9504a469e5606b72df7c4f3c8a261e00c36c7284e2d7efdc1eec15b43fde69be50c1b55f65f3a2259a67894fb9022e9d39280683f SHA512 e698fa9cb56a4f66c4c4281861ee6cfef4667ca9b0643691798929c625fee9eb9534ad9c6c4b94f63a730b9dedcf9f0b6a120d179052c3519d8010bc2791dd3e
DIST pgxnclient-1.3.tar.gz 51976 BLAKE2B 84ae5573588e6da0b01d5b05e296adc09f28a0b21ff81e5f2f14f3035a98ad5eb834d6793acf0a48a8b19190b989562e75094341f7c01b371028a0dd6a87b0f4 SHA512 fd9326107334d473db3466f776021186a5add389a93266b000c143131a0214b9773dd4cdd4688575cd720c8357afce1473838dea4aa5ff2564dcbc2c359de2dd
EBUILD pgxnclient-1.3-r2.ebuild 802 BLAKE2B f4845b035cfaaf7d9dfbb986561adbf1498bff3d3b4369c81b8b92e875cd0ad35dc49c43b546b1850c6e6d2aff349eac949141f25c55e8a69638913792ec091a SHA512 497d87ee6c7fb68212294a0b293ae68f364b1798eac23ecdff1369568aa2e72e881d727887e163be812909cbc241011101d84a62b678201ca7dc4c3e92a71223
+EBUILD pgxnclient-1.3.1.ebuild 913 BLAKE2B 847b7a2bcb3c210f3e089708dd7107abca16345b21dcde351acabd8556017df008961dba186e0bc75b766679865fdfad4d1e944cf4e04c01b2b69467fd963f69 SHA512 244c7015b80876993278bf22fb4e991d30d3caf977b2ca44aadd3860904cc56a3e7e65151b5b47efcc05aef01ae42d5b73c07ff5db65faf82b3500e79e382fb1
MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.3.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.3.1.ebuild
new file mode 100644
index 000000000000..4f973fee60b7
--- /dev/null
+++ b/dev-db/pgxnclient/pgxnclient-1.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL Extension Network Client"
+HOMEPAGE="https://pgxn.github.io/pgxnclient/
+ 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 ~sparc ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="test"
+
+RDEPEND="dev-db/postgresql:*[server]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock )
+"
+
+# Test data is currently missing from the distribution. Next release
+# will include it.
+RESTRICT="test"
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed "s/setup_requires/#/" -i setup.py || die
+ sed "s/find_packages()/find_packages(exclude=['tests'])/" -i setup.py || die
+
+ default
+}
diff --git a/dev-db/plr/Manifest b/dev-db/plr/Manifest
index f4d9d966b230..5a2a5922f33d 100644
--- a/dev-db/plr/Manifest
+++ b/dev-db/plr/Manifest
@@ -2,4 +2,4 @@ DIST plr-8.3.0.17.tar.gz 74017 BLAKE2B 314b4cfa2c3ca8ed31e80a72233a6dc8cdb9f3811
DIST plr-8.4.1.tar.gz 265142 BLAKE2B 859913ba14d3e6876eb5a3d7593346b98ab2e1b6c70d9fd9cc7e1810fe11ecb3c552305485735cf975cc41ce2de6cbd7bcf407c9e373fc4024230be797c9899a SHA512 0db407355271009bad95c21f81e544839322f0fa0a63d2abd8edbf9eab8f61e208a3e4f7083729cc8247411885197ff3569c88264db0a29b34523dc83bbed7ec
EBUILD plr-8.3.0.17.ebuild 1700 BLAKE2B 441f233545359ab8d171834c88564883acdb1470ffc88e01c8b617cded8af24b2dbce943a23ae4ab7275908f809b805773915e96c9788b1be71ccf9fd65cb07f SHA512 deb87ada7c10d6fd263f0a1261e31444c1034dcfd603ad3ef1287f1f5fb30c040953d64de5ba0a58ef7c7036b38923cfb4beb94518a25e5e363a6dc2bed87563
EBUILD plr-8.4.1.ebuild 1706 BLAKE2B 9cf57201d0630c2f3f8934b2d64db8c01409cbf1001a0e3ce0949682e01280da700f4a9f14165e5c06fb369136f7cecff8c9b3f8f3465540893dc9f84ebba75c SHA512 45a3d957f45b2d71eff298b9f8931a495fcb6c7f48edf318d21f036a682d899d003fdaf56c4688395d716ce8a8f1eaf4554cfd124b96ac5221e75c7ae7095310
-MISC metadata.xml 800 BLAKE2B b12bbd609b12d63306bdc9af15f788d91847ae4a8960b26f92d1d8ca000291a047424f2632d22798855a1b61cad2a9d46095f214ba9f7c41616c5a90ee4dddbf SHA512 23728ed4ec8bd27a2ccf2081f4b0ddd2d8ecf47fd9c44f999406c8f3bd7c2f86545dbf837c99dc0e9ef9100b2028a9ae3f10a6d60a21bafbbc7231c445a9c85a
+MISC metadata.xml 399 BLAKE2B 3c3d305e53fbb1fae5ca9c97fe8d3e9b765bbd9db2e2fc79d392d889da65069487b867f73f69bbb10971fce543827947e3611e9052081558c33da7b4a66c29eb SHA512 213efff0d0d08b552143e20704f5f8506f94c8ccc67484c8048d95421f4b6ade9ff1a40d9db6bff6dffcab22abdff5003142948abe95bc5f19aae7e67d34056e
diff --git a/dev-db/plr/metadata.xml b/dev-db/plr/metadata.xml
index a604889e04b6..60798fb9b769 100644
--- a/dev-db/plr/metadata.xml
+++ b/dev-db/plr/metadata.xml
@@ -1,23 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!--
-This is the example metadata file.
-The root element of this file is <pkgmetadata>. Within this element a
-number of subelements are allowed, the most common being maintainer.
-For a full description look at:
-https://devmanual.gentoo.org/ebuild-writing/misc-files/metadata/
-
-Before committing, please remove the comments from this file. They are
-not relevant for general metadata.xml files.
--->
<pkgmetadata>
-<maintainer type="person">
- <email>axs@gentoo.org</email>
- <name>Ian Stakenvicius</name>
-</maintainer>
-<longdescription>
-An extension for postgresql databases to allow direct usage of <pkg>dev-lang/R</pkg>
-in SQL queries and database functions
-</longdescription>
+ <maintainer type="project">
+ <email>pgsql-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ An extension for postgresql databases to allow direct usage of
+ <pkg>dev-lang/R</pkg> in SQL queries and database functions
+ </longdescription>
</pkgmetadata>
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e4a97c2fab5e..08bad6964443 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -23,5 +23,5 @@ EBUILD postgresql-12.5.ebuild 13727 BLAKE2B cd7bc2d88bb24546eca15495eb368c1baae2
EBUILD postgresql-13.1.ebuild 13981 BLAKE2B c99c02c02de0fc3a2cca7a7adbebc142de7467cbaa4056e48365c92eeb435259fe923b06aa209405088fe26d9378e570428bfb50397e13feada03ee3eae0628c SHA512 feeae61aa22cd50615e43a68d3704c5b07fe1fc63815539dc0c74d3ee775e775ea391ab29f4849a23fe86d7bd4173c36e7411dc868e63f12813932d06cb4ec33
EBUILD postgresql-9.5.24.ebuild 14360 BLAKE2B 5737e94065f6efecdf7d43298c071fedd1281d484ebbf7a77731d3de68e5920e69a36581d6b43634c5d8805724688668cce9d4550e8235e22d85025fb99c245b SHA512 be18fb31727ae3f0796f3a0fd9ff0c272be7fbcd0f7a287b94caa18c781f6aa0be1e36b3a4b926fca8c789405d5ac84af8c55c14198c4aac735f8203c0eb633a
EBUILD postgresql-9.6.20.ebuild 14593 BLAKE2B 41614372b80c5691822bd59a02f66b93139eebc3f49421237660643b8690baec26c0466b38bca1a502108d220659a01a10ebc45d729412c3dd83bb3ebe3fe8c5 SHA512 a2ffcfcbed1637c78ebae251a272d49b6730a37137aaeb7ea9a9958b0644e958033243a2d8a35a0a9bc5eda5b86a7761fabe8068a44f0f8498c48c68acc15e18
-EBUILD postgresql-9999.ebuild 14055 BLAKE2B 5b0143afed6634552561adff30f858e8ce2af41c3aec395856a13701465fcc0a8c1ceb66526ddc1795bb10976bb31726702fa45acfb65db2ec9199b476271873 SHA512 395dd97cc70928dc46943da16311d61e70a894a53ce436dd068b9df1a54d791c80033dff47c86f5c21183507d65cbc01306d6f06e69ff03ec5bb218d3142536e
+EBUILD postgresql-9999.ebuild 14059 BLAKE2B ea0aa8bae9186e8e09ddfebd40ccfd088bf73cc1ff4d81d350efe8e3affe5e1289a41fe021e4298fc4177447486236ad15fc3c80516913dc79877e33eb8a5c02 SHA512 778ec556a9ed5e32ba7dfcdc6b780bc4042c2a3fc794d49b089da995d78192757432201962e217d1cebc7f92c97f0b97f00ba4e58e1e0b28d966ac71ea798a7e
MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 9b9884bf901e..94e83ea608fc 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit flag-o-matic git-r3 linux-info multilib pam prefix python-single-r1 \
systemd
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index e2752d5472f5..336a813850e8 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,5 +1,5 @@
-DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
DIST psqlodbc-11.01.0000.tar.gz 919372 BLAKE2B ce84b4bb210c4c3c3f2a3e9eae713c875e4bae491e20f207f740a02af69cb771f504de6b1da06fcd12306d986299e1537184a6787eac80e320eea6d8c13dc142 SHA512 57762bfa9925012946e56a3d5b815af00078299c121ba0142865c06f877cabf314512e4e6efc654589fb409c4dd2cbb9a3b7fd7aa1a6ace361879552774b11d7
-EBUILD psqlodbc-10.01.0000.ebuild 694 BLAKE2B 980058570611ee2b1926e864f75fbff4893c27c7427f2c0cd1616181adb0ac83cdf43f3f45c5cb9118b6860c0ed54e2aeafffb5f309d645be1dde2e109ed0cc5 SHA512 15aa0ca7dc3fddd4052ba7a05eeb8ae08739a5c69532585ee59c3f38fc4e0a60e0b73a81b60d1648e5ff3712d18949fa54f596c7b5164c4a72313f130461a778
+DIST psqlodbc-13.00.0000.tar.gz 940031 BLAKE2B 346a06b5b7b16ead1d87b7bdadcd050102b1b30e19d7bf236e134439711e4832b193241d6ea02b5628a64afbfad77b0c6d3bdf921fd3ae3a5cf696a58100e53c SHA512 c8d5cb0ce304e702f3c6f0b2e1c681df283973a8459a820f92df806814659eb15668c38a855a69b44cf5ebe459283bef1ca1cba44df0fe16a361e614f5481bc7
EBUILD psqlodbc-11.01.0000.ebuild 690 BLAKE2B 9f70ec2a0c718567611936ac3cadadee457a2338bb3792ed4a14ff2f84ca4f7c70b1d63b2a731abac47530e17436af414f0c0864ee7aa58717efc2866116cea9 SHA512 308f135df50933cc6a0a41cfe5cc1468bad9e76163383e73101437eb8011d0e45dcdbf34ac50f4cda354aeb3357d439254baa2022e3952f92681c8509a36ad12
+EBUILD psqlodbc-13.00.0000.ebuild 727 BLAKE2B bcdb118196c22fdf7224888d82749c34552d3f968798d883ad7306bcde8ce15a9178dcc288781088822b6b952cbbb844b3031cfafd68d33b4f29a8f3bf166bbe SHA512 d0d5a2f32e1c1ba83b5af483eef438eec84616eb46939609789c475e40996df7a0d014d2b434874474cdc96de1834ef41458e4308b7f6b6ac7b22d5dc05d20e3
MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild
index 2e2bc98f9a4d..eb5492ff004f 100644
--- a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-13.00.0000.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="https://www.postgresql.org/"
+HOMEPAGE="https://odbc.postgresql.org/"
SRC_URI="https://ftp.postgresql.org/pub/odbc/versions/src/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc iodbc ssl threads"
DEPEND="dev-db/postgresql:*[ssl?]
@@ -17,6 +17,9 @@ DEPEND="dev-db/postgresql:*[ssl?]
"
RDEPEND="${DEPEND}"
+# No tests to run
+RESTRICT="test"
+
src_configure() {
econf \
$(use_with iodbc) \
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 5efa691af8ef..65737f139794 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,7 +1,8 @@
+AUX qdbm-1.8.78-darwin.patch 1139 BLAKE2B 687d8dc4948fb075ab41a32cb8378da49025f477c23af9be3605f1377fdd8366af4d1225fdf60b597a443054d4cb2b57558bb0fcc7d8b3b8c2e4f84c67590d7f SHA512 45014e917ff16b7295eb7d2d583399779b05f98668418f756710a2e456a86f1366fdcdc006398a19e65465ba1ffec593aa77f398393ea2a543083bf3b7c2532f
AUX qdbm-configure.patch 5913 BLAKE2B a899d4d281eddbe974afd5969e4766d5f2eb55dfa545e6187003c4bb12f3224ead704cc1b14fd33841c8a9788832763d641ef04b5e49eee307aa71412d1301a4 SHA512 a15c513243f2b4976acf9a27f8572726bbaa7e55c7314228fa9fbc5899454c12d8c7efbf7ab24f1b3af427e64daded8ace1a5e4af4a227cae7fbb436e875461c
AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253b8950ec6f80ed29964e41cd3297b063db62e8c726a8e57399fe4ee52e67887bcaa74fad829b0b372f SHA512 a7356c2f5a4313e7da2524a6276bca5720459858d8619bfd8e6514cd9c1cd9aa1a2f7f0592e5ad1ee8b05e7e34452761e26be351f8e933e79a75cb4d19c862f3
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 3403 BLAKE2B 23967de1b107a6f912ca47808a47a9aa4f7b29dba650eb137b4603b40e9e8948380fa191d98333bf8e70a10b97195a919e01faced7256617beb2cf5dfa5616be SHA512 a3f8ff8dbeb8705bd96684d55c04dfa4d835096e44dd4fcd1137f7803ad8bb8d43fdf76c9aac21cc40985e76785df815fac22bcca0283943f698ada4e7d30352
+EBUILD qdbm-1.8.78-r2.ebuild 3707 BLAKE2B f73a6db82c52f8bf986fb90075c26dfbcef5c8a1f50c820707b92cce304801260920050b03eb7d971de3b459aa355d95400f338deeb36fc64aa3ae216a40f7b1 SHA512 3e238150a4108032ec21eaaf4f14d5a8676123a01d1629569f46682572196fa8f9c4c4c20347bc7ee7cf7c380b31797914efc6296523b9b221ab36f5c8026ddf
MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
new file mode 100644
index 000000000000..de2d33c4ea15
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-1.8.78-darwin.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2fec03a..2a1c3a3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,18 +52,18 @@ DESTDIR =
+ # Building binaries
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+- -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++ -I$(HOME)/include @MYDEFS@ \
+ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+ -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+ -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
++CFLAGS = -Wall -pedantic -fPIC -fsigned-char -fforce-addr @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib $(LIBS)
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=./:$(MYLIBDIR):$(HOME)/lib
+
+
+
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index 40f5281fa882..1906d48f0204 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-perl.patch
"${FILESDIR}"/${PN}-ruby19.patch
"${FILESDIR}"/${PN}-runpath.patch
+ "${FILESDIR}"/${PN}-1.8.78-darwin.patch
)
HTML_DOCS=( doc/. )
@@ -99,10 +100,10 @@ src_prepare() {
-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
-e 's/make\( \|$\)/$(MAKE)\1/g' \
-e '/^debug/,/^$/s/LDFLAGS="[^"]*" //' \
- Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in
- find -name "*~" -delete
+ Makefile.in {cgi,java,perl,plus,ruby}/Makefile.in || die
+ find -name "*~" -delete || die
- mv configure.{in,ac}
+ mv configure.{in,ac} || die
eautoreconf
qdbm_foreach_api
}
@@ -111,9 +112,9 @@ each_ruby_prepare() {
sed -i \
-e "s|ruby |${RUBY} |" \
-e "s|\.\./\.\.|${WORKDIR}/all/${P}|" \
- {Makefile,configure}.in {curia,depot,villa}/extconf.rb
+ {Makefile,configure}.in {curia,depot,villa}/extconf.rb || die
- mv configure.{in,ac}
+ mv configure.{in,ac} || die
eautoreconf
}
@@ -133,8 +134,12 @@ each_ruby_configure() {
}
src_compile() {
- default
- qdbm_foreach_api
+ if [[ ${CHOST} == *darwin* ]] ; then
+ emake mac
+ else
+ default
+ qdbm_foreach_api
+ fi
}
each_ruby_compile() {
@@ -142,8 +147,12 @@ each_ruby_compile() {
}
src_test() {
- default
- qdbm_foreach_api
+ if [[ ${CHOST} == *darwin* ]] ; then
+ emake check-mac
+ else
+ default
+ qdbm_foreach_api
+ fi
}
each_ruby_test() {
@@ -151,23 +160,28 @@ each_ruby_test() {
}
src_install() {
- default
+ if [[ ${CHOST} == *darwin* ]] ; then
+ emake install-mac
+ else
+ default
+ fi
+
qdbm_foreach_api
use static-libs || find "${ED}" -name '*.a' -delete || die
- rm -rf "${ED}"/usr/share/${PN}
+ rm -rf "${ED}"/usr/share/${PN} || die
if use java; then
java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
- rm -f "${ED}"/usr/$(get_libdir)/*.jar
+ rm -f "${ED}"/usr/$(get_libdir)/*.jar || die
fi
if use perl; then
perl_delete_module_manpages
perl_fix_packlist
fi
- rm -f "${ED}"/usr/bin/*test
- rm -f "${ED}"/usr/share/man/man1/*test.1*
+ rm -f "${ED}"/usr/bin/*test || die
+ rm -f "${ED}"/usr/share/man/man1/*test.1* || die
}
each_ruby_install() {
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index d89ccd53a75d..5725ac95ee75 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -4,6 +4,9 @@ DIST slony1-2.2.6-docs.tar.bz2 1450956 BLAKE2B 949d0736eb9ab021767b80b4240e30a8c
DIST slony1-2.2.6.tar.bz2 1465709 BLAKE2B 87e581638aab5ac9f51437fc43b65f200c29e012fa2b5331d4a7972359bb345c8d5aec9917fbc348ce8338115f8270d6e55025905aa5aba642090a8486d0a3fc SHA512 5aeadb9ed72b83d303596e4f8513409a1f826f25fe283ca6aa969a7563172bbc5f5360f876fa87780f6a6fc70cb55688a2daf678b9cf91972a3c403cb76184b8
DIST slony1-2.2.7-docs.tar.bz2 252020 BLAKE2B 315d54c008fca121fac12385602e729c7bb6a7a90db502165625c1138da6b87f147410555ca6bc315ba766fd6fed22b6c5dcbe06c9481dd37b9e9c8832209b02 SHA512 7735aae634788acae77eb2cc64f51a851e3b804fb1ca860eddc237734aa6182bd7dfcdae485cd89682c413f55003ea67d91c4c24922b4fdef79ac34793022e56
DIST slony1-2.2.7.tar.bz2 1464923 BLAKE2B aee11f92d634a6c2eaf84dd48faf6cac7a27956474aaa9070f1d4fad3e70b0af09475abda149e096f1b238d68237c0b43b18880440bd4c2d66f5c0f4ad789e99 SHA512 22700e1574c91d4a4be5b78aac967eebc039440897364780891c2c76ed5b8e07c03205f0fbcd4870ee7c620d62b175987c46c43750524c6e5f9009044cc24f9a
+DIST slony1-2.2.9-docs.tar.bz2 1445251 BLAKE2B eafd17370e333a706fd563440b7948513db19a05e23f6a0a118e0f8927b5b52c99f46953c3c9ce2d8e9f04371a35ff390e0e542f295f4e926b7002642fc913b0 SHA512 88d1c26d668b4a021c7b53cb5c2a9b140485595460d1444997ae49e4b77910f58860d603777f1836fdfa1231d2e44ad5cdf8e82c0a03df5278c9de7de3101c5b
+DIST slony1-2.2.9.tar.bz2 1464548 BLAKE2B 6a2f3e21679ed1542066016bdc9e97aa7b5885fe15770d5015f26deb16e4d9634b930d9f13a8dbba6b1e89bf28cdcc28b3181f12efbf9b549a75c6e62755c099 SHA512 c42d7604ae2eda9b83bfa608ca13a4a25b2a4b77301a591b9308eda964d263490a02acdfd5b1a7e7751c24b2a7cb5d9410c58deaf82bdb3c422456af65c2b3f5
EBUILD slony1-2.2.6.ebuild 1643 BLAKE2B f9c9cce6671b1a5c613a6950ee34df5627db305c83709af4a1a76d25b8f0520ee73d679db0d974531062f83d4bb085f65165ba0ca46059908839de639385d41a SHA512 9ee213f0628031c5b670a0a8533c19c43b45694e64bfd7c23ddf5a9d8a09d9d048898214536cde6303b81134504c0e11412e9e28705abe649982e2d4bb69841c
EBUILD slony1-2.2.7.ebuild 1635 BLAKE2B c3d2307c14aaec2a9ae999e31ef5ec3b090857d59e50eb09e17c175b4d92f92ba12e15b6a43823a79c9e95d0be94f31218b17ca17f8dfc0c966b87fdb713932a SHA512 767988ade2ba9f7203b1142767d43dfb8fb11f34d9555fc86dec8a2c2360bd423112aaae4a5632b44b8e01610a0f8dbfd3af23a8972adb5d686b9b38eb7d56ea
+EBUILD slony1-2.2.9.ebuild 1941 BLAKE2B 6e10b4c4952f637f2a79adbd8487e09bfb1333d07adbdf0391a014a352e9b43a26b1a8c03ffc4741a868ae4e6ed1a8f3adcb600a5ff26bd5ea4ccca1306aaf31 SHA512 dfcfd92604100b4934dc270fd74be4f239c2adaef6e999509ce3af9f8798033b30766273093731c876c7dcb3655baa788daa29b58b3712f7ef4d854f6f411ce0
MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/slony1/slony1-2.2.9.ebuild b/dev-db/slony1/slony1-2.2.9.ebuild
new file mode 100644
index 000000000000..0e854d2ba2ca
--- /dev/null
+++ b/dev-db/slony1/slony1-2.2.9.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server,threads"
+
+inherit postgres-multi
+
+IUSE="doc perl"
+
+DESCRIPTION="A replication system for the PostgreSQL Database Management System"
+HOMEPAGE="https://slony.info/"
+
+MAJ_PV=$(ver_cut 1-2)
+SRC_URI="https://slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
+ doc? ( https://slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2 )
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="${POSTGRES_DEP}
+ perl? ( dev-perl/DBD-Pg )
+"
+RDEPEND=${DEPEND}
+
+REQUIRE_USE="${POSTGRES_REQ_USE}"
+
+# Testing requires a more complex setup than we benefit from being able
+# to perform.
+# https://slony.info/documentation/2.2/testing.html
+RESTRICT="test"
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+
+ if use doc ; then
+ # The docs tarball will unpack over the source directory. So, we
+ # clear the adminguide directory now to make it easier to
+ # install later.
+ rm ${P}/doc/adminguide/* || die
+ unpack ${P}-docs.tar.bz2
+ fi
+}
+
+src_configure() {
+ local slot_bin_dir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/bin"
+ use perl && myconf=" --with-perltools=\"${slot_bin_dir}\""
+ postgres-multi_foreach econf ${myconf} \
+ --with-pgconfigdir="${slot_bin_dir}" \
+ --with-slonybindir="${slot_bin_dir}"
+}
+
+src_install() {
+ postgres-multi_foreach emake DESTDIR="${D}" install
+
+ dodoc README SAMPLE TODO UPGRADING share/slon.conf-sample
+ use doc && postgres-multi_forbest dodoc -r doc/adminguide
+
+ newinitd "${FILESDIR}"/slony1.init slony1
+ newconfd "${FILESDIR}"/slony1.conf slony1
+}
+
+pkg_postinst() {
+ # Slony-I installs its executables into a directory that is
+ # processed by the PostgreSQL eselect module. Call it here so that
+ # the symlinks will be created.
+ ebegin "Refreshing PostgreSQL $(postgresql-config show) symlinks"
+ postgresql-config update
+ eend $?
+}