Updated patch for 8.3 (accidentally disabled tsearch2, thanks to Elvis Pranskevichus). Corrected a bug in init.d scripts.

Package-Manager: portage-2.1.5_rc4

9 files changed, 90 insertions, 49 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index a45dbcc80faf..d4741eba2098 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.1 2008/04/15 09:29:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.2 2008/04/19 20:37:12 dev-zero Exp $
+
+  19 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  files/postgresql.init-7.3, files/postgresql.init-7.4,
+  files/postgresql.init-8.0, files/postgresql.init-8.1,
+  files/postgresql.init-8.2, files/postgresql.init-8.3,
+  files/postgresql-8.3-server.patch:
+  Updated patch for 8.3 (accidentally disabled tsearch2, thanks to Elvis
+  Pranskevichus). Corrected a bug in init.d scripts.
 
 *postgresql-server-8.3.1 (15 Apr 2008)
 *postgresql-server-8.2.7 (15 Apr 2008)
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 76efdac879df..d703355a88e5 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -13,19 +13,19 @@ AUX postgresql-8.1-server.patch 6862 RMD160 94dc4c22f1f480bf5844f6e654d8a4e05340
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-8.2-server.patch 5319 RMD160 9aae5832defd2e43879246e773fd1aada0680716 SHA1 ea726704fc85118c27f511bfd9324b136ced3eb1 SHA256 2687fa5159a34da59e36af4c894f43b2136e8e88c965a682607cb48acb61d8ee
 AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
-AUX postgresql-8.3-server.patch 6683 RMD160 58fb842a74512a94b24a85a4268a61b095cfedf0 SHA1 5041fe54bfe00b29b9abeb4bc6cd6139ef247f00 SHA256 fd44afe3fdb3109bdd3c849543e2065efc9aef2511a80ba711961ab9e879a02f
+AUX postgresql-8.3-server.patch 6683 RMD160 2d7ae14be0cde3aa90f2327d382de04511e2af34 SHA1 9b4f68dbca6a146cea12cc23e1614eb7da5b5358 SHA256 83bb38600702f58c0fa08d3fc388b3bbe8b732da2656436d72535253e3fdfd4d
 AUX postgresql.conf-7.3 1532 RMD160 fa088eb5742efbce852d6dcff1dba420857aa67e SHA1 22ac6f3632d6baa1a97017f27001951ccf6a224c SHA256 c0e2ae8c22895bde591302234735ceaddcf4c2a4b1e17ed8cee53b66dad32a24
 AUX postgresql.conf-7.4 1532 RMD160 8897005145112dc1782174fcac512531a32ce88a SHA1 f7e1e1c6cac39d1c7ecc371c9391214d6a8c8055 SHA256 4084c99ad0fff027876c82375c4d99d1669090398137ef5ed19c8e74cecb6e0c
 AUX postgresql.conf-8.0 1532 RMD160 de03805c18ac079b830bcc412c838eb67cbf4f2b SHA1 a7e288d80b0fd24ddf55bdd560f1e8b216b1f540 SHA256 471cd40a0f9100789d238722e5e5efb923dd4f526b564341a5401b3df236721a
 AUX postgresql.conf-8.1 1532 RMD160 69ce81cb490d73b1c6fd373ff6d4f76abbaec4f9 SHA1 6120fcbc61cce8da2b02eb5608def3e65a6ff04d SHA256 e28635d2abb43a30fe58d0d35c7266e40cb323c94797b8a98a0b7f2a4caf507d
 AUX postgresql.conf-8.2 1532 RMD160 8712059a8898ff65aff6d8dd6287726ebfc7719f SHA1 ca6547ac197a81a84b3de5c6f41d1b824fa6cef4 SHA256 775d1aa953c1d5a82f16e013249c6c29c4907f810536bfc4852eca72a2228780
 AUX postgresql.conf-8.3 1532 RMD160 90f201a80549b663fccb3dd90fd507845b27a958 SHA1 7c4f44369064e81b5092491b5327254022e12492 SHA256 7d9814b4bc11c3ca50c0891ac8c57b0793d92d5eb9814d43ef0ef31d0d2eee46
