Marked stable on ppc/sparc/alpha/amd64/hppa/ia64/mips.

20 files changed, 84 insertions, 1412 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 09c4a4fd3ae7..da21572590f8 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.93 2004/05/01 04:16:50 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.94 2004/05/02 23:53:59 nakano Exp $
+
+*postgresql-7.4.2-r2 (03 May 2004)
+
+  03 May 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-7.4.1, -files/pg_autovacuum.init-7.4.1,
+  -files/postgresql-7.4.1-gentoo.patch,
+  -files/postgresql-7.4.1-hppa-testandset.patch,
+  -files/postgresql-7.4.1-vacuum-delay.patch, -files/postgresql.conf-7.4.1,
+  -files/postgresql.init-7.3.4, -files/postgresql.init-7.3.5,
+  -files/postgresql.init-7.4.1, -postgresql-7.3.4-r1.ebuild,
+  -postgresql-7.3.5.ebuild, -postgresql-7.4.1-r4.ebuild,
+  postgresql-7.4.2-r1.ebuild, +postgresql-7.4.2-r2.ebuild,
+  -postgresql-7.4.2.ebuild:
+  Marked stable on ppc/sparc/alpha/amd64/hppa/ia64/mips.
+  Updated pg-hier patch in postgresql-7.4.2-r2
+  Removed old files.
 
 *postgresql-7.4.2-r1 (01 May 2004)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 0c71d356692e..6af9499d5afe 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,32 +1,17 @@
+MD5 15528fec4e8ec0601f679604b4c8a991 postgresql-7.4.2-r2.ebuild 9422
 MD5 9baaa754e37557aad88bb06ca9824145 postgresql-7.3.6.ebuild 7912
-MD5 e25629ef6e9345b8f0cff734e45937f8 postgresql-7.4.2-r1.ebuild 9421
-MD5 a98fd9137bbec854415b55b04ee5de6f postgresql-7.3.5.ebuild 7907
-MD5 d4c97a4a5a1112fc0ffcfe62207a6c85 postgresql-7.4.1-r4.ebuild 8629
-MD5 0df5e93e0aa096d3414004ab9963d04c postgresql-7.3.4-r1.ebuild 8037
-MD5 642177531e6613d37932a96f62a30d86 ChangeLog 16751
+MD5 8bbfafe7135616dd55ec8c7043dd141e postgresql-7.4.2-r1.ebuild 9414
+MD5 e427377b1dc632d1228d796f10fb6d2d ChangeLog 17464
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 b47387990dd71dcc05ff0a93138f8222 postgresql-7.4.2.ebuild 8640
 MD5 89b3a541ee6728d8934977b81ca112c2 files/postgresql-7.4.2-gentoo.patch 631
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.1-vacuum-delay.patch 8918
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
-MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
-MD5 03f05cf1f4a1c7be863a2aa664ce7638 files/postgresql.init-7.3.4 1288
-MD5 b25cbbcf131706a94c9b77e8c6c58f16 files/postgresql.init-7.3.5 1288
 MD5 e1a50f45f1b53450b915836a975d96cc files/postgresql.init-7.3.6 1288
-MD5 28061ecf68e40d99b5dadf0a0f3abea6 files/postgresql.init-7.4.1 1288
 MD5 87d6c19e0b4bc95f392b11a565608540 files/postgresql.init-7.4.2 1288
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.2 390
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.2-vacuum-delay.patch 8918
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.2-hppa-testandset.patch 1596
-MD5 6aa51ffe3edcbada285a86d4cab456de files/digest-postgresql-7.3.5 223
 MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6 223
-MD5 4d8aca42d50fc04376009d650a3d8f60 files/digest-postgresql-7.4.2 290
-MD5 9034af61e538ae850c2b3103158d492d files/pg_autovacuum.init-7.4.1 1090
 MD5 7ef2de54b21230964a767dcd5982e150 files/pg_autovacuum.init-7.4.2 1090
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.1 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.2 302
-MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
-MD5 90d60bb0f7ce4dd379d1b3dc4c75a339 files/digest-postgresql-7.4.1-r4 290
 MD5 4d8aca42d50fc04376009d650a3d8f60 files/digest-postgresql-7.4.2-r1 290
