version bump

(Portage version: 2.0.51.21-r1)

24 files changed, 1418 insertions, 32 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 84f13807262c..bb4fa692e5e0 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.217 2005/05/15 04:03:43 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.218 2005/05/16 06:54:44 nakano Exp $
+
+*postgresql-8.0.3 (16 May 2005)
+*postgresql-7.4.8 (16 May 2005)
+*postgresql-7.3.10 (16 May 2005)
+
+  16 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.init-7.3.10, +files/postgresql-7.3.10-gentoo.patch,
+  +files/pg_autovacuum.conf-7.4.8, +files/pg_autovacuum.init-7.4.8,
+  +files/postgresql.conf-7.4.8, +files/postgresql.init-7.4.8,
+  +files/postgresql-7.4.8-gentoo.patch,
+  +files/postgresql-7.4.8-hppa-testandset.patch,
+  +files/postgresql-7.4.8-vacuum-delay.patch,
+  -files/postgresql-8.0.2-gentoo-libpq.patch,
+  +files/pg_autovacuum.conf-8.0.3, +files/pg_autovacuum.init-8.0.3,
+  +files/postgresql.conf-8.0.3, +files/postgresql.init-8.0.3,
+  +files/postgresql-8.0.3-gentoo.patch, +postgresql-7.3.10.ebuild,
+  +postgresql-7.4.8.ebuild, postgresql-8.0.1-r4.ebuild,
+  -postgresql-8.0.2-r2.ebuild, +postgresql-8.0.3.ebuild:
+  Version bump.
 
   15 May 2005; Masatomo Nakano <nakano@gentoo.org>
   postgresql-7.4.7-r2.ebuild, postgresql-8.0.1-r3.ebuild:
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index e770633abd8d..1c2b9a72769a 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,44 +1,60 @@
 MD5 7c4985fe29bbff02173bccc94a3fafcb postgresql-8.0.2.ebuild 7718
 MD5 afe753b7eff1fd76c94b033a125b9d65 postgresql-8.0.1-r3.ebuild 7782
 MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750
-MD5 8c2e9ba5641bf05a449974f9884e2bfe postgresql-8.0.2-r2.ebuild 7686
+MD5 5fb7cf45edf95c716b19c98565b6e22b postgresql-7.3.10.ebuild 8190
 MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078
 MD5 461bda3ff314acce4f6a587a61864385 postgresql-8.0.1-r2.ebuild 7633
+MD5 1edff958a4d4643143ba697f71874f5c postgresql-7.4.8.ebuild 10622
 MD5 337a42d98f8373978cca5e56cbd47ab3 postgresql-8.0.2-r1.ebuild 7854
-MD5 b8f11cab31615b77205d402db0be77bb postgresql-8.0.1-r4.ebuild 7870
+MD5 0ccba60b72cd194c0967e9ef9d5f1b61 postgresql-8.0.3.ebuild 7530
+MD5 2fb5a3cfd8f493a38800d9a9d3822d15 postgresql-8.0.1-r4.ebuild 7874
 MD5 2e8cb4fb57a0620f97ed47decce6bb61 postgresql-7.4.7-r2.ebuild 10900
 MD5 b97f1ff215bab634316e5cf9cee6598e postgresql-7.3.6-r2.ebuild 7869
-MD5 26f6787ef327fed87a209df1bada50ba ChangeLog 40734
+MD5 675d62dde02b37c64d503be495719331 ChangeLog 41593
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
 MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
+MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.10 1279
 MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918
+MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741
+MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200
 MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r2 293
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r4 293
 MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2-r1 223
-MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2-r2 223
 MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279
 MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
 MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
+MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.8 1279
 MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
 MD5 707bbfd80773f0874ff6ea36822166ec files/postgresql.init-8.0.2 1279
+MD5 707bbfd80773f0874ff6ea36822166ec files/postgresql.init-8.0.3 1279
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.8 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.2 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.3 390
 MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
+MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290
 MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2 223
+MD5 6eaf9ba52385d9fc515d84cc4246db62 files/digest-postgresql-8.0.3 293
 MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
+MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.8 1414
 MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
 MD5 52db3da1b290758687e1df279ea7ccfe files/pg_autovacuum.init-8.0.2 1414
+MD5 52db3da1b290758687e1df279ea7ccfe files/pg_autovacuum.init-8.0.3 1414
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.8 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.2 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.3 302
 MD5 94081f9cc2dbcb9e1bd47cfa45d9eb6d files/postgresql-8.0.2-gentoo.patch 808
 MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
 MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 73070a96fbb39842e26f24a76e8d4e1e files/postgresql-7.4.8-gentoo.patch 2360
 MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
 MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
 MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
