Bump, remove old

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

9 files changed, 13 insertions, 663 deletions

diff --git a/dev-db/pgpool2/ChangeLog b/dev-db/pgpool2/ChangeLog
index 74dd839f4617..a1d4c413b6b2 100644
--- a/dev-db/pgpool2/ChangeLog
+++ b/dev-db/pgpool2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/pgpool2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.28 2015/06/01 03:28:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/ChangeLog,v 1.29 2015/07/27 09:13:52 patrick Exp $
+
+*pgpool2-3.3.7 (27 Jul 2015)
+
+  27 Jul 2015; Patrick Lauer <patrick@gentoo.org> +pgpool2-3.3.7.ebuild,
+  -pgpool2-3.2.3.ebuild, -pgpool2-3.2.4.ebuild, -pgpool2-3.3.1.ebuild,
+  -pgpool2-3.3.2.ebuild, -pgpool2-3.3.3.ebuild, -pgpool2-3.3.4.ebuild,
+  -pgpool2-3.3.5.ebuild:
+  Bump, remove old
 
 *pgpool2-3.3.6 (01 Jun 2015)
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index a466e31e430a..fb3d12fd4311 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,24 +1,12 @@
 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.3.tar.gz 1563129 SHA256 cb3b62957afe506e4b420bdc0b959f829d62c708fdce1a17d99a8521c586a5e5 SHA512 55748db315bb005efea173586845c0924eb1f4e5597d55a997446b6e9e01219575698b1b0d8de376e3aebc0cf497adbac19429908002f124aafee7e7bd269e01 WHIRLPOOL 0d7620d643924bb9347208abda27a15b62181756bdadea3ba823df8539f8541c6ad136f7301e8c1fd16a3a27a81e512979103e8b8202115b234ef7e4d46f1910
-DIST pgpool-II-3.2.4.tar.gz 1627417 SHA256 c4ebc6fe1ff0936bcfdfcd0b23e07b956bab24b7b5ee744fc9347c091f08a818 SHA512 fd05bffac69ee4a8c51ef87a04ccc02027422780474dd39ffbd966570a1deaef0d432fc58c92d62eed863740f5f482106df1f4df69f71aec5df0a2619a65fc96 WHIRLPOOL 1a70a7ac7cd7481177b2153f95dad80aac155030850dc1d930497f2fa50b29dff16c63a53eeb9c4d643e6b28762a240e58af408cfa980376c646a1514fcc3041
 DIST pgpool-II-3.2.5.tar.gz 1643267 SHA256 aecac952fd3d292584c9aa359d72f89b144c29f45c9f848cb030e46215a814f7 SHA512 c6dd033462de7f56724f7416fca3ee3e25835f113604fb03b97deee2e3ab25a07cfd9aea33ec36211aa0ec41c2bcea31ca9befe0cfe8f6389a39c2f6495388b6 WHIRLPOOL 5db077d51c5aa8692ba23c0f5ad3b3291c42448724cf633db13850d9b22df256c2aedc15b95fe74a33e486e09f4cc6a37daed0d39becff38acd40fa52b78ab8d