+MD5 90e39b59c8f3ef721cea92787012e87e files/digest-postgresql-7.4.2-r2 290
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.4-r1 b/dev-db/postgresql/files/digest-postgresql-7.3.4-r1
deleted file mode 100644
index 8207fcf9b42c..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 82878d6d74c36384af3595d26ed38067 postgresql-7.3.4.tar.gz 11265028
-MD5 3dcc78b227bc1052c6a280d313908114 hier-Pg7.3-0.3.tar.gz 29696
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.5 b/dev-db/postgresql/files/digest-postgresql-7.3.5
deleted file mode 100644
index bf408c28c14d..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 071efb8cee72a62b4f0da478df39f08d postgresql-base-7.3.5.tar.bz2 5645560
-MD5 d106ee6a4b0fb1d63eb51525ee8faed6 postgresql-opt-7.3.5.tar.bz2 340898
-MD5 7354a7c9cc5f1203586131e454df270e postgresql-docs-7.3.5.tar.bz2 2336586
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.1-r4 b/dev-db/postgresql/files/digest-postgresql-7.4.1-r4
deleted file mode 100644
index 5e2c594c9510..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.1-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6a608caae10fb1d90bf3c7bdcc56b876 postgresql-base-7.4.1.tar.bz2 6407883
-MD5 5c2c63741d9c7a4168b29e4b4439b0c7 postgresql-opt-7.4.1.tar.bz2 329268
-MD5 c1ed614b482df37fa0b174b3f3839752 postgresql-docs-7.4.1.tar.bz2 2381553
-MD5 b4532952a464943229f6a35f41d91d33 hier-Pg7.4-0.5.1.tar.gz 32107
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.2 b/dev-db/postgresql/files/digest-postgresql-7.4.2-r2
index 0e6877d2d619..60b8a670a3dc 100644
--- a/dev-db/postgresql/files/digest-postgresql-7.4.2
+++ b/dev-db/postgresql/files/digest-postgresql-7.4.2-r2
@@ -1,4 +1,4 @@
 MD5 1e397e48237aae3948266fe97807e885 postgresql-base-7.4.2.tar.bz2 6480665
 MD5 9eb004120328def9d938c63d4a8afa64 postgresql-opt-7.4.2.tar.bz2 330741
 MD5 a2ba1247b26f7cd638d280d5552e75a0 postgresql-docs-7.4.2.tar.bz2 2388008
-MD5 b4532952a464943229f6a35f41d91d33 hier-Pg7.4-0.5.1.tar.gz 32107
+MD5 438721e9c5d6ef4df9b4023f0e579ff4 hier-Pg7.4-0.5.2.tar.gz 34747
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.1 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.1
deleted file mode 100644
index f342ebfd2a47..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-# The PostgreSQL user is:
-PGUSER=postgres
-
-# LOG file is:
-PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
-
-# See the pg_autovacuum documentation for the details of how these
-# parameters affect pg_autovacuum's aggressiveness.
-
-VACUUM_BASE=1000
-VACUUM_SCALE=2
-
-SLEEP_BASE=300
-SLEEP_SCALE=2
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.1 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.1
deleted file mode 100644
index a6aad40beded..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.1,v 1.2 2004/02/13 19:26:51 vapier Exp $
-
-depend() {
-	need postgresql logger
-}
-
-start() {
-	ebegin "Starting pg_autovacuum"
-	start-stop-daemon --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
-	sleep 1
-	pidof /usr/bin/pg_autovacuum > /dev/null
-	if [ $? -eq 0 ]; then
-		eend 0
-	else
-		eerror "Please see log file: $PG_AUTOVACUUM_LOG"
-		eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
-		eerror " stats_start_collector = true"
-		eerror " stats_row_level = true"
-
-		eerror "Please read /usr/share/doc/postgresql-7.4.1/contrib/README.pg_autovacuum for details."
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping pg_autovacuum"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
-	result=$?
-	eend $result
-}
diff --git a/dev-db/postgresql/files/postgresql-7.4.1-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.1-gentoo.patch
deleted file mode 100644
index b886af56f7da..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.1-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naru postgresql-7.4.1/src/bin/initdb/initdb.sh postgresql-7.4.1.new/src/bin/initdb/initdb.sh
---- postgresql-7.4.1/src/bin/initdb/initdb.sh	2003-10-13 22:06:44.000000000 +0100
-+++ postgresql-7.4.1.new/src/bin/initdb/initdb.sh	2003-12-25 01:08:12.000000000 +0000
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo "    $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--#  process writing to the terminal.)
--echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo "    /etc/init.d/postgresql start"
- echo
- 
- exit 0
diff --git a/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch
deleted file mode 100644
index 010a42a4088e..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
---- postgresql-7.4.1.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.1/src/include/port/linux.h	2004-01-09 20:22:50.000000000 +0000
-@@ -3,6 +3,11 @@
- 
- #define HAS_TEST_AND_SET
- 
-+#elif defined(__hppa__)
-+typedef struct { int sema[4]; } slock_t;
-+
-+#define HAS_TEST_AND_SET
-+
- #elif defined(__sparc__)
- typedef unsigned char slock_t;
- 
-diff -urN postgresql-7.4.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
---- postgresql-7.4.1.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.1/src/include/storage/s_lock.h	2004-01-09 20:12:15.000000000 +0000
-@@ -112,6 +112,33 @@
- 
- #endif	 /* __i386__ || __x86_64__ */
- 
-+#if defined(__hppa__) || defined(__hppa)
-+#define TAS(lock) tas(lock)
-+
-+#define __ldcw(a) ({ \
-+	unsigned int __ret;						\
-+	__asm__ __volatile__("ldcw 0(%2),%0"				\
-+				: "=r" (__ret), "=m" (*(a)) : "r" (a));	\
-+	__ret;								\
-+})
-+
-+#define __PA_LDCW_ALIGNMENT 16
-+#define __ldcw_align(a) ({ \
-+	volatile unsigned int __ret = (unsigned int) a;					\
-+	if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a)			\
-+		__ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT;	\
-+	(unsigned int *) __ret;								\
-+})
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	volatile unsigned int *a = __ldcw_align (lock);
-+	return (__ldcw(a) == 0);
-+}
-+
-+#endif	/* __hppa__ || __hppa */
-+
- 
- /* Intel Itanium */
- #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/files/postgresql-7.4.1-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.1-vacuum-delay.patch
deleted file mode 100644
index e0f499859009..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.1-vacuum-delay.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-    * From: Jan Wieck <JanWieck ( at ) Yahoo ( dot ) com>

