Clean out old and insecure versions. Version bump. Fixes bugs 425480, 460310, 477062, and 425034.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

14 files changed, 229 insertions, 494 deletions

diff --git a/dev-db/pgbouncer/ChangeLog b/dev-db/pgbouncer/ChangeLog
index 03446e1eeec2..d7a434325578 100644
--- a/dev-db/pgbouncer/ChangeLog
+++ b/dev-db/pgbouncer/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/pgbouncer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/ChangeLog,v 1.9 2013/03/17 15:19:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/ChangeLog,v 1.10 2013/07/19 00:47:55 titanofold Exp $
+
+*pgbouncer-1.5.4 (19 Jul 2013)
+
+  19 Jul 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  -pgbouncer-1.4.2.ebuild, -pgbouncer-1.5.ebuild, -pgbouncer-1.5.1.ebuild,
+  -pgbouncer-1.5.2.ebuild, -pgbouncer-1.5.3.ebuild, -pgbouncer-1.5.3-r1.ebuild,
+  +pgbouncer-1.5.4.ebuild, +files/logrotate, +files/pgbouncer.confd,
+  +files/pgbouncer-dirs.patch, files/pgbouncer.initd, metadata.xml:
+  Clean out old and insecure versions. Version bump. Fixes bugs 425480, 460310,
+  477062, and 425034.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 85b4a58ea01e..025799a5921d 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,36 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pgbouncer.initd 922 SHA256 53c13e9bc6be5d492d9ad6742fe3cc6e2ff5b91b31cf79b4ac77fece26c63b4e SHA512 daf875c67d5c2edea1d6cfde178248d59746bfe7addd15ba628384194c6b94bd81f1a555b08a5f18177fc0f195524c53b31e75c3489402c83023d9b9ec2e47e9 WHIRLPOOL abe8e9fc904e1834a3c87070dfb8fc3d5cf74d9b8217ba4e0dcdcaca802998c21ed437b7a32cb27a445b6512bcdd2427943fd178e9af26174e1e8155fa4235d5
-DIST pgbouncer-1.4.2.tgz 283204 SHA256 e9916f08621f8ad4134840049a41783fa93d056905d445942f8aa1d2e5aa1eae SHA512 fdab1e80974d5f8317760b3613bfdd50771fdc308ad433631033513087a4136da84b369f81b62ecc385db183225f7d9e35e71f690d03c6648748857e5a9c9d6d WHIRLPOOL 723d8e80c4d4cf8510d3cf04ea63ed6264662e188fbdadfcb2a2e523a4a5f606f8bdb1ed1e79e4f78ac9711e8faa479fa34cb4be9a5e8d797a4097191ae75acd
-DIST pgbouncer-1.5.1.tar.gz 334413 SHA256 d0634253d319e43ebc18cb0476ba28c47803eff5bae5c6e17f650dc031fc4434 SHA512 6c93cd44b0f74300cb567fcef23027cdffcb435243afdea4d5aa6c772cc5dfd952fdddad7bdc83e4751199a6aa9bca4755fd4ec66cad686b66cc764beb7bfb7e WHIRLPOOL 6c03a7b0a9c57e9887bc8866c8ecd8fa43619d9d24cf177065e213a816c215a3263623b8013b7af0aa52b2d0264997dba8269fae858463c94e6a13bba987a9cb
-DIST pgbouncer-1.5.2.tar.gz 335338 SHA256 f17ebf1dfe34dd4c39c2dd861d5b58f08cecef22be3b74da256d25ea15d451f8 SHA512 951effb47af17dc7769399264637e907662707c49af994b90b9eb1dcc485c1fa3e29bd6738428fb14574b4a165105942f9e354f2141f09d1607826b4beb394d1 WHIRLPOOL bc96b99cc3682f472aa9fb1c1bb36525b92887d4e7bc391a09306513fc948e68ebaac672718335721339a9daa9628e4301fed1edbd0a8d1269a2ab7a96ca0dd7
-DIST pgbouncer-1.5.3.tar.gz 339013 SHA256 8a8e0354eeec1aa28f402cab8c12664e9638c80d067467cb727417a4f6a6a80a SHA512 ab0fb9755d1ae0b2c66dc458d7b93596506d44fba4258bb538a5fad15b814f0e3d0e019fe0c20aa7cafca3eff95f198bd81b84ae1422edd381864f9017407124 WHIRLPOOL 6d11e85ba8e5d748764bd63370da3699f8bc21e5711f1dd77640205f07bc4d8c7623c296388f9f26bef482fe17436b015b2a1840a5e7873f8baca585e3f7ff36
-DIST pgbouncer-1.5.tar.gz 411488 SHA256 408924d54794fcd63cd31284fa13a21266b2fc33c6b5e6be1eb1d91512261fee SHA512 0511db2ce386463b526c3c4f1d9989f96b6435b31c0cb78d5d3b2764abd27f08b40422cc5d4cff3220c71cb32d2db03a2fed8b975d17841c4e66b14ee70713c5 WHIRLPOOL efebf3072ebc36028071779bacdb4b1610fd4cfa867378e1f0fb587db715359101848eeff045535701c7c8d7712aebe399aa7d2b8c52f980a5c7694c9b262d2c
-EBUILD pgbouncer-1.4.2.ebuild 1764 SHA256 b153f6f964a0ecad265df50cb8a4cd0286421857ad2606fde09ede3828d4dd2a SHA512 bf9ad96d954da15250fcae82a12ae04629fe1e772581854e6c1ec15f863fbf46ae7152fcaedecf024e31491ec62d1611d5d583ee2bd3fccd643511d29316af14 WHIRLPOOL 2e0b9d4dc8ec122aa462741316cbbe25f47b47f6acf3c5f3409080b18717d6858c68d2eeb0cb66848c594e72fc8cac35938bb6e4cfbe3c0dc818ca9eeb5b2f13
-EBUILD pgbouncer-1.5.1.ebuild 1767 SHA256 4c68d965549e7b351a113f377c54ab59310ae6ceb29ece548ab7392f245f28c4 SHA512 b46ba9c3ae1fa0879871f28eb1c8d5df54cc1b00b751f540106de7ff8b959d877730c63514529897337aa6260ce02342b2225da13b460032f92c71635282bf43 WHIRLPOOL 4088a6d34a0c67405da0cdb6066ec7397b1ac6faff86056ca3776eeabea398b405b440d94f1cf3972b5def67d18df9c97eb6e0a077d668c07fbc4dc2df2a268c
-EBUILD pgbouncer-1.5.2.ebuild 1767 SHA256 ea561d4dd7a8be1e51059a5c66e9de79519bfc63a0c0684ecea0681995cc70ca SHA512 b052ff4ee6f81eb6c94ebc11b3937aac437d83b8b92af07062b7cfc3025ba3e0709b81eae009cbf3babdfed7461b2d59e306e6d0412e715e16f85beacf087338 WHIRLPOOL a5defdf068f4882cc62dc01065b68beb34873d8c64b347d747ef44e123ae672d769c3ff583c957cdda3dff95faeab82726cac1e419799ccb6f504529229631a8
-EBUILD pgbouncer-1.5.3-r1.ebuild 1768 SHA256 279a80b7567c4d13e72fe5efbf6c0e3f7fc71f6b46beec3795c71e4171a9826a SHA512 7a3acfb2fda92069ac83b3e9d81de948bb6b6803572e4241305286bc1d81881bdfd8c360b7e4de8ae7676c553020a4bfcc7c65371d6dff26b0cfa6044d3dfb6a WHIRLPOOL 8c2d2e359ae319a5efedf1432993131a6010936b399b57682a07c0cfc742bf26e3d625aeb0303a9b5948b0e153e8da677abe35d331687e383d80d751117fd084
-EBUILD pgbouncer-1.5.3.ebuild 1767 SHA256 f8a9a9d6692543071d8fd2a8be40d0a56c50c6fd9455dcf1a6d3b9e0d73a6b7c SHA512 85ad5d3c4ac8110602dfa2ccde6982404e8c0dacc08c4a6f9b77c708b0a252ea737ab65659a9083e04fdeba794f2fc9aaf6fcc4db347a682f120e51602ab6d4e WHIRLPOOL 7223e665a6cdcab1c7e8c9fd605ccb75706f6b18c02172038ad72e6486f0c31f79cd4f157a62d0debb414fb7e8de453b154b8f4f78183c43e05b45ad821151bf
-EBUILD pgbouncer-1.5.ebuild 1765 SHA256 330402aa069080d5bd0b7b5fea07b501411f47c8cc111db487d080d2429548a7 SHA512 e8f62858844a2caa5fe65aa796c208d7768d960ae650b91e5681fbf712bfc37c82dd8b136edde90e37f908f192037c2d161f4132e630ea9fe2d17a64d70fe1e8 WHIRLPOOL 63b04062c1ffbe3c221145d42c2c15e778e27ef9aafa5cae9ec3f2958387dc66676a2505c9d34349212ae417148a716c3e90dd709392edc4c5b21c996db04cfe
-MISC ChangeLog 1562 SHA256 ff3d3e8fe5dfa5f7df9f00641c7f98d80134bdc1a7c01ad13a4cf63cf74d94da SHA512 2fa9de451b739dd4bfc986a788902501b65f2426da1dc5646deb0417aba1910227adaf0fa7356b62245d12caf7940a3fae5e1aa704407e13c504d7e5faf83293 WHIRLPOOL d225d841f18c9dd9dd72f93a4c12db508f096579fa1053eb69e8286b65584429fd880b99a1bff994423fd3f226680bb8efe183a8f082cf5f58a2334d988293fe
-MISC metadata.xml 453 SHA256 e3a9b36a5cb7862322addb7aa64ad4673222d309bc9b7ce9bba56672fb20e8c6 SHA512 ca8a02a87ff4f45c774fb7479523fb3ae786a08f24c5121fab42ea585fcd7424c5a1147786b60be7c95304a64586da78ddc7f262268bec0effdbf52ec3891829 WHIRLPOOL e3d7fc51b64deabfa9c4063b2d96fe0ce3b649d59eb28ee5042a06dcb78fdfa4a76665c59305838df944d657496d857471252efffa656c149222287edbcd45b1
+AUX logrotate 119 SHA256 09e12d5f8f026251a0a8532dfc181199085e4cc23a3f4cbb4dd15a4bea5af6ad SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8 WHIRLPOOL 982d153670d43bf5b195988887474cd8b4dc268dc663ce88d430f86d83f6cf5cd3bc0455495eb8d225fe4d6179b5bf6e3136d3d960cb9b1d1dabeb0b2f4288a3
+AUX pgbouncer-dirs.patch 685 SHA256 d5b0875000c89e945b0eb3f3007d68b211d675a4e18872ef7166c76dbd3eb695 SHA512 6a475bf5cff10b464177af619051529ad78e802c56655500ad23130c5989721f41592387f9bf6719810eae2d876a8dd36219b87ae1fdb29304b2adc98c49ae4c WHIRLPOOL ac8df7239880f21479bec1153a4b9a6ab4da937bccec38205785ccc4f951b4d8a227e94c12f564b2694803a2a43c5390c4700944c9ed60f55fdbeeec370439c7
+AUX pgbouncer.confd 425 SHA256 e681f992f6051bc1bb2887f712530c38be1c0a2ffb8ee254d0438b8679f55b9c SHA512 9f997cbfb18f5bb1623aea2a9af706359a973fd2167be91ee6ffb37a22a6dc453280c66b6d2c11ab0174dbf159a195f0a1612be198466633d728a5317a878035 WHIRLPOOL bbad3f2609c638e859e44555e25bef1249a7cbb024a7f6e07f4cee57bfc1571d8100a43715360d2d03a9bf62b0ed65878339cc5f641ac0f3736296a93c597b6f
+AUX pgbouncer.initd 1882 SHA256 f72ab3dd5b3ec3633f1c0d42972f8911c5e3716c5d693c0f48919bb05c23802a SHA512 f06a33f5c122c06b293671230313c266e6f62d0929ff7039c40ad5347dcc5805214f9b9bf97a63cdec9006c701e20c10577b05cae061ac557aee867d22c786fb WHIRLPOOL 31a82dfb8216c8daafa32027bdc5372bc80a451bf448b7fb18ec45dd4ea2b18f80224be230c5252ece948302d0cbd2d7f2f8924179fad8f32f976fa1c85d975b
+DIST pgbouncer-1.5.4.tar.gz 339610 SHA256 08040482f4c887e14d8c8c46fab838fff640c0f3cf231f86ad7f766b7a292280 SHA512 ade8304eba682a468a5e4c1c5e661d67ea64fad951d6f767a3157de4e5398c52492b2ca022f274c55e43022df8d5fad87e45fc60adbcbab00a5ac843a26c6b71 WHIRLPOOL 107d028eaa4ea9f0469994ca9fa3caab64fc33dd2c7228aa7784b04b89091352a6b086fe7123ddfbcc9900b1c1cadef4c08030d9b9a5b169a4be4441ff3a6f02
+EBUILD pgbouncer-1.5.4.ebuild 1940 SHA256 2a23f46843ff81b705081fcea2d6e4f87d796b813cadcf67180da5fe4a8fe11b SHA512 33459ed839dcc43ffb74542ca815f32070f85ccbc5f098ff43c0389ee19adbcf2f37d75428ab5c4186574aa5ec3bd7bbf76c62fef77751ef09f4a178e41ac567 WHIRLPOOL 378b737ba3012c46e1c21192a40485496bcc034a8f8c15d6358d69c072917c8a656a0002206cf838d8060d97e6e6401d664306fc1758d57980f7af50db1f25fe
+MISC ChangeLog 2048 SHA256 60d51a548788dcdf42bfe9c3590bcf4efac58fbc1353fbc1d7cd67ce3195f20a SHA512 17b41dc03de87f0d1d3d788ae9ba45667721e43c22416499dee36e162c4a9ea091e3391a90e92f6ea01b19c67add4d5afa52ac2628dfa2fbbfbbc14266ebbcbb WHIRLPOOL e3321c42a2759a17b1d1a74b892003dfd894753926eb149dcada8d32fb33f8439cf3234033b723bb34962788d4c99b422c0c642e43e69c75a31a97265f67c2e9
+MISC metadata.xml 687 SHA256 6c86b074d669b130901588bfe5683a3dd86895219cc9e6c94ffe88671065b67f SHA512 37821a44019dcd379378d1acc28d59dcbd6b0cca8366a941a179d6338c92825233b113d53ef4d15ffa32ac40b127b04f74e8b3ce7af21185d08758286389a285 WHIRLPOOL 6937473b0039b501309065643b79220fd85978cff813358f30567e1540e3124060b3ab53c3d15ca92911bb0ac27f7dc6cb00585181731820dc10c821dec09a20
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRd8ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88OAIP/3Xdeo9w3aiZE2iVbPoDcxvv
-O3ljkW57egQzLKLKFyEU2gSgTMMm8hYEyNwsuLT2yepjRe35wW5+PK0en89bSsNB
-m7kl2vySnzN2Z/YsQZxHw50wmhQGvjy+BCzchu5hPpWM3as0e06GWAairEj0vtrM
-AjGf41SjpzyP6FmlUsJsMBFOGZIDMm7pJOAD0yhwjxOR3JwSi2lLBD/p/Ds344ym
-w48MO7jnpcHZk/6MeubY4MGnd9j48B9cvNdlHviB/Nk9jgnqH8flkPOFTfJVxvCS
-jNXpXdQOYUf9w04A3o+YUFyNa9BbGHEEWv05b2j1NuFhNgo+dMMjJmuH/UGzepf/
-DtFS4vZcKEiwUjGqk/jMLhlcRnB2otoU4Bn52BGzm6g4dEvmqJ5V3nCkmjYkLNrb
-tsO26Juv6/Zdxt2iWYujVDuRgtcoQTgHdPUX+GMFNJF8EcT8rFSSoUS6Yrhu/KJv
-71JnhEklYm2TqJBA9eXcuLHqLdfK5rKmv9yMG1jqMarjiyGsvItZ9UnUuwLPLiRF
-TaInxYq6fU/M5y6zu0p6QUxO+wBjK3FrYELkVygNokofjgCuNQ+kiKR08K8Wy4P1
-RlaXw10z5RHmYAhfrlVZE2u5KZMe8IVAsmiAsx8B1GD+M/kdRMeDKBEZpeUeLxxG
-5Xwc+9XkGoEWbHHTvWl6
-=Ol7m
+iF4EAREIAAYFAlHojMEACgkQVxOqA9G7/aBwgwD9G8F3AeDAoWA+QW/phNshp6IJ
+uswlcCEqvJdsjksd2qwA/ikiVqLKbJKRl9h7wwktgy06oLcqJHEoSIU04Rrz9bgJ
+=FIk/
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgbouncer/files/logrotate b/dev-db/pgbouncer/files/logrotate
new file mode 100644
index 000000000000..9617eafa66b0
--- /dev/null
+++ b/dev-db/pgbouncer/files/logrotate
@@ -0,0 +1,7 @@
+/var/log/pgbouncer/pgbouncer.log {
+	missingok
+	sharedscripts
+	postrotate
+		/etc/init.d/pgbouncer -q reload
+	endscript
+}
\ No newline at end of file
diff --git a/dev-db/pgbouncer/files/pgbouncer-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-dirs.patch
new file mode 100644
index 000000000000..62bcd0b84409
--- /dev/null
+++ b/dev-db/pgbouncer/files/pgbouncer-dirs.patch
@@ -0,0 +1,26 @@
+diff -Naruw a/etc/pgbouncer.ini b/etc/pgbouncer.ini
+--- a/etc/pgbouncer.ini	2012-06-10 19:57:01.000000000 +0000
++++ b/etc/pgbouncer.ini	2013-07-17 02:25:59.598888628 +0000
+@@ -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.confd b/dev-db/pgbouncer/files/pgbouncer.confd
new file mode 100644
index 000000000000..e2c584011884
--- /dev/null
+++ b/dev-db/pgbouncer/files/pgbouncer.confd
@@ -0,0 +1,12 @@
+# 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 b/dev-db/pgbouncer/files/pgbouncer.initd
index 83e43cc10808..594129c674f4 100644
--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ b/dev-db/pgbouncer/files/pgbouncer.initd
@@ -1,43 +1,77 @@
 #!/sbin/runscript
 
