gentoo resync : 18.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-18 11:06:49 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-18 11:06:49 +0000
commit: ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch)
tree: e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /dev-db
parent: 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff)
36 files changed, 756 insertions, 1149 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 213ad946c0cf..207e71f8417d 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 42a538341038..76f17b8a040d 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,10 +1,6 @@
 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-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/mycli-1.20.1.ebuild b/dev-db/mycli/mycli-1.20.1.ebuild
deleted file mode 100644
index 9246bbf04576..000000000000
--- a/dev-db/mycli/mycli-1.20.1.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=( python{3_6,3_7} )
-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.1.0[${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-2.0.6[${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.4.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.21.1-r1.ebuild b/dev-db/mycli/mycli-1.21.1-r1.ebuild
deleted file mode 100644
index 042db5617483..000000000000
--- a/dev-db/mycli/mycli-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=rdepend
-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="$(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-2.0.6[${PYTHON_MULTI_USEDEP}]
-	<dev-python/prompt_toolkit-3.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}] )')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.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
-}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index ae992e29152b..3e96dba6c1e9 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 1056 BLAKE2B 1e1ab96e6aef2ebc122b6234ade2ae7463b4bd0fe78aa15317e3045246e561e09516b5d08396453cb2f7f92fd4c20ae41f93b0517e1201b23bcff89c958fcfe5 SHA512 293337b5b82fc9dbcfb9af999bfbb3a1bdcd8e30455d9cb24deb827491f84c0f2ad98fa6c6a812c61efa122e26f16c64146552df2b7aa6c57540330fdda52bf5
+EBUILD mysql-connector-c++-8.0.22.ebuild 1055 BLAKE2B 38dbc920d1e67aa065f6f8dfef6c56a515df757c8939e5f893941e66ae2ad361e350abbbe51b824ab4e24017dd55b0a68f588f99d0cb6d74b8713ddbbea10734 SHA512 1390b0edd15b93ec2446278ff70c043fb4ea2a1311e66099b5e7d558d1de2a6698e59ca609c933319c51a47c042a1724faef0eb70dc25a1e7fc5e19cd668e836
 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 e72e5f0274e1..3f0eadd2941b 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/mytop/Manifest b/dev-db/mytop/Manifest
index f0ace263f7a7..05bc1d9eb48c 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -3,8 +3,6 @@ AUX mytop-1.6-global-status.patch 3694 BLAKE2B 68b2f93f74d4038d5e0527df65061a5b8
 AUX mytop-1.6-queries-vs-questions-mysql-5.0.76.patch 3365 BLAKE2B b28c2855e90201e1c7e5c94a76036b751f7428b3726fcc9d69b5848eb4fd8fe6c0cd538b80f901eef95586aa965485c64571439884f3fdda41a66f230355aba7 SHA512 a2735b157b81f702af09d6ee38003e4d15b6f901bc8f5e7013e8c73a1bd9ee798d0ed00ac0578b7e8ef36e5d4ddcc65489325937e9c2074004d2f69fb81fdcfb
 AUX mytop-1.9.1-global-status.patch 3459 BLAKE2B 338dffab012e3026d1c4e5edf241cf15a4bc2d67b1a29f4770aeb20b952d5d171e9fd805e21a963652eb601a4ed3bb5ddf3dd35fd310f66ce4fb89eee7257f9c SHA512 68052535131147a446133fbc155e04e13c5f0195c8fd111059b2bc266aa7a79f72cb25ec1f453e051651783760e212349dc7c50e1de2768d45281d25582a0cc9
 AUX mytop-1.9.1-queries-vs-questions-mysql-5.0.76.patch 3431 BLAKE2B 4d1d18cd3c9f9f74df49ab1958e68b50e286700619e28c8fc3e701a51eb4e95b5a1a8da2bae0e671f458f163d17ee163a30b697cc02219d118f0a05ecc00498f SHA512 50f5373dda953ea7ac18aff65b1319999fe0c53471ebef548309e49e2c6f762d5d98f105280a2c58a324731ff3c1c1af123114acf09f6bb3c99e4580e6041473
-DIST mytop-1.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 819 BLAKE2B 875526378cde5b771663733fb81be9d2a63d2ae60178aef424c055c23772365a874566daa0dde3911be2c46c74482b226c2156e4e4fcc4a5d7b573e4e0ff28da SHA512 59e2bc37d7ac1861a21a090c2e493fecdbe68a047686a9e361b98f70fdc04e659470b31253c1d9bb652584a0a481c7a1ded24dcc4789b2c7f12546d77fece892
+EBUILD mytop-1.9.1.ebuild 818 BLAKE2B 69e693945e30b7f5ec6a37c03abcce2ed8affbbeebdb355ee5e1a0932cd3cc0b77707fd14bd73772431dfcb610989fc242edbb706593176d40d54cd5073f5fe5 SHA512 973a39bfc22fbe8b86415295d12f323d4a1ccc930a90bce53f24f5f2657cc34c9991cc04874335d6311c87b6a961e79f590d867a4ac19a4464ffe2e6dd878ddf
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mytop/mytop-1.6-r4.ebuild b/dev-db/mytop/mytop-1.6-r4.ebuild
deleted file mode 100644
index 94921dc7b57f..000000000000
--- a/dev-db/mytop/mytop-1.6-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="mytop - a top clone for mysql"
-HOMEPAGE="http://jeremy.zawodny.com/mysql/mytop/"
-SRC_URI="http://jeremy.zawodny.com/mysql/mytop/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-perl/DBD-mysql
-	virtual/perl-Getopt-Long
-	dev-perl/TermReadKey
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-PATCHES=( "${FILESDIR}/${PN}-1.6-global-status.patch"
-		  "${FILESDIR}/${PN}-1.6-queries-vs-questions-mysql-5.0.76.patch"
-		  "${FILESDIR}/${PN}-1.6-getopt-long-2.38-fixup.patch"
-		)
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	sed -i -r\
-		-e "s|socket( +)=> '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \
-		"${D}"/usr/bin/mytop
-}
diff --git a/dev-db/mytop/mytop-1.9.1.ebuild b/dev-db/mytop/mytop-1.9.1.ebuild
index abf078984e41..004f5b3371ee 100644
--- a/dev-db/mytop/mytop-1.9.1.ebuild
+++ b/dev-db/mytop/mytop-1.9.1.ebuild
@@ -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 b7f3e56d1ce7..a74007a7cafb 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -1,7 +1,4 @@
-AUX pg_top-3.7.0.patch 749 BLAKE2B 26d3d391e33a55b5af857ec3262b5f37e97a64262c050e00d9e0980eb954c100810885f53e27c2e917468b196b8280c705b2ebd41d7420a085bce082498d1cb8 SHA512 e94b14318f22f35fb28de3e0d53e6ff785a36e1eed37fe0f8066a0e0e4adb5c2c280de5c577ba7969715bee594ed2686b41fde0ce2930990064ab80132c760e4
-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-r1.ebuild 503 BLAKE2B 63696aa64d340b27d60fa544cf064dfaacf1e3f710aa86042068cea7cf30b040779f2b147f250cc7b019ffe74cc0ccd92d539fa5bac9b39dc0711e4b45190f9c SHA512 ada49d5653fd5c2e722f1e26ff1f7a7cc75f0191140b2f2383318baf01f397d484693080e769dc284f4ad92e719646cb25404b80f0a101685122ff268a2d3796
-EBUILD pg_top-4.0.0.ebuild 401 BLAKE2B 5df7c89bac799f355746deae2b915d1572b0e4292f062a1dde7f7c99c44ae03141042689b2606964cfc7dc3ab9c4c170d2d91757443391c9024843a71299dfcd SHA512 34d7e8a2e95e14046e8ed55861ffe0bb6b2b837860a03df1163757da75671052d92562354fca5187ef0146e8fc2023cf4a8c3aa74a3f0e980262971bf6a8a4cd
+EBUILD pg_top-4.0.0.ebuild 400 BLAKE2B d5ac60a50fa11db849c9457077ad063151772d9c95e43c85b7267e056b011c54226f867fd2d6190775f6cd95ab78f6dc46bd88318bc1ab3f21ba54b5393344f1 SHA512 92e5c7de0b037b57a75e995953fd26f4ff4f1651f5945b95c1af61d4e708349a2f262c3dbc1a019bb56b4f6541bc51f3d607893e5dd0bb0b2f6b7ec78a50b53c
 MISC metadata.xml 461 BLAKE2B e6f8d76b546b6b6b6cb13dc1158f71d20f3c68fc9ecc9b37ccf8d8581ec8699e5faab5bd4b10100a0897f668e04449e8f67622e3e3eeb3fdbc54023af536ec0a SHA512 ef6740e37b9d51eb8d303e393d826c91519e8fbd2fe66930486bfbf16bf3bfe09f1a90040a044428841ed61dd6885eefefa2fc9bc43a08e6d4e2dec4a67ba9fc
