summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorJohan Bergström (jbergstroem) <bugs@bergstroem.nu>2011-04-14 09:03:38 +0000
committerJohan Bergström (jbergstroem) <bugs@bergstroem.nu>2011-04-14 09:03:38 +0000
commit54604d57c776fb43b9d12ef701688e5b372e5302 (patch)
tree95a86c5a3f63a87c4f2c6ad8f1c1af3a82fd73cc /dev-db
parentapp-text/ pdfgrep: app-text/pdfgrep moved to tree (diff)
downloadsunrise-54604d57c776fb43b9d12ef701688e5b372e5302.tar.gz
sunrise-54604d57c776fb43b9d12ef701688e5b372e5302.tar.bz2
sunrise-54604d57c776fb43b9d12ef701688e5b372e5302.zip
dev-db/pgbouncer: Version bump. Add eutils and some minor fixes to init, config
svn path=/sunrise/; revision=11894
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/pgbouncer/ChangeLog4
-rw-r--r--dev-db/pgbouncer/Manifest8
-rw-r--r--dev-db/pgbouncer/files/pgbouncer.initd6
-rw-r--r--dev-db/pgbouncer/pgbouncer-1.4.1.ebuild (renamed from dev-db/pgbouncer/pgbouncer-1.4.ebuild)13
4 files changed, 22 insertions, 9 deletions
diff --git a/dev-db/pgbouncer/ChangeLog b/dev-db/pgbouncer/ChangeLog
index 571a75dac..cb9cc60fd 100644
--- a/dev-db/pgbouncer/ChangeLog
+++ b/dev-db/pgbouncer/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Apr 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
+ -pgbouncer-1.4.ebuild, +pgbouncer-1.4.1.ebuild, files/pgbouncer.initd:
+ Version bump. Add eutils and some minor fixes to init, config
+
05 Feb 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
-pgbouncer-1.3.4.ebuild, +pgbouncer-1.4.ebuild,
-files/modify-config-paths.patch, files/pgbouncer.initd:
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 23c8f0f35..e84fa95f4 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,5 +1,5 @@
-AUX pgbouncer.initd 539 RMD160 8a8a02a266840cf12b5eff5799d6456b7f0fd524 SHA1 7f8bb5dddb3ff830c1cd38fc22a9c13150bfc0d4 SHA256 b8feda0725afdd9c9204d99fc1ea1965f28ef30f4302f2aa7cb8b10ef3003e9f
-DIST pgbouncer-1.4.tgz 231691 RMD160 3a3e4ea9dcbefc309e6aafa74b079963e5b6a53b SHA1 f0c9ffd7b65250feee1865ba83a62ff857f226bb SHA256 e94a8e7edd6de4ae6978e8f485bbc6a610195b56b1f5fe95a49bfd70959628fb
-EBUILD pgbouncer-1.4.ebuild 1736 RMD160 59cc675bea25253dbe35c0f76bee0dcb53c6468b SHA1 c27960d61796e9136391c27ccec01b1c02f5ac80 SHA256 7243acfdd9c6be8e7991f71c58b3092988e4b17f79ab8f9c6a36f48955bec602
-MISC ChangeLog 2100 RMD160 e7c55ebd15e067deedf90ba1894840dc43f7edab SHA1 a1789fa9a587fce83f48d75fcde24dabda5c54e8 SHA256 08001065350183375508ab9440368921cb2a5f1bb1249cd9f6a6d52937ce940c
+AUX pgbouncer.initd 648 RMD160 1e63be977969304d304825bd31fa1dc7e001901d SHA1 a339c622ae2504f6114818c9bdf04ec835101c2d SHA256 fb0acf00f748069eabdf988b1967c845939ff1f54688a5e0cc65b44ea20524b4
+DIST pgbouncer-1.4.1.tgz 282728 RMD160 f8bcafd887a214b4865af4da14800292caec4ec6 SHA1 2773ffe1b571f980e20103b9c7b8ccb16f457d97 SHA256 24cd8fdeb6725bec260e5efbd21ba1e0a3f14b741b7003285760d178d6505672
+EBUILD pgbouncer-1.4.1.ebuild 1820 RMD160 f0ecdc7d0292d0f41970ec0962188327755b527e SHA1 22d7942022d225eef3fb7d6c2155396be4e7eb6b SHA256 4563c5578c71017a2d6437d1fafacf29a671690e6403f7ac89d313526bcbacdc
+MISC ChangeLog 2305 RMD160 6ff954916bf67e55d4571c5e430d393ea973934a SHA1 d24c525cfba2e7dd238fa176680e1482cab297d4 SHA256 a18ce2fe31754b0ddfa7c8a1ed568b9058b9848c4e716eb2b3403204bb7c6acf
MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/dev-db/pgbouncer/files/pgbouncer.initd b/dev-db/pgbouncer/files/pgbouncer.initd
index 443140426..ca8b8c95b 100644
--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ b/dev-db/pgbouncer/files/pgbouncer.initd
@@ -10,6 +10,9 @@ depend() {
}
start() {
+ mkdir -p /var/run/pgbouncer
+ chown pgbouncer:pgbouncer /var/run/pgbouncer
+
ebegin "Starting pgbouncer"
start-stop-daemon --start --pidfile ${PIDFILE} \
@@ -25,6 +28,7 @@ stop() {
reload() {
ebegin "Gracefully reloading pgbouncer"
- kill -HUP `cat ${PIDFILE}` &>/dev/null
+ start-stop-daemon --stop --oknodo --signal HUP \
+ --pidfile ${PIDFILE}
eend $?
}
diff --git a/dev-db/pgbouncer/pgbouncer-1.4.ebuild b/dev-db/pgbouncer/pgbouncer-1.4.1.ebuild
index fb0897b0e..078df0d6d 100644
--- a/dev-db/pgbouncer/pgbouncer-1.4.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.4.1.ebuild
@@ -4,11 +4,13 @@
EAPI="2"
+inherit eutils
+
RESTRICT="test"
DESCRIPTION="Lightweight connection pooler for PostgreSQL"
HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
-SRC_URI="http://pgfoundry.org/frs/download.php/2912/${P}.tgz"
+SRC_URI="http://pgfoundry.org/frs/download.php/2987/${P}.tgz"
LICENSE="BSD"
SLOT="0"
@@ -25,9 +27,12 @@ pkg_setup() {
}
src_prepare() {
- sed -i -e "s,pgbouncer.log,/var/log/pgbouncer/pgbouncer.log," \
- -e "s,pgbouncer.pid,/var/run/pgbouncer/pgbouncer.pid," \
- -e "s,etc/userlist.txt,/etc/userlist.txt," etc/pgbouncer.ini || die
+ sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
+ -e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
+ -e "s,etc/userlist.txt,/etc/userlist.txt," \
+ -e "s,;unix_socket_dir = /tmp,unix_socket_dir = /var/run/${PN}/${PN}.sock," \
+ "${S}"/etc/pgbouncer.ini || die
+
}
src_configure() {