Added PGDATA_ALT env var for postgres-7.4: bug #69139

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 26 insertions, 15 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 7d9c654e1007..ae84a6561246 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.298 2006/11/09 18:35:25 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.299 2006/11/11 12:15:02 dev-zero Exp $
+
+  11 Nov 2006; Tiziano Müller <dev-zero@gentoo.org>
+  files/postgresql.conf-7.4, files/postgresql.init-7.4:
+  Added PGDATA_ALT env var for postgres-7.4: bug #69139
 
   09 Nov 2006; Luca Longinotti <chtekk@gentoo.org>
   postgresql-7.3.15-r1.ebuild, postgresql-7.3.16.ebuild,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9a70bd3f43ad..bd41c4482b9e 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -94,10 +94,10 @@ AUX postgresql.conf-7.3 391 RMD160 08437cac48aa9fc5d5b2840cf23395cb71fc270b SHA1
 MD5 55ee2ca58443142443c777c567a60a01 files/postgresql.conf-7.3 391
 RMD160 08437cac48aa9fc5d5b2840cf23395cb71fc270b files/postgresql.conf-7.3 391
 SHA256 b935682b39bf139f7d0a20a5901dd084476e4cc17189c0fc979f17334063701e files/postgresql.conf-7.3 391
-AUX postgresql.conf-7.4 391 RMD160 08437cac48aa9fc5d5b2840cf23395cb71fc270b SHA1 5a627c9f3d7f41df9e3228a2301f6ee0daf5f16f SHA256 b935682b39bf139f7d0a20a5901dd084476e4cc17189c0fc979f17334063701e
-MD5 55ee2ca58443142443c777c567a60a01 files/postgresql.conf-7.4 391
-RMD160 08437cac48aa9fc5d5b2840cf23395cb71fc270b files/postgresql.conf-7.4 391
-SHA256 b935682b39bf139f7d0a20a5901dd084476e4cc17189c0fc979f17334063701e files/postgresql.conf-7.4 391
+AUX postgresql.conf-7.4 609 RMD160 eeee59a542da3f1f4f8ea06f344e75764a141a14 SHA1 19e59878bfee0be66af1ad35dd46cbc70e761844 SHA256 f906adea9223b0d03455d4a27a09639212ef8576d59c1148dccf9596c0c42683
+MD5 0026c57589b19b23ac7da9a938aaec9b files/postgresql.conf-7.4 609
+RMD160 eeee59a542da3f1f4f8ea06f344e75764a141a14 files/postgresql.conf-7.4 609
+SHA256 f906adea9223b0d03455d4a27a09639212ef8576d59c1148dccf9596c0c42683 files/postgresql.conf-7.4 609
 AUX postgresql.conf-8.0 391 RMD160 08437cac48aa9fc5d5b2840cf23395cb71fc270b SHA1 5a627c9f3d7f41df9e3228a2301f6ee0daf5f16f SHA256 b935682b39bf139f7d0a20a5901dd084476e4cc17189c0fc979f17334063701e
 MD5 55ee2ca58443142443c777c567a60a01 files/postgresql.conf-8.0 391
 RMD160 08437cac48aa9fc5d5b2840cf23395cb71fc270b files/postgresql.conf-8.0 391
@@ -110,10 +110,10 @@ AUX postgresql.init-7.3 1332 RMD160 deb0bbb69d96ec21ac9b9b636f62fb47f5d997ab SHA
 MD5 0f39215e02d3c179cb2a49334bf82fee files/postgresql.init-7.3 1332
 RMD160 deb0bbb69d96ec21ac9b9b636f62fb47f5d997ab files/postgresql.init-7.3 1332
 SHA256 15296b663506b9840990a08d592adda16acbb1b59b57b81484808e5486b35ab4 files/postgresql.init-7.3 1332
