Version bump. Clean out old versions. Remove autotools inherit. Fixes

bug 459030.

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

8 files changed, 28 insertions, 497 deletions

diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 054f1c960093..0af2faee6d6a 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2013/03/22 05:32:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.17 2013/04/02 01:51:48 titanofold Exp $
+
+  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,
+  -pgpool2-3.2.2.ebuild, pgpool2-3.2.3.ebuild:
+  Version bump. Clean out old versions. Remove autotools
+  inherit. Fixes bug 459030.
 
 *pgpool2-3.2.3 (22 Mar 2013)
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index e9c9c0625ba1..e7f7fbe58205 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,15 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pgpool2.confd 649 SHA256 542007a1f5fc377ce921316913526fe08a5b6913d533359a3ec3317b0075b60d SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910 WHIRLPOOL 0b28a1731bed4a316f33c2c0f8d95567093b6685e43912a2de05802248d3f6a7044bf391efa1f01a320e978f45764b4c7569f0e5aa73be8291abad264d43964c
 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.0.tar.gz 1599391 SHA256 2e41ce78154fc7e9e13eb34f0b60e352d6183de08c4040bea9fbdd914e3e28e0 SHA512 9c9d56bed525c3d8508cde32cd6ac8b13df6dd28366b90157c46c2900eef93fa90254de49b1b574f83fe76525f27a2e8c23d7dcec02cad566aaeff62a6b3282d WHIRLPOOL 25e8f086ea48300affe7195ffcbeee1faa8cde344a99d6caccb0041db04e8040bd2750148c1fde94342b4c544c328f9f97d0b1cf9394443cf37a0d003ace0a90
-DIST pgpool-II-3.2.1.tar.gz 1605959 SHA256 015284c4d83cf8367580fb58469e20330330204d914d00df2fe9ee5a57b3055b SHA512 4b7b947e8d8bdbeabf669323f37f05b38a48a1c397b54875547e85e66e4ea9ec13c6bdbe8d5b996b96db4f85640ca0d2cbc62e74ba0fb56d989d916104a0869f WHIRLPOOL b3bff26e44bb7910e2e74e1e2ab377c9e3e868b509cc958133be26b2bc42d1437cd7292506840d0d1f137d42ebd66f751fbab6f5b47508af94ca363df9cd5722
-DIST pgpool-II-3.2.2.tar.gz 1555174 SHA256 307bab80dcefdcc5c1a2a7b2f294d5734d9c258985503e550b3cbf8d1858cfb0 SHA512 e02091ab5aa336d01e3a0d314b856868452880c4f86aa92e4f73105d4e9aa0c21914e18587f06a2f67282e30e3a50ffff0c0b3825efc5f91529de06206dbdfb8 WHIRLPOOL f0dd8ac3ff2a233a1591c34379f9740d39b6ccdb07542bef530fa21413a2ccab5292f69381172b4b5078cf547827e6c15c028bd5eb03b28faf3d93b49fbd0966
 DIST pgpool-II-3.2.3.tar.gz 1563129 SHA256 cb3b62957afe506e4b420bdc0b959f829d62c708fdce1a17d99a8521c586a5e5 SHA512 55748db315bb005efea173586845c0924eb1f4e5597d55a997446b6e9e01219575698b1b0d8de376e3aebc0cf497adbac19429908002f124aafee7e7bd269e01 WHIRLPOOL 0d7620d643924bb9347208abda27a15b62181756bdadea3ba823df8539f8541c6ad136f7301e8c1fd16a3a27a81e512979103e8b8202115b234ef7e4d46f1910