-    * To: "Matthew T. O'Connor" <matthew ( at ) zeut ( dot ) net>

-    * Subject: Re: Performance features the 4th

-    * Date: Sun, 09 Nov 2003 18:42:53 -0500

-

-Matthew T. O'Connor wrote:

-

-    ----- Original Message ----- From: "Jan Wieck" <JanWieck ( at ) Yahoo ( dot ) com>

-

-Tom Lane wrote:

-> Gaetano and a couple of other people did experiments that seemed to show

-> it was useful.  I think we'd want to change the shape of the knob per

-> later suggestions (sleep 10 ms every N blocks, instead of N ms every

-> block) but it did seem that there was useful bang for little buck there.

-

-

-        I thought it was "sleep N ms every M blocks".

-

-Have we seen any numbers? Anything at all? Something that gives us a

-clue by what factor one has to multiply the total time a "VACUUM

-ANALYZE" takes, to get what effect in return?

-

-

-I have some time on sunday to do some testing.  Is there a patch that I can

-apply that implements either of the two options? (sleep 10ms every M blocks

-or sleep N ms every M blocks).

-

-

-I know Tom posted the original patch that sleept N ms every 1 block (where N

-is > 10 due to OS limitations).  Jan can you post a patch that has just the

-sleep code in it? Or should it be easy enough for me to cull out of the

-larger patch you posted?

-

-

-Sorry for the delay, had to finish some other concept yesterday (will be published soon).

-

-The attached patch adds

-

-    vacuum_group_delay_size = 10 (range 1-1000)

-    vacuum_group_delay_msec = 0  (range 0-1000)

-

-

-and does the sleeping via select(2). It does it only at the same places where Tom had done the usleep() in his hack, so I guess there is still some more to do besides the documentation, before it can be added to 7.4.1. But it should be enough to get some testing done.

-

-

-Jan

-

---

-#======================================================================#

-# It's easier to get forgiveness for being wrong than for being right. #

-# Let's break this rule - forgive me.                                  #

-#================================================== JanWieck ( at ) Yahoo ( dot ) com #

-

-Index: src/backend/access/nbtree/nbtree.c

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/access/nbtree/nbtree.c,v

-retrieving revision 1.106

-diff -c -b -r1.106 nbtree.c

-*** src/backend/access/nbtree/nbtree.c	2003/09/29 23:40:26	1.106

---- src/backend/access/nbtree/nbtree.c	2003/11/09 23:39:36

-***************

-*** 27,32 ****

---- 27,40 ----

-  #include "storage/smgr.h"

-  

-  

-+ /*

-+  * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)

-+  */

-+ extern int	vacuum_group_delay_size;	/* vacuum N pages */

-+ extern int	vacuum_group_delay_msec;	/* then sleep M msec */

-+ extern int	vacuum_group_delay_count;

