Version bump. Fixes bug 410059. Fixed minor syntax.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

6 files changed, 180 insertions, 15 deletions

diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 9a6401b34797..9b97ed5aab0c 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2011/06/19 18:50:43 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.9 2012/04/23 15:00:44 titanofold Exp $
+
+*pgpool2-3.1.3 (23 Apr 2012)
+*pgpool2-3.0.7 (23 Apr 2012)
+
+  23 Apr 2012; Aaron W. Swenson <titanofold@gentoo.org> pgpool2-3.0.4.ebuild,
+  +pgpool2-3.0.7.ebuild, +pgpool2-3.1.3.ebuild, pgpool2-9999.ebuild:
+  Version bump. Fixes bug 410059. Fixed minor syntax.
 
 *pgpool2-3.0.4 (19 Jun 2011)
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 2a48399e6ef1..def464ed6df7 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pgpool2.initd 625 RMD160 c19f8bb11c2a6f353f1aae65d1a6452e6a301d52 SHA1 d45254f3972df9fead5d85f76be399b771a3237a SHA256 65d00f07f7c14f78c8a4f41c49ef5d9542796ea2278e74c022b93dd7d6ff60fc
 DIST pgpool-II-3.0.4.tar.gz 1211828 RMD160 51572b55e7e7ac1d67269ac2c45a1b8316314fa4 SHA1 dfbc5d8e05f79bbf96725204a0291955194e96d0 SHA256 886e0fa3dec98f4a6c25cc5b4b1fc5aac49258e2669c1ffda178d18711c8b5c1
-EBUILD pgpool2-3.0.4.ebuild 1669 RMD160 c19e5b42ae544a154e89da15c1e96f24fea554be SHA1 18386aa56c054aa74624990eaa9506437369283d SHA256 e0dbdb6f5b3c1799506fa4d46a9dc71880a4e84d86a91c2b87c8c08ce0e67a1c
-EBUILD pgpool2-9999.ebuild 1668 RMD160 b892d1994a7091efb91ee55a4f4031bfe051b8a9 SHA1 98c61701a9ac59f081177d54028362ef299bc8f5 SHA256 e8570c39ef49f000ebd4a4dee575896dc55448e6103e9eb67427e59dad2f8997
-MISC ChangeLog 1682 RMD160 fdc3468cbd27d48761d56f2cd38adaad9910e7d8 SHA1 019c8baa12405e082ab8065f75e7da59a592cdc3 SHA256 fd46466619c9d048f7ec5886f6db04c700899ec024e9f3d407ac3efd4c8bc2fd
+DIST pgpool-II-3.0.7.tar.gz 1211828 RMD160 51572b55e7e7ac1d67269ac2c45a1b8316314fa4 SHA1 dfbc5d8e05f79bbf96725204a0291955194e96d0 SHA256 886e0fa3dec98f4a6c25cc5b4b1fc5aac49258e2669c1ffda178d18711c8b5c1
+DIST pgpool-II-3.1.3.tar.gz 1211828 RMD160 51572b55e7e7ac1d67269ac2c45a1b8316314fa4 SHA1 dfbc5d8e05f79bbf96725204a0291955194e96d0 SHA256 886e0fa3dec98f4a6c25cc5b4b1fc5aac49258e2669c1ffda178d18711c8b5c1
+EBUILD pgpool2-3.0.4.ebuild 1672 RMD160 892cdad6e3166f85fb91889d67b0b9838e4f93f9 SHA1 09e8b467fe140e826c484ea2d391b97a17f16c49 SHA256 ece6264b00ed63ca05b2a107af6adaad6ed67f2d190b54215a6c6449d784d64d
+EBUILD pgpool2-3.0.7.ebuild 1755 RMD160 0312052c7bcc1264f8ec3a1352dccd0eee9defdc SHA1 735416b409a5828239abfc11e65050b20d08ebb4 SHA256 633c727dc94d83f549502ad23b22bb87968f82bf68c1b5fb679d7a9134c186cf
+EBUILD pgpool2-3.1.3.ebuild 1755 RMD160 e31e7ed2e5dddf368d81808b925d862f4e1b820f SHA1 a7c343f5cba4c2ef17674dfbd9e0b6204b06e0b3 SHA256 137d392a6083d76f1d28d316bd2df096803f0cba8e036110ea8cbb032c9e39c7
+EBUILD pgpool2-9999.ebuild 1671 RMD160 b749b2c164b834b6a23a37ef8b632b9569f5f6af SHA1 a2c361eb7be43fea168fffa74d43252b3fdf945c SHA256 df98116bdec1057d7f812a10e8280f3611516c380a68116306592c8311388363
+MISC ChangeLog 1944 RMD160 e6a0f54c3c2878a7c112c86cf6914ca9a46d50b9 SHA1 1f5f46868495caa16f06580004a137cc71a2d6b6 SHA256 46f8e3fc249868608bb584be3fba1486efd17374193aabc25aab1905542e515e
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3+RNYACgkQHB6c3gNBRYdVlACgrQfZxxZA1SVKVxt4XiCq2w36
-8b4AnRarG9wAmYbsr2PXBUD7U9nCbUE9
-=gwzi
+iF4EAREIAAYFAk+VbpAACgkQVxOqA9G7/aCHFgD+IDAFthflB3vyARB7SNmfxqPN
+4tB8i0Lx1jRJU5T3kkEA/jgvsBkGJgZ6Pt5MSr9nZVHsL+D/XFi8o4Vo3c/3djQI
+=I3jU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgpool2/pgpool2-3.0.4.ebuild b/dev-db/pgpool2/pgpool2-3.0.4.ebuild
index e177bbebc1b6..9f216ea0da7a 100644
--- a/dev-db/pgpool2/pgpool2-3.0.4.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0.4.ebuild,v 1.1 2011/06/19 18:50:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.0.4.ebuild,v 1.2 2012/04/23 15:00:44 titanofold Exp $
 
 EAPI=4
 
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--sysconfdir=${EROOT}/etc/${PN} \
+		--sysconfdir="${EROOT}/etc/${PN}" \
 		--disable-rpath \
 		$(use_enable static-libs static) \
 		$(use_with ssl openssl) \