-extra_started_commands="reload upgrade"
-
-if [ -d /run ] ; then
-	RUNDIR=/run/pgbouncer
-else
-	RUNDIR=/var/run/pgbouncer
-fi
+extra_started_commands="reload"
 
 depend() {
-	need net
-	after postgresql
+    use net
+    after postgresql
 }
 
-start() {
-	checkpath -d -m 755 -o pgbouncer:pgbouncer ${RUNDIR}
+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)"
 
-	ebegin "Starting pgbouncer"
-	start-stop-daemon --start --pidfile ${RUNDIR}/pgbouncer.pid \
-		--exec /usr/bin/pgbouncer -- -q -d -u pgbouncer /etc/pgbouncer.conf
-	eend $? "Failed to start pgbouncer"
+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 0644 -f "${PIDFILE}" \
+        || return 1
+    checkpath -o pgbouncer:postgres -m 0640 -f "$(get_config logfile)" \
+        || return 1
+}
+
+start() {
+    ebegin "Starting PgBouncer"
+    prep || eend 1
+    start-stop-daemon --start \
+        --pidfile ${PIDFILE} \
+        --user pgbouncer \
+        --exec /usr/bin/pgbouncer -- -q -d "${INIFILE}"
+    eend $?
 }
 
 stop() {
-	ebegin "Stopping pgbouncer"
-	start-stop-daemon --stop --quiet --pidfile ${RUNDIR}/pgbouncer.pid
-	eend $?
+    local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_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_TIMEOUT}"
+    fi
+
+    # Loops through nice and force quit in one go.
+    start-stop-daemon --stop \
+        --pidfile ${PIDFILE} \
+        --retry ${retries}
+
+    eend $?
 }
 
