3 files changed, 119 insertions, 5 deletions
diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 0af2faee6d6a..b9623fa19388 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pgpool2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.17 2013/04/02 01:51:48 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.18 2013/05/04 12:14:47 titanofold Exp $
+
+*pgpool2-3.2.4 (04 May 2013)
+
+  04 May 2013; Aaron W. Swenson <titanofold@gentoo.org> +pgpool2-3.2.4.ebuild:
+  Version bump.
 
   02 Apr 2013; Aaron W. Swenson <titanofold@gentoo.org>
   -pgpool2-3.2.0-r1.ebuild, -pgpool2-3.2.1.ebuild, -pgpool2-3.2.1-r1.ebuild,
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index e7f7fbe58205..2f612a668650 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -5,14 +5,16 @@ AUX pgpool2.confd 649 SHA256 542007a1f5fc377ce921316913526fe08a5b6913d533359a3ec
 AUX pgpool2.initd 2286 SHA256 8fe6a5d284b619050c5dc075428003acf3154fe9f1abf8cdde283d9984b92852 SHA512 a83a949a1caf753a20414c7d18c66e38a620bae7b68c78a99c59d447680c685b8a6ed3303a07216f823a1012e4ea275b9793ec82916dc8bc8f660ed942eccaad WHIRLPOOL 3e97a9bce8b01ff07a61b74ca510a009f5df720886a94374c700402fc364992578a7b9aa9d496bbd939b92aefb868bb9b1aa92628fc73534fd64a64addc59d45
 AUX pgpool_run_paths.patch 7443 SHA256 c75abd28e48c8895e7c00eab800b8497f8b64d55c7f192c2343aab1eb3fee31c SHA512 227716daf9d93d1ca0c749faedca3d1c9e35b64eebe4c61db2e37f94ed2dcc2e97e34118d853b3dbc848e395329c05c026f819a9e5350b4f0e32b269932d68b1 WHIRLPOOL 822b11df3b7940f8557d51f93967e892b7d66ee9cec2c52a62a0ba2848148a52edfab13e0f2d29e24e76328a69be0b11156d64503c22e576dc4fa033cc700e76
 DIST pgpool-II-3.2.3.tar.gz 1563129 SHA256 cb3b62957afe506e4b420bdc0b959f829d62c708fdce1a17d99a8521c586a5e5 SHA512 55748db315bb005efea173586845c0924eb1f4e5597d55a997446b6e9e01219575698b1b0d8de376e3aebc0cf497adbac19429908002f124aafee7e7bd269e01 WHIRLPOOL 0d7620d643924bb9347208abda27a15b62181756bdadea3ba823df8539f8541c6ad136f7301e8c1fd16a3a27a81e512979103e8b8202115b234ef7e4d46f1910
+DIST pgpool-II-3.2.4.tar.gz 1627417 SHA256 c4ebc6fe1ff0936bcfdfcd0b23e07b956bab24b7b5ee744fc9347c091f08a818 SHA512 fd05bffac69ee4a8c51ef87a04ccc02027422780474dd39ffbd966570a1deaef0d432fc58c92d62eed863740f5f482106df1f4df69f71aec5df0a2619a65fc96 WHIRLPOOL 1a70a7ac7cd7481177b2153f95dad80aac155030850dc1d930497f2fa50b29dff16c63a53eeb9c4d643e6b28762a240e58af408cfa980376c646a1514fcc3041
 EBUILD pgpool2-3.2.3.ebuild 2605 SHA256 695a00dc48b2c6bcdbef402ba6db5869067f4279de290b6b0a0d7ab977317de0 SHA512 caf838d00657075a42c876f88fbe402fe6edca45c4a52b3423c83b5adebbd02f0c3af649dcf119ceae5dc2218407eeb853dacb977544f97e560689807da9f20f WHIRLPOOL ec941ccd1ef57506a5a408f0ac85f339861bfe6312b24aff051c3261f5f4f8c675706129304ffbc197384008193bd98ba0fe65071b4e7513ba8694c057236035