diff --git a/dev-db/pgpool2/pgpool2-3.0.7.ebuild b/dev-db/pgpool2/pgpool2-3.0.7.ebuild
new file mode 100644
index 000000000000..43b7108c1bdc
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.0.7.ebuild
@@ -0,0 +1,77 @@
+# 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.0.7.ebuild,v 1.1 2012/04/23 15:00:45 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://pgpool.projects.postgresql.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="http://pgfoundry.org/frs/download.php/3076/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+[[ ${PV} == 9999 ]] || 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"
+)
+
+# Those turkeys didn't update the directory name!'
+#S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/pgpool-II-3.0.4"
+
+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
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EROOT}/etc/${PN}" \
+		--disable-rpath \
+		$(use_enable static-libs static) \
+		$(use_with ssl openssl) \
+		$(use_with pam)
+}
+
+src_install() {
+	base_src_install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	# 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-3.1.3.ebuild b/dev-db/pgpool2/pgpool2-3.1.3.ebuild
new file mode 100644
index 000000000000..c3405a15379b
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.1.3.ebuild
@@ -0,0 +1,77 @@
+# 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.1.3.ebuild,v 1.1 2012/04/23 15:00:45 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://pgpool.projects.postgresql.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="http://pgfoundry.org/frs/download.php/3076/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+[[ ${PV} == 9999 ]] || 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"
+)
+
+# Those turkeys didn't update the directory name!'
+#S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/pgpool-II-3.0.4"
+
+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
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EROOT}/etc/${PN}" \
+		--disable-rpath \
+		$(use_enable static-libs static) \
+		$(use_with ssl openssl) \
+		$(use_with pam)
+}
+
+src_install() {
+	base_src_install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	# 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 c1d066d7f1fc..ce717286d285 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.3 2011/06/19 18:50:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-9999.ebuild,v 1.4 2012/04/23 15:00:45 titanofold Exp $
 
 EAPI=4
 
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--sysconfdir=${EROOT}/etc/${PN} \
+		--sysconfdir="${EROOT}/etc/${PN}" \
 		--disable-rpath \
 		$(use_enable static-libs static) \
 		$(use_with ssl openssl) \