-reload() {
-	ebegin "Gracefully reloading pgbouncer"
-	kill -HUP $(head -n1 ${RUNDIR}/pgbouncer.pid)
-	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
 }
 
-upgrade() {
-	egrep -q "^unix_socket_dir" /etc/pgbouncer.conf || \
-		eerror "Not running with unix sockets, cannot upgrade"
-    ebegin "Gracefully upgrading pgbouncer"
-		/usr/bin/pgbouncer -R -q -d -u pgbouncer /etc/pgbouncer.conf
+reload() {
+    ebegin "Reloading PgBouncer configuration from '${INIFILE}'"
+    start-stop-daemon --signal HUP --pidfile ${PIDFILE}
     eend $?
-}
\ No newline at end of file
+}
diff --git a/dev-db/pgbouncer/metadata.xml b/dev-db/pgbouncer/metadata.xml
index 7eb3f9208074..f9bdcdbde21a 100644
--- a/dev-db/pgbouncer/metadata.xml
+++ b/dev-db/pgbouncer/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>postgresql</herd>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
-	<email>bugs@bergstroem.nu</email>
-	<name>Johan Bergström</name>
-	<description>Proxy-Maintainer, assign bugs</description>
-  </maintainer>
-  <maintainer>
-	<email>titanofold@gentoo.org</email>
-	<name>Aaron W. Swenson</name>
-  </maintainer>
+    <herd>postgresql</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>bugs@bergstroem.nu</email>
+        <name>Johan Bergström</name>
+        <description>Proxy-Maintainer, assign bugs</description>
+    </maintainer>
+    <maintainer>
+        <email>titanofold@gentoo.org</email>
+        <name>Aaron W. Swenson</name>
+    </maintainer>
+    <use>
+        <flag name="libevent">Use libevent 2.0+ and evdns as the DNS backend</flag>
+        <flag name="udns">Use udns as the DNS backend. Supports IPv4 only.</flag>
+    </use>
 </pkgmetadata>
