Fixes bug 356035

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 94 insertions, 5 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/Manifest b/dev-db/pgpool2/Manifest
index 541f26ec1fc8..71da8d0a3f41 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pgpool2.initd 625 RMD160 c19f8bb11c2a6f353f1aae65d1a6452e6a301d52 SHA1 d45254f3972df9fead5d85f76be399b771a3237a SHA256 65d00f07f7c14f78c8a4f41c49ef5d9542796ea2278e74c022b93dd7d6ff60fc
 DIST pgpool-II-3.0.3.tar.gz 1202898 RMD160 06643c78de389777d378f13b6c9667eeee2d6cb2 SHA1 3b28e04a7dd664bf0b8fd2be58e99465bdc39c13 SHA256 46384b14b6690fcaddd472de8bbeb03f901eeb9f3303386a932016b5c28bc9fe
+EBUILD pgpool2-3.0.3-r1.ebuild 1496 RMD160 a034bcce5f3b8d949e65cac2759e517dbe2cdb1b SHA1 d7d3b6c80aa6c9c50fadf86d910865bab635abed SHA256 cb4c6e7f76367cfa6c6fd661c4ab1bf520d53085b95e491bfb35bbd29b5023be
 EBUILD pgpool2-3.0.3.ebuild 1474 RMD160 7d1f4522c802122a4fcda660b6a163453a05ae5b SHA1 5aee84c7b043db07542428f94bb64b3ca5e76620 SHA256 4fa43076b170ee863a5e3f4032f286460465ace51ab8b5ca4f62036232425cb9
-EBUILD pgpool2-9999.ebuild 1449 RMD160 39b970c10f24a14ad400191b358fd135c55f4bfc SHA1 dc06cb096d89f96182324cf314a56bce9c3cd694 SHA256 8da25ccccdb62bb2c602c8b18f2c814270c93378993d28a163e2c8d226f20700
-MISC ChangeLog 1213 RMD160 c1f4c4ece62754a626b07d73af60e8494fa95f8b SHA1 eadb7974bd8663698f9e53aaff4dc42bb622b9bf SHA256 bc8721863b46a41a8b5fe616cd88ca3243a04170e33537b53febb92534f56a99
+EBUILD pgpool2-9999.ebuild 1468 RMD160 c210aebfea112e47eeabc2da6eabc17effc237de SHA1 9baa4771211e12eb37e67dd029fa5fd51728d0d1 SHA256 deb27d9a4b9ad8accba36994e33c3c121cb14f2a6a37ec5ee32911d11efb59ad
+MISC ChangeLog 1372 RMD160 65e95372c6c85eb6e6a0d6a31abe6e00af7ed5f2 SHA1 69812a96f9806e685f37c4b677e796aa103dd27e SHA256 c0718803334dfee83dcfb568d759b64dc3d6501a1d82bff17e7fb36242755ace
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2q8qsACgkQCOhwUhu5AEnrLAD+J3iqGm/ehIetIQ2DJEPKtt1b
+mRd6anCZ3u3RRnbrZB4A/inuBDxtyaubV+A2b1KBnABzTT7bpIF/1ijVkzpJr/nl
+=W+Kb
+-----END PGP SIGNATURE-----
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"