gentoo resync : 21.12.2017

8 files changed, 222 insertions, 15 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0083bb7d5986..fdad901b4a57 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index daa53a8715b3..a7de926a31ca 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,7 +1,11 @@
 AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3d043f693af2b963aaf18bb230ec4cd5ae34f09219f02b9ee0ca5b43fe61489f46aa7a8d505 SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8
+AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f701dae628ae8c9fb201e08ae3f0c5826515c6a884a00f2b0afd048490b16d87f9b3b9cf836ca4c77284cd705334 SHA512 2c9ddd2ae193b032435f97d41e789283ae69d99fefeb3829e80a90be296ccd2a754a9d00e6930985408758dfa3349d65f3c2ddf1f74053424bc8d8d09b2fa0e2
 AUX pgbouncer-dirs.patch 685 BLAKE2B 6a12d056f9a61a637d491cee28ec00cd9f6e24f0278176392775102a3a2e37e11fe7873654854311132bffab82db02a54a8db41a8c71b657235ae8cc3a53adcb SHA512 6a475bf5cff10b464177af619051529ad78e802c56655500ad23130c5989721f41592387f9bf6719810eae2d876a8dd36219b87ae1fdb29304b2adc98c49ae4c
 AUX pgbouncer.confd 425 BLAKE2B f9b7065c043474f2208b44eecefb9cd1d6544295a47c3aee51f340f522eb4ba87bb270c99e18183541aca144eb16487a622ff5f2b5d5b87b2d1c7dd950262afd SHA512 9f997cbfb18f5bb1623aea2a9af706359a973fd2167be91ee6ffb37a22a6dc453280c66b6d2c11ab0174dbf159a195f0a1612be198466633d728a5317a878035
 AUX pgbouncer.initd 2183 BLAKE2B 1a1cf76abf1de076aa7c4362a52ff84d754306d51a8da19f6d7c320ebdd64b7bea5c1e914cb947d55ea274220543ce5adbd2969656f582dc439f2b73c0be2914 SHA512 ecd34f017316b2c0aad172e5bf5393137da5ab841f4d6de93eb82a07abe9f234a2426ca7dada2dc047c33ea4c7dc0af3040b249ec1f9d7e0c1782fb0463a7293
+AUX pgbouncer.initd-r1 2216 BLAKE2B cfc489a5db03b6e4c56c79036d070152a6f78ce6c300fdc52049aaf91c41db1e2a41af409e701ab8dc2a24a5ca4e8b89b38cc61c52885a1330a04ef727d7585e SHA512 c2af62daf4e7c8e5a25acd17237de2134f1e496a51bd054abecc020a65b39c309c85572c17105431fd598a80ada187fb32fa8f2b1db229d2207c59607748220a
 DIST pgbouncer-1.7.2.tar.gz 462374 BLAKE2B 0fea85063e30dad3b7e5d145ecd8660d260c6c09202af3661e8acfdcb5ab25f5c23a2f4e02fcfdfcee872ddeb92b78e157457aafa158ee759a1d73a3d33eb009 SHA512 11c89606599f424b34f39a4b072ec6293fea0b14ee52ae4fbc44775e6d83771a22d194f4e8eabe410e0d6a70657508cf1a3b1012543d91873c36f644afb5675d
+DIST pgbouncer-1.8.1.tar.gz 465930 BLAKE2B 692c551cb7bfb56bfe1b354791b06bdf61866197150a78a7fa9688891a2e4cd3c015abc5fbe33bf66dc85ab0ae83745f2db852eae91ae99596c97be0154e8bd5 SHA512 595a94db98866cec211f2b8c1ad13d209dba00e5fd41f2e9025aabdcb660194f0f772810270a1d9f067c3039c9fee630e8ff2d56f231935add17207aecc10bee
 EBUILD pgbouncer-1.7.2.ebuild 1786 BLAKE2B 00dc4c138a598a44bed9fedd366eead98f0d0f560e3dd941cfd472989c88824f8193839732b146b989c2d0f906424155f8d7d7be530d8f3941c04fb540bf5201 SHA512 dabfa3936e5292c14d6aaf44489c4d8b530725328776ac207b90b2b0dbecf6a3767b858848eb3d94be8766cdc496584c5062dda25f2b291e2aec68c05cd29e98