diff --git a/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild b/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild
deleted file mode 100644
index d1befc890788..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.4.2.ebuild,v 1.2 2012/06/04 06:45:39 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="mirror://postgresql/projects/pgFoundry/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup pgbouncer
-	enewuser pgbouncer -1 -1 -1 pgbouncer
-}
-
-src_prepare() {
-	local rundir=""
-	[[ ! -d /run ]] && rundir="/var"
-
-	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
-		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
-		-e "s,etc/userlist.txt,/etc/userlist.txt," \
-		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
-		"${S}"/etc/pgbouncer.ini || die
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins etc/pgbouncer.ini pgbouncer.conf
-	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
-
-	dodoc README NEWS AUTHORS
-	dodoc doc/*.txt
-
-	dodir /var/log/pgbouncer/
-	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
-}
-
-pkg_postinst() {
-	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."
-
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild
deleted file mode 100644
index bd20dff2b40b..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.1.ebuild,v 1.2 2012/06/04 06:45:39 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="mirror://postgresql/projects/pgFoundry/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup pgbouncer
-	enewuser pgbouncer -1 -1 -1 pgbouncer
-}
-
-src_prepare() {
-	local rundir=""
-	[[ ! -d /run ]] && rundir="/var"
-
-	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
-		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
-		-e "s,etc/userlist.txt,/etc/userlist.txt," \
-		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
-		"${S}"/etc/pgbouncer.ini || die
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins etc/pgbouncer.ini pgbouncer.conf
-	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
-
-	dodoc README NEWS AUTHORS
-	dodoc doc/*.txt
-
-	dodir /var/log/pgbouncer/
-	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
-}
-
-pkg_postinst() {
-	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."
-
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.2.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.2.ebuild
deleted file mode 100644
index bebd4334de42..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.5.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.2.ebuild,v 1.1 2012/06/18 07:53:26 patrick Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="mirror://postgresql/projects/pgFoundry/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup pgbouncer
-	enewuser pgbouncer -1 -1 -1 pgbouncer
-}
-
-src_prepare() {
-	local rundir=""
-	[[ ! -d /run ]] && rundir="/var"
-
-	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
-		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
-		-e "s,etc/userlist.txt,/etc/userlist.txt," \
-		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
-		"${S}"/etc/pgbouncer.ini || die
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins etc/pgbouncer.ini pgbouncer.conf
-	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
-
-	dodoc README NEWS AUTHORS
-	dodoc doc/*.txt
-
-	dodir /var/log/pgbouncer/
-	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
-}
-
-pkg_postinst() {
-	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."
-
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild
deleted file mode 100644
index a4fb2c5afbb5..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild,v 1.1 2013/01/14 17:29:29 pinkbyte Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="http://pgfoundry.org/frs/download.php/3369/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup pgbouncer
-	enewuser pgbouncer -1 -1 -1 pgbouncer
-}
-
-src_prepare() {
-	local rundir=""
-	[[ ! -d /run ]] && rundir="/var"
-
-	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
-		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
-		-e "s,etc/userlist.txt,/etc/userlist.txt," \
-		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
-		"${S}"/etc/pgbouncer.ini || die
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins etc/pgbouncer.ini pgbouncer.conf
-	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
-
-	dodoc README NEWS AUTHORS
-	dodoc doc/*.txt
-
-	dodir /var/log/pgbouncer/
-	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
-}
-
-pkg_postinst() {
-	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."
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.3.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.3.ebuild
deleted file mode 100644
index 09c1a14a0099..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.5.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.3.ebuild,v 1.1 2012/11/13 02:54:25 titanofold Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="http://pgfoundry.org/frs/download.php/3369/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup pgbouncer
-	enewuser pgbouncer -1 -1 -1 pgbouncer
-}
-
-src_prepare() {
-	local rundir=""
-	[[ ! -d /run ]] && rundir="/var"
-
-	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
-		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
-		-e "s,etc/userlist.txt,/etc/userlist.txt," \
-		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
-		"${S}"/etc/pgbouncer.ini || die
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins etc/pgbouncer.ini pgbouncer.conf
-	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
-
-	dodoc README NEWS AUTHORS
-	dodoc doc/*.txt
-
-	dodir /var/log/pgbouncer/
-	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
-}
-
-pkg_postinst() {
-	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."
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.4.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.4.ebuild
new file mode 100644
index 000000000000..8f70bdbc414a
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.5.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.4.ebuild,v 1.1 2013/07/19 00:47:55 titanofold Exp $
+
+EAPI="5"
+
+# Upstream has *way* broken tests.
+RESTRICT="test"
+
+inherit eutils user
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
+SRC_URI="mirror://postgresql/projects/pgFoundry/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libevent udns"
+REQUIRED_USE="
+	libevent? ( !udns )
+	udns? ( !libevent )
+"
+DEPEND="
+	>=sys-libs/glibc-2.10
+	doc? (
+			app-text/docbook-xml-dtd:4.5
+			app-text/xmlto
+			>=app-text/asciidoc-8.4
+	)
+	libevent? ( >=dev-libs/libevent-2.0 )
+	udns? ( >=net-libs/udns-0.1 )
+"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	enewuser pgbouncer -1 -1 -1 postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgbouncer-dirs.patch"
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-debug \
+		$(use_enable debug cassert) \
+		$(use_with libevent) \
+		$(use_with udns)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${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.5.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.ebuild
deleted file mode 100644
index 35c37754f6f8..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.ebuild,v 1.2 2012/06/04 06:45:39 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils user
-
-RESTRICT="test"
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="mirror://postgresql/projects/pgFoundry/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup pgbouncer
-	enewuser pgbouncer -1 -1 -1 pgbouncer
-}
-
-src_prepare() {
-	local rundir=""
-	[[ ! -d /run ]] && rundir="/var"
-
-	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
-		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
-		-e "s,etc/userlist.txt,/etc/userlist.txt," \
-		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
-		"${S}"/etc/pgbouncer.ini || die
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--enable-debug \
-		$(use_enable debug cassert) \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins etc/pgbouncer.ini pgbouncer.conf
-	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
-
-	dodoc README NEWS AUTHORS
-	dodoc doc/*.txt
-
-	dodir /var/log/pgbouncer/
-	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
-}
-
-pkg_postinst() {
-	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."
-
-}