-DIST pgpool-II-3.3.1.tar.gz 1692087 SHA256 214e0fe96f8f2b3568ee6937318d254cb69e614ed5acd7e342bc6f34996dce7e SHA512 b1cd120dbc92cae27df099a8eec5b741edbf5c331e015051a79607b47a41c3623a916890a9b21b5e78d5497e0f830e239afbb514a5cc723dfb7f47816087af67 WHIRLPOOL 77216f6aa0ddce1679f5a8237e2b760f92855b4e06eb8876e377065e9d6ecdf2b0b4ba848390caa98933841ebc770d87d9314816ffc98f26f10a64638af47f5b
-DIST pgpool-II-3.3.2.tar.gz 1710418 SHA256 6c723787b92208f4ecc18f28e84e5cb472be446e08ce708d28b70c7d2fd80a70 SHA512 cd8af636b4ecb72884826da193c7062bb62c8dfef206c1e7248585c8abba9afde362fbb631c1dadbbadaa9b94cf7a01652724e82c5d1ea521423bd36fb5bf346 WHIRLPOOL e74e25a2a46fa50c012a3f52fe8803c68be51bc2c52de79c4073bfdb7b1cff5617cca34554aecf97d58d61dd81a0397a52f3869308c5c53261969b0d316fa709
-DIST pgpool-II-3.3.3.tar.gz 1725512 SHA256 b8da35bb50b24f011da9fffef2875035f07cd6da8e3c60f8c0c33323b16214c4 SHA512 95bac43cefd36bd4822fd24ea90f5bb3b3ff4924b43c2d948c17e390c220b96f19fefafc5d4b759fcfb321b232253f5d181634aca0b3d1018973c68b134bcbb9 WHIRLPOOL 0e9f80c00cd6ed61502dbd83f6e3f0c85c297f354edbc02b82e0e880a2598642195f029273bb6c84dc4eb88dc0bc233b47c98985bbba80009ea6aaa9e4a67f86
-DIST pgpool-II-3.3.4.tar.gz 1752572 SHA256 4ea1ddfd80d06763ffd8bb7f9bea32d71fbfcdc0af998150ce3a116edd3732c5 SHA512 b35e797e07c9647de8853453fb998d3ccad79dd43fd2b8a62a5853b5fbfcedac97a660bb270a69e235ae16264ca740b359d23fd9790d60bcc91d0b5be75584ba WHIRLPOOL d3afa6e69b3d0e2bccc83d1aa09a0d6c18d2d358c65d2e5d1c5a8bb55cdb4410b2abf1d63507033d357d79a0db6783b7f1c38fd48a500a73fd933846130c63f6
-DIST pgpool-II-3.3.5.tar.gz 1793009 SHA256 7d97dd479212301c9dc2c77b555df259d49b0138441c56c969c277760a678588 SHA512 cac95bb895035446a006c5fc21d69f2a66c7dcb8a2e5b8057576265e7d85dd5847272f18b005b81fef3bb7a9dc7bb31cc2ac9796a506c6ca9277fb4005c31749 WHIRLPOOL 4a5a83ea1c6a6b8ccf10c6da5f64279d47af93b4d4eebddea45fa64ce3b953b2b3bf0c3855a880289cffa8fcbd5a4711d5962e47b75be412a9553a07e7745a1a
 DIST pgpool-II-3.3.6.tar.gz 1812394 SHA256 8e0a9829122ed96793b4c340799d62778eb4176ee0f93288d8d4100fc620ff0e SHA512 64edf6ee96fc18bccaf72e79dc165318587da49f45f7d9748e051a9b87f1938b79eefc020a70f1be31fdf922e6d646710105d97961aef1e0c1538b29cdb0575c WHIRLPOOL a4bfc20115e3a17474e9d57c5abec48ca613568f9e5dcea171a39a114dc5ef3ad59ecd7fba4f0cad703bf6f3dcf7fb1d9dea7b30faa818403bf450f8df10a7c3
