[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/files/, dev-db/pgbouncer/

2020-12-23 Thread Aaron W. Swenson
commit: 04a5df2287c49f43be4fa156c1d14dc0a2c83878
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Thu Dec 24 02:54:20 2020 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Thu Dec 24 02:54:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a5df22

dev-db/pgbouncer: Cleanup

Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pgbouncer/Manifest|  5 --
 dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch | 18 -
 dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch  | 32 -
 dev-db/pgbouncer/pgbouncer-1.10.0.ebuild | 85 
 dev-db/pgbouncer/pgbouncer-1.11.0.ebuild | 85 
 dev-db/pgbouncer/pgbouncer-1.12.0.ebuild | 84 ---
 dev-db/pgbouncer/pgbouncer-1.14.0.ebuild | 85 
 dev-db/pgbouncer/pgbouncer-1.9.0.ebuild  | 85 
 8 files changed, 479 deletions(-)

diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 9ecb47e5a65..91aec86d5e0 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,6 +1 @@
-DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B 
a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333bcbd62ff2f22741984d
 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

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 3dd40537252..000
--- 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 cc4d0634b6b..000
--- 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.0 
-0500
-+++ pgbouncer-1.8/etc/pgbouncer.ini2017-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

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/files/

2019-11-19 Thread Aaron W. Swenson
commit: d1f437973c0c7e6872659bfd239bc38c82ae439f
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Tue Nov 19 11:23:13 2019 +
Commit: Aaron W. Swenson  gentoo  org>
CommitDate: Tue Nov 19 11:23:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f43797

dev-db/pgbouncer: Remove executable bit (QA)

Removed executable bit from files/pgbouncer.initd-r2

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Aaron W. Swenson  gentoo.org>

 dev-db/pgbouncer/files/pgbouncer.initd-r2 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-db/pgbouncer/files/pgbouncer.initd-r2 
b/dev-db/pgbouncer/files/pgbouncer.initd-r2
old mode 100755
new mode 100644



[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/files/, dev-db/pgbouncer/

2019-10-20 Thread 罗百科
commit: 90fae2db1a43c1fc0530b97e82f927bae68645e5
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Oct 20 17:17:04 2019 +
Commit: 罗百科  gentoo  org>
CommitDate: Sun Oct 20 17:17:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fae2db

dev-db/pgbouncer: Bump

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Patrick Lauer  gentoo.org>

 dev-db/pgbouncer/Manifest|  1 +
 dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch | 18 +
 dev-db/pgbouncer/pgbouncer-1.11.0.ebuild | 86 
 3 files changed, 105 insertions(+)

diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 8336f7b1320..3b82c47d939 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,2 +1,3 @@
 DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B 
a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333bcbd62ff2f22741984d
 SHA512 
8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d
+DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 
044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6
 SHA512 
2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 
466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514
 SHA512 
b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9

diff --git a/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch 
b/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch
new file mode 100644
index 000..3dd40537252
--- /dev/null
+++ b/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch
@@ -0,0 +1,18 @@
+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/pgbouncer-1.11.0.ebuild 
b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
new file mode 100644
index 000..1492a74c6e8
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 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 \
+   --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 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 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/files/, dev-db/pgbouncer/

2018-10-02 Thread Aaron Swenson
commit: 9d6096a26797a9a97098db1da96a61c894197ab0
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Wed Oct  3 01:41:26 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Wed Oct  3 01:59:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6096a2

dev-db/pgbouncer: Cleanup

Closes: https://bugs.gentoo.org/654136
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Aaron Swenson  gentoo.org>

 dev-db/pgbouncer/Manifest |  1 -
 dev-db/pgbouncer/files/pgbouncer.confd| 12 -
 dev-db/pgbouncer/files/pgbouncer.initd-r1 | 83 -
 dev-db/pgbouncer/pgbouncer-1.8.1.ebuild   | 86 ---
 4 files changed, 182 deletions(-)

diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 1bea33dfbba..11cc6304a31 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,2 +1 @@
-DIST pgbouncer-1.8.1.tar.gz 465930 BLAKE2B 
692c551cb7bfb56bfe1b354791b06bdf61866197150a78a7fa9688891a2e4cd3c015abc5fbe33bf66dc85ab0ae83745f2db852eae91ae99596c97be0154e8bd5
 SHA512 
595a94db98866cec211f2b8c1ad13d209dba00e5fd41f2e9025aabdcb660194f0f772810270a1d9f067c3039c9fee630e8ff2d56f231935add17207aecc10bee
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 
466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514
 SHA512 
b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9

diff --git a/dev-db/pgbouncer/files/pgbouncer.confd 
b/dev-db/pgbouncer/files/pgbouncer.confd
deleted file mode 100644
index e2c58401188..000
--- a/dev-db/pgbouncer/files/pgbouncer.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Location of configuration file for PgBouncer.
-INIFILE="/etc/pgbouncer.ini"
-
-# How long to wait in seconds for a safe shutdown. Equivalent to
-# issuing 'PAUSE;' and 'SHUTDOWN;' on psql console. (See 'man 1 pgbouncer'.)
-NICE_TIMEOUT=60
-
-# Set to 'YES' to perform an immediate shutdown if the nice shutdown
-# doesn't work. Same as issuing 'SHUTDOWN;' on console. (See 'man 1
-# pgbouncer'.)
-FORCE_QUIT="no"
-FORCE_QUIT_TIMEOUT=2
\ No newline at end of file

diff --git a/dev-db/pgbouncer/files/pgbouncer.initd-r1 
b/dev-db/pgbouncer/files/pgbouncer.initd-r1
deleted file mode 100755
index 7392918593b..000
--- a/dev-db/pgbouncer/files/pgbouncer.initd-r1
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-PIDFILE="/run/pgbouncer.pid"
-
-depend() {
-use net
-after postgresql
-}
-
-get_config() {
-[ -f "${INIFILE}" ] || eend 1 "'${INIFILE}' not found"
-
-eval echo $(sed -e 's:;.*::' "${INIFILE}" | \
-awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-start_pre() {
-local s="$(get_config unix_socket_dir)"
-
-if [ -n "${s}" ] ; then
-checkpath -o root:postgres -m 1775 -d "${s}" || return 1
-
-local listen_port="$(get_config listen_port)"
-
-if [ -e "${s%/}/.s.PGSQL.${listen_port}" ] ; then
-eerror "Socket conflict."
-eerror "A server is already listening on:"
-eerror "${s%/}/.s.PGSQL.${listen_port}"
-eerror "HINT: Change listen_port in pgbouncer.ini to listen on a"
-eerror "different socket."
-return 1
-fi
-fi
-
-checkpath -o pgbouncer:postgres -m 0755 \
-  -d "$(dirname $(get_config logfile))" || return 1
-checkpath -o pgbouncer:postgres -m 0640 \
-  -f "$(get_config logfile)" || return 1
-
-return 0
-}
-
-start() {
-ebegin "Starting PgBouncer"
-[ -f ${PIDFILE} ] && rm ${PIDFILE}
-
-start-stop-daemon --start \
-  --pidfile ${PIDFILE} \
-  --background \
-  --make-pidfile \
-  --user pgbouncer \
-  --exec /usr/bin/pgbouncer \
-  -- -q "${INIFILE}"
-eend $?
-}
-
-stop() {
-local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_QUIT_TIMEOUT} ))
-ebegin "Stopping PgBouncer (this can take up to ${seconds} seconds)"
-
-local retries=SIGINT/${NICE_TIMEOUT}
-
-if [ "${FORCE_QUIT}" = "YES" ] ; then
-einfo "FORCE_QUIT enabled."
-retries="${retries}/SIGTERM/${FORCE_QUIT_TIMEOUT}"
-fi
-
-# Loops through nice and force quit in one go.
-start-stop-daemon --stop \
-  --user pgbouncer \
-  --pidfile ${PIDFILE} \
-  --retry ${retries}
-
-eend $?
-}
-
-reload() {
-ebegin "Reloading PgBouncer configuration from '${INIFILE}'"
-start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-eend $?
-}

diff --git a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild 
b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
deleted file mode 100644
index f590a731732..000
--- a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
+++ 

[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/files/

2018-08-28 Thread Aaron Swenson
commit: 68521fe516d66a94851bf09352e6155d5a1347a6
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Tue Aug 28 10:09:03 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Tue Aug 28 10:09:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68521fe5

dev-db/pgbouncer: Specify group to run under

Bug: https://bugs.gentoo.org/654136
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-db/pgbouncer/files/pgbouncer.initd-r2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/pgbouncer/files/pgbouncer.initd-r2 
b/dev-db/pgbouncer/files/pgbouncer.initd-r2
old mode 100644
new mode 100755
index a2a79a0784a..72e0103e0b5
--- a/dev-db/pgbouncer/files/pgbouncer.initd-r2
+++ b/dev-db/pgbouncer/files/pgbouncer.initd-r2
@@ -48,7 +48,7 @@ start() {
   --pidfile ${PIDFILE} \
   --background \
   --make-pidfile \
-  --user pgbouncer \
+  --user pgbouncer:postgres \
   --exec /usr/bin/pgbouncer \
   -- -q "${INIFILE}"
 eend $?
@@ -67,7 +67,7 @@ stop() {
 
 # Loops through nice and force quit in one go.
 start-stop-daemon --stop \
-  --user pgbouncer \
+  --user pgbouncer:postgres \
   --pidfile ${PIDFILE} \
   --retry ${retries}
 



[gentoo-commits] repo/gentoo:master commit in: dev-db/pgbouncer/files/, dev-db/pgbouncer/

2018-01-23 Thread Aaron Swenson
commit: d1336fab60d57949472d66270dd14722a32e6ebd
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Wed Jan 24 02:30:19 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Wed Jan 24 02:30:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1336fab

dev-db/pgbouncer: Clean out old and insecure

Closes: https://bugs.gentoo.org/577784
Closes: https://bugs.gentoo.org/500546
Bug: https://bugs.gentoo.org/629334
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-db/pgbouncer/Manifest   |  1 -
 dev-db/pgbouncer/files/pgbouncer-dirs.patch | 26 -
 dev-db/pgbouncer/files/pgbouncer.initd  | 88 -
 dev-db/pgbouncer/metadata.xml   |  1 -
 dev-db/pgbouncer/pgbouncer-1.7.2.ebuild | 82 ---
 5 files changed, 198 deletions(-)

diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 22400911164..c49eebee4d6 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,2 +1 @@
-DIST pgbouncer-1.7.2.tar.gz 462374 BLAKE2B 
0fea85063e30dad3b7e5d145ecd8660d260c6c09202af3661e8acfdcb5ab25f5c23a2f4e02fcfdfcee872ddeb92b78e157457aafa158ee759a1d73a3d33eb009
 SHA512 
11c89606599f424b34f39a4b072ec6293fea0b14ee52ae4fbc44775e6d83771a22d194f4e8eabe410e0d6a70657508cf1a3b1012543d91873c36f644afb5675d
 DIST pgbouncer-1.8.1.tar.gz 465930 BLAKE2B 
692c551cb7bfb56bfe1b354791b06bdf61866197150a78a7fa9688891a2e4cd3c015abc5fbe33bf66dc85ab0ae83745f2db852eae91ae99596c97be0154e8bd5
 SHA512 
595a94db98866cec211f2b8c1ad13d209dba00e5fd41f2e9025aabdcb660194f0f772810270a1d9f067c3039c9fee630e8ff2d56f231935add17207aecc10bee

diff --git a/dev-db/pgbouncer/files/pgbouncer-dirs.patch 
b/dev-db/pgbouncer/files/pgbouncer-dirs.patch
deleted file mode 100644
index 62bcd0b8440..000
--- a/dev-db/pgbouncer/files/pgbouncer-dirs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naruw a/etc/pgbouncer.ini b/etc/pgbouncer.ini
 a/etc/pgbouncer.ini2012-06-10 19:57:01.0 +
-+++ b/etc/pgbouncer.ini2013-07-17 02:25:59.59628 +
-@@ -29,7 +29,7 @@
- ;;;
- 
- logfile = /var/log/pgbouncer/pgbouncer.log
--pidfile = /var/run/pgbouncer/pgbouncer.pid
-+pidfile = /run/pgbouncer/pgbouncer.pid
- 
- ;;;
- ;;; Where to wait for clients
-@@ -40,10 +40,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
- 
- ;;;
- ;;; Authentication settings

diff --git a/dev-db/pgbouncer/files/pgbouncer.initd 
b/dev-db/pgbouncer/files/pgbouncer.initd
deleted file mode 100644
index 20479dc22da..000
--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-depend() {
-use net
-after postgresql
-}
-
-get_config() {
-[ -f "${INIFILE}" ] || eend 1 "'${INIFILE}' not found"
-
-eval echo $(sed -e 's:;.*::' "${INIFILE}" | \
-awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-PIDFILE="$(get_config pidfile)"
-UNIX_SOCKET_DIR="$(get_config unix_socket_dir)"
-
-prep() {
-if [ -n "${UNIX_SOCKET_DIR}" ] ; then
-checkpath -o postgres:postgres -m 0775 -d "${UNIX_SOCKET_DIR}" \
-|| return 1
-fi
-checkpath -o pgbouncer:postgres -m 0755 -d "$(dirname ${PIDFILE})" \
-|| return 1
-checkpath -o pgbouncer:postgres -m 0644 -f "${PIDFILE}" \
-|| return 1
-checkpath -o pgbouncer:postgres -m 0755 -d "$(dirname $(get_config 
logfile))" \
-|| return 1
-checkpath -o pgbouncer:postgres -m 0640 -f "$(get_config logfile)" \
-|| return 1
-
-return 0
-}
-
-start() {
-ebegin "Starting PgBouncer"
-prep
-local ret=$?
-if [ $ret -ne 0 ] ; then
-eend $ret
-exit $ret
-fi
-start-stop-daemon --start \
---pidfile ${PIDFILE} \
---user pgbouncer \
---exec /usr/bin/pgbouncer -- -q -d "${INIFILE}"
-eend $?
-}
-
-stop() {
-local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_QUIT_TIMEOUT} ))
-ebegin "Stopping PgBouncer (this can take up to ${seconds} seconds)"
-
-local retries=SIGINT/${NICE_TIMEOUT}
-
-if [ "${FORCE_QUIT}" = "YES" ] ; then
-einfo "FORCE_QUIT enabled."
-retries="${retries}/SIGTERM/${FORCE_QUIT_TIMEOUT}"
-fi
-
-# Loops through nice and force quit in one go.
-start-stop-daemon --stop \
---pidfile ${PIDFILE} \
---retry ${retries}
-
-eend $?
-}
-
-restart() {
-if [ -n "${UNIX_SOCKET_DIR}" ] ; then
-ebegin "Performing online restart of PgBouncer"
-start-stop-daemon --start \
---pidfile ${PIDFILE} \
---user pgbouncer \
---exec /usr/bin/pgbouncer -- -q -d -R "${INIFILE}"
-eend $?
-else
-stop && start
-fi
-}
-
-reload() {
-