-MISC metadata.xml 617 BLAKE2B d4e539b4dbf35b0be4c9435fb595464406e45dc23cf1b404bad47d5c81900560c66e23e9b8c222819220002c0503dd0fc20d7d04b56a01814fd4da9977cb4e65 SHA512 55348cd751a6d896a112a750609bcb2d68f1f2079eeb460f87a14eeff15c8bf70cd7da86d0e0fd81b6fbc704e6dbc17102a9d8a49e348cab6713e6b95815646d
+EBUILD pgbouncer-1.8.1.ebuild 1894 BLAKE2B 9ab35b90aead2714dbefaea801bfa13d9c3f83926124f368b39614edefa7f0e77e7c1321fc50aab884ddcdcf6a919dc32382676772ac5fd35b854286d7e85136 SHA512 84323f9ee97ff31a1ca8014aa3a1b90ae2dcb8382566192f3ab854ac0a461d46d513c5b592695b3a80c5866539dd5cf45316244b5898d85f38dd07ce64310059
+MISC metadata.xml 550 BLAKE2B 62cc3b07c70773656e24c6a90af4d0e19869f4472f3de01221b08a2361ba1c00080677f3bf07cf25734e280250821710e6281038b263cb4656790c7332cfe40a SHA512 7639d610c12de943d4b7c7b77e832a1e47865dc3deb934f9d23a2d521ea1c72a8c481dd9e3c1fbe5b88863e37e19a5a6229184791f4a0a04ef7989a91300bb7b
diff --git a/dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch
new file mode 100644
index 000000000000..cc4d0634b6b3
--- /dev/null
+++ b/dev-db/pgbouncer/files/pgbouncer-1.8-dirs.patch
@@ -0,0 +1,32 @@
+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/files/pgbouncer.initd-r1 b/dev-db/pgbouncer/files/pgbouncer.initd-r1
new file mode 100755
index 000000000000..7392918593bb
--- /dev/null
+++ b/dev-db/pgbouncer/files/pgbouncer.initd-r1
@@ -0,0 +1,83 @@
+#!/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/metadata.xml b/dev-db/pgbouncer/metadata.xml
index 0d24afdb221a..29bfef0ab645 100644
--- a/dev-db/pgbouncer/metadata.xml
+++ b/dev-db/pgbouncer/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>titanofold@gentoo.org</email>
-        <name>Aaron W. Swenson</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>pgsql-bugs@gentoo.org</email>
-        <name>PostgreSQL and Related Package Development</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>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL</name>
+	</maintainer>
+	<use>
+		<flag name="c-ares">
+			Use c-ares as the DNS backend instead of evdns (libevent).
+		</flag>
+		<flag name="libevent">Use libevent 2.0+ and evdns as the DNS backend</flag>
+		<flag name="udns">
+			Use udns as the DNS backend instead of evdns (libevent). Supports
+			IPv4 only.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
new file mode 100644
index 000000000000..69a361cbeaeb
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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:=[-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 \
+		--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" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd-r1" "${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/slony1/Manifest b/dev-db/slony1/Manifest
index b8e175063d4e..4ce93284a8c6 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -12,5 +12,5 @@ DIST slony1-2.2.6.tar.bz2 1465709 BLAKE2B 87e581638aab5ac9f51437fc43b65f200c29e0
 EBUILD slony1-2.1.3.ebuild 1773 BLAKE2B 40c30eb53c68f34f95a1fa99134a8aea0d4077863d8d85c11794eecb456c22aa04c0463d27b408f540c703f1a149eba8ce0b8acad8f10b3e41862a7c1e21f2d9 SHA512 feff51265613b44f13878516bbd8f5f2c1b5d1cb7e858b71163a5bf8c18bf325c99b708fd3aaf45b81a2219941eb4040066593bcec1d65cdd604e91cfea6838a
 EBUILD slony1-2.1.4.ebuild 1819 BLAKE2B 91997da5e05bb3caf47f40395f05066d9f4e8619ed257d14bdeb10a0fcf80f87d243e2c18bd37b289ae13a81c9fe5f72e7265a890fc3f8c67380249aa24ebde5 SHA512 3c878c1e8e2f2906d7ae9b96602a3431304aff3f081e372fbecf830dbe7c1d487e0f5ea7176076ef0e096081cf2b06e15eefd34089e3f3fcdf31626f631460ad
 EBUILD slony1-2.2.5-r1.ebuild 1629 BLAKE2B 8eea7920799a5617708d591ebbadd3b8bd1d31e20be24af2037d0fba007c07afc00103113cd96e16a583b32e79db5c9ce7fed9b8b874366063563fe5a67a7d25 SHA512 3ef05022f6c1af203a1dbedf4df3ac2fd6912eaf80b612331134c4503eaf0b9e49efb02f58576e577aa2a6b52d747910bd5f1bf791b907b57f68bbb3f80156f4
-EBUILD slony1-2.2.6.ebuild 1649 BLAKE2B bb8a227023c1806872d91802334daba5beeda70df2be8d273b2d40e679bd871ebb74df620d4d2b37e3c73462c0bc1580284ccfafda4ecc7beec03c5ff0d3a167 SHA512 fe458004f707723676e6f31b7e1acd4b48d405696b4fa715c42f005d4358c875ba68f9a4943701ed5dce074deec194b80ff1b19c4d1117c59110e2b5a7483e03
+EBUILD slony1-2.2.6.ebuild 1648 BLAKE2B b0f555404a3523c96bffae95774b3dc00593c1b2223be8a0216737f8c8d2a79e74beb0f51c37af5bddd60e4c55a754b3fbc3909de671ed166f4a153bfffbeaff SHA512 d1adaaf727f9d6d59195a8ed1f9984f084f480cb6e061402dee8440e7fe5f141c41b471d049b562bb2c9ed858bd846b321726832685c4162465586d184436295
 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/slony1/slony1-2.2.6.ebuild b/dev-db/slony1/slony1-2.2.6.ebuild
index c165df4a991b..a6cff37e04bf 100644
--- a/dev-db/slony1/slony1-2.2.6.ebuild
+++ b/dev-db/slony1/slony1-2.2.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="${POSTGRES_DEP}
 		perl? ( dev-perl/DBD-Pg )