gentoo christmass resync : 25.12.2020

9 files changed, 2 insertions, 488 deletions

diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 1bda9e3354eb..9f4e15e04534 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,19 +1,7 @@
 AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3d043f693af2b963aaf18bb230ec4cd5ae34f09219f02b9ee0ca5b43fe61489f46aa7a8d505 SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8
-AUX pgbouncer-1.11-dirs.patch 461 BLAKE2B ed51cc404049c92f59f08b87a2a7402c7f70e5ee4a66bf6ce0c2ea02a29ebb07441833852d46b34f95461fe4fef6972945c8a7ed5c0f3c8e7024103645e84ae1 SHA512 b6c53cf6b4ec5fb4620dfd71033a96918d90440c964a745c7befb89cb797c6b5af1b5f2cfd3f454cf1479df48a9f459f8a50d60127eef404c38de2b2445555a3
 AUX pgbouncer-1.12-dirs.patch 804 BLAKE2B fba4fbc1a9c01b2d43f74719cbc4b285817c301ec7f0fbe1b59871d9121a507d35e8059f8d74f69645fd4dc25dac5c22bae2841cf8f3ad448ce3513b2e70d404 SHA512 5d3f9bae8789d9be376b897396ffabc94fd13fa50abad811abd9195f75cad46315465e90a843579552ba53bc17d2c53a52211c824de97b1905babd1e51cd35f7
-AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f701dae628ae8c9fb201e08ae3f0c5826515c6a884a00f2b0afd048490b16d87f9b3b9cf836ca4c77284cd705334 SHA512 2c9ddd2ae193b032435f97d41e789283ae69d99fefeb3829e80a90be296ccd2a754a9d00e6930985408758dfa3349d65f3c2ddf1f74053424bc8d8d09b2fa0e2
 AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c29d86fd3047307bd05d62f922fc66a0805ba3396934f6e2e7060f810f1c71c5b07d887edf2763cc0f40d SHA512 0642b12236e944b6b5086b593dfd4a5d7c04c8347fc286835381945a50a421e87805900d63d84d12dcb1fad667fc81f21c8644c63af33388a71048ec6e024ab5
 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e
-DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333b1111cbd62ff2f22741984d SHA512 8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d
-DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6 SHA512 2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115
-DIST pgbouncer-1.12.0.tar.gz 567465 BLAKE2B 866a877478a417b3854e6e2a724fcd06c04bd94893e5d79f8bf250fa9391407c5b7cd00bf2771af18b162dfd2b7bdced00be15c44ba74cf842e3d98c561991e3 SHA512 017d150f865df231861cda4678963ad7e63a0cd238f5ece5679c920484e01c53ab27af63bf47e6227d66b7dc94b4d59ca41ac49c26f60aba74d40b43cad55664
-DIST pgbouncer-1.14.0.tar.gz 578955 BLAKE2B 49e1e22b2fa604410111ac19b7c0c2c15f6739274d642e7100a9988379e828e8546454766ae32edb65ab7299b82693bcec32938621923bfbf99d946f5dc17f4a SHA512 506810c9896a45d67fbc97c3027572278b3857635c222cfaa53b4f3893069cfbee2ec92facd6f387de217bb3170045410b88a7cea09a45686661a2d2ccc85271
 DIST pgbouncer-1.15.0.tar.gz 588042 BLAKE2B 3dac09303e1c86126dd9cb44823c6f3fca4195e3155b360719c736c6e1327cc10d05e7f1e45c08d14c1dd0cb5c074b32263eee3be9e6350db9a8c5cbdfe61aa1 SHA512 5f78018ab80ab8d81f20ef3df1314ffc9557f1c6469d485d11ac822f596e3d4b554743fd9e9fe19b008a8aaf93bcf3673b42a8fb82bbd9611bd735cd2cbb98c6
-DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
-EBUILD pgbouncer-1.10.0.ebuild 1856 BLAKE2B edb6277234d85c6797c89c07fa68ffb50ec23949155a55a7dccd5c99d454028ee593bbd34770da51be3886e143d9a8241464db586fe0d79a46ff9101107de4ac SHA512 28ea2302c28e746cb4c31a3528cc7329007ac67fd5c860619c350663c731000cd51f4859a7635cbb77916c3a8c817a82931e25e0275ca8854f6790eb32a15a65
-EBUILD pgbouncer-1.11.0.ebuild 1859 BLAKE2B 63d383eb450a181d8cdd56c6c2dbfdf1a4e2c5ac66cc24c670fc57f80651b5540664bbfc7435b8f0424c78bab38b87422988157e79b93d1ea3d92596c5afff6e SHA512 bc14e6b213c905bd9db7b69943a3c49a6094e5fb62cfa17465c36336d8ba4f21197b3ddfff33ad43451974af4ff7107dd5ecfcccbaa44f8e5d80c442ca254194
-EBUILD pgbouncer-1.12.0.ebuild 1957 BLAKE2B c9f2064bc29a8bce4515ae635ec03039a5a52efa5d56608f3f1a12e6fe2e014a1b22dd73e57dfa261ed29215672f42abaebafda232e94c7291d85ea06e57c842 SHA512 dfe2ef2ea5190456b1eb8af6c66b52ed40fa1b35962ed5a9a630649ade19714fb4e91ed4574196edd47461d1a792318329d92749e7406bf08da80d2502514c28
-EBUILD pgbouncer-1.14.0.ebuild 1859 BLAKE2B 63d383eb450a181d8cdd56c6c2dbfdf1a4e2c5ac66cc24c670fc57f80651b5540664bbfc7435b8f0424c78bab38b87422988157e79b93d1ea3d92596c5afff6e SHA512 bc14e6b213c905bd9db7b69943a3c49a6094e5fb62cfa17465c36336d8ba4f21197b3ddfff33ad43451974af4ff7107dd5ecfcccbaa44f8e5d80c442ca254194
-EBUILD pgbouncer-1.15.0.ebuild 1934 BLAKE2B b962a088243f29b5372d67f4723a16df1782c3b7a93df4ee730a21b103232ee94d4d0bb3593602c790ac05970e7ba1d10a56e7875b97d104df0d440ae1767ded SHA512 d2fa96fc8167ac1fcd9c78f2c290fe2c4914942870e2252c801f3d1f563588e6e1cab5d4f4a7b0940e6c02d50a703212cf0944952d9cf2203fdb8a6f64b8344b
-EBUILD pgbouncer-1.9.0.ebuild 1859 BLAKE2B 2a734101531a115c4156a0528b0b5a3d3d82f6ee71b285ec588ce7ede59efaea92fac1eb7afce31e3a362f68162c7d87d950d75ce26946a775d1910e4b884cd1 SHA512 62b251daa6ecca0df80eff8893dddcea38807d48820e0d66a7021c49b413b6408616abb38a3aeccccf5a0fe7dc707a715153d6dbf10ef16fe035fbbbe79cb098
+EBUILD pgbouncer-1.15.0.ebuild 1932 BLAKE2B 12c800325c4d0ca8b51f663753d35d938bc001d7f967874b736520db72cef23d8a7db2455dd522f8579d7082b5f58477f9e560c55613fa579ce393ea63e2b573 SHA512 b20db31e0a8dba0417a71a1fb34534a99cc1cb6aee5a023ccace98e52a876acaa53c1d3185acd2adef6008c5707f516af4edfd9f1a2bdc8df1c3636dbbbe4b69
 MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch
deleted file mode 100644
index 3dd405372525..000000000000
--- a/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/etc/pgbouncer.ini b/etc/pgbouncer.ini
-index fed4a9f..5f2ed8e 100644
---- a/etc/pgbouncer.ini
-+++ b/etc/pgbouncer.ini
-@@ -55,9 +55,9 @@ listen_port = 6432
-
- ;; Unix socket is also used for -R.
- ;; On Debian it should be /var/run/postgresql
--;unix_socket_dir = /tmp
--;unix_socket_mode = 0777
--;unix_socket_group =
-+unix_socket_dir = /run/postgresql
-+unix_socket_mode = 0777
-+unix_socket_group = postgres
-
- ;;;
- ;;; TLS settings for accepting clients
-
diff --git a/dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch
deleted file mode 100644
index cc4d0634b6b3..000000000000
--- a/dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naruw pgbouncer-1.8.orig/etc/pgbouncer.ini pgbouncer-1.8/etc/pgbouncer.ini
---- pgbouncer-1.8.orig/etc/pgbouncer.ini	2017-12-18 11:03:18.000000000 -0500
-+++ pgbouncer-1.8/etc/pgbouncer.ini	2017-12-20 06:48:25.935839539 -0500
-@@ -34,7 +34,9 @@
- ;;;
- 
- logfile = /var/log/pgbouncer/pgbouncer.log
--pidfile = /var/run/pgbouncer/pgbouncer.pid
-+
-+; Leave unset. This is handled in the initscript.
-+;pidfile =
- 
- ;;;
- ;;; Where to wait for clients
-@@ -44,11 +46,12 @@
- listen_addr = 127.0.0.1
- listen_port = 6432
- 
--; Unix socket is also used for -R.
--; On Debian it should be /var/run/postgresql
--;unix_socket_dir = /tmp
--;unix_socket_mode = 0777
--;unix_socket_group =
-+; Unix socket is also used for -R (online restart), but the
-+; initscripts can't do that. Generally, you'll want to leave these
-+; alone. System-wide default is: /run/postgresql
-+unix_socket_dir = /run/postgresql
-+unix_socket_mode = 0777
-+unix_socket_group = postgres
- 
- ;;;
- ;;; TLS settings for accepting clients
diff --git a/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
deleted file mode 100644
index 7a8301aab37a..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://pgbouncer.github.io"
-SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl -udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0
-	>=sys-libs/glibc-2.10
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgbouncer-1.8-dirs.patch"
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with udns)
-}
-
-src_test() {
-	cd "${S}/test"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
deleted file mode 100644
index 65c33e53faad..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://pgbouncer.github.io"
-SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+c-ares debug doc pam ssl -udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0
-	>=sys-libs/glibc-2.10
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgbouncer-1.11-dirs.patch"
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with udns)
-}
-
-src_test() {
-	cd "${S}/test"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
deleted file mode 100644
index 3e1f0046c6e8..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://www.pgbouncer.org/"
-SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+c-ares debug doc pam ssl -udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0
-	>=sys-libs/glibc-2.10
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-# Tests require a local database server, wants to fiddle with iptables,
-# and doesn't support override. things.
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with udns)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.14.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.14.0.ebuild
deleted file mode 100644
index 65c33e53faad..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.14.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://pgbouncer.github.io"
-SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+c-ares debug doc pam ssl -udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0
-	>=sys-libs/glibc-2.10
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgbouncer-1.11-dirs.patch"
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with udns)
-}
-
-src_test() {
-	cd "${S}/test"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
index 050a21fdea6c..f1d854b8b322 100644
--- a/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.pgbouncer.org/"
 SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+c-ares debug doc pam ssl systemd -udns"
 
 # At-most-one-of, one can be enabled but not both
diff --git a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
deleted file mode 100644
index 51abcc975d86..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://pgbouncer.github.io"
-SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl -udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0
-	>=sys-libs/glibc-2.10
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0=[-bindist] )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	enewuser pgbouncer -1 -1 -1 postgres
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/pgbouncer-1.8-dirs.patch"
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with udns)
-}
-
-src_test() {
-	cd "${S}/test"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}