-+ 

-+ 

-  /* Working state for btbuild and its callback */

-  typedef struct

-  {

-***************

-*** 610,615 ****

---- 618,632 ----

-  

-  			CHECK_FOR_INTERRUPTS();

-  

-+ 			if (vacuum_group_delay_msec > 0)

-+ 			{

-+ 				if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 				{

-+ 					PG_DELAY(vacuum_group_delay_msec);

-+ 					vacuum_group_delay_count = 0;

-+ 				}

-+ 			}

-+ 

-  			ndeletable = 0;

-  			page = BufferGetPage(buf);

-  			opaque = (BTPageOpaque) PageGetSpecialPointer(page);

-***************

-*** 736,741 ****

---- 753,769 ----

-  		Buffer		buf;

-  		Page		page;

-  		BTPageOpaque opaque;

-+ 

-+ 		CHECK_FOR_INTERRUPTS();

-+ 

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-  

-  		buf = _bt_getbuf(rel, blkno, BT_READ);

-  		page = BufferGetPage(buf);

-Index: src/backend/commands/vacuumlazy.c

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/commands/vacuumlazy.c,v

-retrieving revision 1.32

-diff -c -b -r1.32 vacuumlazy.c

-*** src/backend/commands/vacuumlazy.c	2003/09/25 06:57:59	1.32

---- src/backend/commands/vacuumlazy.c	2003/11/09 23:40:13

-***************

-*** 88,93 ****

---- 88,100 ----

-  static TransactionId OldestXmin;

-  static TransactionId FreezeLimit;

-  

-+ /*

-+  * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)

-+  */

-+ int	vacuum_group_delay_size = 10;	/* vacuum N pages */

-+ int	vacuum_group_delay_msec = 0;	/* then sleep M msec */

-+ int	vacuum_group_delay_count = 0;

-+ 

-  

-  /* non-export function prototypes */

-  static void lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,

-***************

-*** 228,233 ****

---- 235,249 ----

-  

-  		CHECK_FOR_INTERRUPTS();

-  

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-+ 

-  		/*

-  		 * If we are close to overrunning the available space for

-  		 * dead-tuple TIDs, pause and do a cycle of vacuuming before we

-***************

-*** 469,474 ****

---- 485,499 ----

-  

-  		CHECK_FOR_INTERRUPTS();

-  

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-+ 

-  		tblk = ItemPointerGetBlockNumber(&vacrelstats->dead_tuples[tupindex]);

-  		buf = ReadBuffer(onerel, tblk);

-  		LockBufferForCleanup(buf);

-***************

-*** 799,804 ****

---- 824,838 ----

-  					hastup;

-  

-  		CHECK_FOR_INTERRUPTS();

-+ 

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-  

-  		blkno--;

-  

-Index: src/backend/utils/misc/guc.c

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/guc.c,v

-retrieving revision 1.164.2.1

-diff -c -b -r1.164.2.1 guc.c

-*** src/backend/utils/misc/guc.c	2003/11/07 21:27:50	1.164.2.1

---- src/backend/utils/misc/guc.c	2003/11/09 23:27:49

-***************

-*** 73,78 ****

---- 73,80 ----

-  extern int	CommitDelay;

-  extern int	CommitSiblings;

-  extern char *preload_libraries_string;

-+ extern int	vacuum_group_delay_size;

-+ extern int	vacuum_group_delay_msec;

-  

-  #ifdef HAVE_SYSLOG

-  extern char *Syslog_facility;

-***************

-*** 1188,1193 ****

---- 1190,1213 ----

-  		},

-  		&log_min_duration_statement,

-  		-1, -1, INT_MAX / 1000, NULL, NULL

-+ 	},

-+ 

-+ 	{

-+ 		{"vacuum_group_delay_msec", PGC_USERSET, RESOURCES,

-+ 			gettext_noop("Sets VACUUM's delay in milliseconds between processing groups of pages."),

-+ 			NULL

-+ 		},

-+ 		&vacuum_group_delay_msec,

-+ 		0, 0, 1000, NULL, NULL

-+ 	},

-+ 

-+ 	{

-+ 		{"vacuum_group_delay_size", PGC_USERSET, RESOURCES,

-+ 			gettext_noop("Sets VACUUM's group size for the vacuum_group_delay_msec option."),

-+ 			NULL

-+ 		},

-+ 		&vacuum_group_delay_size,

-+ 		10, 1, 1000, NULL, NULL

-  	},

-  

-  	/* End-of-list marker */

-Index: src/backend/utils/misc/postgresql.conf.sample

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v

-retrieving revision 1.92

-diff -c -b -r1.92 postgresql.conf.sample

-*** src/backend/utils/misc/postgresql.conf.sample	2003/10/08 03:49:38	1.92

---- src/backend/utils/misc/postgresql.conf.sample	2003/11/09 23:04:21

-***************

-*** 69,74 ****

---- 69,79 ----

-  #max_files_per_process = 1000	# min 25

-  #preload_libraries = ''

-  

-+ # - Vacuum napping -

-+ 

-+ #vacuum_group_delay_size = 10	# range 1-1000 pages ; vacuum this many pages

-+ #vacuum_group_delay_msec = 0	# range 0-1000 msec  ; then nap this long

-+ 

-  

-  #---------------------------------------------------------------------------

-  # WRITE AHEAD LOG

-Index: src/include/miscadmin.h

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/include/miscadmin.h,v

-retrieving revision 1.134

-diff -c -b -r1.134 miscadmin.h

-*** src/include/miscadmin.h	2003/09/24 18:54:01	1.134

---- src/include/miscadmin.h	2003/11/09 23:02:03

-***************

-*** 96,101 ****

---- 96,111 ----

-  		CritSectionCount--; \

-  	} while(0)