-EBUILD pgpool2-3.2.3.ebuild 2605 SHA256 4db3b42f4221ff4d897c55f17688434a82f11750467ce9ae59d52fdcec96e418 SHA512 0afa5d69ac8b4fb9bcda7b9667e42217f59153e28683248a8c7f606d2b23eab71cd76c5f45657131d958705556baf8c0d12ade71974778b6d7c0397e77857b16 WHIRLPOOL b0bc5ad1fcd452b13d6100509382fd440e39d9fc9a397ebc66a02ac88741007823094bd6cfa24853c23d081333e911aa8b7fe6b51295d41befc347570e00573a
-EBUILD pgpool2-3.2.4.ebuild 2605 SHA256 294413a5e07c0bc0eaf78267f375724112a78456ca2ea68d8e807b92cee49adf SHA512 09d5aae0cdcf0affc120174f271a863e76ec2ebe1570274be74099c6cbdea03e549f7355c35c7383b3047e4cea151928d5f22482b7465b5e8b4ce3a51745b4b3 WHIRLPOOL 4b3bcf5a13aeb6357c63b9e30b22aea37d6af3d65216f5e29cba5a5cca7275e8df59c3fe8506cb97fc82546ae9e4cac6565694d143dd74e739b028112dc78078
+DIST pgpool-II-3.3.7.tar.gz 1808677 SHA256 b1bfc8c48be252f6c4e54521d24a0e28e86d0027b18aa4ccf6b8405508319032 SHA512 814f8a59ed8488a3ab049cc31ee4579ec954672f4cbca9102d8aa4d18dd2c169fd16518461cbcab24c28394c629234c54d9799d6df9f3ffdf0c57c56dfb2d094 WHIRLPOOL b8ca5e6689d1ac947b2da45c601c3206653b9ae5a181bd63f667a3df6ceecc012621ba4349671caa2e0d1ad371409e046b278e9a6b558786aa7ceed6583ccd9f
 EBUILD pgpool2-3.2.5.ebuild 2605 SHA256 82281fe8a2f27bd0a65d5917365ff05afadef7988a4e88551781c6893d246b3c SHA512 85712f7b6edd2c536b7992f28d0b72448d75148ec07f0db349bcbb4d6712f5c75b1f58ad85e3d21e9de569c2b527702abbb5686e718440c8d24a0eac3a42b211 WHIRLPOOL 38bbb12444f8bf38ebcb3e297202c4429fbfd7636531ea1706b628aada065245419ca4fdaf2875acedb7f3c4d8c75a8c2f9b25de1c8bddd0ed84c157d5374fa3
-EBUILD pgpool2-3.3.1.ebuild 2647 SHA256 5b43f4fa8794fd48e7e21fb823e4545827774e5a7fe66e986ae03e86a164b616 SHA512 6e376b18253a9ab2a6e2b9e4320ce5db71a8e9a1c9fc97b7782479d3faa868260638339792e7e359c684e65167ddde69471f99ccce616b20ac7e09c32e86040a WHIRLPOOL 7c5d8e3ae2430928fd1b483e358ec5d4bfd0eb59d4db987d2e88a2e3280f8d16761d8612f9b3e58f86aecbcb7525de7d35c50e0cbf1a80dadb1d70ccd8e74914
-EBUILD pgpool2-3.3.2.ebuild 2647 SHA256 c7e33fe7cf82948a700c61601af8ba64f9cbc47a41b3a5c1fd7c24d08029cd6b SHA512 a0bed4add0b3c479ebda20ee82cf1c2efe2d570df7680e632030e727d2fc4e3eb07f179f18fcf5ea20c3200163d093833c9afde44aa78e73e6043d7a89c28671 WHIRLPOOL ab54c479ccdd409945af95372dd6ccb7faaeed9debd0f3604ca6180226978115e08e59b4a440c1649b7bda2c59cf78c9d1a4d84097b4ca23ea8115f0e4b745ab
-EBUILD pgpool2-3.3.3.ebuild 2647 SHA256 1d9951dc4018acb31d595c6507c35cdc6cf68fd0c8c74b640b36419f58d539cc SHA512 e5a6f8f9730116e7e67dc983eec4e74d5c2c87725501e3fa147597113afea408c9f0bfd8c7e7d6fb2222d43c96f1a2a14ea808c3a844f4059f42876fbc66bc0e WHIRLPOOL 52954c8fcab3d9b407fa53e001f5f471a69e266b818f0f6577f2ec619f675b0e4b4a4b09dc37b663cd0f4efad8e3da25996fc9590d1946f212ba6ed3b43ccf10
-EBUILD pgpool2-3.3.4.ebuild 2647 SHA256 0eaf55a12ede5d2dec16470251d1329eabb0b89017565f67198be3467ecc957b SHA512 5315d8d55a72b6ccb7172748ebcfb0b1ebfb52e17b2b75fcbf74b975ff330fe8be6ab67c81f8d6ee8a945ba2f9244698d4e69b0aac4a7ed25414113428193274 WHIRLPOOL d40bdb692b3ba5fedb0eab462370857c06f3aca6631cd7f90ef008cb9dd97d28bc042fead72f23e0fc445978961081d39cf9e3a340d1ece70fbf66b3b9a49954
-EBUILD pgpool2-3.3.5.ebuild 2644 SHA256 4cdb64484444aaeda0d5e5fe33e0979ef7ab21546c3844f8c134a40710deb0b7 SHA512 28b2c6a07f14e3c06d56208faaf98a739efd2ea568b23b788b4697ba4267e9665bc94ddb98dc1993e6641900a245fa098e7446018c0071e65d6a9d7b99b994f8 WHIRLPOOL 41faf90dbb0d4e8a6cdcd33cea4ffc3aae78f01887bcab79d91ff2828c534ec64c97f4ed739b151f5c6782a50935683fad5d9589346e3de52ff4f893474fc2ba
 EBUILD pgpool2-3.3.6.ebuild 2644 SHA256 c58844a5a01d2710e99ffb3fc996f5c5801818ba5bf0941bbcab76b9ea3dbd50 SHA512 d3835aa5bdd5e3e57c1a6667ac7caf2327d269d45c98f418f44341e2a952196091bf058f7dfa1b23d49e4fac4903e8767fe1b5f6aa30437db5b539973da5ccfc WHIRLPOOL 47867e9144beccfae78ec15a716db7ec4ef62b3e85bdcafd5322af55ffa36451c9daca01695713b2bdfd98e6cad71a9de78891fa3b05364331a5ace6d9ebc935