-AUX postgresql.init-7.3 2269 RMD160 cb0d93467e18c07f97e7d82acc1ac357c8cc94b1 SHA1 f88ca0b0e791c2ffb22e70e1f27a2ad70f78e9ca SHA256 e9750a5f38184ad69bc722ba46fe66ad2cf5f5018dd28bdb9f9a32959827946f
-AUX postgresql.init-7.4 2269 RMD160 05b87888911800c8988db49e52e567f446938088 SHA1 c0edd1728312107408712bc090b576824c4a1369 SHA256 af8f6153b24190a9240f19c40d8404fbff1338aec74be4f820b184fc62d71d4c
-AUX postgresql.init-8.0 2269 RMD160 7c1ca65c5667d5873fa0f6628bbb2cd0d1e9d1f8 SHA1 dea0cf8bf017daa56cdebdc25c80ffa905568c5a SHA256 572bc9eb536ddedba327fe72a5c4e5733a4a6da593f886ef9856f1efce3a2654
-AUX postgresql.init-8.1 2269 RMD160 49e87fe3e2c3de4d68015391f59082dbd5051fc9 SHA1 0fde2855982feff06413a4a2ff13cff7a17f41a2 SHA256 8ddb7db9012587800eb1ea09c4bca618888a69b9a361ecb7b2d6bc40fdca5b0b
-AUX postgresql.init-8.2 2269 RMD160 cf85381e793aba0aa45b9b3809f4642034afa82d SHA1 39cac0283f4f30ba3d69d541d0205c92b8df4dfb SHA256 5481163b44802446a1ed95fc5ce81663c5765e4b44e9706f80e3cc0e736896b1
-AUX postgresql.init-8.3 2269 RMD160 87354a9aaf37d1f66af0f568b5c6d2338f6499b4 SHA1 d919fea67a5b39e9e25b5b44f301ec18ad11dff8 SHA256 45048120fa11b64917978d954374116ab6099b9ffd40be6eb9f3edce3c55da44
+AUX postgresql.init-7.3 2396 RMD160 34213806d381944703d9e1b746b93fc2de6fd02c SHA1 93f7d3d50683cd5a4ac4c311256ac70fee1a0546 SHA256 04df465361428002287d80d070ccfdf94feccfd0cb2ddf9f500d4504a214ac75
+AUX postgresql.init-7.4 2440 RMD160 38a79b22a4d22c4890ef7c6c86443baaa43ac838 SHA1 0f44ea59ba4fcb391471caf5279955e863802a90 SHA256 4c6bb39642a76db6a72c42e012313eaae8496b7eabedc8cdbd91cc7bb664d9a0
+AUX postgresql.init-8.0 2396 RMD160 54d452d70da6488b5f53a05645c601642e331e43 SHA1 d7794bc066a7f176197d84453fa62280432e9c65 SHA256 4428b4e3e7f71701cae451d88bf6f656acecd28f0ab94facf8b399a2f8e00b5d
+AUX postgresql.init-8.1 2396 RMD160 0198a3b6200946eb3a1e8dda2538cb62cefafdf5 SHA1 c212408342d780fb11f559a3bf4d3accf5c2f8cd SHA256 948bf952aec585206b1ce63b7b8090199c6ad5b35c2b4e710411879b5e354d6c
+AUX postgresql.init-8.2 2396 RMD160 38c988125d50b42337decafe79ffc4c81bbe3150 SHA1 ce12ca5e5366ee584c2b0d68d093983ea9130988 SHA256 07d103a64afbc4d9752d5bf4d0c42db4b8bb604e63ad75d6a9974fac47cce739
+AUX postgresql.init-8.3 2396 RMD160 2f3d096add1a9fa771a557963b354d34c41b47ae SHA1 55bffdcf1d8318fd157a697acd805d5c19d179ab SHA256 2f858bd09d3b9f4efc7a56091db42164b39b35f50dc6dd2cab97aed4e139b7bb
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
@@ -38,5 +38,5 @@ EBUILD postgresql-server-8.0.15.ebuild 9131 RMD160 0fe98d0211654df7fe71269d78b6d
 EBUILD postgresql-server-8.1.11.ebuild 9252 RMD160 5ac91b6cea145854a048d4e1fcd1a6b25ae49fdb SHA1 7fd48a555136c1e0d90b5fbb444a5dfc3c9e4f0f SHA256 721b46ec2b1d21171e620fbb9020868b22d1b9f16de77cdf403d3603fe7f73ce
 EBUILD postgresql-server-8.2.7.ebuild 9480 RMD160 3fd42d2567a24a0a1da0946074ba9e96fe83ecba SHA1 1d8f952d308ba02ef568c082593c4b9864c2a93b SHA256 ada69e68da43d39ef4a276ab10c2168c404acdf9e2fc92f1c4b1d11637251a2a
 EBUILD postgresql-server-8.3.1.ebuild 9649 RMD160 3711d1c616eeccfff832a33026ad69d58f473eef SHA1 9b73e7784fc4ec7d8527e48066a866cb99d9f0b6 SHA256 3d7631c1ebc4dcb32f8a4ceeb9718a25d06f4132634a77a3844108b44457abfd