-EBUILD pgpool2-3.2.0-r1.ebuild 2939 SHA256 3c11a686dc949e862ea0f080316f931cc8b4fc3068b234e5cc0228a207194b4a SHA512 c3b906394ff081044fc6c2b0944a58733dc231e174093bd19f43aa82309657e2e7d87795014656208bab3577f2114d80c71fd5b919047557ddbc6a0c9c6b12ae WHIRLPOOL 17aba5c3e9b5c4dea08e5663e25e631d515f59a9b1b4dac82fab277256cc272c4b568f0b09888d45ca60dacbe376b68803849c118ab4ff02bb84fd2e8059d8db
-EBUILD pgpool2-3.2.1-r1.ebuild 2960 SHA256 f32b23f6e57e71804504598ee897ea71927deda235636ff98a3759a3a5627925 SHA512 88416065d30afdd14e879ec727d6eab63f0c17a9146288aa413c17e9ddbf7e5b8f4f7ff0543961060ff55103b6f86a1a4b48829b3a3cbb2e6670fbd30089552e WHIRLPOOL 2970400d440e10b43ed8fc601cb5d37935894945854a03a2e1b80200cb683212d39e11d9711c09c8544815744c513d1bcf451dcbec3d4187776402d9cdec826b
-EBUILD pgpool2-3.2.1.ebuild 2936 SHA256 d4ac5b9163057b84fa7a7e9ffe428648bfb6c1529f5ecc972f3d074e75188984 SHA512 0e806c81d03940030fbe3d6de3428a7064f8b7f1dbb08f6771247b321296090f62934905ddd4ac0723ff1ab3b998e6bfbeb0cdfc2e7a58d370d37655e017022b WHIRLPOOL 49c2494a53ee436c760637a967ec0a32b94d9d697251799c3cb2f1650cc08e45bd1bfbbe370db66c95726dcb6d552c5f739d03ea82a7e2c9577ff2d353b3d792
-EBUILD pgpool2-3.2.2.ebuild 2954 SHA256 92659780e699a0254086964e43a43dbce7f130bed4d3020de60d0515b3774f68 SHA512 af757bb813e9fd4b2aaf3eb3fb14c2351d4acfc8a8fab9df08c063df6720af07b0c610b4d91cd068147bd9d14fe3b0f40a4d3a2f7a135ee424021f3f20763717 WHIRLPOOL 504a389c814e65795bc8e8f7a2c838d312905cb9288ee76788f5022cabfcded31ee4669520b0efa5e06d24a2fcd6a89dcb1c804190f36ab8aeeab24d13b5f304
-EBUILD pgpool2-3.2.3.ebuild 2954 SHA256 df132db9b816ad4b249c33df0dd43e8e656d1456baaea694433b2096dbca43a7 SHA512 d7ed0a9fb17e5ade6a957cb35fb3033e2fd6a289f042d4f25b366a6928d1f13e0cc65e860b0809129a2531f83bc9a70b2a8ad0d5ec1f66cc84b9499bfd1b77d4 WHIRLPOOL d7a3e5c75b26cf480df378a5a10030ef5b91ebce544781bfad9a17d5099a0f62f931fcb4832b07f580fd21e29ceed9f0bf7ac02f9da21d9cb262fb5b2c2b92a0
-EBUILD pgpool2-9999.ebuild 2956 SHA256 c52c9b566f033e286cff5f31f4167201d8ecf72566a46e476bdd6160aeb7b806 SHA512 bfd3144d920cf1f2ccdb9e0a9b12e795849216faed57f10af737e076cf3fcd5926dde22891028ed6e3c1bef551f1eb489ae06f9e97465eb15614d066d4aade6c WHIRLPOOL 6eeeb81986ef4d2ecb966534d8c51ff2ed440f26aab4f22e5a1da24ce0cdf46624b329a4111f24127b6d9c7dd27a7edb8ad9b4aa4b0f634527ab67f2b3da5869
-MISC ChangeLog 3090 SHA256 826c42e1f617dc0e0bdb9c9d3a432f6f0a6725695102dfd980f307bed9b208f9 SHA512 106be8ce2c9786f920ccdee512124360860742f0dbe3aa6bbb81169ae3da000ada35d9b3842cbecd3aaacce461588b17445be33357d1b675a7177400928f18c5 WHIRLPOOL deb4bfb32295bbf48ebfc96a89b68b82f19660eb741b9c1693ff3471b7a51c5b738610698e947268d45db96d586800dac816a74aa1412c9dd08b18331bf89e2d
+EBUILD pgpool2-3.2.3.ebuild 2605 SHA256 695a00dc48b2c6bcdbef402ba6db5869067f4279de290b6b0a0d7ab977317de0 SHA512 caf838d00657075a42c876f88fbe402fe6edca45c4a52b3423c83b5adebbd02f0c3af649dcf119ceae5dc2218407eeb853dacb977544f97e560689807da9f20f WHIRLPOOL ec941ccd1ef57506a5a408f0ac85f339861bfe6312b24aff051c3261f5f4f8c675706129304ffbc197384008193bd98ba0fe65071b4e7513ba8694c057236035
+EBUILD pgpool2-9999.ebuild 2946 SHA256 39ada7849c1136ca54ee72e9108b07dcc45c09c6302938fa39da5727aa088944 SHA512 4de450429e9dac49b637ad11483f17d6256756dbebf73c108d8ce12e667cb89b0b6d1428584117a2145c59b7b521370d6751f5c3b4ceb63db49d75dd8ba91c9d WHIRLPOOL 2c53754213cc71e7bb8fb747f6116474c41763184ea1eef4f6b78a22849873470d849ed739e6a37684c00a5de61e3907545e9f0513b04c700dd62f51a6124797
+MISC ChangeLog 3360 SHA256 041e02addbe94b705fb03e5df0a0a9e4ba6b61e92bf9ab58e3e7119369e94a1a SHA512 533a743436cd456f68b11bf78c460ac52c8d8798d9891afdffa33dd7d895bd9d7688edd421979d0e64b81628032572f0a1ab083abe12d2ebca31a23cf09f84ac WHIRLPOOL f28a17a308784b59aa386e309e3122ecacd8f3107cb0829f596c739a2a22b57254aa734dfdeb99f726828818a870d1d23b4a862d7f8a73a01fd19af4b1853829
 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
