4 files changed, 83 insertions, 18 deletions
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 8b5fb7e66340..f6710438c8f5 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,2 +1,3 @@
-DIST pgbouncer-1.15.0.tar.gz 588042 BLAKE2B 3dac09303e1c86126dd9cb44823c6f3fca4195e3155b360719c736c6e1327cc10d05e7f1e45c08d14c1dd0cb5c074b32263eee3be9e6350db9a8c5cbdfe61aa1 SHA512 5f78018ab80ab8d81f20ef3df1314ffc9557f1c6469d485d11ac822f596e3d4b554743fd9e9fe19b008a8aaf93bcf3673b42a8fb82bbd9611bd735cd2cbb98c6
-DIST pgbouncer-1.16.0.tar.gz 592136 BLAKE2B 752d5cfa18dacfdb72e9e9f12d5a1ac5346649e3a0c49ef530dd29ca16039949af0993d54080a7cf558c6eb6a919254c1dc4a36ab22f38992e790469ecd973bf SHA512 3b6f23052ca3b8af40a618da6bed2577b92ffe27b627f8980cda2d645991434bf298f720c1d423a272961c9f3f52a9d1b28154ed7f355d539f71dc68c028b617
+DIST pgbouncer-1.16.1.tar.gz 591450 BLAKE2B 137193ad614586d708598fd7003af4dee69f03f88a7235ba4074b63d57ffc3ee1c41fbccb49c5df7c23a2272b33810f8c2a9084d98e2e695a3b5f5ec317e0227 SHA512 9ecb7c7ae136d85e3da434094909df3a6ff06ce8586a1848c0c00914d87a877aecbb26ea30ad8230062160f3177621cc16deb4a490e9a2a649c8032dacb86341
+DIST pgbouncer-1.22.0.tar.gz 670589 BLAKE2B feb0138c09eb2e3f865f9c372d1924f9fbe67785a52534f8b99783c0bc2d5a54a6fd8b0554ea8ac7d4e8e108fd2296a3a9ae19cb75d628052c45e4a57fd037cd SHA512 1d8f4b352103e17a3905ec0677362954f4b9f606f6dc00011514c2ec46d8c4e8d17b24e9ca92794ccaf4c86c9c77ac062e6be92be7856192b7c534b5a4911163
+DIST pgbouncer-1.22.1.tar.gz 677351 BLAKE2B c67eba10b51ae74fb77ad61f7c597b687769e75b687ff9682c16d0ac0b32c0e9d20d4c90cd5803331d128f3f388800faa38dd9965b86c5a75688455db1a06d6b SHA512 ac63fe877f68745f1faab096ee9d9e185de9cab97d4fef121c2c551fa0e69ea22342dc8b5ce75cadff755314e5493a5440f0748b5ee9f524f71d871ec1861530
diff --git a/dev-db/pgbouncer/pgbouncer-1.16.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.16.1.ebuild
index 1214ffcf2b4c..bd386524fe68 100644
--- a/dev-db/pgbouncer/pgbouncer-1.16.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,6 @@ REQUIRED_USE="?? ( c-ares udns )"
 
 RDEPEND="
 	>=dev-libs/libevent-2.0:=
-	>=sys-libs/glibc-2.10
 	acct-user/pgbouncer
 	c-ares? ( >=net-dns/c-ares-1.10 )
 	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
diff --git a/dev-db/pgbouncer/pgbouncer-1.15.0-r1.ebuild b/dev-db/pgbouncer/pgbouncer-1.22.0.ebuild
index 347c11f2b936..1647a74fb4c5 100644
--- a/dev-db/pgbouncer/pgbouncer-1.15.0-r1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.22.0.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit systemd
+EAPI=8
 
 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 systemd udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+c-ares debug doc pam ssl systemd"
 
 RDEPEND="
 	>=dev-libs/libevent-2.0:=
-	>=sys-libs/glibc-2.10
 	acct-user/pgbouncer
 	c-ares? ( >=net-dns/c-ares-1.10 )
 	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
 	systemd? ( sys-apps/systemd )
-	udns? ( >=net-libs/udns-0.1 )
 "
 
 DEPEND="${RDEPEND}"
@@ -47,15 +40,14 @@ src_configure() {
 		$(use_enable debug cassert) \
 		$(use_with pam) \
 		$(use_with ssl openssl) \
-		$(use_with systemd) \
-		$(use_with udns)
+		$(use_with systemd)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
+	use doc && dodoc doc/*.md
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
 	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
diff --git a/dev-db/pgbouncer/pgbouncer-1.22.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.22.1.ebuild
new file mode 100644
index 000000000000..1647a74fb4c5
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.22.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 systemd"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0:=
+	acct-user/pgbouncer
+	c-ares? ( >=net-dns/c-ares-1.10 )
+	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+# Tests require a local database server, wants to fiddle with iptables,
+# and doesn't support overriding.
+RESTRICT="test"
+
+src_prepare() {
+	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
+
+	default
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-debug \
+		$(use_with c-ares cares) \
+		$(use_enable debug cassert) \
+		$(use_with pam) \
+		$(use_with ssl openssl) \
+		$(use_with systemd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+	use doc && dodoc doc/*.md
+
+	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
+}