-MISC ChangeLog 8193 RMD160 a5087acc410271d968f8ae6370d8b94e8bc56db1 SHA1 77c57b0fc650a239a6f31c7b54b3a0b6b7dd3a08 SHA256 0ba42ef9967d138aba09d0866f34286b647e798096b70b72cb5a93af6ae95cc2
+MISC ChangeLog 8578 RMD160 60cefd477a8347a0aed5e6e36d507264c9a35213 SHA1 be0c05d4d783418ca45a7384568f316f2fe1d9b0 SHA256 5040eee419e9957351b670de79cb1f7367faea3064abaa86e801c5f5ef1954cd
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
index 756127c5d188..6b04efa41610 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -26,7 +26,7 @@
 ==================================================================
 --- contrib/Makefile	(revision 12)
 +++ contrib/Makefile	(local)
-@@ -20,22 +20,18 @@
+@@ -20,22 +20,19 @@
  		isn		\
  		lo		\
  		ltree		\
@@ -44,7 +44,7 @@
  		spi		\
  		tablefunc	\
 -		test_parser	\
--		tsearch2	\
+ 		tsearch2	\
 -		vacuumlo
 +		test_parser
  
diff --git a/dev-db/postgresql-server/files/postgresql.init-7.3 b/dev-db/postgresql-server/files/postgresql.init-7.3
index 0c852763e270..833387bc3169 100644
--- a/dev-db/postgresql-server/files/postgresql.init-7.3
+++ b/dev-db/postgresql-server/files/postgresql.init-7.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-7.3,v 1.1 2008/04/15 09:29:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-7.3,v 1.2 2008/04/19 20:37:13 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -40,20 +40,25 @@ start() {
 stop() {
 	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
 
+	local retval
+
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -TERM/${WAIT_FOR_DISCONNECT}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -INT/${WAIT_FOR_CLEANUP}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
 		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
-		eend $?
+		eend $retval
+		return $retval
 	fi
 
 	ewarn "Shutting down the server gracefully failed."
@@ -61,8 +66,8 @@ stop() {
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -QUIT/${WAIT_FOR_QUIT}
-		
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
 	eend $?
diff --git a/dev-db/postgresql-server/files/postgresql.init-7.4 b/dev-db/postgresql-server/files/postgresql.init-7.4
index cdb11581fb2d..b5ec7093069f 100644
--- a/dev-db/postgresql-server/files/postgresql.init-7.4
+++ b/dev-db/postgresql-server/files/postgresql.init-7.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-7.4,v 1.1 2008/04/15 09:29:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-7.4,v 1.2 2008/04/19 20:37:13 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -25,6 +25,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
+	local retval
+
 	ebegin "Starting PostgreSQL"
 
 	if [ -f "$PGDATA/postmaster.pid" ] ; then
@@ -33,27 +35,33 @@ start() {
 
 	su -l ${PGUSER} \
 		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-7.4/bin/pg_ctl start -w -o '--silent-mode=true ${PGOPTS}'"
-
-	eend $?
+	retval=$?
+	echo $retval
+	eend $retval
 }
 
 stop() {
 	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
 
+	local retval
+
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -TERM/${WAIT_FOR_DISCONNECT}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -INT/${WAIT_FOR_CLEANUP}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
 		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
-		eend $?
+		eend $retval
+		return $retval
 	fi
 
 	ewarn "Shutting down the server gracefully failed."
@@ -61,8 +69,8 @@ stop() {
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -QUIT/${WAIT_FOR_QUIT}
-		
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
 	eend $?
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.0 b/dev-db/postgresql-server/files/postgresql.init-8.0
index b02d1e6450ea..a6840b3ef314 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.0
+++ b/dev-db/postgresql-server/files/postgresql.init-8.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.0,v 1.1 2008/04/15 09:29:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.0,v 1.2 2008/04/19 20:37:13 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -40,20 +40,25 @@ start() {
 stop() {
 	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
 
+	local retval
+
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -TERM/${WAIT_FOR_DISCONNECT}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -INT/${WAIT_FOR_CLEANUP}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
 		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
-		eend $?
+		eend $retval
+		return $retval
 	fi
 
 	ewarn "Shutting down the server gracefully failed."
@@ -61,8 +66,8 @@ stop() {
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -QUIT/${WAIT_FOR_QUIT}
-		
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
 	eend $?
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.1 b/dev-db/postgresql-server/files/postgresql.init-8.1
index 5d498e0cddc4..b277eee1742f 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.1
+++ b/dev-db/postgresql-server/files/postgresql.init-8.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.1,v 1.1 2008/04/15 09:29:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.1,v 1.2 2008/04/19 20:37:13 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -40,20 +40,25 @@ start() {
 stop() {
 	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
 
+	local retval
+
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -TERM/${WAIT_FOR_DISCONNECT}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -INT/${WAIT_FOR_CLEANUP}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
 		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
-		eend $?
+		eend $retval
+		return $retval
 	fi
 
 	ewarn "Shutting down the server gracefully failed."
@@ -61,8 +66,8 @@ stop() {
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -QUIT/${WAIT_FOR_QUIT}
-		
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
 	eend $?
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.2 b/dev-db/postgresql-server/files/postgresql.init-8.2
index 212a4ca3fd3a..8dd4c4f59893 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.2
+++ b/dev-db/postgresql-server/files/postgresql.init-8.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.2,v 1.1 2008/04/15 09:29:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.2,v 1.2 2008/04/19 20:37:13 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -40,20 +40,25 @@ start() {
 stop() {
 	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
 
+	local retval
+
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -TERM/${WAIT_FOR_DISCONNECT}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -INT/${WAIT_FOR_CLEANUP}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
 		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
-		eend $?
+		eend $retval
+		return $retval
 	fi
 
 	ewarn "Shutting down the server gracefully failed."
@@ -61,8 +66,8 @@ stop() {
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -QUIT/${WAIT_FOR_QUIT}
-		
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
 	eend $?
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.3 b/dev-db/postgresql-server/files/postgresql.init-8.3
index a936c7296167..e284ddc58a6e 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.3
+++ b/dev-db/postgresql-server/files/postgresql.init-8.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.1 2008/04/15 09:29:55 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.2 2008/04/19 20:37:13 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -40,20 +40,25 @@ start() {
 stop() {
 	ebegin "Stopping PostgreSQL (this can take up to $(( ${WAIT_FOR_DISCONNECT} + ${WAIT_FOR_CLEANUP} )) seconds)"
 
+	local retval
+
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -TERM/${WAIT_FOR_DISCONNECT}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -INT/${WAIT_FOR_CLEANUP}
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	if [ ${WAIT_FOR_QUIT} -eq 0 ] ; then
 		eerror "Server did not shut down and sending the SIGQUIT has been disabled."
-		eend $?
+		eend $retval
+		return $retval
 	fi
 
 	ewarn "Shutting down the server gracefully failed."
@@ -61,8 +66,8 @@ stop() {
 
 	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
 		--retry -QUIT/${WAIT_FOR_QUIT}
-		
-	[ $? -eq 0 ] && eend $? && exit
+	retval=$?
+	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	eerror "Forced shutdown failed!!! Something is wrong with your system, please take care of it manually."
 	eend $?