Version bump.

10 files changed, 686 insertions, 4 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index df1846fb1f80..f380196dbfe7 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.74 2003/12/19 01:42:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.75 2003/12/25 04:39:37 nakano Exp $
+
+*postgresql-7.4.1 (25 Dec 2003)
+
+  25 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.1.ebuild,
+  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-vacuum-delay.patch, files/postgresql.conf-7.4.1,
+  files/postgresql.init-7.4.1:
+  Version bump.
+  Included vacuum-delay.patch and added pg_autovacuum init script.
+  Thanks to Arthur Ward <award-gentoo-bugs@dominionsciences.com>.
+  Close #35152, #36449.
 
 *postgresql-7.3.5 (19 Dec 2003)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index b009c10e094b..d2d28916b015 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,15 +1,23 @@
-MD5 0c494f9d8e7b0d73e82156f08bef930d ChangeLog 12281
+MD5 0e3e903f76f03b0bd538495467aa4657 ChangeLog 12774
 MD5 c618574d1288cc0cdc40dcbdbae5be9e postgresql-7.3.4-r1.ebuild 8001
 MD5 eaea8c1fdd7613d1676b8ee32e8b0195 postgresql-7.3.5.ebuild 8212
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 6831821042e1bfa1877540320d7a2278 postgresql-7.4-r1.ebuild 7821
+MD5 7e90ba21ccfc222e341f8e4cd538a2e8 postgresql-7.4.1.ebuild 8153
 MD5 7b4771ec5dd5bcb3f47495cca2fb3482 files/digest-postgresql-7.3.5 288
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.5 1138
+MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
+MD5 0c7826b3fcbba5971ff5d5a3f3c4a8ba files/pg_autovacuum.init-7.4.1 1101
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.1 302
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
 MD5 4e148f930c09bddec23d157f9c446020 files/postgresql.init 937
-MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
+MD5 fe2e030e20b8ae2c4f0169de5d42c0a7 files/postgresql.init-7.4.1 1145
+MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1 288
+MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4 390
 MD5 b325603c1adc7c6734e48976c2b604c0 files/postgresql.init-7.4 1137
-MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
 MD5 819dc2dce7f1371731ac23b5792054ba files/digest-postgresql-7.4-r1 282
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.1-vacuum-delay.patch 8918
+MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.1 b/dev-db/postgresql/files/digest-postgresql-7.4.1
new file mode 100644
index 000000000000..a972fa33ab5e
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.4.1
@@ -0,0 +1,4 @@
+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 d9f4cf61cd53ca84e9163f986bfbf2a9 hier-Pg7.4-0.3.tar.gz 28392
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.1 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.1
new file mode 100644
index 000000000000..f342ebfd2a47
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.1
@@ -0,0 +1,14 @@
+# 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
new file mode 100644
index 000000000000..7014e79e5eb0
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.1
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.1,v 1.1 2003/12/25 04:39:37 nakano 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
new file mode 100644
index 000000000000..b886af56f7da
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.1-gentoo.patch
@@ -0,0 +1,16 @@
+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-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.1-vacuum-delay.patch
new file mode 100644
index 000000000000..e0f499859009
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.1-vacuum-delay.patch
@@ -0,0 +1,284 @@
+    * 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
new file mode 100644
index 000000000000..e8dab3e4c827
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.conf-7.4.1
@@ -0,0 +1,14 @@
+# 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.4.1 b/dev-db/postgresql/files/postgresql.init-7.4.1
new file mode 100644
index 000000000000..f83f754b11a3
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-7.4.1
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.1,v 1.1 2003/12/25 04:39:37 nakano Exp $
+
+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 postgres"
+	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 postgres"
+	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
+	eend $?
+}
+
+svc_restart () {
+	ebegin "Restarting postgres"
+	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
+	eend $?
+}
diff --git a/dev-db/postgresql/postgresql-7.4.1.ebuild b/dev-db/postgresql/postgresql-7.4.1.ebuild
new file mode 100644
index 000000000000..3965ae3d7bb3
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.4.1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2003 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.ebuild,v 1.1 2003/12/25 04:39:37 nakano Exp $
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+
+RESTRICT="nomirror"
+P_HIERPG="hier-Pg7.4-0.3"
+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"
+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? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	java? ( !amd64? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 ) )
+	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 ${WORKDIR} || die
+		mv readme.html README-${P_HIERPG}.html || die
+		cd ${S} || die
+		epatch ${WORKDIR}/${P_HIERPG}.diff
+	fi
+
+	if [ "`use pg-vacuumdelay`" ]; then
+		cd ${S} || die
+		epatch ${FILESDIR}/${P}-vacuum-delay.patch
+	fi
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	use java && check_java_config
+
+	local myconf
+	use tcltk && myconf="--with-tcl"
+	use python && myconf="$myconf --with-python"
+	use perl && myconf="$myconf --with-perl"
+	use java && myconf="$myconf --with-java"
+	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"
+
+	./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` ]; 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"
+}
+
+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
+}