From 3044b7ea39dfb2003ebc8783f49dc19a22c7e66a Mon Sep 17 00:00:00 2001
From: "Aaron W. Swenson" <titanofold@gentoo.org>
Date: Tue, 2 Apr 2013 01:51:48 +0000
Subject: Version bump. Clean out old versions. Remove autotools inherit. Fixes
 bug 459030.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
---
 dev-db/pgpool2/ChangeLog               |   8 ++-
 dev-db/pgpool2/pgpool2-3.2.0-r1.ebuild | 117 ---------------------------------
 dev-db/pgpool2/pgpool2-3.2.1-r1.ebuild | 117 ---------------------------------
 dev-db/pgpool2/pgpool2-3.2.1.ebuild    | 117 ---------------------------------
 dev-db/pgpool2/pgpool2-3.2.2.ebuild    | 117 ---------------------------------
 dev-db/pgpool2/pgpool2-3.2.3.ebuild    |  22 ++-----
 dev-db/pgpool2/pgpool2-9999.ebuild     |   4 +-
 7 files changed, 15 insertions(+), 487 deletions(-)
 delete mode 100644 dev-db/pgpool2/pgpool2-3.2.0-r1.ebuild
 delete mode 100644 dev-db/pgpool2/pgpool2-3.2.1-r1.ebuild
 delete mode 100644 dev-db/pgpool2/pgpool2-3.2.1.ebuild
 delete mode 100644 dev-db/pgpool2/pgpool2-3.2.2.ebuild

(limited to 'dev-db/pgpool2')

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/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"
-- 
cgit v1.2.3-65-gdbad