+EBUILD pgpool2-3.3.7.ebuild 2644 SHA256 5ffa2148256146ea710b04b1de8fa61e70acb9e24667ffcedbb0994f13b0722b SHA512 f435cda02c4322b00956e7fd7f18a6291cfa745ce207cde843256ed8a4af8b87918f8e18b1d0071f62b7f8917074b5753c9f23503517abce0bb82daaeaf13507 WHIRLPOOL 53b332176f6f120e112a9585bf3ce3bacf18b11672c7a3377f4aced3cd6448312d97ba8b231ba9e17230428c17337ddc6bc024da2e0a259277004fdae47f8392
 EBUILD pgpool2-9999.ebuild 2946 SHA256 fcaeac44dbffe8cbbd81fbd2a009bf4251c75044232211f859708fd364884d50 SHA512 3b2b2cc6c40ed8bcc1302623844a45b714aa667de0b342cddc3247de64a677db3097dd2155221528114bbfccd9b6a7772704476d6757efef29e21d72434a3148 WHIRLPOOL 20d4aa2bb4c0072833d891c29fa820cfaf9ef27a15b98b73d2a9f42e4ac354a281dd376a9370157a1b08c0bc48ca29ca216f4b7939cfd5c11dfbf2c862fd26d8
-MISC ChangeLog 4963 SHA256 da211251f9423cd8418fe0499e12126d92f0a315cb237591413ce4104b5c0f84 SHA512 5c91e16076c2aefab952707d2d6e2af81622247aa9326c214beb8f895611df8a8a39cabd11db4a2a03eab96c4bac08c4760c3fb6dfb7965389d975051417de2a WHIRLPOOL daa7840d21f041fcaf3fe00da4855612e89ec0a348e5e01cc55379ff19d1b546d27e207d0c64645ae289d42d870be51eb34c57b421a35900652aef475bebf027
+MISC ChangeLog 5253 SHA256 fa072640b1475ffb2c7cb9407832d0cd2e1ae47d71be3f8ec6e60c7887c5a7d3 SHA512 a4e8b1bc2e41e6280fb37fc9edfec9cfacea8d611aaf2c344ed177cfccb7e9bd72e95c2fd1b8ee462c4c632dc09e365c3fc1aa4bb46aace1afbd0d0f288e5620 WHIRLPOOL 4e41bffad28612c3c2580561006f6f8e73a82506b52f704311d3d70cce7314166741f6701655e981d97d05b2668dcac50c3d5addee63fef1985034433e1916d9
 MISC metadata.xml 259 SHA256 f42aac06ff89f92bbcda31eadabefeed1a3d697f69ab8ae80341bcbf2e3fd530 SHA512 d67ad6e98b318a4eb2caf657e7d326c17afb7ddc841bd415388fbd196e274d68cfb6d362da3f39e2d2f81352fbfa66e8b805c29326024236d4c4f69b87124231 WHIRLPOOL 05314d28fa00f4c699d1d6535810322af91c192d013105f53bc5ebeafa99c182e8501d693efe8c12a1ede11d244f7627656c643a72902412f468f465e39a6c98