diff --git a/dev-db/pg_top/files/pg_top-3.7.0.patch b/dev-db/pg_top/files/pg_top-3.7.0.patch
deleted file mode 100644
index 6367a1dc03dc..000000000000
--- a/dev-db/pg_top/files/pg_top-3.7.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -103,7 +103,7 @@
- AC_SEARCH_LIBS(elf32_getphdr, elf)
- # -lmld -lmach
- AC_SEARCH_LIBS(vm_statistics, mach)
--AC_SEARCH_LIBS(tgetent, termcap curses ncurses)
-+AC_SEARCH_LIBS(tgetent, termcap tinfo curses ncurses)
- AC_SEARCH_LIBS(exp, m)
- 
- AC_SEARCH_LIBS(dlerror, dl)
-@@ -111,6 +111,8 @@
- AC_SEARCH_LIBS(inet_aton, resolv, AC_DEFINE(HAVE_INET_ATON, 1,
-         [inet_aton is already defined]))
- 
-+AC_SEARCH_LIBS(PQexec, pq)
-+
- # check for libraries required by extension
- extlibs=""
- if test -n "$with_ext" -a -f "${srcdir}/ext/$with_ext.libs"; then
-@@ -217,8 +219,6 @@
- AC_SUBST(SRC)
- AC_SUBST(OBJ)
- 
--CFLAGS="-Wall -g"
--
- AC_MSG_CHECKING(for installation settings)
- # calculate appropriate settings
- OWNER=""
diff --git a/dev-db/pg_top/pg_top-3.7.0.ebuild b/dev-db/pg_top/pg_top-3.7.0.ebuild
deleted file mode 100644
index 5b311408477c..000000000000
--- a/dev-db/pg_top/pg_top-3.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
-
-DESCRIPTION="'top' for PostgreSQL"
-HOMEPAGE="http://ptop.projects.postgresql.org/"
-SRC_URI="http://pgfoundry.org/frs/download.php/3504/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="dev-db/postgresql"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( FAQ HISTORY README TODO Y2K )
-PATCHES=( "${FILESDIR}/${P}.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
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 28d2942c81e7..45ca3ea8b48b 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/pgagent/Manifest b/dev-db/pgagent/Manifest
index f8f4b90cbb99..af2d640addee 100644
--- a/dev-db/pgagent/Manifest
+++ b/dev-db/pgagent/Manifest
@@ -1,14 +1,6 @@
-AUX add-log-timestamps.patch 18087 BLAKE2B f5febe934692aa8c6a794aa711de5152629c6f4e88ba1582378f0bfbc6e6e4de0f1464a62da63c76060c5672db460c7c7a1763279052f2ffdcb5b84c20bcbc97 SHA512 ce5d00aeda35bc4282ca65e8112be35e6f28cb70ff64316e47ab2247574ba71edbc99a1b4567df6a5a40bda1c8dbb5a1d65faa45054a7c63444c8591c9c059c5
-AUX fix-dbconn-getlasterror-crash.patch 1242 BLAKE2B f60c02a1044d1768dd8e9ae6c30281d893ee31219b0cfc2a736def73620b716e0c67878691229908599c362f29b8e92a4cf68c6f1890efde719bc68998e38391 SHA512 fa5553592878a6778d56306b515804ff60510c2327ea13d2f11f6b1259c13dc908237065bcc3e79a975128fa5e48e68135f1357e9c5053fb667e52c8d1a14dc0
-AUX fix-job-success-test.patch 1119 BLAKE2B f21cd2d132fc272be1f2add642f8b8b92c0b43aa94d84d824a40b16baf2a79818dbcf8344a6689ba33f326a56f902a79c746d55300c8da272789ba633d096688 SHA512 67f8c882b548057095b6914e6462b4e87be02fedc9c281d4aa4a4f1b936d257b9b0c9e01cd06e5a5e065e5ee128dc0da9416a436e78ab956b7d68f117e0bd102
 AUX pgagent-4.0.0-pthreads-linking.patch 806 BLAKE2B 771541db654044bc7de240a9b1df3a0d14fbedfbd396b887fb252c83b105cce3431f74913faf07f9c638f2b7a046d5aeb7f944692f03efb0b097c5d683133632 SHA512 7693f63555dc817caa41ed5052f2548c06f6ab87da3ef0267e07ff99bda9e1aac6c20dee5628bbc9ed79adc0183da726f9e256bd658c0283046b6d41f8cb7905
 AUX pgagent.confd 292 BLAKE2B e40e12a1a915653ffa62b113733db93cc7b1c3fc7200ef476a91080fdc054fdb64b6ee9b838583b93b27827a7858e905df8fbe0084dedd8d70deee6887469005 SHA512 a7346ae4dc7231efb8c29d3b7a1d7d377a2b1dabe01b0be9b090e070bec927b29d8e8c20ce30d437cab2ab5c119af89dfcdc6f75fecaca7366b2c10c5e48ed11
 AUX pgagent.initd-r1 837 BLAKE2B 27bd762c0fd56cf63d1c31c2c0d94b6d8ed62dbfeaed42e260294604a5059c55dc9d204a526bfd5725831c99f712f1e5812a8bb7ee80cb745fc9bebfa06d7359 SHA512 ec6843ad55a7b2800c146ce7ee0551c5ede319d1fca1cfd700acd2245c6fcbaa36a87ad6cda04f33e124b479e6ca6b040cb57d0f78e40d335276e29c800f6627
-AUX postgres-10-build-fix.patch 2421 BLAKE2B 3b6865e7843edf420b59b1f2ededbca9707145d2b98a8d1cd015cadbe1dcf8729eb39d300c63ee847ae5c229a3583b4bd137139a007e8eda4bf8af670f99f6c4 SHA512 52aaf0582d8132904d7b95fc523d597749f045f9d465401ed851ebfeeb0824d2c8668ba0525db5e15a3966b388215e885aaea5626e3102a765fb7f2a2ba0b349
-AUX save-stderr-jobstep-output.patch 2626 BLAKE2B 8a0eb06fecb9450e027219f2ede7b9dc3fbeb6ad1d70e15f5294c954a924c9eb82b10569a6b045e6acd79430b1f5d7116ba4f19316599a2354dc9795ae274458 SHA512 b84b52e5a96d98067eab5e4877c54e02e3c912215067f4e1a1c9d3983a29acfd3e63fe666c6e62cf46391fb72cb02b4197d23e305cadf88da096f80d8e0c8167
-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 1240 BLAKE2B 29669c503503e31f3553eb4011653ff36f8e068f3add1722c9ed5b6ab82ecbb45ffd4246ce901d2aa2eb6ba7e51987f29fc839eee57d7598947aa9728deaadf8 SHA512 07c544c2f6823186d341584b75b80c195d817bcc64aa036bc4f22a5e7a5dacc29afc19969604e89e08410a7801e8c643a75413b7b3a043ef68c83276f0ee71d7
-EBUILD pgagent-4.0.0.ebuild 1177 BLAKE2B 8db48f73f87790fa3fde33b846bb62093757ae6b70735743081b36eddd99bbdd7d8f4a094546d889362bb2f00c13b49a266776d6828547db4853b078c48c52f1 SHA512 2a732df46d076d08a9934d73a4ed1ee15d0de5e1f94b141f0a64eb80fcd77800c06db4baaec333da36a509a7ec7ed5e59d57e673fadc25d5b64d6da8da700ff1
+EBUILD pgagent-4.0.0-r1.ebuild 1239 BLAKE2B 765398f1d00a72a30ab9b676d5688ddd9370b4e29324938fff1b85694c8732d64302ab0d3b6b7e91f3d44ef5f7c42492553b5581aa7422e0a9f6c617db6eb72e SHA512 b2054c28cd377fd4b69e895ae8a5494cf78fd15f23d67171f91f15c7369ae9ba51a0bd832ab8a889b50e7ab5debad98e9a5a21f693460404052f4ced3a98e236
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pgagent/files/add-log-timestamps.patch b/dev-db/pgagent/files/add-log-timestamps.patch
deleted file mode 100644
index 8d9eb4a3e8e2..000000000000
--- a/dev-db/pgagent/files/add-log-timestamps.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-From 2eef6cc4928c611cecdca3c1daecb60568deca4e Mon Sep 17 00:00:00 2001
-From: Sanket Mehta <sanket.mehta@enterprisedb.com>
-Date: Fri, 17 Jul 2015 09:07:09 +0100
-Subject: [PATCH] Add log timestamps and a --version option per Josh Berkus.
- Update copyright notices while passing.
-
----
- CMakeLists.txt                   |  8 ++++----
- LICENSE                          |  2 +-
- cmake/MakeExt.cmake              |  2 +-
- connection.cpp                   |  2 +-
- include/connection.h             |  2 +-
- include/job.h                    |  2 +-
- include/misc.h                   |  3 ++-
- include/pgAgent.h                |  2 +-
- job.cpp                          |  2 +-
- misc.cpp                         | 14 +++++++++++++-
- pgAgent.cpp                      |  2 +-
- pgAgent.rc                       | 14 +++++++-------
- pgaevent/CMakeLists.txt          |  2 +-
- pgaevent/pgaevent.c              |  2 +-
- pgaevent/pgaevent.def            |  2 +-
- pgaevent/pgamsgevent.h           |  2 +-
- pgaevent/pgamsgevent.rc          | 14 +++++++-------
- precomp.cpp                      |  2 +-
- sql/pgagent--unpackaged--3.4.sql |  2 +-
- sql/pgagent.sql                  |  2 +-
- sql/pgagent_upgrade.sql          |  2 +-
- unix.cpp                         | 16 +++++++++++-----
- win32.cpp                        |  5 ++++-
- 23 files changed, 64 insertions(+), 42 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab02fea..c8bfa4a 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- #######################################################################
- #
- # pgAgent - PostgreSQL tools
--# Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+# Copyright (C) 2002 - 2015, The pgAdmin Development Team
- # This software is released under the PostgreSQL Licence
- #
- # CMakeLists.txt - CMake build configuration
-@@ -27,7 +27,6 @@ SET(CMAKE_FIND_LIBRARY_PREFIXES "")
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
- 
- SET(STATIC_BUILD YES CACHE BOOL "Statically link the executable?")
--
- ################################################################################
- # Apple stuff
- ################################################################################
-@@ -61,12 +60,12 @@ PROJECT(pgagent)
- # in pgagent.sql and upgrade_pgagent.sql if the major version number is
- # changed. The full version number also needs to be included in pgAgent.rc and
- # pgaevent/pgamsgevent.rc at present.
--SET(VERSION 3.4.0)
-+SET(VERSION "3.4.1")
- 
- # CPack stuff
- SET(CPACK_PACKAGE_VERSION_MAJOR 3)
- SET(CPACK_PACKAGE_VERSION_MINOR 4)
--SET(CPACK_PACKAGE_VERSION_PATCH 0)
-+SET(CPACK_PACKAGE_VERSION_PATCH 1)
- SET(CPACK_PACKAGE_NAME "pgAgent")
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "pgAgent is a job scheduling engine for PostgreSQL")
- SET(CPACK_PACKAGE_VENDOR "the pgAdmin Development Team")
-@@ -79,6 +78,7 @@ SET(CPACK_SOURCE_GENERATOR TGZ)
- SET(CPACK_SOURCE_IGNORE_FILES "\\\\.DS_Store;/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;.*~;cscope.*")
- 
- ADD_DEFINITIONS(-DPGAGENT_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR})
-+ADD_DEFINITIONS(-DPGAGENT_VERSION="${VERSION}")
- 
- # This must come after we set the CPACK variables!!
- INCLUDE(CPack)
-diff --git a/LICENSE b/LICENSE
-index 3b2638a..c460d6f 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -1,6 +1,6 @@
- pgAgent
- 
--Copyright (c) 2002 - 2014, The pgAdmin Development Team
-+Copyright (c) 2002 - 2015, The pgAdmin Development Team
- 
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose, without fee, and without a written agreement is
-diff --git a/cmake/MakeExt.cmake b/cmake/MakeExt.cmake
-index 5777c97..ae30e30 100644
---- a/cmake/MakeExt.cmake
-+++ b/cmake/MakeExt.cmake
-@@ -1,7 +1,7 @@
- #######################################################################
- #
- # pgAgent - PostgreSQL tools
--# Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+# Copyright (C) 2002 - 2015, The pgAdmin Development Team
- # This software is released under the PostgreSQL Licence
- #
- # MakeExt,cmake - Create the PG Extension
-diff --git a/connection.cpp b/connection.cpp
-index f2213bd..25432bb 100644
---- a/connection.cpp
-+++ b/connection.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // connection.cpp - database connection
-diff --git a/include/connection.h b/include/connection.h
-index a201450..064067c 100644
---- a/include/connection.h
-+++ b/include/connection.h
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // connection.h - database connection
-diff --git a/include/job.h b/include/job.h
-index e511852..abc33d4 100644
---- a/include/job.h
-+++ b/include/job.h
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // job.h - agent job
-diff --git a/include/misc.h b/include/misc.h
-index 14b4edc..59847d1 100644
---- a/include/misc.h
-+++ b/include/misc.h
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // misc.h - misc functions
-@@ -18,6 +18,7 @@ void WaitAWhile(const bool waitLong = false);
- void setOptions(int argc, char **argv, const wxString &executable);
- wxString getArg(int &argc, char **&argv);
- wxString NumToStr(const long l);
-+void printVersion();
- 
- #endif // MISC_H
- 
-diff --git a/include/pgAgent.h b/include/pgAgent.h
-index 6ef4944..059e0ca 100644
---- a/include/pgAgent.h
-+++ b/include/pgAgent.h
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgAgent.h - main include
-diff --git a/job.cpp b/job.cpp
-index c4b39ce..f3eaa03 100644
---- a/job.cpp
-+++ b/job.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // job.cpp - pgAgent job
-diff --git a/misc.cpp b/misc.cpp
-index dfd56a0..2252d83 100644
---- a/misc.cpp
-+++ b/misc.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // misc.cpp - misc functions
-@@ -16,6 +16,8 @@
- #include <unistd.h>
- #endif
- 
-+#define APPVERSION_STR wxT(PGAGENT_VERSION)
-+
- // In unix.c or win32.c
- void usage(const wxString &executable);
- 
-@@ -42,6 +44,11 @@ wxString getArg(int &argc, char **&argv)
- 	return s;
- }
- 
-+void printVersion()
-+{
-+	wxPrintf(_("PostgreSQL Scheduling Agent\n"));
-+	wxPrintf(_("Version: %s\n"), APPVERSION_STR);
-+}
- 
- void setOptions(int argc, char **argv, const wxString &executable)
- {
-@@ -72,6 +79,11 @@ void setOptions(int argc, char **argv, const wxString &executable)
- 						minLogLevel = val;
- 					break;
- 				}
-+				case 'v':
-+				{
-+					printVersion();
-+					exit (0);
-+				}
- #ifndef __WXMSW__
- 				case 'f':
- 				{
-diff --git a/pgAgent.cpp b/pgAgent.cpp
-index 5ed43fb..9238fa1 100644
---- a/pgAgent.cpp
-+++ b/pgAgent.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgAgent.cpp - pgAgent main entry
-diff --git a/pgAgent.rc b/pgAgent.rc
-index 3c51bfa..c4169e1 100644
---- a/pgAgent.rc
-+++ b/pgAgent.rc
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- // 
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgAgent.rc - win32 Resources
-@@ -16,8 +16,8 @@ aaaPGAGENT      ICON    DISCARDABLE     "include/pgAgent.ico"
- 
- 
- VS_VERSION_INFO VERSIONINFO
--FILEVERSION    3,4,0,0
--PRODUCTVERSION 3,4,0,0
-+FILEVERSION    3,4,1,0
-+PRODUCTVERSION 3,4,1,0
- FILEOS         VOS__WINDOWS32
- FILETYPE       VFT_APP
- BEGIN
-@@ -25,15 +25,15 @@ BEGIN
-     BEGIN
-         BLOCK "040904E4"
-         BEGIN
--            VALUE "FileVersion",     "3.4.0", "\0"
--            VALUE "File Version",    "3.4.0", "\0"
-+            VALUE "FileVersion",     "3.4.1", "\0"
-+            VALUE "File Version",    "3.4.1", "\0"
-             VALUE "FileDescription", "pgAgent - PostgreSQL Scheduling Agent", "\0"
--            VALUE "LegalCopyright",  "\251 2002 - 2012, The pgAdmin Development Team", "\0"
-+            VALUE "LegalCopyright",  "\251 2002 - 2015, The pgAdmin Development Team", "\0"
-             VALUE "LegalTrademarks", "This software is released under the PostgreSQL Licence.", "\0"
-             VALUE "InternalName",    "pgAgent", "\0"
-             VALUE "OriginalFilename","pgagent.exe", "\0"
-             VALUE "ProductName",     "pgAgent", "\0"
--            VALUE "ProductVersion",  "3.4.0", "\0"
-+            VALUE "ProductVersion",  "3.4.1", "\0"
-         END
-     END
-     BLOCK "VarFileInfo"
-diff --git a/pgaevent/CMakeLists.txt b/pgaevent/CMakeLists.txt
-index 10478c3..2fd6192 100644
---- a/pgaevent/CMakeLists.txt
-+++ b/pgaevent/CMakeLists.txt
-@@ -1,7 +1,7 @@
- #######################################################################
- #
- # pgAgent - PostgreSQL tools
--# Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+# Copyright (C) 2002 - 2015, The pgAdmin Development Team
- # This software is released under the PostgreSQL Licence
- #
- # pgaevent/CMakeLists.txt - CMake build configuration
-diff --git a/pgaevent/pgaevent.c b/pgaevent/pgaevent.c
-index a66ed42..c9fac75 100644
---- a/pgaevent/pgaevent.c
-+++ b/pgaevent/pgaevent.c
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- // 
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgaevent.c - win32 message format dll
-diff --git a/pgaevent/pgaevent.def b/pgaevent/pgaevent.def
-index c9e222d..34e03c1 100644
---- a/pgaevent/pgaevent.def
-+++ b/pgaevent/pgaevent.def
-@@ -2,7 +2,7 @@
- ; //
- ; // pgAgent - PostgreSQL Tools
- ; // 
--; // Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+; // Copyright (C) 2002 - 2015 The pgAdmin Development Team
- ; // This software is released under the PostgreSQL Licence
- ; //
- ; // pgaeventdef - pgaevent.dll exports
-diff --git a/pgaevent/pgamsgevent.h b/pgaevent/pgamsgevent.h
-index b8e11a5..f589d60 100644
---- a/pgaevent/pgamsgevent.h
-+++ b/pgaevent/pgamsgevent.h
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgamsgevent.h - Message id declarations
-diff --git a/pgaevent/pgamsgevent.rc b/pgaevent/pgamsgevent.rc
-index 79e77aa..510ab65 100644
---- a/pgaevent/pgamsgevent.rc
-+++ b/pgaevent/pgamsgevent.rc
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- // 
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgaevent.rc - win32 Resources
-@@ -19,8 +19,8 @@ aaaPGAEVENT      ICON    DISCARDABLE     "../include/pgagent.ico"
- 
- 
- VS_VERSION_INFO VERSIONINFO 
--FILEVERSION    3,4,0,0
--PRODUCTVERSION 3,4,0,0
-+FILEVERSION    3,4,1,0
-+PRODUCTVERSION 3,4,1,0
- FILEOS         VOS__WINDOWS32
- FILETYPE       VFT_APP
- BEGIN
-@@ -28,15 +28,15 @@ BEGIN
-     BEGIN
-         BLOCK "040904E4"
-         BEGIN 
--            VALUE "FileVersion",     "3.4.0", "\0"
--            VALUE "File Version",    "3.4.0", "\0"
-+            VALUE "FileVersion",     "3.4.1", "\0"
-+            VALUE "File Version",    "3.4.1", "\0"
-             VALUE "FileDescription", "pgaevent - pgAgent Event Log Message DLL", "\0"
--            VALUE "LegalCopyright",  "\251 2002 - 2014, The pgAdmin Development Team", "\0"
-+            VALUE "LegalCopyright",  "\251 2002 - 2015, The pgAdmin Development Team", "\0"
-             VALUE "LegalTrademarks", "This software is released under the PostgreSQL Licence.", "\0"
-             VALUE "InternalName",    "pgaevent", "\0"
-             VALUE "OriginalFilename","pgaevent.dll", "\0"
-             VALUE "ProductName",     "pgAgent", "\0"
--            VALUE "ProductVersion",  "3.4.0", "\0"
-+            VALUE "ProductVersion",  "3.4.1", "\0"
-         END
-     END
-     BLOCK "VarFileInfo" 
-diff --git a/precomp.cpp b/precomp.cpp
-index 02c969f..56766bb 100644
---- a/precomp.cpp
-+++ b/precomp.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // precomp.cpp - pgAgent precompiled headers
-diff --git a/sql/pgagent--unpackaged--3.4.sql b/sql/pgagent--unpackaged--3.4.sql
-index 536640e..f5ffc63 100644
---- a/sql/pgagent--unpackaged--3.4.sql
-+++ b/sql/pgagent--unpackaged--3.4.sql
-@@ -1,7 +1,7 @@
- /*
- // pgAgent - PostgreSQL Tools
- // 
--// Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgagent--unpackaged--3.4.sql - Convert pgAgent existing tables and functions to an extension
-diff --git a/sql/pgagent.sql b/sql/pgagent.sql
-index 3708adf..1118833 100644
---- a/sql/pgagent.sql
-+++ b/sql/pgagent.sql
-@@ -1,7 +1,7 @@
- /*
- // pgAgent - PostgreSQL Tools
- // 
--// Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgagent.sql - pgAgent tables and functions
-diff --git a/sql/pgagent_upgrade.sql b/sql/pgagent_upgrade.sql
-index ae0d995..c256c93 100644
---- a/sql/pgagent_upgrade.sql
-+++ b/sql/pgagent_upgrade.sql
-@@ -1,7 +1,7 @@
- /*
- // pgAgent - PostgreSQL Tools
- // 
--// Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // pgagent_upgrade.sql - Upgrade pgAgent tables and functions
-diff --git a/unix.cpp b/unix.cpp
-index 34ad0f6..e206408 100644
---- a/unix.cpp
-+++ b/unix.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014, The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // unix.cpp - pgAgent unix specific functions
-@@ -17,14 +17,17 @@
- #include <wx/filename.h>
- #include <wx/ffile.h>
- #include <fcntl.h>
-+void printVersion();
- 
- void usage(const wxString &executable)
- {
- 	wxFileName *fn = new wxFileName(executable);
-+	printVersion();
- 
- 	wxPrintf(_("Usage:\n"));
- 	wxPrintf(fn->GetName() + _(" [options] <connect-string>\n"));
- 	wxPrintf(_("options:\n"));
-+	wxPrintf(_("-v (display version info and then exit)\n"));
- 	wxPrintf(_("-f run in the foreground (do not detach from the terminal)\n"));
- 	wxPrintf(_("-t <poll time interval in seconds (default 10)>\n"));
- 	wxPrintf(_("-r <retry period after connection abort in seconds (>=10, default 30)>\n"));
-@@ -50,22 +53,25 @@ void LogMessage(wxString msg, int level)
- 		return;
- 	}
- 
-+	wxDateTime logTime = wxDateTime::Now();
-+	wxString logTimeString = logTime.Format() + wxT(" : ");
-+
- 	switch (level)
- 	{
- 		case LOG_DEBUG:
- 			if (minLogLevel >= LOG_DEBUG)
--				file.Write(_("DEBUG: ") + msg + wxT("\n"));
-+				file.Write(logTimeString + _("DEBUG: ") + msg + wxT("\n"));
- 			break;
- 		case LOG_WARNING:
- 			if (minLogLevel >= LOG_WARNING)
--				file.Write(_("WARNING: ") + msg + wxT("\n"));
-+				file.Write(logTimeString + _("WARNING: ") + msg + wxT("\n"));
- 			break;
- 		case LOG_ERROR:
--			file.Write(_("ERROR: ") + msg + wxT("\n"));
-+			file.Write(logTimeString + _("ERROR: ") + msg + wxT("\n"));
- 			exit(1);
- 			break;
- 		case LOG_STARTUP:
--			file.Write(_("WARNING: ") + msg + wxT("\n"));
-+			file.Write(logTimeString + _("WARNING: ") + msg + wxT("\n"));
- 			break;
- 	}
- 
-diff --git a/win32.cpp b/win32.cpp
-index aa5d5d7..624ae77 100644
---- a/win32.cpp
-+++ b/win32.cpp
-@@ -2,7 +2,7 @@
- //
- // pgAgent - PostgreSQL Tools
- //
--// Copyright (C) 2002 - 2014 The pgAdmin Development Team
-+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
- // This software is released under the PostgreSQL Licence
- //
- // win32.cpp - pgAgent win32 specific functions
-@@ -36,6 +36,7 @@ static HANDLE serviceSync;
- static HANDLE eventHandle;
- 
- bool stopService();
-+void printVersion();
- 
- // This will be called from MainLoop, if pgagent is initialized properly
- void Initialized()
-@@ -435,12 +436,14 @@ bool removeService(const wxString &serviceName)
- void usage(const wxString &executable)
- {
- 	wxFileName *fn = new wxFileName(executable);
-+	printVersion();
- 
- 	wxPrintf(_("Usage:\n"));
- 	wxPrintf(fn->GetName() + _(" REMOVE <serviceName>\n"));
- 	wxPrintf(fn->GetName() + _(" INSTALL <serviceName> [options] <connect-string>\n"));
- 	wxPrintf(fn->GetName() + _(" DEBUG [options] <connect-string>\n"));
- 	wxPrintf(_("options:\n"));
-+	wxPrintf(_("-v (display version info and then exit)\n"));
- 	wxPrintf(_("-u <user or DOMAIN\\user>\n"));
- 	wxPrintf(_("-p <password>\n"));
- 	wxPrintf(_("-d <displayname>\n"));
diff --git a/dev-db/pgagent/files/fix-dbconn-getlasterror-crash.patch b/dev-db/pgagent/files/fix-dbconn-getlasterror-crash.patch
deleted file mode 100644
index 633a359b6765..000000000000
--- a/dev-db/pgagent/files/fix-dbconn-getlasterror-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f9bf1ccb27ebcfce00e7a6d467bc0e1b5ee9555e Mon Sep 17 00:00:00 2001
-From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
-Date: Wed, 1 Apr 2015 15:24:11 +0530
-Subject: [PATCH] Fixed a bug in DBconn::GetLastError() function.
-
-pgAgent was crashing, while removing the trailing new-lines from the
-empty error message string (Reported by: Thomas Krennwallner)
----
- connection.cpp | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/connection.cpp b/connection.cpp
-index b7623e6..f2213bd 100644
---- a/connection.cpp
-+++ b/connection.cpp
-@@ -313,15 +313,7 @@ int DBconn::ExecuteVoid(const wxString &query)
- 
- wxString DBconn::GetLastError()
- {
--	// Return the last error message, minus any trailing line ends
--	if (lastError.substr(lastError.length() - 2, 2) == wxT("\r\n")) // DOS
--		return lastError.substr(0, lastError.length() - 2);
--	else if (lastError.substr(lastError.length() - 1, 1) == wxT("\n")) // Unix
--		return lastError.substr(0, lastError.length() - 1);
--	else if (lastError.substr(lastError.length() - 1, 1) == wxT("\r")) // Mac
--		return lastError.substr(0, lastError.length() - 1);
--	else
--		return lastError;
-+	return lastError.Trim(true);
- }
- 
- ///////////////////////////////////////////////////////7
diff --git a/dev-db/pgagent/files/fix-job-success-test.patch b/dev-db/pgagent/files/fix-job-success-test.patch
deleted file mode 100644
index cd5495a52aa9..000000000000
--- a/dev-db/pgagent/files/fix-job-success-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 01b72d867cc2bdbaff1765499a6395f7bc94e2be Mon Sep 17 00:00:00 2001
-From: Sanket Mehta <sanket.mehta@enterprisedb.com>
-Date: Tue, 1 Dec 2015 11:34:32 +0530
-Subject: [PATCH] Set 'succeeded' flag to true/false by checking for the step
- failure everytime (it gets executed).
-
-These was an issue with the current implementation.
-
-Once the 'succeeded' flag is set to true, the following batch step
-execution does not stop executiong of following steps on failure, even
-we have set 'onerror' to 'f' for that step.
----
- job.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/job.cpp b/job.cpp
-index f3eaa03..9864f57 100644
---- a/job.cpp
-+++ b/job.cpp
-@@ -307,9 +307,7 @@ int Job::Execute()
- 
- 				// set success status for batch runs, be pessimistic by default
- 				LogMessage(wxString::Format(_("Script return code: %d"), rc), LOG_DEBUG);
--				if (rc == 0)
--					succeeded = true;
--
-+				succeeded = ((rc == 0) ? true : false);
- 				// If output is empty then either script did not return any output
- 				// or script threw some error into stderr.
- 				// Check script threw some error into stderr
diff --git a/dev-db/pgagent/files/postgres-10-build-fix.patch b/dev-db/pgagent/files/postgres-10-build-fix.patch
deleted file mode 100644
index e2ecb0aa60b7..000000000000
--- a/dev-db/pgagent/files/postgres-10-build-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a7b82fb3d3bd3de3ce624d9e4b0da53cb9835c2d Mon Sep 17 00:00:00 2001
-From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
-Date: Mon, 31 Jul 2017 14:57:55 +0530
-Subject: [PATCH] Added support two digits version for PostgreSQL/EDB Postgres
- Advanced Server >= 10
-
----
- CMakeLists.txt     | 6 +++++-
- cmake/FindPG.cmake | 6 +++---
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8214650..29755b4 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -176,7 +176,11 @@ MESSAGE(STATUS "  Description                 : ${CPACK_PACKAGE_DESCRIPTION_SUMM
- MESSAGE(STATUS "  Version                     : ${VERSION}")
- MESSAGE(STATUS " ")
- MESSAGE(STATUS "  PostgreSQL version string   : ${PG_VERSION_STRING}")
--MESSAGE(STATUS "  PostgreSQL version parts    : ${PG_MAJOR_VERSION}.${PG_MINOR_VERSION}.${PG_PATCH_VERSION}")
-+IF(${PG_MAJOR_VERSION} GREATER 9)
-+	MESSAGE(STATUS "  PostgreSQL version parts    : ${PG_MAJOR_VERSION}")
-+ELSE()
-+	MESSAGE(STATUS "  PostgreSQL version parts    : ${PG_MAJOR_VERSION}.${PG_MINOR_VERSION}")
-+ENDIF(${PG_MAJOR_VERSION} GREATER 10)
- MESSAGE(STATUS "  PostgreSQL path             : ${PG_ROOT_DIR}")
- MESSAGE(STATUS "  PostgreSQL config binary    : ${PG_CONFIG_PATH}")
- MESSAGE(STATUS "  PostgreSQL include path     : ${PG_INCLUDE_DIRS}")
-diff --git a/cmake/FindPG.cmake b/cmake/FindPG.cmake
-index 349086c..9768771 100644
---- a/cmake/FindPG.cmake
-+++ b/cmake/FindPG.cmake
-@@ -28,7 +28,6 @@
- # PG_VERSION_STRING - The PostgreSQL version number.
- # PG_MAJOR_VERSION - The PostgreSQL major version (x in x.y.z).
- # PG_MINOR_VERSION - The PostgreSQL minor version (y in x.y.z).
--# PG_PATCH_VERSION - The PostgreSQL patch version (z in x.y.z).
- # PG_EXTENSION - Set to TRUE if PostgreSQL supports extensions.
- 
- IF(NOT PG_STATIC OR PG_STATIC STREQUAL "")
-@@ -70,8 +69,9 @@ IF(NOT _retval)
-     # Split the version into its component parts.
-     STRING(REGEX MATCHALL "[0-9]+" PG_VERSION_PARTS "${PG_VERSION_STRING}")
-     LIST(GET PG_VERSION_PARTS 0 PG_MAJOR_VERSION)
--    LIST(GET PG_VERSION_PARTS 1 PG_MINOR_VERSION)
--    LIST(GET PG_VERSION_PARTS 2 PG_PATCH_VERSION)
-+    IF((PG_MAJOR_VERSION LESS 10))
-+        LIST(GET PG_VERSION_PARTS 1 PG_MINOR_VERSION)
-+    ENDIF((PG_MAJOR_VERSION LESS 10))
- 
-     # Are extensions supported?
-     IF((PG_MAJOR_VERSION GREATER 9) OR ((PG_MAJOR_VERSION EQUAL 9) AND (PG_MINOR_VERSION GREATER 0)))
diff --git a/dev-db/pgagent/files/save-stderr-jobstep-output.patch b/dev-db/pgagent/files/save-stderr-jobstep-output.patch
deleted file mode 100644
index 245dbe2764ea..000000000000
--- a/dev-db/pgagent/files/save-stderr-jobstep-output.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5d2e0d3500a8e144215cdfe10b52cf7415b58046 Mon Sep 17 00:00:00 2001
-From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
-Date: Mon, 25 May 2015 12:37:42 +0530
-Subject: [PATCH] Save the standarad error too along with the standard output
- in the jobstep output for the batch jobs.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[Worked on by: Mehmet Emin KARAKAŞ, Akshay Joshi]
-[Reviewed and improvised by: Sanket Joshi, Ashesh Vashi]
----
- job.cpp | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/job.cpp b/job.cpp
-index 00334ab..c4b39ce 100644
---- a/job.cpp
-+++ b/job.cpp
-@@ -186,8 +186,10 @@ int Job::Execute()
- 
- #ifdef __WIN32__
- 				wxString filename = dirname + wxT("\\") + jobid + wxT("_") + stepid + wxT(".bat");
-+				wxString errorFile = dirname + wxT("\\") + jobid + wxT("_") + stepid + wxT("_error.txt");
- #else
- 				wxString filename = dirname + wxT("/") + jobid + wxT("_") + stepid + wxT(".scr");
-+				wxString errorFile = dirname + wxT("/") + jobid + wxT("_") + stepid + wxT("_error.txt");
- #endif
- 
- 				// Write the script
-@@ -233,6 +235,10 @@ int Job::Execute()
- 				file->Close();
- 				LogMessage(wxString::Format(_("Executing script file: %s"), filename.c_str()), LOG_DEBUG);
- 
-+				// freopen function is used to redirect output of stream (stderr in our case)
-+				// into the specified file.
-+				FILE *fpError = freopen(errorFile.mb_str(), "w", stderr);
-+
- 				// Execute the file and capture the output
- #ifdef __WIN32__
- 				// The Windows way
-@@ -304,6 +310,37 @@ int Job::Execute()
- 				if (rc == 0)
- 					succeeded = true;
- 
-+				// If output is empty then either script did not return any output
-+				// or script threw some error into stderr.
-+				// Check script threw some error into stderr
-+				if (fpError)
-+				{
-+					//fclose(fpError);
-+					FILE* fpErr = fopen(errorFile.mb_str(), "r");
-+					if (fpErr)
-+					{
-+						char buffer[4098];
-+						wxString errorMsg = wxEmptyString;
-+						while (!feof(fpErr))
-+						{
-+							if (fgets(buffer, 4096, fpErr) != NULL)
-+								errorMsg += wxString(buffer, wxConvLibc);
-+						}
-+
-+						if (errorMsg != wxEmptyString) {
-+							wxString errmsg =
-+								wxString::Format(
-+										_("Script Error: \n%s\n"),
-+										errorMsg.c_str());
-+							LogMessage(errmsg, LOG_WARNING);
-+							output += wxT("\n") + errmsg;
-+						}
-+
-+						fclose(fpErr);
-+					}
-+					wxRemoveFile(errorFile);
-+				}
-+
- 				// Delete the file/directory. If we fail, don't overwrite the script output in the log, just throw warnings.
- 				if (!wxRemoveFile(filename))
- 				{
diff --git a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild b/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
deleted file mode 100644
index 399bd3b0ab28..000000000000
--- a/dev-db/pgagent/pgagent-3.4.0-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_IN_SOURCE_BUILD=1
-WX_GTK_VER="3.0"
-
-inherit cmake-utils user wxwidgets
-
-MY_PN=${PN/a/A}
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
-HOMEPAGE="http://www.pgadmin.org/download/pgagent.php"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin3/release/${PN}/${MY_PN}-${PV}-Source.tar.gz"
-LICENSE="POSTGRESQL GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-db/postgresql:*
-		 x11-libs/wxGTK:${WX_GTK_VER}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}-Source"
-
-PATCHES=(
-	"${FILESDIR}/fix-dbconn-getlasterror-crash.patch"
-	"${FILESDIR}/save-stderr-jobstep-output.patch"
-	"${FILESDIR}/add-log-timestamps.patch"
-	"${FILESDIR}/fix-job-success-test.patch"
-	"${FILESDIR}/postgres-10-build-fix.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:share):share/${P}):" \
-		-i CMakeLists.txt || die "failed to patch CMakeLists.txt"
-	sed -i -e '/SET(WX_VERSION "2.8")/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	if has_version "x11-libs/wxGTK[X]"; then
-		need-wxwidgets unicode
-	else
-		need-wxwidgets base-unicode
-	fi
-	mycmakeargs=( "-DSTATIC_BUILD:BOOLEAN=FALSE"
-				  "-DWX_VERSION=${WX_GTK_VER}" )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}/pgagent.initd-r1" "${PN}"
-	newconfd "${FILESDIR}/pgagent.confd" "${PN}"
-
-	rm "${ED}"/usr/{LICENSE,README} || die "failed to remove useless docs"
-}
-
-pkg_preinst() {
-	# This user needs a real shell, and the daemon will use the
-	# ~/.pgpass file from its home directory.
-	enewuser pgagent -1 /bin/bash /home/pgagent
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		# This warning can be removed around a year after this version
-		# goes stable.
-		ewarn 'pgAgent now runs as a dedicated "pgagent" user (as'
-		ewarn 'opposed to root). You may need to move your /root/.pgpass'
-		ewarn 'file to /home/pgagent/.pgpass, and the new user will'
-		ewarn 'need permissions on any paths that it will access.'
-	fi
-}
diff --git a/dev-db/pgagent/pgagent-4.0.0-r1.ebuild b/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
index 588908c4b242..50120fe2593b 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/pgagent/pgagent-4.0.0.ebuild b/dev-db/pgagent/pgagent-4.0.0.ebuild
deleted file mode 100644
index dab33c73221a..000000000000
--- a/dev-db/pgagent/pgagent-4.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils user
-
-MY_PN=${PN/a/A}
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
-HOMEPAGE="https://www.pgadmin.org/download/pgagent-source-code/"
-SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/${MY_PN}-${PV}-Source.tar.gz"
-
-LICENSE="POSTGRESQL GPL-2"
-SLOT="0"
-
-RDEPEND="dev-db/postgresql:*
-		dev-libs/boost
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}-Source"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:share):share/${P}):" \
-		-i CMakeLists.txt || die "failed to patch CMakeLists.txt"
-}
-
-src_configure() {
-	mycmakeargs=( "-DSTATIC_BUILD:BOOLEAN=FALSE"
-				   )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}/pgagent.initd-r1" "${PN}"
-	newconfd "${FILESDIR}/pgagent.confd" "${PN}"
-
-	rm "${ED}"/usr/{LICENSE,README} || die "failed to remove useless docs"
-}
-
-pkg_preinst() {
-	# This user needs a real shell, and the daemon will use the
-	# ~/.pgpass file from its home directory.
-	enewuser pgagent -1 /bin/bash /home/pgagent
-}
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 49d67b4514a2..3bade1fb664d 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,5 +1,4 @@
-DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
+AUX pgcli-3.0.0-sqlparse.patch 1258 BLAKE2B bb899fcd3e059e3380d3bdba12765a1709af9cdb7f9da7358a436afc7229c8b33a2c83e27895321b6fe327ba2e81a35166a04649928d52215fc429df09d16b63 SHA512 c2e40269a65fe07140329c70d063e23dbf6853939005a35b209d1f32bb60786ece4fc37c760fc25ecf4859cde0cf7a4df158caaf6e40660a158bd102ecf15173
 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 1190 BLAKE2B 5372491093076a14591371c22fe76f4f267a3cf33a3ee4bec09987b343ab1ca427007aee6120859af33e1bc6e8296971b483d3cb1732db67050fa7298acae38f SHA512 c4e5711dfc90fd80d3b3327d8381e5aae7e1a07757b1bff9c4163d7827398b42b29b8ea7f12117a07b6a1588aa516c0a9e99049ef9eeefa6463f9bc94b6f438e
+EBUILD pgcli-3.0.0-r1.ebuild 1066 BLAKE2B c879ab11069b87424a5c9118e27f0b0ec06f9dc2d9d5584d13d25f2c52dc4365e37656ab9c0d0df2fc00713fa8a3840f7796a4af4452cda23ee5948d79d563bf SHA512 85b78c0153202b25ea0b3900a9c26579655f4fcfbe735ae271f0a32f3544791348f82d8a758794071b895863538fa47fa973169d2d92f1630e7f4f57615b9e0d
 MISC metadata.xml 460 BLAKE2B c6dc837776eb72ba61b0b0e00cd3f3adc022b70385204346eb2aa0eb8229636ab230be67b194993b22e18cda08b4f968ff02b96d390b8782aac2a4f4de92d7ee SHA512 a3b44f66861c5f8b66cda0fcac6b1d3418bf04835e7ed202ae22faca50ee22187fda785c6e7e7c0848f31b88e1cd9c8c6b4be1999eb600d48965edff2e959c35
diff --git a/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch
new file mode 100644
index 000000000000..4403a2e9c037
--- /dev/null
+++ b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch
@@ -0,0 +1,37 @@
+Taken from: https://github.com/dbcli/pgcli/pull/1224
+Author: Kevin Marsh <kevinmarsh3@gmail.com>
+
+--- a/pgcli/packages/parseutils/ctes.py
++++ b/pgcli/packages/parseutils/ctes.py
+@@ -16,7 +16,7 @@
+ def isolate_query_ctes(full_text, text_before_cursor):
+     """Simplify a query by converting CTEs into table metadata objects"""
+ 
+-    if not full_text:
++    if not full_text or not full_text.strip():
+         return full_text, text_before_cursor, tuple()
+ 
+     ctes, remainder = extract_ctes(full_text)
+--- a/setup.py
++++ b/setup.py
+@@ -13,7 +13,7 @@
+     # see: https://github.com/dbcli/pgcli/pull/1197
+     "prompt_toolkit>=2.0.6,<4.0.0",
+     "psycopg2 >= 2.8",
+-    "sqlparse >=0.3.0,<0.4",
++    "sqlparse >=0.3.0,<0.5",
+     "configobj >= 5.0.6",
+     "pendulum>=2.1.0",
+     "cli_helpers[styles] >= 2.0.0",
+--- a/tests/test_sqlcompletion.py
++++ b/tests/test_sqlcompletion.py
+@@ -816,7 +816,7 @@ def test_create_db_with_template():
+     assert set(suggestions) == set((Database(),))
+ 
+ 
+-@pytest.mark.parametrize("initial_text", ("", "    ", "\t \t"))
++@pytest.mark.parametrize("initial_text", ("", "    ", "\t \t", "\n"))
+ def test_specials_included_for_initial_completion(initial_text):
+     suggestions = suggest_type(initial_text, initial_text)
+ 
+
diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild
deleted file mode 100644
index 54f699d3aa06..000000000000
--- a/dev-db/pgcli/pgcli-2.2.0.ebuild
+++ /dev/null
@@ -1,44 +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} )
-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/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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/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}]
-	>=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	test? (
-		dev-db/postgresql
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-# there is a flaky test, so no tests for now
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-db/pgcli/pgcli-3.0.0.ebuild b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild
index b5da66f7a3dd..8b0fa47c6b88 100644
--- a/dev-db/pgcli/pgcli-3.0.0.ebuild
+++ b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild
@@ -13,29 +13,26 @@ 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/click[${PYTHON_USEDEP}]
+	dev-python/cli_helpers[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/pgspecial[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.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}]
-	>=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
-"
+	dev-python/psycopg[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/sqlparse[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
-
 BDEPEND="
 	test? (
 		dev-db/postgresql
 		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-sqlparse.patch )
 
 distutils_enable_tests pytest
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 68d41114c1f9..668091e4cf05 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,6 @@
+AUX pgpool-4.2.0-configure-memcached.patch 2023 BLAKE2B 6216bb0e83f2e66ab3b46d6fca08ec151ad18821b2ca3dba1f5444c553874ded5d839c11efe5031979c3f4d11aa8c2db0e68c35b77c415daf2b622fe332821dd SHA512 34de23f441a8b0ad4cc727ac450132c43b91d015ac4488f243b86305749a8cf1df967c19ddf9e6a5e3beb6dafff7680c7273dac316ee2d10b97b6c340b5cd5eb
+AUX pgpool-4.2.0-configure-pthread.patch 471 BLAKE2B 789cbcb435d64ef87d12379dc4d4e66b38e253286321d4994480c04635713bc272f0e70b25493189cea891f8a33be86a882c682cf7394c75cadf6c5ab5919e10 SHA512 3ba36eec9c2d22c4abc18aaa5a60a7713ed807f5d7d69c129ba16875082553875ab0ee9f03f59b490ac1973a1cf7c7adafabac8d2e3788c356a84eb399532fb6
+AUX pgpool-4.2.0-run_paths.patch 19114 BLAKE2B 1a3f545774b9389cdb16a09741e39d6b470580aa7e26d17ed32bcaf0d83e83e6772a3e6bbfbb4ec894088347d05d06f59a8ebacea6a1fe9ded4bd0d0ac184359 SHA512 65a4c32d2061608dea10f0a38dd6043a3f95ad087aea3867c3501bc56babb739c9f71ed3d9138fd7343a4d27049224eb4828ebb2aa79c8205bab3052be117ada
 AUX pgpool-configure-memcached.patch 2137 BLAKE2B c557fe1f00dfca7b3927bfe43175f4c26823ac95da79f75ad197be955211530f3823a860a4b6fc7a9b68db6b2d49ba7c1a5e90aecfc7fb8a614a04d061916c9e SHA512 e8f53dadd71117878a18d3e2237d3777abc5bb648977a1aca7cf78d629745539a062cea69de4771b07bb8e0f534ddcb47baff987f9fdc6fefa69c2cc3c4e6d13
 AUX pgpool-configure-pam.patch 1077 BLAKE2B 4dad8c20faf2ecb1c65e95b87d394d1c17c363d0337e830ea25efb88b1cb07d1a19fc1169ed9fbf69807347eba59296c276b33e0f786d32300e6c518b7a8c4ea SHA512 7c3b3f02977c7d9b1dbf7fb8905cca3a405ab856b8884bb9016dccb70650ed074af76ee81ee6cf2c1d4c366283af07ddb5c473960d81f7528d9d7afe762f9d4e
 AUX pgpool-configure-pthread.patch 251 BLAKE2B 69ae31095583e4615117fbeb08ceff520b9462955c3986a675971215a6ac109e6b5bebee9b5b9c49f8005a8c68c144a741307fbe3c0aab318ae324b2d8527261 SHA512 b6cae4159919d22cd63aa13efae31d1270b07da203c0abc3ea96387570543134397873668484db205a0221dbd9f87d74dcf19f3f6d103d586b3c8f21e7f4000c
@@ -6,7 +9,9 @@ AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c54903
 AUX pgpool_run_paths-3.7.10.patch 14548 BLAKE2B 89a18a3c3d4426d82978e303836ff4fafc8d7b4c36154a015c0dadf2e3eb1fa8f19ecf75f39a513b15bca8bfb543ea99e718fff0fa8ef5fde39ecbbe40469df9 SHA512 ea9541a5f9d27011005ab0fd04e2945dea1befaf060429c6a66e0c2091ac8b73a74b01174e5e409c189420405734e73fe2458fce56f4d7b56303957c450bd42d
 DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
 DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
+DIST pgpool-II-4.2.0.tar.gz 4707623 BLAKE2B 9aa54fe0230d5dab303e9b20f35c242f9fe7f09c4c506c72be3a5d789f4e5c23b6e6fdf529ddafd5b1a0c0697a1e1b0f0106f965a8409f8e012633b8be0a58a9 SHA512 73179c3968441b592503512c5e0dfcc95ef778ecfd077024df0485fe831c9af12e708b51607c96c7bebf26f3cc81aefc53f50c7ad0a670d304cbbcf852170abf
 EBUILD pgpool2-3.7.10.ebuild 2640 BLAKE2B 34a3a8a7a0c24f8bd357fc2929f4ea565be60c8c0cf22b3f30cbe94ae46f22d9fd2a8911f93fb5d0df483cae30cc3c658a28c5cea8c3e21fcdc54938bc195ae3 SHA512 af618abfbb7f5a11e8b83e6ff0b5a6c52f424edcdc44211dda557973b09fe67cee5a6a6494dabd8783333981e2ab30410c2a20486489108d51b1a2444c4502e2
 EBUILD pgpool2-4.0.5.ebuild 2646 BLAKE2B ec1fb6883162ddf238c4b8c812d234ee190cbd72030c0157cff601fdadeb60756bcb0a3547b7bd356f51b96a6f8cb0a7ece67e8bb3e803127b3f861d35878993 SHA512 992a4c52dc6eb33c7125ce073b79aefc9baafb9eb0bf4d9dec2ad2ea10f48267138649309e68acf1291dd3f084d93e6455d28c124cf1deea4061520e3ca0664c
-EBUILD pgpool2-9999.ebuild 2723 BLAKE2B 78d14708c61e3f5f8a36d1c8822c7c3fa59eb4dc2a86c118ac73fa2b99859c54f46488d9775ca5bb3fb2a7e83bf745ac1c5e282a9718d6d8ec93f13344eaabda SHA512 731de61fccb5b793c9a451359cbb3f8b730eea5b69525a02ada0f2772b2bbb3c64e7714d51a00c2b27add38ece48b30dc24060971a6f0b3ca321038d150429d9
+EBUILD pgpool2-4.2.0.ebuild 2417 BLAKE2B 37d9881c35087d18708378cef7ab3e12a1998b72e44af393515b9bf8fbad0de5c8f7ea33652cb577bd9e5c2ebcdd817d88a70111ca696c238614a5268c687ba7 SHA512 cf414f1f51dea2a985795d413ac14a8bbe0524556756ee446fff67cc54e7b3aa8d4ec2b46bbd5e4578b1baae11dd6ed10e2c4e34644cae62f021ebffac3b2cb6
+EBUILD pgpool2-9999.ebuild 2492 BLAKE2B 10c0c2e076704a8ebce86ae1c01797ef25809b23f7f4757df2536aa63e1eff4eb6b0789b167760685ac0423e76b878833b642bbc1a1c8afe1bd6cc5dfa6ff3e7 SHA512 6755c3d2ba9260069fec61878f800627a19b7606ad600d703e97c327a6917373bddd677a6daba9fabcbed419766d81917b307c00163c3b2b09622cb252681487
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
new file mode 100644
index 000000000000..9854e45e3a22
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
@@ -0,0 +1,60 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac	2020-11-25 20:25:42.000000000 -0500
++++ pgpool-II-4.2.0/configure.ac	2020-12-16 06:36:26.051076452 -0500
+@@ -392,37 +392,24 @@
+ fi
+ 
+ 
+-AC_ARG_WITH(memcached,
+-    [  --with-memcached=DIR     site header files for libmemcached in DIR],
+-    [
+-  case "$withval" in
+-  "" | y | ye | yes | n | no)
+-      AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.])
+-    ;;
+-    *)
+-
+-  MEMCACHED_INCLUDE_DIR="$withval"/include
+-  MEMCACHED_LIB_DIR="$withval"/lib
+-  OLD_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR"
++AC_ARG_WITH([memcached],
++    AS_HELP_STRING([--with-memcached], [Build with memcached support]))
++AS_IF([test "x$with_memcached" = "xyes"], [
++   PKG_CHECK_MODULES([MEMCACHED], [libmemcached])
++   CFLAGS="$CFLAGS $MEMCACHED_CFLAGS"
++   LIBS="$LIBS $MEMCACHED_LIBS"
++
+     AC_CHECK_HEADERS(
+       [libmemcached/memcached.h],
+         [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
+-        [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])])
+-  CFLAGS=$OLD_CFLAGS
+-  AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)])
+-  MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR"
+-  MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR"
+-  MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR"
+-  ;;
+-  esac
++           [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])])
++
++   AC_SEARCH_LIBS(memcached_create, [], [],
++       [AC_MSG_ERROR(libmemcached is not installed)])
+   ])
+ 
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
+ 
+-AC_SUBST(MEMCACHED_INCLUDE_OPT)
+-AC_SUBST(MEMCACHED_LINK_OPT)
+-AC_SUBST(MEMCACHED_RPATH_OPT)
+ 
+ OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-L$PGSQL_LIB_DIR $LDFLAGS"
+@@ -435,7 +422,6 @@
+ AC_SUBST(PGSQL_INCLUDE_DIR)
+ AC_SUBST(PGSQL_LIB_DIR)
+ AC_SUBST(PGSQL_BIN_DIR)
+-AC_SUBST(MEMCACHED_DIR)
+ 
+ # --enable(disable)-rpath option
+ AC_ARG_ENABLE(rpath,
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
new file mode 100644
index 000000000000..842fd5fbad73
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
@@ -0,0 +1,14 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac	2020-11-25 20:25:42.000000000 -0500
++++ pgpool-II-4.2.0/configure.ac	2020-12-16 06:40:11.150611861 -0500
+@@ -4,6 +4,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CC_C99()
++AX_PTHREAD
++LIBS="$PTHREAD_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++CC="$PTHREAD_CC"
+ 
+ # Error out if the compiler does not support C99, as the codebase
+ # relies on that.
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
new file mode 100644
index 000000000000..2eca0fd59185
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
@@ -0,0 +1,432 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -228,7 +228,7 @@
+  * support them yet.
+  */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -49,6 +49,6 @@
+ extern int	pcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern int	pcp_flush(PCP_CONNECTION * pc);
+ 
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+ 
+ #endif							/* PCP_STREAM_H */
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -69,16 +69,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+ 
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+ 
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+ 
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
+@@ -39,10 +39,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ reserved_connections = 0
+                                    # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -659,10 +655,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
+--- a/src/sample/pgpool.conf.sample-logical
++++ b/src/sample/pgpool.conf.sample-logical
+@@ -38,10 +38,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ reserved_connections = 0
+ 				   # Number of reserved connections.
+@@ -58,10 +56,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -621,10 +617,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
+--- a/src/sample/pgpool.conf.sample-raw
++++ b/src/sample/pgpool.conf.sample-raw
+@@ -39,10 +39,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ reserved_connections = 0
+                                    # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -287,13 +283,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -660,10 +656,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ # - Virtual IP control Setting -
+diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+--- a/src/sample/pgpool.conf.sample-replication
++++ b/src/sample/pgpool.conf.sample-replication
+@@ -39,10 +39,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -282,13 +278,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -657,10 +653,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
+--- a/src/sample/pgpool.conf.sample-slony
++++ b/src/sample/pgpool.conf.sample-slony
+@@ -39,10 +39,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -283,13 +279,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -658,10 +654,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ # - Virtual IP control Setting -
+diff -Naruw a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
+--- a/src/sample/pgpool.conf.sample-snapshot
++++ b/src/sample/pgpool.conf.sample-snapshot
+@@ -39,10 +39,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -280,13 +276,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -655,10 +651,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
+diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+--- a/src/sample/pgpool.conf.sample-stream
++++ b/src/sample/pgpool.conf.sample-stream
+@@ -39,10 +39,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ reserved_connections = 0
+                                    # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ listen_backlog_multiplier = 2
+                                    # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+                                    # PID file name
+                                    # Can be specified as relative to the"
+                                    # location of pgpool.conf file or
+                                    # as an absolute path
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -659,10 +655,8 @@
+                                     # Authentication key for watchdog communication
+                                     # (change requires restart)
+ 
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+                                     # Unix domain socket path for watchdog IPC socket
+-                                    # The Debian package defaults to
+-                                    # /var/run/postgresql
+                                     # (change requires restart)
+ 
+ 
diff --git a/dev-db/pgpool2/pgpool2-4.2.0.ebuild b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
new file mode 100644
index 000000000000..4c93ba916e09
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# 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 autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-configure-pam.patch" \
+		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
+
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_enable static-libs static) \
+		$(use_with memcached) \
+		$(use_with pam) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 042e87ed4a92..2b63038d42ff 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
 
