dev-db/pgbouncer: Version bump. Add doc IUSE, minor change to init and adapt to EAPI=2

svn path=/sunrise/; revision=10300

4 files changed, 20 insertions, 29 deletions

diff --git a/dev-db/pgbouncer/ChangeLog b/dev-db/pgbouncer/ChangeLog
index 64b4f6830..8d92761e8 100644
--- a/dev-db/pgbouncer/ChangeLog
+++ b/dev-db/pgbouncer/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-db/pgbouncer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Mar 2010; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
+  -pgbouncer-1.3.1.ebuild, +pgbouncer-1.3.2.ebuild, files/pgbouncer.initd:
+  Version bump. Add doc IUSE, minor change to init and adapt to EAPI=2
+
   12 Jul 2009; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
   -pgbouncer-1.3-r1.ebuild, +pgbouncer-1.3.1.ebuild:
   Version bump, minor fixes
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index d49966192..8006c2f40 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,6 +1,6 @@
 AUX modify-config-paths.patch 572 RMD160 cd84c2aa6a9eb4fd8e0e244bf80883ab9b6e8c13 SHA1 d2a62c820199fdd4ed2966ec9e35dab8b9322ce3 SHA256 8ee4f5563d4e4136194c7ebdba0d6ca6beaef08c4356c908923ec9203f6f3073
-AUX pgbouncer.initd 711 RMD160 e4f65df75f624a52fbcf1190fb49033839c42791 SHA1 682c5f1e6bc7fbb90399a7519ec4821ae46cc1e1 SHA256 32ebdb63868d228c1555a282d6836cfc825a241359899fd05692e81200fa1f91
-DIST pgbouncer-1.3.1.tgz 161518 RMD160 c385a91a85070f54569bc5a2029751477b1bee6d SHA1 dd4686cb6976ddd52159ac79c5235cad6a06b50f SHA256 64559d85b5b07e5a98c0918c7111afb61114462f9ee1d6af79047024c134440a
-EBUILD pgbouncer-1.3.1.ebuild 1627 RMD160 71e47f7979b7ef0e02518934339593c861dbec55 SHA1 6368b750363779099b7814614f5596c91aebe61a SHA256 2340fc59d630a306bb8b30ebb5623bd4a0604004405d3792953b5546bcfb6b79
-MISC ChangeLog 735 RMD160 5e2cb25e11bef78f7c48bd8857c3f879104910eb SHA1 afefc8d226cac7a372b708eb2bb5321bf1ba4821 SHA256 12edee930977144542906adb54f3ba875e9c4498f63f35be9f3636fc612e7e4f
+AUX pgbouncer.initd 551 RMD160 5a1de7ff3a60b8f9257d42a11b27053620600cff SHA1 c5de3abe36e4aa0a57ccf198f58ddeccbef083a7 SHA256 7b4b5b5510b98786a4d5f7c9cd1d1ba48f3eee65438aa09211f1d50e1b5b1c6e
+DIST pgbouncer-1.3.2.tgz 166756 RMD160 972eba01299668af01150fd5bf33bff5abd00af2 SHA1 b5abe08641bfce5363158f2cd64cd1318eb48c6b SHA256 67148ce54e9d332ccb83f45d1b3ad8198615c5fbc7c25f68a3b408deac813d5a
+EBUILD pgbouncer-1.3.2.ebuild 1548 RMD160 74a208d4456668702718281233b585aff678576e SHA1 5c5c658c56a521d6808c37fbbbd01962e304c5cc SHA256 60ea9553db57fb7436e3119267766cc6ea4d776e25c8e8abf5d349b5bbdf81e6
+MISC ChangeLog 949 RMD160 ed40b553ed3ecf3f61876a45d21453c76d0f9b1f SHA1 c6a7e3179d8d41a23b4b5e27bb6cf2402a537dcb SHA256 95eb59c7c009f62d8a0febb85b76ab4ea38320fb1f6ee627bf3caa0efbcf5b82
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-db/pgbouncer/files/pgbouncer.initd b/dev-db/pgbouncer/files/pgbouncer.initd
index 883ae8804..82d29078f 100644
--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ b/dev-db/pgbouncer/files/pgbouncer.initd
@@ -1,27 +1,18 @@
 #!/sbin/runscript
-# pgbouncer	Start the PgBouncer PostgreSQL pooler
 
-opts="start stop reload checkconfig"
+opts="start stop reload"
 
 depend() {
 	need net
 	after postgresql
 }
 
-checkconfig(){
-	test -f /etc/pgbouncer.conf
-	result=$?
-	eend $result
-}
-
 start() {
-	checkconfig || return 1
 	ebegin "Starting pgbouncer"
 	
 	start-stop-daemon --start --pidfile /var/run/pgbouncer/pgbouncer.pid \
 		--exec /usr/bin/pgbouncer -- -d -u pgbouncer /etc/pgbouncer.conf
 	eend $? "Failed to start pgbouncer"
-
 }
 
 stop() {
diff --git a/dev-db/pgbouncer/pgbouncer-1.3.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.3.2.ebuild
index 2b6b714e1..267d8fab9 100644
--- a/dev-db/pgbouncer/pgbouncer-1.3.1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.3.2.ebuild
@@ -2,19 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit autotools eutils
 
 DESCRIPTION="Lightweight connection pooler for PostgreSQL"
 HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="http://pgfoundry.org/frs/download.php/2284/${P}.tgz"
+SRC_URI="http://pgfoundry.org/frs/download.php/2608/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug doc"
 
 DEPEND=">=virtual/postgresql-base-8.0
-	>=dev-libs/libevent-1.3"
+	dev-libs/libevent"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -22,20 +24,15 @@ pkg_setup() {
 	enewuser pgbouncer -1 -1 -1 pgbouncer
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}/modify-config-paths.patch"
 	eautoreconf -f
 }
 
-src_compile() {
-	epatch "${FILESDIR}/modify-config-paths.patch"
-
+src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable debug cassert)
-
-	emake || die "emake failed"
 }
 
 src_install() {
@@ -45,10 +42,9 @@ src_install() {
 	newins "${S}"/etc/pgbouncer.ini pgbouncer.conf || die "Install failed"
 	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}" || die "Install failed"
 
-	dodoc README NEWS AUTHORS || die "Install failed"
-	dodoc doc/*.txt || die "Install failed"
+	use doc && dodoc README NEWS AUTHORS || die "Install failed"
+	use doc && dodoc doc/*.txt || die "Install failed"
 
-	# Create log/run directories and set owner to pgbouncer
 	keepdir /var/{run,log}/pgbouncer/
 	fperms 0700 /var/{run,log}/pgbouncer/
 	fowners pgbouncer:pgbouncer /var/{run,log}/pgbouncer/