+EBUILD pgpool2-3.2.4.ebuild 2605 SHA256 e55763ff4229e6dbbe8820ad64414f7b5ff699848afea9583e743478cc2e0a69 SHA512 18adfe52340496b4860dbd3f6f49951a9ef9fe26d036e845bcf995f29f77c6f3f8126a9143e2bd61b295842097896164e0a3a57d6abcd444c6d7622e9b31619e WHIRLPOOL 2b1109245d5f682b6a2e1920a024f407105e72346c20b098f5589f35cafab8a2bd74ffb18750c1b571a2477bf75a033a4aa42b5d56d466f4b7816ae62b4db44f
 EBUILD pgpool2-9999.ebuild 2946 SHA256 39ada7849c1136ca54ee72e9108b07dcc45c09c6302938fa39da5727aa088944 SHA512 4de450429e9dac49b637ad11483f17d6256756dbebf73c108d8ce12e667cb89b0b6d1428584117a2145c59b7b521370d6751f5c3b4ceb63db49d75dd8ba91c9d WHIRLPOOL 2c53754213cc71e7bb8fb747f6116474c41763184ea1eef4f6b78a22849873470d849ed739e6a37684c00a5de61e3907545e9f0513b04c700dd62f51a6124797
-MISC ChangeLog 3360 SHA256 041e02addbe94b705fb03e5df0a0a9e4ba6b61e92bf9ab58e3e7119369e94a1a SHA512 533a743436cd456f68b11bf78c460ac52c8d8798d9891afdffa33dd7d895bd9d7688edd421979d0e64b81628032572f0a1ab083abe12d2ebca31a23cf09f84ac WHIRLPOOL f28a17a308784b59aa386e309e3122ecacd8f3107cb0829f596c739a2a22b57254aa734dfdeb99f726828818a870d1d23b4a862d7f8a73a01fd19af4b1853829
+MISC ChangeLog 3486 SHA256 98a2c557a2db4765c474f6d39ef28b5b11b59a0a240cf67c53ea300d6d8b36e6 SHA512 22bc4067a4d50aa320c7d29a5569fd037b3020915ed6476f67f697c1e561680b016d9df226a6c436153ce0194d834b83c415ee59c966c2f66c9be18148213b1a WHIRLPOOL 18c0a3814fc3b7fb8e3c3f026019d5966c485c360901219e9c8baffa5107599aa1246b5d550f79feaec4a8bc316deb1d5723f41f79cc067e34aaacf3edb532ca
 MISC metadata.xml 259 SHA256 f42aac06ff89f92bbcda31eadabefeed1a3d697f69ab8ae80341bcbf2e3fd530 SHA512 d67ad6e98b318a4eb2caf657e7d326c17afb7ddc841bd415388fbd196e274d68cfb6d362da3f39e2d2f81352fbfa66e8b805c29326024236d4c4f69b87124231 WHIRLPOOL 05314d28fa00f4c699d1d6535810322af91c192d013105f53bc5ebeafa99c182e8501d693efe8c12a1ede11d244f7627656c643a72902412f468f465e39a6c98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFaOboACgkQVxOqA9G7/aBrnwD/T9tp2p7MYBTDKaOXwjmSibtg
-I5H6SOJC4d85VppkH0IA/0gF5dL46WTiNGxWr82HrOH3wR7pK9kwg8cGg+XxQ285
-=QmUQ
+iF4EAREIAAYFAlGE+78ACgkQVxOqA9G7/aBSMQD+O98iqraBl6y+llRg9Va3gAdQ
+UxU54gxdlmMAqck6XocBAJbUF6x5Y5maim3+Ll8cCFfdhXokF2j6bmEwFDwT563a
+=Fmgq
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgpool2/pgpool2-3.2.4.ebuild b/dev-db/pgpool2/pgpool2-3.2.4.ebuild
new file mode 100644
index 000000000000..1a0459004f9f
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.2.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.2.4.ebuild,v 1.1 2013/05/04 12:14:47 titanofold Exp $
+
+EAPI=4
+
+MY_P="${PN/2/-II}-${PV}"
+
+inherit base
+
+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-base
+	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 {} +
+}