Fixed postgresql configuration (bug #251590), fixed server rootd and proofd files

(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 27 insertions, 21 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0c5a48b0ac17..02694b841344 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/root
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.40 2008/12/19 14:35:32 bicatali Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.41 2009/01/20 18:04:09 bicatali Exp $
+
+  20 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> files/proofd.initd,
+  files/rootd.initd, files/xrootd.initd, root-5.20.00-r3.ebuild,
+  root-5.22.00.ebuild:
+  Fixed postgresql configuration (bug #251590), fixed server rootd and
+  proofd files
 
   19 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org> root-5.22.00.ebuild:
   Fixed ftgl dependency, closing bug #251634
diff --git a/sci-physics/root/files/proofd.initd b/sci-physics/root/files/proofd.initd
index 524ef2bf67dd..c34a51ccae28 100644
--- a/sci-physics/root/files/proofd.initd
+++ b/sci-physics/root/files/proofd.initd
@@ -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/sci-physics/root/files/proofd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/proofd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
 
 depend() {
     need root-file-server
@@ -11,8 +11,8 @@ depend() {
 start() {
     ebegin "Starting parallel ROOT facility server"
     start-stop-daemon --start --quiet \
-	--pidfile=/var/run/proofd.pid \
-	--exec /usr/bin/proofd -- ${PROOFD_OPTS}
+	--pidfile /var/run/proofd.pid \
+	--exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
     pidof /usr/bin/proofd > /var/run/proofd.pid
     eend $?
 }
@@ -20,7 +20,7 @@ start() {
 stop() {
     ebegin "Stopping parallel ROOT facility server"
     start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/proofd.pid \
+	--pidfile /var/run/proofd.pid \
 	--exec /usr/bin/proofd
     eend $?
 }
diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
index ddebb58fba76..72dccb559ff6 100644
--- a/sci-physics/root/files/rootd.initd
+++ b/sci-physics/root/files/rootd.initd
@@ -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/sci-physics/root/files/rootd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/rootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
 
 depend() {
     need net
@@ -11,10 +11,10 @@ depend() {
 
 start() {
     ebegin "Starting ROOT file server"
-    pid=$(start-stop-daemon --start --quiet --user=${ROOTD_USER} \
-	--pidfile=/var/run/rootd.pid \
+    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
+	--pidfile /var/run/rootd.pid \
 	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
-    eval ${pid}
+    retval=$?
     echo ${ROOTD_PID} > /var/run/rootd.pid
     eend ${retval}
 }
@@ -22,7 +22,7 @@ start() {
 stop() {
     ebegin "Stopping ROOT file server"
     start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/rootd.pid \
+	--pidfile /var/run/rootd.pid \
 	--exec /usr/bin/rootd
     eend $?
 }
diff --git a/sci-physics/root/files/xrootd.initd b/sci-physics/root/files/xrootd.initd
index 73408a316513..d0528db067b0 100644
--- a/sci-physics/root/files/xrootd.initd
+++ b/sci-physics/root/files/xrootd.initd
@@ -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/sci-physics/root/files/xrootd.initd,v 1.1 2008/12/18 18:10:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/files/xrootd.initd,v 1.2 2009/01/20 18:04:09 bicatali Exp $
 
 depend() {
     need net
@@ -11,8 +11,8 @@ depend() {
 
 start() {
     ebegin "Starting extended ROOTD file server"
-    start-stop-daemon --start --quiet --user=${XROOTD_USER} \
-	--make-pidfile --pidfile=/var/run/xrootd.pid \
+    start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+	--make-pidfile --pidfile /var/run/xrootd.pid \
 	--exec /usr/bin/xrootd --background -- ${XROOTD_OPTS}
     eend $?
 }
@@ -20,7 +20,7 @@ start() {
 stop() {
     ebegin "Stopping extended ROOTD file server"
     start-stop-daemon --stop --quiet \
-	--pidfile=/var/run/xrootd.pid \
+	--pidfile /var/run/xrootd.pid \
 	--exec /usr/bin/xrootd
     eend $?
 }
diff --git a/sci-physics/root/root-5.20.00-r3.ebuild b/sci-physics/root/root-5.20.00-r3.ebuild
index c18920daf263..1b8492de69c7 100644
--- a/sci-physics/root/root-5.20.00-r3.ebuild
+++ b/sci-physics/root/root-5.20.00-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r3.ebuild,v 1.2 2008/12/19 10:46:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r3.ebuild,v 1.3 2009/01/20 18:04:09 bicatali Exp $
 
 EAPI=1
 inherit versionator eutils qt4 fortran elisp-common fdo-mime
@@ -52,7 +52,7 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/libiodbc )
 	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( virtual/postgresql-server )
+	postgres? ( virtual/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( dev-lang/python )
diff --git a/sci-physics/root/root-5.22.00.ebuild b/sci-physics/root/root-5.22.00.ebuild
index 062b74e9d100..f45c0ee0b002 100644
--- a/sci-physics/root/root-5.22.00.ebuild
+++ b/sci-physics/root/root-5.22.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00.ebuild,v 1.2 2008/12/19 14:35:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.22.00.ebuild,v 1.3 2009/01/20 18:04:09 bicatali Exp $
 
 EAPI=2
 inherit versionator eutils qt4 fortran elisp-common fdo-mime toolchain-funcs
@@ -53,7 +53,7 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( virtual/postgresql-server )
+	postgres? ( virtual/postgresql-base )
 	pythia6? ( sci-physics/pythia:6 )
 	pythia8? ( sci-physics/pythia:8 )
 	python? ( dev-lang/python )