-AUX postgresql.init-7.4 1332 RMD160 c55ab8cec9b287795b4084796f91907bf439a772 SHA1 d2b0548faf1f341475b33c9dbe302cf287967f52 SHA256 3e0833b9a9e78b1fb72cd03844cd116f9cfaf1b830d716577e3389f1418d1dec
-MD5 c54cc29eb625f2b79d7c602914019ed1 files/postgresql.init-7.4 1332
-RMD160 c55ab8cec9b287795b4084796f91907bf439a772 files/postgresql.init-7.4 1332
-SHA256 3e0833b9a9e78b1fb72cd03844cd116f9cfaf1b830d716577e3389f1418d1dec files/postgresql.init-7.4 1332
+AUX postgresql.init-7.4 1348 RMD160 6fbb9aeff7137cc15a58b7bc957d4b6025a03b82 SHA1 445397c698f30ecc8124f7d65b3f92b13f5e4e97 SHA256 5f7d16795081250a2f97f4ad3b2cfee8bcbd822c83c10cc168d31cdd28eff7dc
+MD5 dcdc04d7faa233ff29311f8e4c650f2c files/postgresql.init-7.4 1348
+RMD160 6fbb9aeff7137cc15a58b7bc957d4b6025a03b82 files/postgresql.init-7.4 1348
+SHA256 5f7d16795081250a2f97f4ad3b2cfee8bcbd822c83c10cc168d31cdd28eff7dc files/postgresql.init-7.4 1348
 AUX postgresql.init-8.0 1332 RMD160 399eb26947b79df8a825c4d0d878860efc998f2e SHA1 480faebe21875b1684e9c15963fa15e11287b0c5 SHA256 953564b15a95920afbaafa8956189ccd97d8de0cdb47afccccc8357266776fba
 MD5 811789386d2e7f706a50b742294d7c1c files/postgresql.init-8.0 1332
 RMD160 399eb26947b79df8a825c4d0d878860efc998f2e files/postgresql.init-8.0 1332
@@ -177,10 +177,10 @@ EBUILD postgresql-8.1.5.ebuild 8492 RMD160 4f90882bb047b9f6cb8176b272ac01fee8758
 MD5 60a8f90b6ccf290fece5fa07b4dde8ba postgresql-8.1.5.ebuild 8492
 RMD160 4f90882bb047b9f6cb8176b272ac01fee8758e70 postgresql-8.1.5.ebuild 8492
 SHA256 224f9c2c42868cb3b0d038bb620849dbda09e850749c10d1918a86f1f6ebdbde postgresql-8.1.5.ebuild 8492
-MISC ChangeLog 64413 RMD160 33f07438e07fd62d4583fd75c5d6bc2f41d61711 SHA1 ff732ef9408d886e71b5db5f65faad951609d11b SHA256 18de7eeec8cdb7dc72f68bdbc1d6aa6fd336654fe9ae404409d646afeba650df
-MD5 866f57b273354a6dc07d8174739d2667 ChangeLog 64413
-RMD160 33f07438e07fd62d4583fd75c5d6bc2f41d61711 ChangeLog 64413
-SHA256 18de7eeec8cdb7dc72f68bdbc1d6aa6fd336654fe9ae404409d646afeba650df ChangeLog 64413
+MISC ChangeLog 64581 RMD160 74791e5342cd216385116e0ee2928111acc2ff45 SHA1 9099e1a3e54d49b26e8078ce8cdcb196d9ac7eff SHA256 b49221235764faa88489c956a893fdae7da62c478fb547e871295cf670a6b8ea
+MD5 7764e3761023e5060edd5c92b9c7f2ec ChangeLog 64581
+RMD160 74791e5342cd216385116e0ee2928111acc2ff45 ChangeLog 64581
+SHA256 b49221235764faa88489c956a893fdae7da62c478fb547e871295cf670a6b8ea ChangeLog 64581
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
diff --git a/dev-db/postgresql/files/postgresql.conf-7.4 b/dev-db/postgresql/files/postgresql.conf-7.4
index c6fd787f744d..6c8ecc5963dc 100644
--- a/dev-db/postgresql/files/postgresql.conf-7.4
+++ b/dev-db/postgresql/files/postgresql.conf-7.4
@@ -1,6 +1,13 @@
 # PostgreSQL's Database Directory
 PGDATA="/var/lib/postgresql/data"
 
+# Alternate database data locations
+# Please read http://www.postgresql.org/docs/7.4/static/manage-ag-alternate-locs.html
+# for more information.
+# Example:
+#   PGDATA_ALT="PGDATA_RAID=/mnt/superfastraid"
+PGDATA_ALT=
+
 # Logfile path (NOTE: This must be owned by the uid/gid of $PGUSER!)
 PGLOG="/var/lib/postgresql/data/postgresql.log"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.4 b/dev-db/postgresql/files/postgresql.init-7.4
index 453b93dc0748..4efe43485f26 100644
--- a/dev-db/postgresql/files/postgresql.init-7.4
+++ b/dev-db/postgresql/files/postgresql.init-7.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4,v 1.5 2006/11/07 22:48:22 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4,v 1.6 2006/11/11 12:15:02 dev-zero Exp $
 
 opts="${opts} reload"
 
@@ -26,7 +26,7 @@ start() {
 		rm -f "$PGDATA/postmaster.pid"
 	fi
 
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
+	su - $PGUSER -c "${PGDATA_ALT} /usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
 
 	while :
 	do