diff --git a/dev-db/pgpool2/pgpool2-3.2.3.ebuild b/dev-db/pgpool2/pgpool2-3.2.3.ebuild
deleted file mode 100644
index d0badf532a82..000000000000
--- a/dev-db/pgpool2/pgpool2-3.2.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 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.5 2014/12/28 15:10:55 titanofold Exp $
-
-EAPI=4
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit base user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-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
-
-	emake -C sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C sql 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.4.ebuild b/dev-db/pgpool2/pgpool2-3.2.4.ebuild
deleted file mode 100644
index 5c249ba7e82f..000000000000
--- a/dev-db/pgpool2/pgpool2-3.2.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.2.4.ebuild,v 1.4 2014/12/28 15:10:55 titanofold Exp $
-
-EAPI=4
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit base user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-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
-
-	emake -C sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C sql 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.3.1.ebuild b/dev-db/pgpool2/pgpool2-3.3.1.ebuild
deleted file mode 100644
index 702f3cc805bb..000000000000
--- a/dev-db/pgpool2/pgpool2-3.3.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.3.1.ebuild,v 1.3 2014/12/28 15:10:55 titanofold Exp $
-
-EAPI=4
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit base user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-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
-
-	emake -C sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C sql install
-	cd "${S}"
-
-	# 3.3 appears to have removed this
-	# `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.3.2.ebuild b/dev-db/pgpool2/pgpool2-3.3.2.ebuild
deleted file mode 100644
index 8587bcec6e4f..000000000000
--- a/dev-db/pgpool2/pgpool2-3.3.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.3.2.ebuild,v 1.3 2014/12/28 15:10:55 titanofold Exp $
-
-EAPI=4
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit base user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-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
-
-	emake -C sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C sql install
-	cd "${S}"
-
-	# 3.3 appears to have removed this
-	# `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.3.3.ebuild b/dev-db/pgpool2/pgpool2-3.3.3.ebuild
deleted file mode 100644
index d9b960660b13..000000000000
--- a/dev-db/pgpool2/pgpool2-3.3.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.3.3.ebuild,v 1.3 2014/12/28 15:10:55 titanofold Exp $
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit base user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-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
-
-	emake -C sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C sql install
-	cd "${S}"
-
-	# 3.3 appears to have removed this
-	# `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.3.4.ebuild b/dev-db/pgpool2/pgpool2-3.3.4.ebuild
deleted file mode 100644
index 9114ea6cc0d9..000000000000
--- a/dev-db/pgpool2/pgpool2-3.3.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.3.4.ebuild,v 1.2 2014/12/28 15:10:55 titanofold Exp $
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit base user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="memcached pam ssl static-libs"
-
-RDEPEND="
-	dev-db/postgresql
-	memcached? ( dev-libs/libmemcached )
-	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	!!dev-db/pgpool
-"
-
-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
-
-	emake -C sql
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" -C sql install
-	cd "${S}"
-
-	# 3.3 appears to have removed this
-	# `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.3.5.ebuild b/dev-db/pgpool2/pgpool2-3.3.7.ebuild
index 5e1d374cef5e..268b598054cd 100644
--- a/dev-db/pgpool2/pgpool2-3.3.5.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.3.5.ebuild,v 1.1 2015/02/15 08:40:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool2/pgpool2-3.3.7.ebuild,v 1.1 2015/07/27 09:13:52 patrick Exp $
 
 EAPI=5