@@ -48,4 +64,5 @@ MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
 MD5 8ec4fecf36cf856f2d3afc97419c2f93 files/postgresql-8.0.1-gentoo-libpq.patch 1200
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 34fc1b2cc0f22f15cc94b5d12e0ded48 files/postgresql-8.0.2-gentoo-libpq.patch 1200
+MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.10 b/dev-db/postgresql/files/digest-postgresql-7.3.10
new file mode 100644
index 000000000000..9f30d52d01bf
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.3.10
@@ -0,0 +1,3 @@
+MD5 d0c5131bad7330b35a0168f871a87711 postgresql-base-7.3.10.tar.bz2 5645041
+MD5 7ffe5bd823436f77f40c6c2e236cac15 postgresql-opt-7.3.10.tar.bz2 340962
+MD5 4e3d402834f19677ef1fe5076589b56a postgresql-docs-7.3.10.tar.bz2 2347114
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.8 b/dev-db/postgresql/files/digest-postgresql-7.4.8
new file mode 100644
index 000000000000..c4a4d9a310bf
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.4.8
@@ -0,0 +1,4 @@
+MD5 c066dd74a746e15a49e0fded93a45329 postgresql-base-7.4.8.tar.bz2 6588745
+MD5 b178144bdb13a2dd8eb0d17a49532296 postgresql-opt-7.4.8.tar.bz2 332225
+MD5 c395130c09c98fdf333ef3ab1621b341 postgresql-docs-7.4.8.tar.bz2 2424249
+MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.2-r2 b/dev-db/postgresql/files/digest-postgresql-8.0.2-r2
deleted file mode 100644
index 462e8d577622..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.0.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39ef5bfca3d573b356c755b5429aea8b postgresql-base-8.0.2.tar.bz2 7806083
-MD5 ed57846ed0b4a0044fe545437fcf6f6f postgresql-opt-8.0.2.tar.bz2 133708
-MD5 9840cc8892ac52e7ae0ac5a357b5b610 postgresql-docs-8.0.2.tar.bz2 2202096
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.3 b/dev-db/postgresql/files/digest-postgresql-8.0.3
new file mode 100644
index 000000000000..1446a60b5ce1
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.3
@@ -0,0 +1,4 @@
+MD5 35ff2b9a3bc5c65f55b4192a334b0e88 postgresql-base-8.0.3.tar.bz2 7818251
+MD5 ea1ce6f570a4408e934af914de71da0e postgresql-opt-8.0.3.tar.bz2 133623
+MD5 a9bb1e0dbc7ff862a30b6b9ca00b6470 postgresql-docs-8.0.3.tar.bz2 2213693
+MD5 1d410cfb38253675fee36c8f9ee655e2 hier-Pg8.0.1-0.5.4.diff.gz 30662
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.8 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.8
new file mode 100644
index 000000000000..f342ebfd2a47
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.8
@@ -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.conf-8.0.3 b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.3
new file mode 100644
index 000000000000..f342ebfd2a47
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.3
@@ -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.8 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.8
new file mode 100644
index 000000000000..8c632270fe3c
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.8
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# 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.8,v 1.1 2005/05/16 06:54:44 nakano Exp $
+
+depend() {
+	need postgresql logger
+}
+
+start() {
+	ebegin "Starting pg_autovacuum"
+	echo ""
+	echo -n "Waiting max. 10 sec. for postgresql to start "
+	CONTINUE=0
+	TOO_LONG=0
+	while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ]
+	do
+		psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null
+		if [ "$?" -eq 0 ]
+		then
+			CONTINUE=1
+		else
+			echo -n "."
+			TOO_LONG=`expr $TOO_LONG + 1`
+			sleep 1
+		fi
+	done
+	start-stop-daemon -o --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 ""
+		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 ___DOCDIR___/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/pg_autovacuum.init-8.0.3 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.3
new file mode 100644
index 000000000000..1df769eff6de
--- /dev/null
+++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0.3
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.3,v 1.1 2005/05/16 06:54:44 nakano Exp $
+
+depend() {
+	need postgresql logger
+}
+
+start() {
+	ebegin "Starting pg_autovacuum"
+	echo ""
+	echo -n "Waiting max. 10 sec. for postgresql to start "
+	CONTINUE=0
+	TOO_LONG=0
+	while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ]
+	do
+		psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null
+		if [ "$?" -eq 0 ]
+		then
+			CONTINUE=1
+		else
+			echo -n "."
+			TOO_LONG=`expr $TOO_LONG + 1`
+			sleep 1
+		fi
+	done
+	start-stop-daemon -o --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 ""
+		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 ___DOCDIR___/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.3.10-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3.10-gentoo.patch
new file mode 100644
index 000000000000..90c9c3d87b10
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.3.10-gentoo.patch
@@ -0,0 +1,51 @@
+diff -Naru postgresql-7.3.10.org/src/interfaces/Makefile postgresql-7.3.10/src/interfaces/Makefile
+--- postgresql-7.3.10.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
++++ postgresql-7.3.10/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
+@@ -12,7 +12,7 @@
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-DIRS := libpq ecpg 
++DIRS := ecpg 
+ 
+ ALLDIRS := $(DIRS) 
+ 
+diff -Naru postgresql-7.3.10.org/src/Makefile postgresql-7.3.10/src/Makefile
+--- postgresql-7.3.10.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-7.3.10/src/Makefile	2005-05-09 21:59:54.000000000 +0100
+@@ -18,7 +18,6 @@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+ 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -47,7 +46,6 @@
+ 	$(MAKE) -C port $@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -61,7 +59,6 @@
+ 	-$(MAKE) -C port $@
+ 	-$(MAKE) -C timezone $@
+ 	-$(MAKE) -C backend $@
+-	-$(MAKE) -C include $@
+ 	-$(MAKE) -C interfaces $@
+ 	-$(MAKE) -C bin $@
+ 	-$(MAKE) -C pl $@
+diff -Naru postgresql-7.3.10.org/configure postgresql-7.3.10/configure
+--- postgresql-7.3.10.org/configure	2004-08-15 01:51:58.000000000 +0100
++++ postgresql-7.3.10/configure	2004-10-03 00:24:38.477010826 +0100
+@@ -5871,7 +5871,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   pgac_cv_check_readline=no
+-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
++for pgac_lib in "" " -lncurses" " -lcurses" ; do
+   for pgac_rllib in -lreadline -ledit ; do
+     pgac_save_LIBS=$LIBS
+     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
diff --git a/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch
new file mode 100644
index 000000000000..30c1a94ae9b0
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch
@@ -0,0 +1,67 @@
+diff -Naru postgresql-7.4.8.org/configure postgresql-7.4.8/configure
+--- postgresql-7.4.8.org/configure	2004-08-18 04:11:24.000000000 +0100
++++ postgresql-7.4.8/configure	2004-09-15 20:28:46.933631781 +0100
+@@ -6003,7 +6003,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   pgac_cv_check_readline=no
+-for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
++for pgac_lib in "" " -lncurses" " -lcurses" ; do
+   for pgac_rllib in -lreadline -ledit ; do
+     pgac_save_LIBS=$LIBS
+     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
+diff -Naru postgresql-7.4.8.org/src/bin/initdb/initdb.sh postgresql-7.4.8/src/bin/initdb/initdb.sh
+--- postgresql-7.4.8.org/src/bin/initdb/initdb.sh	2004-05-05 17:09:56.000000000 +0100
++++ postgresql-7.4.8/src/bin/initdb/initdb.sh	2004-09-15 20:28:35.507026977 +0100
+@@ -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 -Naru postgresql-7.4.8.org/src/interfaces/Makefile postgresql-7.4.8/src/interfaces/Makefile
+--- postgresql-7.4.8.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
++++ postgresql-7.4.8/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
+@@ -12,7 +12,7 @@
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-DIRS := libpq ecpg 
++DIRS := ecpg 
+ 
+ ALLDIRS := $(DIRS) 
+ 
+diff -Naru postgresql-7.4.8.org/src/Makefile postgresql-7.4.8/src/Makefile
+--- postgresql-7.4.8.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-7.4.8/src/Makefile	2005-05-09 21:59:54.000000000 +0100
+@@ -18,7 +18,6 @@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+ 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -47,7 +46,6 @@
+ 	$(MAKE) -C port $@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -61,7 +59,6 @@
+ 	-$(MAKE) -C port $@
+ 	-$(MAKE) -C timezone $@
+ 	-$(MAKE) -C backend $@
+-	-$(MAKE) -C include $@
+ 	-$(MAKE) -C interfaces $@
+ 	-$(MAKE) -C bin $@
+ 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-7.4.8-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.8-hppa-testandset.patch
new file mode 100644
index 000000000000..010a42a4088e
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.8-hppa-testandset.patch
@@ -0,0 +1,52 @@
+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.8-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.8-vacuum-delay.patch
new file mode 100644
index 000000000000..e0f499859009
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.8-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-8.0.2-gentoo-libpq.patch b/dev-db/postgresql/files/postgresql-8.0.3-gentoo.patch
index ba4aa175cf69..7cac7ad65b3b 100644
--- a/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch
+++ b/dev-db/postgresql/files/postgresql-8.0.3-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Naru postgresql-8.0.2.org/src/interfaces/Makefile postgresql-8.0.2/src/interfaces/Makefile
---- postgresql-8.0.2.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-8.0.2/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
+diff -Naru postgresql-8.0.3.org/src/interfaces/Makefile postgresql-8.0.3/src/interfaces/Makefile
+--- postgresql-8.0.3.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
++++ postgresql-8.0.3/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
 @@ -12,7 +12,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -10,9 +10,9 @@ diff -Naru postgresql-8.0.2.org/src/interfaces/Makefile postgresql-8.0.2/src/int
  
  ALLDIRS := $(DIRS) 
  
-diff -Naru postgresql-8.0.2.org/src/Makefile postgresql-8.0.2/src/Makefile
---- postgresql-8.0.2.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
-+++ postgresql-8.0.2/src/Makefile	2005-05-09 21:59:54.000000000 +0100
+diff -Naru postgresql-8.0.3.org/src/Makefile postgresql-8.0.3/src/Makefile
+--- postgresql-8.0.3.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-8.0.3/src/Makefile	2005-05-09 21:59:54.000000000 +0100
 @@ -18,7 +18,6 @@
  	$(MAKE) -C timezone $@
  	$(MAKE) -C backend $@
diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.8 b/dev-db/postgresql/files/postgresql.conf-7.4.8
new file mode 100644
index 000000000000..e8dab3e4c827
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.conf-7.4.8
@@ -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.conf-8.0.3 b/dev-db/postgresql/files/postgresql.conf-8.0.3
new file mode 100644
index 000000000000..e8dab3e4c827
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.conf-8.0.3
@@ -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.3.10 b/dev-db/postgresql/files/postgresql.init-7.3.10
new file mode 100644
index 000000000000..c32584e0eddc
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-7.3.10
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2004 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.3.10,v 1.1 2005/05/16 06:54:44 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.8 b/dev-db/postgresql/files/postgresql.init-7.4.8
new file mode 100644
index 000000000000..e725650d7d10
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-7.4.8
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2004 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.8,v 1.1 2005/05/16 06:54:44 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-8.0.3 b/dev-db/postgresql/files/postgresql.init-8.0.3
new file mode 100644
index 000000000000..bd47a36e4957
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-8.0.3
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.3,v 1.1 2005/05/16 06:54:44 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.10.ebuild b/dev-db/postgresql/postgresql-7.3.10.ebuild
new file mode 100644
index 000000000000..714b6b983777
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.3.10.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.10.ebuild,v 1.1 2005/05/16 06:54:44 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic java-pkg
+
+DESCRIPTION="sophisticated Object-Relational DBMS"
+
+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 ~mips"
+IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
+
+DEPEND="virtual/libc
+	=dev-db/libpq-7.3.10
+	sys-devel/autoconf
+	>=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? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	java? ( >=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/libc
+	=dev-db/libpq-7.3.10
+	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? ( >=virtual/jdk-1.3 )
+	selinux? ( sec-policy/selinux-postgresql )
+	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})."
+			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
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	if use java; then
+		check_java_config
+	fi
+
+	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 threads && myconf="$myconf --enable-thread-safety"
+
+	# 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
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/lib \
+		--includedir=/usr/include/postgresql/pgsql \
+		--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} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal 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; then
+		# we need to remove jar file after dojar; otherwise two same jar
+		# file are installed.
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
+		rm ${D}/usr/share/postgresql/java/postgresql.jar
+	fi
+
+	# backward compatibility
+	for i in ${D}/usr/include/postgresql/pgsql/*
+	do
+		ln -s ${i} ${D}/usr/include/
+	done
+
+	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})."
+			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
+		su postgres -c "/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."
+
+		einfo ""
+		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
+		einfo ""
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-7.4.8.ebuild b/dev-db/postgresql/postgresql-7.4.8.ebuild
new file mode 100644
index 000000000000..2c5db3616c80
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.4.8.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.8.ebuild,v 1.1 2005/05/16 06:54:44 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+HOMEPAGE="http://www.postgresql.org/"
+P_HIERPG="hier-Pg7.4-0.5.3"
+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 )
+	pg-hier? ( ftp://gborg.postgresql.org/pub/hierpg/stable/${P_HIERPG}.tar.gz )"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+
+DEPEND="virtual/libc
+	=dev-db/libpq-7.4.8
+	sys-devel/autoconf
+	>=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? ( >=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 )
+	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+# java dep workaround for portage bug
+# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
+RDEPEND="virtual/libc
+	=dev-db/libpq-7.4.8
+	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? ( >=virtual/jdk-1.3 )
+	selinux? ( sec-policy/selinux-postgresql )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+PG_DIR="/var/lib/postgresql"
+MAX_CONNECTIONS=1024
+
+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
+
+	if [ "${ARCH}" = "hppa" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/${P}-hppa-testandset.patch
+	fi
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	if use java; then
+		check_java_config
+	fi
+
+	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"
+	use threads && myconf="$myconf --enable-thread-safety"
+
+	# 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"
+	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--includedir=/usr/include/postgresql/pgsql \
+		--enable-depend \
+		--with-gnu-ld \
+		--with-maxbackends=${MAX_CONNECTIONS} \
+		$myconf || die
+
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	cd contrib
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	if use xml2; then
+		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	fi
+}
+
+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} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
+	cd ${S}/contrib
+	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	if use xml2; then
+		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
+	fi
+	cd ${S}
+	if use pg-hier; then
+		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
+	fi
+	dodoc README HISTORY COPYRIGHT INSTALL
+	dodoc contrib/adddepend/*
+
+	exeinto /usr/bin
+
+	if use java; then
+		# we need to remove jar file after dojar; otherwise two same jar
+		# file are installed.
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		rm ${D}/usr/share/postgresql/java/postgresql.jar
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
+	fi
+
+	# backward compatibility
+	for i in ${D}/usr/include/postgresql/pgsql/*
+	do
+		ln -s ${i} ${D}/usr/include/
+	done
+
+	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
+	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
+
+	insinto /etc/conf.d/
+	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
+	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
+}
+
+pkg_postinst() {
+	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
+
+	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
+
+	einfo ""
+	einfo "Python modules was removed from PostgreSQL package."
+	einfo "If you need it, please run \"emerge dev-db/pygresql\"."
+	einfo ""
+}
+
+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
+		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=`expr 250000 + 30600 \* ${MAX_CONNECTIONS}`
+
+		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
+		su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
+
+		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 [ ${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
+		einfo ""
+		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
+		einfo ""
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
index 4e8d16c0ff3f..e394ddd51371 100644
--- a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.4 2005/05/09 21:55:20 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.5 2005/05/16 06:54:44 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -21,7 +21,7 @@ IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerber
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	=dev-db/libpq-3.2
+	=dev-db/libpq-8.0.1
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
 	>=sys-devel/bison-1.875
@@ -35,7 +35,7 @@ DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
-	=dev-db/libpq-3.2
+	=dev-db/libpq-8.0.1
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
diff --git a/dev-db/postgresql/postgresql-8.0.2-r2.ebuild b/dev-db/postgresql/postgresql-8.0.3.ebuild
index 209735800e4f..b1bff4d05333 100644
--- a/dev-db/postgresql/postgresql-8.0.2-r2.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.2-r2.ebuild,v 1.4 2005/05/09 21:55:20 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.3.ebuild,v 1.1 2005/05/16 06:54:44 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -11,18 +11,17 @@ MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 	mirror://postgresql/source/v${PV}/${PN}-opt-${MY_PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${MY_PV}.tar.bz2 )"
-#	pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )"
+	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${MY_PV}.tar.bz2 )
+	pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime"
-#pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	=dev-db/libpq-4.0
+	=dev-db/libpq-8.0.3
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
 	>=sys-devel/bison-1.875
@@ -36,7 +35,7 @@ DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
-	=dev-db/libpq-4.0
+	=dev-db/libpq-8.0.3
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
@@ -66,13 +65,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
-#	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
-	epatch ${FILESDIR}/${P}-gentoo-libpq.patch
-
-	# Bug 91231
-	epatch ${FILESDIR}/CAN-2005-1409.patch
-	epatch ${FILESDIR}/CAN-2005-1410.patch
-	use doc && epatch ${FILESDIR}/CAN-2005-1409-doc.patch
+	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {