proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

9 files changed, 731 insertions, 0 deletions

diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
new file mode 100644
index 000000000000..cbaabe77bc3c
--- /dev/null
+++ b/dev-db/pgpool2/Manifest
@@ -0,0 +1,3 @@
+DIST pgpool-II-3.2.5.tar.gz 1643267 SHA256 aecac952fd3d292584c9aa359d72f89b144c29f45c9f848cb030e46215a814f7 SHA512 c6dd033462de7f56724f7416fca3ee3e25835f113604fb03b97deee2e3ab25a07cfd9aea33ec36211aa0ec41c2bcea31ca9befe0cfe8f6389a39c2f6495388b6 WHIRLPOOL 5db077d51c5aa8692ba23c0f5ad3b3291c42448724cf633db13850d9b22df256c2aedc15b95fe74a33e486e09f4cc6a37daed0d39becff38acd40fa52b78ab8d
+DIST pgpool-II-3.3.6.tar.gz 1812394 SHA256 8e0a9829122ed96793b4c340799d62778eb4176ee0f93288d8d4100fc620ff0e SHA512 64edf6ee96fc18bccaf72e79dc165318587da49f45f7d9748e051a9b87f1938b79eefc020a70f1be31fdf922e6d646710105d97961aef1e0c1538b29cdb0575c WHIRLPOOL a4bfc20115e3a17474e9d57c5abec48ca613568f9e5dcea171a39a114dc5ef3ad59ecd7fba4f0cad703bf6f3dcf7fb1d9dea7b30faa818403bf450f8df10a7c3
+DIST pgpool-II-3.3.7.tar.gz 1808677 SHA256 b1bfc8c48be252f6c4e54521d24a0e28e86d0027b18aa4ccf6b8405508319032 SHA512 814f8a59ed8488a3ab049cc31ee4579ec954672f4cbca9102d8aa4d18dd2c169fd16518461cbcab24c28394c629234c54d9799d6df9f3ffdf0c57c56dfb2d094 WHIRLPOOL b8ca5e6689d1ac947b2da45c601c3206653b9ae5a181bd63f667a3df6ceecc012621ba4349671caa2e0d1ad371409e046b278e9a6b558786aa7ceed6583ccd9f
diff --git a/dev-db/pgpool2/files/pgpool2.confd b/dev-db/pgpool2/files/pgpool2.confd
new file mode 100644
index 000000000000..b2dd2a69e02e
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool2.confd
@@ -0,0 +1,17 @@
+# NICE_QUIT ignores new connections and wait for clients to disconnect from
+# server before shutting down. NICE_TIMEOUT in seconds determines how long to
+# wait for this to succeed.
+NICE_TIMEOUT=60
+
+# Forecfully disconnect clients from server and shut down. This is performed
+# after NICE_QUIT. Terminated client connections have their open transactions
+# rolled back.
+# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
+RUDE_QUIT="YES"
+RUDE_TIMEOUT=30
+
+# If the server still fails to shutdown, you can force it to quit by setting
+# this to YES.
+# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
+FORCE_QUIT="NO"
+FORCE_TIMEOUT=2
\ No newline at end of file
diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd
new file mode 100644
index 000000000000..e2bb1870153a
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool2.initd
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="reload"
+
+CONFIGFILE="/etc/pgpool2/pgpool.conf"
+LOGFILE="/var/log/pgpool2.log"
+
+depend() {
+    use net
+    use postgresql
+    after logger
+}
+
+get_config() {
+    [ -f ${CONFIGFILE} ] || return 1
+
+    eval echo $(sed -e 's:#.*::' ${CONFIGFILE} | \
+        awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
+}
+
+PIDFILE="$(get_config pid_file_name)"
+: ${PIDFILE:='/run/pgpool/pgpool.pid'}
+
+prep() {
+    # $logdir contains status file(s), not log files.
+    local logdir=$(get_config logdir)
+    local socket_dir=$(get_config socket_dir)
+    local pcp_socket_dir=$(get_config pcp_socket_dir)
+
+    checkpath -o pgpool:postgres -m 0770 -d $(dirname ${PIDFILE}) || return 1
+    checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/run/pgpool'} || return 1
+    checkpath -o pgpool:postgres -m 0660 -f ${LOGFILE} || return 1
+    checkpath -o postgres:postgres -m 0770 \
+        -d ${socket_dir:-'/run/postgresql'} || return 1
+    checkpath -o postgres:postgres -m 0770 \
+        -d ${pcp_socket_dir:-'/run/postgresql'} || return 1
+}
+
+start() {
+    prep || return 1
+
+    ebegin "Starting pgpool2"
+
+    start-stop-daemon --start \
+        --user pgpool:postgres \
+        --pidfile ${PIDFILE} \
+        --exec /usr/bin/pgpool
+
+    eend
+}
+
+stop() {
+    local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} ))
+    ebegin "Stopping pgpool (this can take up to ${seconds} seconds)"
+
+    local retval
+    local retries=SIGTERM/${NICE_TIMEOUT}
+
+    if [ "${RUDE_QUIT}" != "NO" ] ; then
+        einfo "RUDE_QUIT enabled."
+        retries="${retries}/SIGINT/${RUDE_TIMEOUT}"
+    fi
+    if [ "${FORCE_QUIT}" = "YES" ] ; then
+        einfo "FORCE_QUIT enabled."
+        ewarn "A recover-run might be executed on next startup."
+        retries="${retries}/SIGQUIT/${FORCE_TIMEOUT}"
+    fi
+
+    # Loops through nice, rude, and force quit in one go.
+    start-stop-daemon --stop \
+        --pidfile ${PIDFILE} \
+        --retry ${retries}
+
+    eend
+}
+
+reload() {
+    start-stop-daemon --signal HUP \
+        --pidfile ${PIDFILE}
+}
diff --git a/dev-db/pgpool2/files/pgpool_run_paths.patch b/dev-db/pgpool2/files/pgpool_run_paths.patch
new file mode 100644
index 000000000000..a1912af15e4c
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool_run_paths.patch
@@ -0,0 +1,180 @@
+diff -Naurw a/pgpool.conf.sample b/pgpool.conf.sample
+--- a/pgpool.conf.sample	2012-07-19 03:06:21.000000000 -0400
++++ b/pgpool.conf.sample	2012-08-14 07:33:39.200695855 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -43,10 +41,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -176,10 +172,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
+                                    # PID file name
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '@PGPOOL_SOCKETDIR@'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+diff -Naurw a/pgpool.conf.sample-master-slave b/pgpool.conf.sample-master-slave
+--- a/pgpool.conf.sample-master-slave	2012-07-16 22:56:37.000000000 -0400
++++ b/pgpool.conf.sample-master-slave	2012-08-14 07:33:39.201695842 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -43,10 +41,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -176,10 +172,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
+                                    # PID file name
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '@PGPOOL_SOCKETDIR@'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+diff -Naurw a/pgpool.conf.sample-replication b/pgpool.conf.sample-replication
+--- a/pgpool.conf.sample-replication	2012-07-16 22:56:37.000000000 -0400
++++ b/pgpool.conf.sample-replication	2012-08-14 07:33:39.202695830 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -43,10 +41,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -176,10 +172,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
+                                    # PID file name
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '@PGPOOL_SOCKETDIR@'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+diff -Naurw a/pgpool.conf.sample-stream b/pgpool.conf.sample-stream
+--- a/pgpool.conf.sample-stream	2012-07-16 22:56:37.000000000 -0400
++++ b/pgpool.conf.sample-stream	2012-08-14 07:33:39.203695818 -0400
+@@ -31,10 +31,8 @@
+ port = 9999
+                                    # Port number
+                                    # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ 
+@@ -43,10 +41,8 @@
+ pcp_port = 9898
+                                    # Port number for pcp
+                                    # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '@PGSQL_SOCKETDIR@'
+                                    # Unix domain socket path for pcp
+-                                   # The Debian package defaults to
+-                                   # /var/run/postgresql
+                                    # (change requires restart)
+ 
+ # - Backend Connection Settings -
+@@ -176,10 +172,10 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
+                                    # PID file name
+                                    # (change requires restart)
+-logdir = '/tmp'
++logdir = '@PGPOOL_SOCKETDIR@'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+diff -Naurw a/pool.h b/pool.h
+--- a/pool.h	2012-07-02 00:09:18.000000000 -0400
++++ b/pool.h	2012-08-14 07:26:56.005764702 -0400
+@@ -61,13 +61,13 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+ 
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
+ 
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "@PGSQL_SOCKETDIR@"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
diff --git a/dev-db/pgpool2/metadata.xml b/dev-db/pgpool2/metadata.xml
new file mode 100644
index 000000000000..d724a3dd009d
--- /dev/null
+++ b/dev-db/pgpool2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>postgresql</herd>
+    <use>
+        <flag name='memcached'>Use memcached for query caching.</flag>
+    </use>
+</pkgmetadata>
diff --git a/dev-db/pgpool2/pgpool2-3.2.5.ebuild b/dev-db/pgpool2/pgpool2-3.2.5.ebuild
new file mode 100644
index 000000000000..9c9035cbf125
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.2.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P="${PN/2/-II}-${PV}"
+
+inherit base user
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="memcached pam ssl static-libs"
+
+RDEPEND="
+	dev-db/postgresql
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser pgpool -1 -1 -1 postgres
+
+	# We need the postgres user as well so we can set the proper
+	# permissions on the sockets without getting into fights with
+	# PostgreSQL's initialization scripts.
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgpool_run_paths.patch"
+
+	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
+	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
+		sed 's|.*\"\(.*\)\"|\1|g')
+	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
+
+	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+
+	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	emake -C sql
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	emake DESTDIR="${D}" -C sql install
+	cd "${S}"
+
+	# `contrib' moved to `extension' with PostgreSQL 9.1
+	local pgslot=$(postgresql-config show)
+	if [[ ${pgslot//.} > 90 ]] ; then
+		cd "${ED%/}$(pg_config --sharedir)"
+		mv contrib extension || die
+		cd "${S}"
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation
+	dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
+	dohtml -r doc
+
+	# Examples and extras
+	insinto "/usr/share/${PN}"
+	doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-3.3.6.ebuild b/dev-db/pgpool2/pgpool2-3.3.6.ebuild
new file mode 100644
index 000000000000..c2cff651ead3
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.3.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN/2/-II}-${PV}"
+
+inherit base user
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="memcached pam ssl static-libs"
+
+RDEPEND="
+	dev-db/postgresql
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser pgpool -1 -1 -1 postgres
+
+	# We need the postgres user as well so we can set the proper
+	# permissions on the sockets without getting into fights with
+	# PostgreSQL's initialization scripts.
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgpool_run_paths.patch"
+
+	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
+	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
+		sed 's|.*\"\(.*\)\"|\1|g')
+	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
+
+	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+
+	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	emake -C sql
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	emake DESTDIR="${D}" -C sql install
+	cd "${S}"
+
+	# 3.3 appears to have removed this
+	# `contrib' moved to `extension' with PostgreSQL 9.1
+	#local pgslot=$(postgresql-config show)
+	#if [[ ${pgslot//.} > 90 ]] ; then
+	#	cd "${ED%/}$(pg_config --sharedir)"
+	#	mv contrib extension || die
+	#	cd "${S}"
+	#fi
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation
+	dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
+	dohtml -r doc
+
+	# Examples and extras
+	insinto "/usr/share/${PN}"
+	doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-3.3.7.ebuild b/dev-db/pgpool2/pgpool2-3.3.7.ebuild
new file mode 100644
index 000000000000..c2cff651ead3
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.3.7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN/2/-II}-${PV}"
+
+inherit base user
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="memcached pam ssl static-libs"
+
+RDEPEND="
+	dev-db/postgresql
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser pgpool -1 -1 -1 postgres
+
+	# We need the postgres user as well so we can set the proper
+	# permissions on the sockets without getting into fights with
+	# PostgreSQL's initialization scripts.
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgpool_run_paths.patch"
+
+	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
+	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
+		sed 's|.*\"\(.*\)\"|\1|g')
+	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
+
+	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+
+	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	emake -C sql
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	emake DESTDIR="${D}" -C sql install
+	cd "${S}"
+
+	# 3.3 appears to have removed this
+	# `contrib' moved to `extension' with PostgreSQL 9.1
+	#local pgslot=$(postgresql-config show)
+	#if [[ ${pgslot//.} > 90 ]] ; then
+	#	cd "${ED%/}$(pg_config --sharedir)"
+	#	mv contrib extension || die
+	#	cd "${S}"
+	#fi
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation
+	dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
+	dohtml -r doc
+
+	# Examples and extras
+	insinto "/usr/share/${PN}"
+	doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
new file mode 100644
index 000000000000..4c518f713e6c
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
+
+ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
+ECVS_MODULE="pgpool-II"
+[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
+inherit base user ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+
+IUSE="memcached pam ssl static-libs"
+
+RDEPEND="
+	dev-db/postgresql
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser pgpool -1 -1 -1 postgres
+
+	# We need the postgres user as well so we can set the proper
+	# permissions on the sockets without getting into fights with
+	# PostgreSQL's initialization scripts.
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgpool_run_paths.patch"
+
+	local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
+	local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
+		sed 's|.*\"\(.*\)\"|\1|g')
+	local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
+
+	sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+
+	sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
+		-i *.conf.sample* pool.h || die
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	cd sql
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cd sql
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	# `contrib' moved to `extension' with PostgreSQL 9.1
+	local pgslot=$(postgresql-config show)
+	if [[ ${pgslot//.} > 90 ]] ; then
+		cd "${ED%/}$(pg_config --sharedir)"
+		mv contrib extension || die
+		cd "${S}"
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation
+	dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
+	dohtml -r doc
+
+	# Examples and extras
+	insinto "/usr/share/${PN}"
+	doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}