-  

-+ /*

-+  * Macro using select(2) to nap for milliseconds

-+  */

-+ #define PG_DELAY(_msec) \

-+ { \

-+     struct timeval _delay; \

-+ 	_delay.tv_sec  = (_msec) / 1000; \

-+ 	_delay.tv_usec = ((_msec) % 1000) * 1000; \

-+ 	(void) select(0, NULL, NULL, NULL, &_delay);\

-+ }

-  

-  /*****************************************************************************

-   *	  globals.h --															 *

diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.1 b/dev-db/postgresql/files/postgresql.conf-7.4.1
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-7.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.4 b/dev-db/postgresql/files/postgresql.init-7.3.4
deleted file mode 100644
index 494cb73efaf0..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.3.4
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.4,v 1.3 2004/02/27 05:44:48 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.5 b/dev-db/postgresql/files/postgresql.init-7.3.5
deleted file mode 100644
index 3e0836a2d105..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.3.5
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.5,v 1.3 2004/02/27 05:44:48 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.1 b/dev-db/postgresql/files/postgresql.init-7.4.1
deleted file mode 100644
index 1ef2eb8b042c..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.4.1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.1,v 1.3 2004/02/27 05:44:48 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/postgresql-7.3.4-r1.ebuild b/dev-db/postgresql/postgresql-7.3.4-r1.ebuild
deleted file mode 100644
index 3b74c614a85c..000000000000
--- a/dev-db/postgresql/postgresql-7.3.4-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.4-r1.ebuild,v 1.10 2004/05/01 04:16:50 nakano Exp $
-
-inherit flag-o-matic eutils
-
-P_HIERPG="hier-Pg7.3-0.3"
-DESCRIPTION="sophisticated Object-Relational DBMS"
-HOMEPAGE="http://www.postgresql.org/ http://gppl.terminal.ru/index.eng.html"
-SRC_URI="mirror://postgresql/src/${PV}/${P}.tar.gz
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64 hppa"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib pg-hier"
-RESTRICT="nomirror"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !ppc? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
-		dev-java/java-config ) )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	nls? ( sys-devel/gettext )"
-# java dep workaround for portage bug
-# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-RDEPEND="virtual/glibc
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !ppc? ( >=dev-lang/python-2.2 ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-PG_DIR="/var/lib/postgresql"
-
-pkg_setup() {
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases, you must"
-			eerror "use pg_dump to export your existing databases to a file, and then"
-			eerror "pg_restore to import them when you have upgraded completely."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			die
-		fi
-	fi
-
-	if [ "`use java`" ]; then
-		if [ "`use amd64`" -o "`use hppa`" ]; then
-			ewarn "Ignored USE=\"java\" in amd64/hppa"
-		fi
-	fi
-
-	if [ "`use python`" ]; then
-		if [ "`use ppc`" ]; then
-			ewarn "Ignore USE=\"python\" in ppc"
-		fi
-	fi
-}
-
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} || die
-	if use pg-hier ; then
-		cd ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/hier-Pg7.3.1-0.3.diff || die
-	fi
-	cd ${S} || die
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java && ! use amd64 && ! use hppa ; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && use ppc || myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if use java && ! use amd64 && ! use hppa ; then
-		myconf="$myconf --with-java"
-	fi
-	use ssl && myconf="$myconf --with-openssl"
-	use nls && myconf="$myconf --enable-nls"
-	use libg++ && myconf="$myconf --with-CXX"
-	use pam && myconf="$myconf --with-pam"
-	use readline || myconf="$myconf --without-readline"
-	use zlib || myconf="$myconf --without-zlib"
-
-	# these are the only working CFLAGS I could get on ppc, so locking them
-	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
-	# Gerk - Nov 26, 2002
-	use ppc && CFLAGS="-pipe -fsigned-char"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/lib \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=1024 \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-}
-
-src_install() {
-	addwrite "/usr/share/man/man3/Pg.3pm"
-
-	if use perl
-	then
-		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
-			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
-		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
-	fi
-
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	cd ${S}
-	if use pg-hier ; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html
-	fi
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	dodoc contrib/adddepend/*
-	cd ${S}/doc
-	dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README*
-	dodoc TODO bug.template
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-	docinto sgml/graphics
-	dodoc src/graphics/*
-	rm -rf ${D}/usr/doc ${D}/mnt
-	exeinto /usr/bin
-
-	if use java && ! use amd64 && ! use hppa ; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf postgresql || die
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial database environment."
-	einfo ""
-	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p ${PG_DIR}/data
-	chown -Rf postgres:postgres ${PG_DIR}
-	chmod 700 ${PG_DIR}/data
-
-	einfo "Initializing the database ..."
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			die
-		else
-			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
-			einfo "Read the documentation to check how to upgrade to version ${PV}."
-		fi
-	else
-		# On hppa, postgresql need way more than the default sem index and shmmax
-		if [ "${ARCH}" = "hppa" ]; then
-			SEM_IDX_MIN=1024
-			SHMMAX_MIN=100000000
-			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
-			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
-				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
-				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
-			fi
-		fi
-		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
-
-		if [ "${ARCH}" = "hppa" ]; then
-			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
-				ewarn "Restoring the sem idx value to the previous value"
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEM_IDX_MIN}"
-			fi
-
-			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
-				eerror "The current value of /proc/sys/kernel/shmmax is too low"
-				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
-				eerror "this value to at least ${SHMMAX_MIN}."
-
-			fi
-		fi
-
-		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
-		einfo "the README.adddepend file for information on how to properly migrate"
-		einfo "all serial columns, unique keys and foreign keys to this version."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.3.5.ebuild b/dev-db/postgresql/postgresql-7.3.5.ebuild
deleted file mode 100644
index 735dceb93ed2..000000000000
--- a/dev-db/postgresql/postgresql-7.3.5.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.5.ebuild,v 1.8 2004/05/01 04:16:50 nakano Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="sophisticated Object-Relational DBMS"
-
-RESTRICT="nomirror"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !ppc? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
-		dev-java/java-config ) )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	nls? ( sys-devel/gettext )"
-# java dep workaround for portage bug
-# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-RDEPEND="virtual/glibc
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !ppc? ( >=dev-lang/python-2.2 ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-PG_DIR="/var/lib/postgresql"
-
-pkg_setup() {
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases, you must"
-			eerror "use pg_dump to export your existing databases to a file, and then"
-			eerror "pg_restore to import them when you have upgraded completely."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			die
-		fi
-	fi
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		if [ "`use amd64`" ]; then
-			ewarn "Ignore USE=\"java\" in amd64"
-		fi
-	fi
-
-	if [ "`use python`" ]; then
-		if [ "`use ppc`" ]; then
-			ewarn "Ignore USE=\"python\" in ppc"
-		fi
-	fi
-}
-
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && use ppc || myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	use ssl && myconf="$myconf --with-openssl"
-	use nls && myconf="$myconf --enable-nls"
-	use libg++ && myconf="$myconf --with-CXX"
-	use pam && myconf="$myconf --with-pam"
-	use readline || myconf="$myconf --without-readline"
-	use zlib || myconf="$myconf --without-zlib"
-
-	# these are the only working CFLAGS I could get on ppc, so locking them
-	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
-	# Gerk - Nov 26, 2002
-	use ppc && CFLAGS="-pipe -fsigned-char"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/lib \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=1024 \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-}
-
-src_install() {
-	addwrite "/usr/share/man/man3/Pg.3pm"
-
-	if [ "`use perl`" ]
-	then
-		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
-			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
-		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
-	fi
-
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	cd ${S}
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	dodoc contrib/adddepend/*
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if [ "`use doc`" ]; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf postgresql || die
-
-	keepdir /var/lib/postgresql
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial database environment."
-	einfo ""
-	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p ${PG_DIR}/data
-	chown -Rf postgres:postgres ${PG_DIR}
-	chmod 700 ${PG_DIR}/data
-
-	einfo "Initializing the database ..."
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			die
-		else
-			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
-			einfo "Read the documentation to check how to upgrade to version ${PV}."
-		fi
-	else
-		# On hppa, postgresql need way more than the default sem index and shmmax
-		if [ "${ARCH}" = "hppa" ]; then
-			SEM_IDX_MIN=1024
-			SHMMAX_MIN=100000000
-			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
-			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
-				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
-				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
-			fi
-		fi
-		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
-
-		if [ "${ARCH}" = "hppa" ]; then
-			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
-				ewarn "Restoring the sem idx value to the previous value"
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEM_IDX_MIN}"
-			fi
-
-			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
-				eerror "The current value of /proc/sys/kernel/shmmax is too low"
-				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
-				eerror "this value to at least ${SHMMAX_MIN}."
-
-			fi
-		fi
-
-		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
-		einfo "the README.adddepend file for information on how to properly migrate"
-		einfo "all serial columns, unique keys and foreign keys to this version."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.2-r1.ebuild b/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
index a7445d59c4a8..8029c39815b9 100644
--- a/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r1.ebuild,v 1.1 2004/05/01 04:16:50 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r1.ebuild,v 1.2 2004/05/02 23:53:59 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64 mips"
 IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime"
 
 DEPEND="virtual/glibc
diff --git a/dev-db/postgresql/postgresql-7.4.1-r4.ebuild b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
index 59b3d8334008..b61acd67e1c5 100644
--- a/dev-db/postgresql/postgresql-7.4.1-r4.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r4.ebuild,v 1.7 2004/05/01 04:16:50 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.1 2004/05/02 23:53:59 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 
 RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.4-0.5.1"
+P_HIERPG="hier-Pg7.4-0.5.2"
 SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
 	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
 	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
@@ -45,6 +45,7 @@ RDEPEND="virtual/glibc
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
+MAX_CONNECTIONS=1024
 
 pkg_setup() {
 	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
@@ -123,7 +124,7 @@ src_compile() {
 		--libdir=/usr/lib \
 		--enable-depend \
 		--with-gnu-ld \
-		--with-maxbackends=1024 \
+		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
 	make || die
@@ -187,18 +188,37 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial database environment."
-	einfo ""
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
-	if use pg-hier; then
-		ewarn ""
-		ewarn "REQUIRED!! After installing patched PostgreSQL by pg-hier"
-		ewarn "it is required to run 'initdb'. Without this Pg will fail "
-		ewarn "with error "
-		ewarn "ERROR: did not find '}' at end of input node. "
-		ewarn ""
+
+	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
+		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
+		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -eq 4 ] ; then
+			ewarn ""
+			ewarn "If you are upgrading from PostgreSQL 7.4 or 7.4.1, it is strongly recommended"
+			ewarn "that you read the release notes concerning changes to the system catalogs."
+			ewarn "You can run 7.4.2 without rerunning initdb, however you may still experience"
+			ewarn "random crashes due to an error in pg_statistic."
+			ewarn ""
+			ewarn "If you prefer not to re-initdb your installation, the release notes contain"
+			ewarn "a procedure for manually correcting the problem."
+			ewarn ""
+		fi
+
+		if use pg-hier; then
+			ewarn ""
+			ewarn "REQUIRED!! After installing patched PostgreSQL by pg-hier"
+			ewarn "it is required to run 'initdb'. Without this Pg will fail "
+			ewarn "with error "
+			ewarn "ERROR: did not find '}' at end of input node. "
+			ewarn ""
+		fi
+	else
+		einfo ""
+		einfo "Execute the following command"
+		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "to setup the initial database environment."
+		einfo ""
 	fi
 }
 
@@ -222,33 +242,37 @@ pkg_config() {
 			einfo "Read the documentation to check how to upgrade to version ${PV}."
 		fi
 	else
-		# On hppa, postgresql need way more than the default sem index and shmmax
-		if [ "${ARCH}" = "hppa" ]; then
-			SEM_IDX_MIN=1024
-			SHMMAX_MIN=100000000
-			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
-			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
-				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
-				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
-			fi
+		local SEM=`sysctl -n kernel.sem | cut -f-3`
+		local SEMMNI=`sysctl -n kernel.sem | cut -f4`
+		local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
+		local SHMMAX=`sysctl -n kernel.shmmax`
+		local SHMMAX_MIN=134217728 # 128M
+
+		if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
+			eerror "The current value of SEMMNI is too low"
+			eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
+			eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
+			echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
 		fi
 		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
 
-		if [ "${ARCH}" = "hppa" ]; then
-			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
-				ewarn "Restoring the sem idx value to the previous value"
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEM_IDX_MIN}"
-			fi
+		if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
+			echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
+			ewarn "Restoring the SEMMNI value to the previous value"
+			ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
+			ewarn "and set it to at least ${SEMMNI_MIN}"
+			ewarn ""
+			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
+			ewarn ""
+		fi
 
-			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
-				eerror "The current value of /proc/sys/kernel/shmmax is too low"
-				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
-				eerror "this value to at least ${SHMMAX_MIN}."
+		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
+			eerror "The current value of SHMMAX is too low for postgresql to run."
+			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
+			eerror ""
+			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
+			eerror ""
 
-			fi
 		fi
 
 		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
diff --git a/dev-db/postgresql/postgresql-7.4.2.ebuild b/dev-db/postgresql/postgresql-7.4.2.ebuild
deleted file mode 100644
index d761dfd25a0f..000000000000
--- a/dev-db/postgresql/postgresql-7.4.2.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2.ebuild,v 1.3 2004/04/06 02:59:46 vapier Exp $
-
-inherit eutils gnuconfig flag-o-matic
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.4-0.5.1"
-SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-HOMEPAGE="http://www.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=sys-libs/ncurses-5.2
-	>=sys-devel/bison-1.875
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !mips? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
-		dev-java/java-config ) )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	nls? ( sys-devel/gettext )"
-# java dep workaround for portage bug
-# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-RDEPEND="virtual/glibc
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 )
-	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-PG_DIR="/var/lib/postgresql"
-
-pkg_setup() {
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 4 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases, you must"
-			eerror "use pg_dump to export your existing databases to a file, and then"
-			eerror "pg_restore to import them when you have upgraded completely."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			exit 1
-		fi
-	fi
-}
-
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [ -z "${JDKHOME}" ] || [ ! -d "${JDKHOME}" ]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	[ "${ARCH}" = "hppa" ] && epatch ${FILESDIR}/${P}-hppa-testandset.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && use mips || myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	use ssl && myconf="$myconf --with-openssl"
-	use nls && myconf="$myconf --enable-nls"
-	use libg++ && myconf="$myconf --with-CXX"
-	use pam && myconf="$myconf --with-pam"
-	use readline || myconf="$myconf --without-readline"
-	use zlib || myconf="$myconf --without-zlib"
-	use pg-intdatetime && myconf="$myconf --enable-integer-datetimes"
-
-	# these are the only working CFLAGS I could get on ppc, so locking them
-	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
-	# Gerk - Nov 26, 2002
-	use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# Detect mips systems properly
-	use mips && gnuconfig_update
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/lib \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=1024 \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-}
-
-src_install() {
-	if use perl; then
-		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
-			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
-		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
-	fi
-
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	fi
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial database environment."
-	einfo ""
-	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, or /bin/true"
-	if use pg-hier; then
-		ewarn ""
-		ewarn "REQUIRED!! After installing patched PostgreSQL by pg-hier"
-		ewarn "it is required to run 'initdb'. Without this Pg will fail "
-		ewarn "with error "
-		ewarn "ERROR: did not find '}' at end of input node. "
-		ewarn ""
-	fi
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p ${PG_DIR}/data
-	chown -Rf postgres:postgres ${PG_DIR}
-	chmod 700 ${PG_DIR}/data
-
-	einfo "Initializing the database ..."
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			exit 1
-		else
-			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
-			einfo "Read the documentation to check how to upgrade to version ${PV}."
-		fi
-	else
-		# On hppa, postgresql need way more than the default sem index and shmmax
-		if [ "${ARCH}" = "hppa" ]; then
-			SEM_IDX_MIN=1024
-			SHMMAX_MIN=100000000
-			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
-			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
-				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
-				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
-			fi
-		fi
-		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
-
-		if [ "${ARCH}" = "hppa" ]; then
-			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
-				ewarn "Restoring the sem idx value to the previous value"
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEM_IDX_MIN}"
-			fi
-
-			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
-				eerror "The current value of /proc/sys/kernel/shmmax is too low"
-				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
-				eerror "this value to at least ${SHMMAX_MIN}."
-
-			fi
-		fi
-
-		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
-		einfo "the README.adddepend file for information on how to properly migrate"
-		einfo "all serial columns, unique keys and foreign keys to this version."
-	fi
-}