Fixes bug 356035

(Portage version: 2.1.9.42/cvs/Linux i686)

3 files changed, 81 insertions, 3 deletions

diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 65901527030e..8ccaed6d6987 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgpool2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.5 2011/03/02 08:52:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.6 2011/04/17 14:00:57 titanofold Exp $
+
+*pgpool2-3.0.3-r1 (17 Apr 2011)
+
+  17 Apr 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +pgpool2-3.0.3-r1.ebuild, pgpool2-9999.ebuild:
+  Fixes bug 356035
 
   02 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/pgpool2.initd:
   Update the initscript to use pgpool rather than start-stop-daemon, but it
diff --git a/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild b/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..5606fe67e388
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.3-r1.ebuild,v 1.1 2011/04/17 14:00:57 titanofold Exp $
+
+EAPI=4
+
+MY_P="${PN/2/-II}-${PV}"
+inherit autotools-utils autotools
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://pgpool.projects.postgresql.org/"
+SRC_URI="http://pgfoundry.org/frs/download.php/2958/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam ssl static-libs"
+
+RDEPEND="
+	dev-db/postgresql-base
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${DEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=(
+	"NEWS"
+	"doc/where_to_send_queries.pdf"
+)
+HTML_DOCS=(
+	"doc/pgpool-en.html" "doc/pgpool.css"
+	"doc/tutorial-en.html"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e 's:/tmp/:/var/run/postgresql:g' \
+		pgpool.conf.sample pool.h || die
+	sed -i \
+		-e '/ACLOCAL_AMFLAGS/ d' \
+		Makefile.am || die
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--sysconfdir=${EROOT}/etc/${PN}"
+		"--disable-dependency-tracking"
+		"--disable-rpath"
+		$(use_with ssl openssl)
+		$(use_with pam)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	remove_libtool_files all
+	# move misc data to proper folder
+	mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 65a5ff83cc0a..2964688e4840 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/02/09 08:18:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.2 2011/04/17 14:00:57 titanofold Exp $
 
 EAPI=4
 
@@ -22,7 +22,9 @@ RDEPEND="
 	ssl? ( dev-libs/openssl )
 "
 DEPEND="${DEPEND}
-	sys-devel/bison"
+	sys-devel/bison
+	!!dev-db/pgpool
+"
 
 AUTOTOOLS_IN_SOURCE_BUILD="1"