+-----END PGP SIGNATURE-----
diff --git a/dev-db/pgpool2/pgpool2-3.2.0-r1.ebuild b/dev-db/pgpool2/pgpool2-3.2.0-r1.ebuild
deleted file mode 100644
index f6142f38d7c8..000000000000
--- a/dev-db/pgpool2/pgpool2-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,117 +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/pgpool2/pgpool2-3.2.0-r1.ebuild,v 1.2 2012/11/16 20:03:13 ago Exp $
-
-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 autotools ${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-base
-	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\""
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with pam) \
-		$(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 {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.2.1-r1.ebuild b/dev-db/pgpool2/pgpool2-3.2.1-r1.ebuild
deleted file mode 100644
index d2314acbeb24..000000000000
--- a/dev-db/pgpool2/pgpool2-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +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/pgpool2/pgpool2-3.2.1-r1.ebuild,v 1.1 2012/12/27 11:37:58 titanofold Exp $
-
-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 autotools ${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-base
-	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 {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.2.1.ebuild b/dev-db/pgpool2/pgpool2-3.2.1.ebuild
deleted file mode 100644
index 6c83b4ff33e1..000000000000
--- a/dev-db/pgpool2/pgpool2-3.2.1.ebuild
+++ /dev/null
@@ -1,117 +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/pgpool2/pgpool2-3.2.1.ebuild,v 1.2 2012/11/16 20:03:13 ago Exp $
-
-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 autotools ${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-base
-	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\""
-
-	econf \
-		--disable-rpath \
-		--sysconfdir="${EROOT%/}/etc/${PN}" \
-		$(use_with pam) \
-		$(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 {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.2.2.ebuild b/dev-db/pgpool2/pgpool2-3.2.2.ebuild
deleted file mode 100644
index f4452d225680..000000000000
--- a/dev-db/pgpool2/pgpool2-3.2.2.ebuild
+++ /dev/null
@@ -1,117 +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/pgpool2/pgpool2-3.2.2.ebuild,v 1.1 2013/03/17 05:19:17 patrick Exp $
-
-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 autotools ${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-base
-	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 {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.2.3.ebuild b/dev-db/pgpool2/pgpool2-3.2.3.ebuild
index 60404b8ce1a1..48b1c779d3a6 100644
--- a/dev-db/pgpool2/pgpool2-3.2.3.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.2.3.ebuild
@@ -1,25 +1,19 @@
 # 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.3.ebuild,v 1.1 2013/03/22 05:32:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.2.3.ebuild,v 1.2 2013/04/02 01:51:48 titanofold Exp $
 
 EAPI=4
 
-[[ ${PV} == 9999 ]] && MY_P=${PN/2/-II} || MY_P="${PN/2/-II}-${PV}"
+MY_P="${PN/2/-II}-${PV}"
 
-ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
-ECVS_MODULE="pgpool-II"
-[[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
-inherit base autotools ${SCM_ECLASS}
-unset SCM_ECLASS
+inherit base
 
 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"
+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"
@@ -35,8 +29,6 @@ DEPEND="${RDEPEND}
 	!!dev-db/pgpool
 "
 
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
@@ -81,15 +73,13 @@ src_configure() {
 src_compile() {
 	emake
 
-	cd sql
-	emake
+	emake -C sql
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	cd sql
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" -C sql install
 	cd "${S}"
 
 	# `contrib' moved to `extension' with PostgreSQL 9.1
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 9ee5aaa9276e..7c816d603c45 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.5 2012/12/27 11:37:58 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.6 2013/04/02 01:51:48 titanofold Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ EAPI=4
 ECVS_SERVER="cvs.pgfoundry.org:/cvsroot/pgpool"
 ECVS_MODULE="pgpool-II"
 [[ ${PV} == 9999 ]] && SCM_ECLASS="cvs"
-inherit base autotools ${SCM_ECLASS}
+inherit base ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="Connection pool server for PostgreSQL"