-POSTGRES_COMPAT=( 9.{5..6} {10..11} )
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
 
 inherit autotools git-r3 postgres-multi
 
@@ -30,7 +30,6 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	!!dev-db/pgpool
 	sys-devel/bison
 	virtual/pkgconfig
 	doc? (
@@ -48,10 +47,10 @@ pkg_setup() {
 
 src_prepare() {
 	eapply \
-		"${FILESDIR}/pgpool-configure-memcached.patch" \
+		"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
 		"${FILESDIR}/pgpool-configure-pam.patch" \
-		"${FILESDIR}/pgpool-configure-pthread.patch" \
-		"${FILESDIR}/pgpool_run_paths-3.7.10.patch"
+		"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+		"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
 
 	eautoreconf
 
@@ -61,7 +60,7 @@ src_prepare() {
 src_configure() {
 	postgres-multi_foreach econf \
 		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--sysconfdir="${EROOT}/etc/${PN}" \
 		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
 		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
 		$(use_enable static-libs static) \
@@ -93,14 +92,9 @@ src_install() {
 	dodoc NEWS TODO
 	use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
 
-	# Examples and extras
 	# mv some files that get installed to /usr/share/pgpool-II so that
 	# they all wind up in the same place
-	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
-	into "/usr/share/${PN}"
-	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
-	insinto "/usr/share/${PN}"
-	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
 
 	# One more thing: Evil la files!
 	find "${ED}" -name '*.la' -exec rm -f {} +
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 0427837eb339..c7b720f08e35 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -19,5 +19,5 @@ DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38
 DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
 EBUILD redis-5.0.10.ebuild 4744 BLAKE2B 911a324ae75ab43090425efbb15fec52b2568e09944656450d13eb82d730466466b638adab70bf71378726d08da982a05d1a7b0bf0db7e8d7fc65606ded549de SHA512 270f9e9b8037799c2e59037c968796155d9c5dcbb29a69e72e1544cd310f0921a9e26101e37b6d4d6701b40ad6114bd1f931d36d8be2d96994ad861ce6cc39ac
 EBUILD redis-5.0.9-r1.ebuild 4738 BLAKE2B ca5644ba5a17e2f982623cc242a9058dd04b682e850b88f6821168d80dded518b176d690087d0f8e4d9e021b01d4c37a3c08bc98a4080c954e028a87c697bb1d SHA512 174942f2f4de53a3dbca64f9100dea33e3570535b1fe0019257d651289fff82da42949403481bdfb5eca0eebf8ec32b8893a56a9cec59a2c5fc61c215293733c
-EBUILD redis-6.0.9.ebuild 4949 BLAKE2B e67312a51b324b149eb6bebdf0da4a23ac5d07d39c60d18e072ff829188403c7d831594ae71f388376954fc91f0fec40e193dae52dbd4da0ff8779547e06c67e SHA512 034a2f4936d283f7c491f2299aecff576e4cbe3337f4d830ac6be655ffadef3c3dd003b680c4b9224da06c3d2f61df23704279985119a409dd009164c77a65d2
+EBUILD redis-6.0.9.ebuild 4948 BLAKE2B 133202bf499aaa91fc22217fd70fd8ef97c76ca45c1d7bfb2211cf512559b030db697ec5c968257bf1a249cbb3913a5cc5b854749f39e84769ca0db2eb613ac8 SHA512 e5e540b806c82a0750985086fb184f977bcb34f894f7ed20e3bae004913123b03f89a05926b69e686c25f32cc9fe9ef1ad9b58c1db26f2bc30af3e65a3ccd9cd
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-6.0.9.ebuild b/dev-db/redis/redis-6.0.9.ebuild
index 4248e34c7462..992380fb720c 100644
--- a/dev-db/redis/redis-6.0.9.ebuild
+++ b/dev-db/redis/redis-6.0.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc luajit tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 5725ac95ee75..b223b43b86d6 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,11 +1,14 @@
 AUX slony1.conf 249 BLAKE2B ec214fb9a7d51bcaa58dc191d7e943c0d07be85c0f31dadbf199f5b309fb61c631d62eac659f4473120ee67649029c45cab606205fd62e1679413d2077fedac6 SHA512 3ef2b9a326cb237aa6ceaf4f161d9ff183c291f423b7ad29cb9102a67de849dbf5a52120ecc756efc5a8d226f0860a2517ced64ab44f135e62cb2e53611775a8
 AUX slony1.init 615 BLAKE2B f1b3fc27ad3c4087713cceb6c2bb9451004b70e87c0347274c75e1c3ed8d439bb99f51d5e6e904d3957150e62760272312423a47235ff4e76792e0661b683bb3 SHA512 d450bba5f65372509e542f138d297202371bcaf78332ba13de72ddf937fcffe419083dddc5032c7bafd51993fbc677b37262e1b1e938e9e3c927e130c0a7c693
+DIST slony1-2.2.10-docs.tar.bz2 1445193 BLAKE2B 071f5faf2f7cae822b484f13ede6a8ede5278a065c55d2199f38e2dd195922cbc78982633316792978b968295d69e36651ae0367682ad45afab295e61e5329fa SHA512 d603abccc1ec7922fe8025ab178e6d12b28ffc763848be8d1f9fc93519b9928aa65ed6bcc1d678f2ad9f79818de06da39ec1f69d60de61c5e6fe42137c7c3112
+DIST slony1-2.2.10.tar.bz2 1464652 BLAKE2B a07a830501be13f33fc189128851cee02c8d8ca51a8a54f6b97028d65eb17937817c9ab6b5ebbcaa092e96fb00f57959806e5003e016df5e7034583de601084c SHA512 1b41addb7a0be0a130c2efcab1b241e3158d10a5a6e203d83f28353e303dd524e224ab9c04a7e37a0f89cd944237b90feeb8910eb35f717926aa3ad28dbe2d0f
 DIST slony1-2.2.6-docs.tar.bz2 1450956 BLAKE2B 949d0736eb9ab021767b80b4240e30a8cd11daa218cac6d722827a8db98f2b54cc093031e02d0cd14cb1eb60d56dc160dcd1c2e0708e7228fdac31ef26d2fcf4 SHA512 b5a870d5688ca24c0a9012d7da539917c74ee697f1b1ae663ead3cb1032345c0d8f5fc5bddc2ca2fec5d738fb9ca74822343cce8739b3b4b478928f26d214a0d
 DIST slony1-2.2.6.tar.bz2 1465709 BLAKE2B 87e581638aab5ac9f51437fc43b65f200c29e012fa2b5331d4a7972359bb345c8d5aec9917fbc348ce8338115f8270d6e55025905aa5aba642090a8486d0a3fc SHA512 5aeadb9ed72b83d303596e4f8513409a1f826f25fe283ca6aa969a7563172bbc5f5360f876fa87780f6a6fc70cb55688a2daf678b9cf91972a3c403cb76184b8
 DIST slony1-2.2.7-docs.tar.bz2 252020 BLAKE2B 315d54c008fca121fac12385602e729c7bb6a7a90db502165625c1138da6b87f147410555ca6bc315ba766fd6fed22b6c5dcbe06c9481dd37b9e9c8832209b02 SHA512 7735aae634788acae77eb2cc64f51a851e3b804fb1ca860eddc237734aa6182bd7dfcdae485cd89682c413f55003ea67d91c4c24922b4fdef79ac34793022e56
 DIST slony1-2.2.7.tar.bz2 1464923 BLAKE2B aee11f92d634a6c2eaf84dd48faf6cac7a27956474aaa9070f1d4fad3e70b0af09475abda149e096f1b238d68237c0b43b18880440bd4c2d66f5c0f4ad789e99 SHA512 22700e1574c91d4a4be5b78aac967eebc039440897364780891c2c76ed5b8e07c03205f0fbcd4870ee7c620d62b175987c46c43750524c6e5f9009044cc24f9a
 DIST slony1-2.2.9-docs.tar.bz2 1445251 BLAKE2B eafd17370e333a706fd563440b7948513db19a05e23f6a0a118e0f8927b5b52c99f46953c3c9ce2d8e9f04371a35ff390e0e542f295f4e926b7002642fc913b0 SHA512 88d1c26d668b4a021c7b53cb5c2a9b140485595460d1444997ae49e4b77910f58860d603777f1836fdfa1231d2e44ad5cdf8e82c0a03df5278c9de7de3101c5b
 DIST slony1-2.2.9.tar.bz2 1464548 BLAKE2B 6a2f3e21679ed1542066016bdc9e97aa7b5885fe15770d5015f26deb16e4d9634b930d9f13a8dbba6b1e89bf28cdcc28b3181f12efbf9b549a75c6e62755c099 SHA512 c42d7604ae2eda9b83bfa608ca13a4a25b2a4b77301a591b9308eda964d263490a02acdfd5b1a7e7751c24b2a7cb5d9410c58deaf82bdb3c422456af65c2b3f5
+EBUILD slony1-2.2.10.ebuild 1941 BLAKE2B 6e10b4c4952f637f2a79adbd8487e09bfb1333d07adbdf0391a014a352e9b43a26b1a8c03ffc4741a868ae4e6ed1a8f3adcb600a5ff26bd5ea4ccca1306aaf31 SHA512 dfcfd92604100b4934dc270fd74be4f239c2adaef6e999509ce3af9f8798033b30766273093731c876c7dcb3655baa788daa29b58b3712f7ef4d854f6f411ce0
 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
diff --git a/dev-db/slony1/slony1-2.2.10.ebuild b/dev-db/slony1/slony1-2.2.10.ebuild
new file mode 100644
index 000000000000..0e854d2ba2ca
--- /dev/null
+++ b/dev-db/slony1/slony1-2.2.10.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 $?
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-18 11:06:49 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-18 11:06:49 +0000
commit	ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch)
tree	e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /dev-db
parent	6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff)