version bump

(Portage version: 2.0.52-r1)

8 files changed, 435 insertions, 53 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 8fd97cbad6f8..37746e8e1e4a 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,14 @@
 # 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.237 2005/09/17 10:59:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.238 2005/09/21 16:31:19 nakano Exp $
+
+*postgresql-8.1_beta2 (21 Sep 2005)
+
+  21 Sep 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.conf-8.1_beta2, +files/postgresql.init-8.1_beta2,
+  +files/postgresql-8.1_beta2-gentoo.patch,
+  +files/postgresql-8.1_beta2-sh.patch, +postgresql-8.1_beta2.ebuild:
+  Version bump.
 
 *postgresql-8.1_beta1 (28 Aug 2005)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9ab60f8ace27..98c8424371b5 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,74 +1,70 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 cfc0f78c9c0a6f8930692cd74295f3c9 postgresql-8.0.1-r3.ebuild 7782
+MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750
 MD5 fa34b8b5457f7857ff00db8a8c1d83f8 postgresql-7.3.10.ebuild 8186
-MD5 b97f1ff215bab634316e5cf9cee6598e postgresql-7.3.6-r2.ebuild 7869
 MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078
-MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750
-MD5 2e8cb4fb57a0620f97ed47decce6bb61 postgresql-7.4.7-r2.ebuild 10900
+MD5 9aca70437786ac31747055d13c19f642 postgresql-8.1_beta2.ebuild 7580
 MD5 24870c05d37481f1938ce4cc551e95ba postgresql-7.4.8.ebuild 10616
-MD5 cfc0f78c9c0a6f8930692cd74295f3c9 postgresql-8.0.1-r3.ebuild 7782
-MD5 6974c8ce8289f43d19c4ea715a1b8ec3 postgresql-8.0.1-r4.ebuild 7871
 MD5 2390b8f1126086636289c0c7a8c37af5 postgresql-8.0.3.ebuild 7557
+MD5 6974c8ce8289f43d19c4ea715a1b8ec3 postgresql-8.0.1-r4.ebuild 7871
+MD5 2e8cb4fb57a0620f97ed47decce6bb61 postgresql-7.4.7-r2.ebuild 10900
+MD5 b97f1ff215bab634316e5cf9cee6598e postgresql-7.3.6-r2.ebuild 7869
 MD5 9aca70437786ac31747055d13c19f642 postgresql-8.1_beta1.ebuild 7580
 MD5 b91ab37f985b25a026c11b85d8e43025 ChangeLog 43935
-MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698
+MD5 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta2-gentoo.patch 1224
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta1-sh.patch 618
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
+MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
+MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280
+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 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta1-gentoo.patch 1224
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta2-sh.patch 618
 MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843
-MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
-MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
-MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r4 293
+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 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279
+MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
+MD5 b7252dad787e4e9f4d645a47d7f74ad8 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.3 390
+MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
+MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290
 MD5 6eaf9ba52385d9fc515d84cc4246db62 files/digest-postgresql-8.0.3 293
-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.3 302
 MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
 MD5 50be58ef7b752834f53ae86c70f75d9a files/pg_autovacuum.init-7.4.8 1414
 MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
 MD5 9b0d09ffaaa125d93a200e3783af23cc files/pg_autovacuum.init-8.0.3 1414
-MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741
-MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+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.3 302
 MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
+MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729
+MD5 7187dbff46912a9355acdbd7509eec3c files/digest-postgresql-8.1_beta1 232
+MD5 d1703acddcbd6eac1bc2fea225594245 files/digest-postgresql-8.1_beta2 232
+MD5 8e8ce270d164b11f885b57ba960e8fca files/postgresql.init-8.1_beta1 1283
+MD5 8e8ce270d164b11f885b57ba960e8fca files/postgresql.init-8.1_beta2 1283
+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
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
 MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
-MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
-MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918
 MD5 8ec4fecf36cf856f2d3afc97419c2f93 files/postgresql-8.0.1-gentoo-libpq.patch 1200
-MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
-MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
-MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-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.3 390
-MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280
-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 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279
-MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
-MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.3 1279
 MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.3-sh.patch 618
-MD5 7187dbff46912a9355acdbd7509eec3c files/digest-postgresql-8.1_beta1 232
-MD5 1111542635fa3a360dd148690cff0fef files/postgresql-8.1_beta1-gentoo.patch 1224
-MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1_beta1-sh.patch 618
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1_beta1 390
-MD5 8e8ce270d164b11f885b57ba960e8fca files/postgresql.init-8.1_beta1 1283
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK/cMKf2g/qXtneoRAqG3AKDFnxx64KwH1D2FharpV0uZp0cDSwCeI/S4
-PzcVKtE7N/3/i5vAMarhTvs=
-=9aNC
------END PGP SIGNATURE-----
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1_beta2 390
+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-8.1_beta2 b/dev-db/postgresql/files/digest-postgresql-8.1_beta2
new file mode 100644
index 000000000000..6ec37de83a57
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.1_beta2
@@ -0,0 +1,3 @@
+MD5 0dd333d7bf38719fca393bad55c689de postgresql-base-8.1beta2.tar.bz2 7968635
+MD5 d28a9b57be29ce5f7ba521df82f5938e postgresql-opt-8.1beta2.tar.bz2 140771
+MD5 3ca3488afacbda566ab4441f70e631f6 postgresql-docs-8.1beta2.tar.bz2 2413203
diff --git a/dev-db/postgresql/files/postgresql-8.1_beta2-gentoo.patch b/dev-db/postgresql/files/postgresql-8.1_beta2-gentoo.patch
new file mode 100644
index 000000000000..b93f376d4d1c
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.1_beta2-gentoo.patch
@@ -0,0 +1,39 @@
+diff -Naru postgresql-8.1beta1.org/src/interfaces/Makefile postgresql-8.1beta1/src/interfaces/Makefile
+--- postgresql-8.1beta1.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
++++ postgresql-8.1beta1/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-8.1beta1.org/src/Makefile postgresql-8.1beta1/src/Makefile
+--- postgresql-8.1beta1.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-8.1beta1/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-8.1_beta2-sh.patch b/dev-db/postgresql/files/postgresql-8.1_beta2-sh.patch
new file mode 100644
index 000000000000..fc59d52af0e8
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.1_beta2-sh.patch
@@ -0,0 +1,34 @@
+--- src/include/storage/s_lock.h~	2005-01-01 07:03:42.000000000 +0900
++++ src/include/storage/s_lock.h	2005-08-17 23:09:19.000000000 +0900
+@@ -239,6 +239,31 @@
+ #endif	 /* __s390__ || __s390x__ */
+ 
+ 
++#if defined(__sh__)
++#define HAS_TEST_AND_SET
++
++typedef unsigned char slock_t;
++
++#define TAS(lock) tas(lock)
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++	register int _res = 1;
++
++	__asm__ __volatile__(
++		"tas.b	@%1\n\t"
++		"movt	%0\n\t"
++		"xor	#1,%0"
++:		"=z"(_res)
++:		"r"(lock)
++:		"t","memory");
++	return _res;
++}
++
++#endif	 /* __sh__ */
++
++
+ #if defined(__sparc__)
+ #define HAS_TEST_AND_SET
+ 
diff --git a/dev-db/postgresql/files/postgresql.conf-8.1_beta2 b/dev-db/postgresql/files/postgresql.conf-8.1_beta2
new file mode 100644
index 000000000000..e8dab3e4c827
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.conf-8.1_beta2
@@ -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-8.1_beta2 b/dev-db/postgresql/files/postgresql.init-8.1_beta2
new file mode 100644
index 000000000000..b35328a92a96
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-8.1_beta2
@@ -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.1_beta2,v 1.1 2005/09/21 16:31:19 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-8.1_beta2.ebuild b/dev-db/postgresql/postgresql-8.1_beta2.ebuild
new file mode 100644
index 000000000000..a498c09cd1fd
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.1_beta2.ebuild
@@ -0,0 +1,225 @@
+# 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.1_beta2.ebuild,v 1.1 2005/09/21 16:31:19 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+HOMEPAGE="http://www.postgresql.org/"
+P_HIERPG="hier-Pg8.0.1-0.5.4"
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://postgresql/source/v8.1beta/${PN}-base-${MY_PV}.tar.bz2
+	mirror://postgresql/source/v8.1beta/${PN}-opt-${MY_PV}.tar.bz2
+	doc? ( mirror://postgresql/source/v8.1beta/${PN}-docs-${MY_PV}.tar.bz2 )"
+#	pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#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"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	=dev-db/libpq-8.1*
+	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 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	=dev-db/libpq-8.1*
+	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 )
+	selinux? ( sec-policy/selinux-postgresql )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	kerberos? ( virtual/krb5 )"
+
+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 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
+			eerror "Postgres ${MY_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
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+#	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-sh.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	local myconf
+	use tcltk && myconf="--with-tcl"
+	use python && myconf="$myconf --with-python"
+	use perl && myconf="$myconf --with-perl"
+	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 kerberos && myconf="$myconf --with-krb5"
+	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
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		--with-gnu-ld \
+		$myconf || die
+
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	cd contrib
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	if use xml2; then
+		cd xml2
+		make 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} 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
+	if use xml2; then
+		cd ${S}/contrib/xml2
+		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	fi
+	cd ${S}
+	dodoc README HISTORY COPYRIGHT INSTALL
+	dodoc contrib/adddepend/*
+
+	exeinto /usr/bin
+
+	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-${PV} postgresql || die
+
+	rm ${D}/usr/include/postgres_ext.h
+}
+
+pkg_postinst() {
+	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
+
+	einfo ""
+	einfo "Execute the following command when you want to setup the initial database environment."
+	einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo ""
+	einfo "autovacuum function, which  was in contrib, has moved to main PostgreSQL function from 8.1."
+	einfo "You can enable it in postgresql.conf."
+	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
+		eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
+		eerror "You must remove your entire database directory to continue."
+		eerror "(database directory = ${PG_DIR})."
+		exit 1
+	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 + 8200 \* 1000 + 14200 \* 100`
+
+		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
+}