Removed versions affected by bug 384539 and cleaned out unused files.

(Portage version: 2.1.10.11/cvs/Linux i686)

35 files changed, 22 insertions, 6005 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 118f4be43551..efbe806d47da 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.149 2011/10/01 20:19:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.150 2011/10/02 11:16:28 titanofold Exp $
+
+  02 Oct 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  -files/postgresql.conf-8.2-r1, -files/postgresql.init-8.2-r1,
+  -postgresql-server-8.2.21-r1.ebuild, -postgresql-server-8.2.21-r2.ebuild,
+  -files/postgresql-8.2-common.patch, -files/postgresql-8.2-server.patch,
+  -files/postgresql.conf-8.3-r1, -files/postgresql.init-8.3-r1,
+  -files/postgresql-8.3.1-server.patch, -postgresql-server-8.3.14.ebuild,
+  -postgresql-server-8.3.15-r1.ebuild, -postgresql-server-8.3.15-r2.ebuild,
+  -files/postgresql-8.3-common.patch, -files/postgresql-8.3-server.patch,
+  -files/postgresql.conf-8.4-r1, -files/postgresql.init-8.4-r1,
+  -postgresql-server-8.4.7.ebuild, -postgresql-server-8.4.8-r1.ebuild,
+  -postgresql-server-8.4.8-r2.ebuild, -files/postgresql-8.4-common.patch,
+  -files/postgresql-8.4-server.patch, -files/postgresql.conf-9.0-r1,
+  -files/postgresql.init-9.0-r1, -postgresql-server-9.0.3.ebuild,
+  -postgresql-server-9.0.4-r1.ebuild, -postgresql-server-9.0.4-r2.ebuild,
+  -files/postgresql-server-9.0.4-bool.patch,
+  -files/postgresql-9.0-common.3.patch, -files/postgresql-9.0-common.patch,
+  -files/postgresql-9.0-makefile.patch, -files/postgresql-9.0-server.2.patch,
+  -files/postgresql-9.0-server.3.patch, -files/postgresql-9.0-server.patch,
+  -files/pg_ctl-exit-status.patch:
+  Removed versions affected by bug 384539 and cleaned out unused files.
 
   01 Oct 2011; Markos Chandras <hwoarang@gentoo.org>
   postgresql-server-8.2.22.ebuild, postgresql-server-8.3.16.ebuild,
diff --git a/dev-db/postgresql-server/files/pg_ctl-exit-status.patch b/dev-db/postgresql-server/files/pg_ctl-exit-status.patch
deleted file mode 100644
index 948e2fe8771d..000000000000
--- a/dev-db/postgresql-server/files/pg_ctl-exit-status.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -cr a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
-*** a/src/bin/pg_ctl/pg_ctl.c	2011-04-14 23:15:53.000000000 -0400
---- b/src/bin/pg_ctl/pg_ctl.c	2011-05-22 10:25:34.186930946 -0400
-***************
-*** 1036,1042 ****
-  		}
-  	}
-  	printf(_("%s: no server running\n"), progname);
-! 	exit(1);
-  }
-  
-  
---- 1036,1042 ----
-  		}
-  	}
-  	printf(_("%s: no server running\n"), progname);
-! 	exit(3);
-  }
-  
-  
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-common.patch b/dev-db/postgresql-server/files/postgresql-8.2-common.patch
deleted file mode 100644
index e6e8e46f3a0b..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.2-common.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index fb9793f..3510942 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
- dnl FIXME: We should probably check for version >=0.10.36.
-   AC_CHECK_PROGS(XGETTEXT, xgettext)
- 
--  # Note: share/locale is always the default, independent of $datadir
--  localedir='${prefix}/share/locale'
-+  # Note: share/locale *WAS* always the default, independent of $datadir
-+  AC_ARG_WITH([locale-dir],
-+   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
-+   [ localedir="${withval}" ],
-+   [ localedir='${prefix}/share/locale' ]
-+  )
-   AC_SUBST(localedir)
- ])# PGAC_CHECK_GETTEXT
- 
-diff --git a/configure.in b/configure.in
-index 908a1ae..30dd3bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
- 
- AC_INIT([PostgreSQL], [8.2.6], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2006, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
-diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index 23f4cc9..707c303 100644
---- a/src/include/storage/s_lock.h
-+++ b/src/include/storage/s_lock.h
-@@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
- 
- #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__)		/* Sparc */
- #define HAS_TEST_AND_SET
-diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
-index 9f761d4..83b2974 100644
---- a/src/makefiles/Makefile.darwin
-+++ b/src/makefiles/Makefile.darwin
-@@ -5,7 +5,15 @@ DLSUFFIX = .so
- CFLAGS_SL =
- 
- ifdef PGXS
-+ifdef PGXS_IN_SERVER
-+ifndef PGXS_WITH_SERVER
-+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
-+else
-+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
-+endif
-+else
- BE_DLLLIBS= -bundle_loader $(bindir)/postgres
-+endif
- else
- BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- endif
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-server.patch b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
deleted file mode 100644
index 9e23f6ae5ef2..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.2-server.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-=== GNUmakefile.in
-==================================================================
---- GNUmakefile.in	(revision 14)
-+++ GNUmakefile.in	(local)
-@@ -11,19 +11,16 @@
- all:
- 	$(MAKE) -C doc all
- 	$(MAKE) -C src all
--	$(MAKE) -C config all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- install:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 	@echo "PostgreSQL installation complete."
- 
- installdirs uninstall:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 
- distprep:
- 	$(MAKE) -C doc $@
-=== contrib/Makefile
-==================================================================
---- contrib/Makefile	(revision 14)
-+++ contrib/Makefile	(local)
-@@ -18,19 +18,16 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_trgm		\
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
- 		seg		\
- 		spi		\
- 		tablefunc	\
--		tsearch2	\
--		vacuumlo
-+		tsearch2
- 
- ifeq ($(with_openssl),yes)
- WANTED_DIRS += sslinfo
-=== contrib/adminpack/Makefile
-==================================================================
---- contrib/adminpack/Makefile	(revision 14)
-+++ contrib/adminpack/Makefile	(local)
-@@ -1,5 +1,5 @@
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- DOCS = README.adminpack
-=== src/Makefile
-==================================================================
---- src/Makefile	(revision 14)
-+++ src/Makefile	(local)
-@@ -18,14 +18,11 @@
- 	$(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 $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-=== src/Makefile.global.in
-==================================================================
---- src/Makefile.global.in	(revision 14)
-+++ src/Makefile.global.in	(local)
-@@ -365,10 +365,10 @@
- 
- 
- submake-libpq:
--	$(MAKE) -C $(libpq_builddir) all
-+	@true $(MAKE) -C $(libpq_builddir) all
- 
- submake-libpgport:
--	$(MAKE) -C $(top_builddir)/src/port all
-+	@true $(MAKE) -C $(top_builddir)/src/port all
- 
- .PHONY: submake-libpq submake-libpgport
- 
-=== src/bin/Makefile
-==================================================================
---- src/bin/Makefile	(revision 14)
-+++ src/bin/Makefile	(local)
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+DIRS := initdb ipcclean pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-=== src/include/pg_config_manual.h
-==================================================================
---- src/include/pg_config_manual.h	(revision 14)
-+++ src/include/pg_config_manual.h	(local)
-@@ -175,7 +175,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-=== src/port/Makefile
-==================================================================
---- src/port/Makefile	(revision 14)
-+++ src/port/Makefile	(local)
-@@ -29,11 +29,10 @@
- # Replace all object files so they use FRONTEND define
- LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-=== src/test/regress/GNUmakefile
-==================================================================
---- src/test/regress/GNUmakefile	(revision 14)
-+++ src/test/regress/GNUmakefile	(local)
-@@ -148,7 +148,7 @@
- check: all
- 	-rm -rf ./testtablespace
- 	mkdir ./testtablespace
--	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
-+	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	-rm -rf ./testtablespace
-=== src/test/regress/pg_regress.c
-==================================================================
---- src/test/regress/pg_regress.c	(revision 14)
-+++ src/test/regress/pg_regress.c	(local)
-@@ -502,7 +502,7 @@
- 		datadir = tmp;
- 
- 		/* psql will be installed into temp-install bindir */
--		psqldir = bindir;
-+		/* psqldir = bindir; */
- 
- 		/*
- 		 * Set up shared library paths to include the temp install.
-@@ -1535,7 +1535,7 @@
- 		 */
- 		snprintf(buf, sizeof(buf),
- 				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
--				 bindir, DEVNULL, DEVNULL);
-+				 psqldir, DEVNULL, DEVNULL);
- 		for (i = 0; i < 60; i++)
- 		{
- 			/* Done if psql succeeds */
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-common.patch b/dev-db/postgresql-server/files/postgresql-8.3-common.patch
deleted file mode 100644
index c9f2ad22052a..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.3-common.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index 9434113..d72b35c 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -202,8 +202,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
- dnl FIXME: We should probably check for version >=0.10.36.
-   AC_CHECK_PROGS(XGETTEXT, xgettext)
- 
--  # Note: share/locale is always the default, independent of $datadir
--  localedir='${prefix}/share/locale'
-+  # Note: share/locale *WAS* always the default, independent of $datadir
-+  AC_ARG_WITH([locale-dir],
-+   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
-+   [ localedir="${withval}" ],
-+   [ localedir='${prefix}/share/locale' ]
-+  )
-   AC_SUBST(localedir)
- ])# PGAC_CHECK_GETTEXT
- 
-diff --git a/configure.in b/configure.in
-index 58cc61c..07ffc38 100644
---- a/configure.in
-+++ b/configure.in
-@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
- 
- AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
-diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index 7d9448f..07799bc 100644
---- a/src/include/storage/s_lock.h
-+++ b/src/include/storage/s_lock.h
-@@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
- 
- #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__)		/* Sparc */
- #define HAS_TEST_AND_SET
-diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
-index 9f761d4..83b2974 100644
---- a/src/makefiles/Makefile.darwin
-+++ b/src/makefiles/Makefile.darwin
-@@ -5,7 +5,15 @@ DLSUFFIX = .so
- CFLAGS_SL =
- 
- ifdef PGXS
-+ifdef PGXS_IN_SERVER
-+ifndef PGXS_WITH_SERVER
-+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
-+else
-+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
-+endif
-+else
- BE_DLLLIBS= -bundle_loader $(bindir)/postgres
-+endif
- else
- BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- endif
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
deleted file mode 100644
index ffa4d23f50ee..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-diff -Naur postgresql-8.3.3.orig/contrib/adminpack/Makefile postgresql-8.3.3/contrib/adminpack/Makefile
---- postgresql-8.3.3.orig/contrib/adminpack/Makefile	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/contrib/adminpack/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-diff -Naur postgresql-8.3.3.orig/contrib/Makefile postgresql-8.3.3/contrib/Makefile
---- postgresql-8.3.3.orig/contrib/Makefile	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/contrib/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -20,22 +20,19 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_trgm		\
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
- 		seg		\
- 		spi		\
- 		tablefunc	\
--		test_parser	\
- 		tsearch2	\
--		vacuumlo
-+		test_parser
- 
- ifeq ($(with_openssl),yes)
- WANTED_DIRS += sslinfo
-diff -Naur postgresql-8.3.3.orig/contrib/uuid-ossp/Makefile postgresql-8.3.3/contrib/uuid-ossp/Makefile
---- postgresql-8.3.3.orig/contrib/uuid-ossp/Makefile	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/contrib/uuid-ossp/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-diff -Naur postgresql-8.3.3.orig/contrib/xml2/Makefile postgresql-8.3.3/contrib/xml2/Makefile
---- postgresql-8.3.3.orig/contrib/xml2/Makefile	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/contrib/xml2/Makefile	2008-06-14 13:21:32.000000000 +0200
-@@ -4,7 +4,8 @@
- 
- OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
- 
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)
-+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
- 
- DATA_built = pgxml.sql
- DATA = uninstall_pgxml.sql
-diff -Naur postgresql-8.3.3.orig/GNUmakefile.in postgresql-8.3.3/GNUmakefile.in
---- postgresql-8.3.3.orig/GNUmakefile.in	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/GNUmakefile.in	2008-06-14 12:57:12.000000000 +0200
-@@ -11,19 +11,16 @@
- all:
- 	$(MAKE) -C doc all
- 	$(MAKE) -C src all
--	$(MAKE) -C config all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- install:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 	@echo "PostgreSQL installation complete."
- 
- installdirs uninstall:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 
- distprep:
- 	$(MAKE) -C doc $@
-diff -Naur postgresql-8.3.3.orig/src/bin/initdb/Makefile postgresql-8.3.3/src/bin/initdb/Makefile
---- postgresql-8.3.3.orig/src/bin/initdb/Makefile	2008-06-14 12:56:40.000000000 +0200
-+++ postgresql-8.3.3/src/bin/initdb/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -14,7 +14,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-8.3.3.orig/src/bin/Makefile postgresql-8.3.3/src/bin/Makefile
---- postgresql-8.3.3.orig/src/bin/Makefile	2008-06-14 12:56:40.000000000 +0200
-+++ postgresql-8.3.3/src/bin/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS = initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+DIRS = initdb ipcclean pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-diff -Naur postgresql-8.3.3.orig/src/include/pg_config_manual.h postgresql-8.3.3/src/include/pg_config_manual.h
---- postgresql-8.3.3.orig/src/include/pg_config_manual.h	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/src/include/pg_config_manual.h	2008-06-14 12:57:12.000000000 +0200
-@@ -184,7 +184,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-8.3.3.orig/src/Makefile postgresql-8.3.3/src/Makefile
---- postgresql-8.3.3.orig/src/Makefile	2008-06-14 12:56:40.000000000 +0200
-+++ postgresql-8.3.3/src/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -19,14 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-8.3.3.orig/src/Makefile.global.in postgresql-8.3.3/src/Makefile.global.in
---- postgresql-8.3.3.orig/src/Makefile.global.in	2008-06-14 12:56:41.000000000 +0200
-+++ postgresql-8.3.3/src/Makefile.global.in	2008-06-14 12:57:12.000000000 +0200
-@@ -373,10 +373,8 @@
- 
- 
- submake-libpq:
--	$(MAKE) -C $(libpq_builddir) all
- 
- submake-libpgport:
--	$(MAKE) -C $(top_builddir)/src/port all
- 
- .PHONY: submake-libpq submake-libpgport
- 
-@@ -419,6 +417,8 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
-+
- 
- ##########################################################################
- #
-diff -Naur postgresql-8.3.3.orig/src/port/Makefile postgresql-8.3.3/src/port/Makefile
---- postgresql-8.3.3.orig/src/port/Makefile	2008-06-14 12:56:40.000000000 +0200
-+++ postgresql-8.3.3/src/port/Makefile	2008-06-14 12:57:12.000000000 +0200
-@@ -35,11 +35,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-diff -Naur postgresql-8.3.3.orig/src/test/regress/GNUmakefile postgresql-8.3.3/src/test/regress/GNUmakefile
---- postgresql-8.3.3.orig/src/test/regress/GNUmakefile	2008-06-14 12:56:40.000000000 +0200
-+++ postgresql-8.3.3/src/test/regress/GNUmakefile	2008-06-14 12:57:12.000000000 +0200
-@@ -141,7 +141,7 @@
- ##
- 
- check: all
--	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
-+	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	./pg_regress --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule --srcdir=$(abs_srcdir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
-diff -Naur postgresql-8.3.3.orig/src/test/regress/pg_regress.c postgresql-8.3.3/src/test/regress/pg_regress.c
---- postgresql-8.3.3.orig/src/test/regress/pg_regress.c	2008-06-14 12:56:40.000000000 +0200
-+++ postgresql-8.3.3/src/test/regress/pg_regress.c	2008-06-14 12:57:12.000000000 +0200
-@@ -781,9 +781,6 @@
- 		sprintf(tmp, "%s/install/%s", temp_install, datadir);
- 		datadir = tmp;
- 
--		/* psql will be installed into temp-install bindir */
--		psqldir = bindir;
--
- 		/*
- 		 * Set up shared library paths to include the temp install.
- 		 *
-@@ -2069,7 +2066,7 @@
- 		 */
- 		snprintf(buf, sizeof(buf),
- 				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
--				 bindir, DEVNULL, DEVNULL);
-+				 psqldir, DEVNULL, DEVNULL);
- 		for (i = 0; i < 60; i++)
- 		{
- 			/* Done if psql succeeds */
-diff -Naur postgresql-8.3.3.orig/src/test/regress/pg_regress.c.orig postgresql-8.3.3/src/test/regress/pg_regress.c.orig
diff --git a/dev-db/postgresql-server/files/postgresql-8.3.1-server.patch b/dev-db/postgresql-server/files/postgresql-8.3.1-server.patch
deleted file mode 100644
index da1e812e0b3d..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.3.1-server.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-=== GNUmakefile.in
-==================================================================
---- GNUmakefile.in	(revision 14)
-+++ GNUmakefile.in	(local)
-@@ -11,19 +11,16 @@
- all:
- 	$(MAKE) -C doc all
- 	$(MAKE) -C src all
--	$(MAKE) -C config all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- install:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 	@echo "PostgreSQL installation complete."
- 
- installdirs uninstall:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 
- distprep:
- 	$(MAKE) -C doc $@
-=== contrib/Makefile
-==================================================================
---- contrib/Makefile	(revision 14)
-+++ contrib/Makefile	(local)
-@@ -20,22 +20,19 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_trgm		\
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
- 		seg		\
- 		spi		\
- 		tablefunc	\
--		test_parser	\
- 		tsearch2	\
--		vacuumlo
-+		test_parser
- 
- ifeq ($(with_openssl),yes)
- WANTED_DIRS += sslinfo
-=== contrib/adminpack/Makefile
-==================================================================
---- contrib/adminpack/Makefile	(revision 14)
-+++ contrib/adminpack/Makefile	(local)
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-=== contrib/uuid-ossp/Makefile
-==================================================================
---- contrib/uuid-ossp/Makefile	(revision 14)
-+++ contrib/uuid-ossp/Makefile	(local)
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-=== src/Makefile
-==================================================================
---- src/Makefile	(revision 14)
-+++ src/Makefile	(local)
-@@ -19,14 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-=== src/Makefile.global.in
-==================================================================
---- src/Makefile.global.in	(revision 14)
-+++ src/Makefile.global.in	(local)
-@@ -373,10 +373,8 @@
- 
- 
- submake-libpq:
--	$(MAKE) -C $(libpq_builddir) all
- 
- submake-libpgport:
--	$(MAKE) -C $(top_builddir)/src/port all
- 
- .PHONY: submake-libpq submake-libpgport
- 
-@@ -419,7 +417,9 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
- 
-+
- ##########################################################################
- #
- # substitute implementations of C library routines (see src/port/)
-=== src/bin/Makefile
-==================================================================
---- src/bin/Makefile	(revision 14)
-+++ src/bin/Makefile	(local)
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS = initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+DIRS = initdb ipcclean pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-=== src/bin/initdb/Makefile
-==================================================================
---- src/bin/initdb/Makefile	(revision 14)
-+++ src/bin/initdb/Makefile	(local)
-@@ -14,7 +14,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-=== src/include/pg_config_manual.h
-==================================================================
---- src/include/pg_config_manual.h	(revision 14)
-+++ src/include/pg_config_manual.h	(local)
-@@ -184,7 +184,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-=== src/port/Makefile
-==================================================================
---- src/port/Makefile	(revision 14)
-+++ src/port/Makefile	(local)
-@@ -35,11 +35,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-=== src/test/regress/GNUmakefile
-==================================================================
---- src/test/regress/GNUmakefile	(revision 14)
-+++ src/test/regress/GNUmakefile	(local)
-@@ -141,7 +141,7 @@
- ##
- 
- check: all
--	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
-+	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	./pg_regress --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule --srcdir=$(abs_srcdir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
-=== src/test/regress/pg_regress.c
-==================================================================
---- src/test/regress/pg_regress.c	(revision 14)
-+++ src/test/regress/pg_regress.c	(local)
-@@ -781,9 +781,6 @@
- 		sprintf(tmp, "%s/install/%s", temp_install, datadir);
- 		datadir = tmp;
- 
--		/* psql will be installed into temp-install bindir */
--		psqldir = bindir;
--
- 		/*
- 		 * Set up shared library paths to include the temp install.
- 		 *
-@@ -2053,7 +2050,7 @@
- 		 */
- 		snprintf(buf, sizeof(buf),
- 				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
--				 bindir, DEVNULL, DEVNULL);
-+				 psqldir, DEVNULL, DEVNULL);
- 		for (i = 0; i < 60; i++)
- 		{
- 			/* Done if psql succeeds */
diff --git a/dev-db/postgresql-server/files/postgresql-8.4-common.patch b/dev-db/postgresql-server/files/postgresql-8.4-common.patch
deleted file mode 100644
index 3ca9f6cd98c2..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.4-common.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-=== configure.in
-==================================================================
---- configure.in	2009-06-27 02:14:47.000000000 +0200
-+++ configure.in	2009-07-09 15:05:02.000000000 +0200
-@@ -19,10 +19,6 @@
- 
- AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
-=== src/include/storage/s_lock.h
-==================================================================
---- src/include/storage/s_lock.h	2009-01-01 18:24:01.000000000 +0100
-+++ src/include/storage/s_lock.h	2009-07-09 15:03:08.000000000 +0200
-@@ -298,6 +298,29 @@
- 
- #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__)		/* Sparc */
- #define HAS_TEST_AND_SET
-=== src/makefiles/Makefile.darwin
-==================================================================
---- src/makefiles/Makefile.darwin	2008-11-14 11:22:47.000000000 +0100
-+++ src/makefiles/Makefile.darwin	2009-07-09 15:07:11.000000000 +0200
-@@ -5,7 +5,15 @@
- CFLAGS_SL =
- 
- ifdef PGXS
-+ifdef PGXS_IN_SERVER
-+ifndef PGXS_WITH_SERVER
-+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
-+else
-+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
-+endif
-+else
- BE_DLLLIBS= -bundle_loader $(bindir)/postgres
-+endif
- else
- BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- endif
diff --git a/dev-db/postgresql-server/files/postgresql-8.4-server.patch b/dev-db/postgresql-server/files/postgresql-8.4-server.patch
deleted file mode 100644
index 209eaa903c3a..000000000000
--- a/dev-db/postgresql-server/files/postgresql-8.4-server.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -Naur postgresql-8.4.0.orig/contrib/adminpack/Makefile postgresql-8.4.0/contrib/adminpack/Makefile
---- postgresql-8.4.0.orig/contrib/adminpack/Makefile	2007-11-11 00:59:50.000000000 +0100
-+++ postgresql-8.4.0/contrib/adminpack/Makefile	2009-07-09 18:10:56.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-diff -Naur postgresql-8.4.0.orig/contrib/dblink/Makefile postgresql-8.4.0/contrib/dblink/Makefile
---- postgresql-8.4.0.orig/contrib/dblink/Makefile	2007-11-11 00:59:50.000000000 +0100
-+++ postgresql-8.4.0/contrib/dblink/Makefile	2009-07-09 22:22:02.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = dblink
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- OBJS	= dblink.o
- SHLIB_LINK = $(libpq)
- 
-diff -Naur postgresql-8.4.0.orig/contrib/Makefile postgresql-8.4.0/contrib/Makefile
---- postgresql-8.4.0.orig/contrib/Makefile	2009-03-26 00:20:01.000000000 +0100
-+++ postgresql-8.4.0/contrib/Makefile	2009-07-09 18:13:23.000000000 +0200
-@@ -23,23 +23,20 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_stat_statements \
- 		pg_trgm		\
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
- 		seg		\
- 		spi		\
- 		tablefunc	\
--		test_parser	\
- 		tsearch2	\
--		vacuumlo
-+		test_parser
- 
- ifeq ($(with_openssl),yes)
- WANTED_DIRS += sslinfo
-diff -Naur postgresql-8.4.0.orig/contrib/uuid-ossp/Makefile postgresql-8.4.0/contrib/uuid-ossp/Makefile
---- postgresql-8.4.0.orig/contrib/uuid-ossp/Makefile	2007-11-13 01:13:19.000000000 +0100
-+++ postgresql-8.4.0/contrib/uuid-ossp/Makefile	2009-07-09 19:12:44.000000000 +0200
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-diff -Naur postgresql-8.4.0.orig/contrib/xml2/Makefile postgresql-8.4.0/contrib/xml2/Makefile
---- postgresql-8.4.0.orig/contrib/xml2/Makefile	2008-05-08 18:49:37.000000000 +0200
-+++ postgresql-8.4.0/contrib/xml2/Makefile	2009-07-09 19:14:32.000000000 +0200
-@@ -4,7 +4,8 @@
- 
- OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
- 
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)
-+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
- 
- DATA_built = pgxml.sql
- DATA = uninstall_pgxml.sql
-diff -Naur postgresql-8.4.0.orig/GNUmakefile.in postgresql-8.4.0/GNUmakefile.in
---- postgresql-8.4.0.orig/GNUmakefile.in	2009-01-15 02:53:49.000000000 +0100
-+++ postgresql-8.4.0/GNUmakefile.in	2009-07-09 19:16:19.000000000 +0200
-@@ -11,19 +11,16 @@
- all:
- 	$(MAKE) -C doc all
- 	$(MAKE) -C src all
--	$(MAKE) -C config all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- install:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 	@echo "PostgreSQL installation complete."
- 
- installdirs uninstall:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 
- distprep:
- 	$(MAKE) -C doc $@
-diff -Naur postgresql-8.4.0.orig/src/bin/initdb/Makefile postgresql-8.4.0/src/bin/initdb/Makefile
---- postgresql-8.4.0.orig/src/bin/initdb/Makefile	2009-01-01 18:23:53.000000000 +0100
-+++ postgresql-8.4.0/src/bin/initdb/Makefile	2009-07-09 19:17:40.000000000 +0200
-@@ -14,7 +14,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-8.4.0.orig/src/bin/Makefile postgresql-8.4.0/src/bin/Makefile
---- postgresql-8.4.0.orig/src/bin/Makefile	2009-01-01 18:23:53.000000000 +0100
-+++ postgresql-8.4.0/src/bin/Makefile	2009-07-09 19:18:21.000000000 +0200
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+DIRS = initdb pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-diff -Naur postgresql-8.4.0.orig/src/include/pg_config_manual.h postgresql-8.4.0/src/include/pg_config_manual.h
---- postgresql-8.4.0.orig/src/include/pg_config_manual.h	2009-06-11 16:49:08.000000000 +0200
-+++ postgresql-8.4.0/src/include/pg_config_manual.h	2009-07-09 19:19:40.000000000 +0200
-@@ -146,7 +146,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-8.4.0.orig/src/Makefile postgresql-8.4.0/src/Makefile
---- postgresql-8.4.0.orig/src/Makefile	2009-02-24 11:06:32.000000000 +0100
-+++ postgresql-8.4.0/src/Makefile	2009-07-09 19:20:44.000000000 +0200
-@@ -19,14 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in
---- postgresql-8.4.0.orig/src/Makefile.global.in	2009-06-23 05:46:00.000000000 +0200
-+++ postgresql-8.4.0/src/Makefile.global.in	2009-07-09 19:39:46.000000000 +0200
-@@ -443,6 +441,8 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
-+
- 
- ##########################################################################
- #
-diff -Naur postgresql-8.4.0.orig/src/port/Makefile postgresql-8.4.0/src/port/Makefile
---- postgresql-8.4.0.orig/src/port/Makefile	2008-11-25 19:19:31.000000000 +0100
-+++ postgresql-8.4.0/src/port/Makefile	2009-07-09 19:24:34.000000000 +0200
-@@ -39,11 +39,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-diff -Naur postgresql-8.4.0.orig/src/test/regress/GNUmakefile postgresql-8.4.0/src/test/regress/GNUmakefile
---- postgresql-8.4.0.orig/src/test/regress/GNUmakefile	2009-01-01 18:24:04.000000000 +0100
-+++ postgresql-8.4.0/src/test/regress/GNUmakefile	2009-07-09 19:28:25.000000000 +0200
-@@ -141,7 +141,7 @@
- pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
- 
- check: all
--	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
-+	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule
diff --git a/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch b/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch
deleted file mode 100644
index ab47b0cb9707..000000000000
--- a/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in
---- postgresql-9.0beta3.orig/configure.in	2010-07-08 22:43:12.000000000 -0400
-+++ postgresql-9.0beta3/configure.in	2010-07-12 00:13:37.585527031 -0400
-@@ -19,10 +19,6 @@
- 
- AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
diff --git a/dev-db/postgresql-server/files/postgresql-9.0-common.patch b/dev-db/postgresql-server/files/postgresql-9.0-common.patch
deleted file mode 100644
index a10346ee092b..000000000000
--- a/dev-db/postgresql-server/files/postgresql-9.0-common.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-=== configure.in
-==================================================================
---- configure.in	2009-06-27 02:14:47.000000000 +0200
-+++ configure.in	2009-07-09 15:05:02.000000000 +0200
-@@ -19,10 +19,6 @@
- 
- AC_INIT([PostgreSQL], [9.0alpha4], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
-=== src/include/storage/s_lock.h
-==================================================================
---- src/include/storage/s_lock.h	2009-01-01 18:24:01.000000000 +0100
-+++ src/include/storage/s_lock.h	2009-07-09 15:03:08.000000000 +0200
-@@ -298,6 +298,29 @@
- 
- #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__)		/* Sparc */
- #define HAS_TEST_AND_SET
-=== src/makefiles/Makefile.darwin
-==================================================================
---- src/makefiles/Makefile.darwin	2008-11-14 11:22:47.000000000 +0100
-+++ src/makefiles/Makefile.darwin	2009-07-09 15:07:11.000000000 +0200
-@@ -5,7 +5,15 @@
- CFLAGS_SL =
- 
- ifdef PGXS
-+ifdef PGXS_IN_SERVER
-+ifndef PGXS_WITH_SERVER
-+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
-+else
-+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
-+endif
-+else
- BE_DLLLIBS= -bundle_loader $(bindir)/postgres
-+endif
- else
- BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- endif
diff --git a/dev-db/postgresql-server/files/postgresql-9.0-makefile.patch b/dev-db/postgresql-server/files/postgresql-9.0-makefile.patch
deleted file mode 100644
index c5b60a5c5d02..000000000000
--- a/dev-db/postgresql-server/files/postgresql-9.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- GNUmakefile.in.old  2010-01-22 17:07:56.574071514 +0100
-+++ GNUmakefile.in      2010-01-22 17:08:13.644073319 +0100
-@@ -9,7 +9,6 @@
- include $(top_builddir)/src/Makefile.global
-
- all:
--	$(MAKE) -C doc all
-	$(MAKE) -C src all
-	$(MAKE) -C config all
-	@echo "All of PostgreSQL successfully made. Ready to install."
-@@ -18,7 +17,6 @@
-	$(MAKE) -C doc $@
-
- install:
--	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
-	$(MAKE) -C config $@
-	@echo "PostgreSQL installation complete."
diff --git a/dev-db/postgresql-server/files/postgresql-9.0-server.2.patch b/dev-db/postgresql-server/files/postgresql-9.0-server.2.patch
deleted file mode 100644
index 1f6e8a0151bc..000000000000
--- a/dev-db/postgresql-server/files/postgresql-9.0-server.2.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -Naur postgresql-8.5alpha3.orig/contrib/adminpack/Makefile postgresql-8.5alpha3/contrib/adminpack/Makefile
---- postgresql-8.5alpha3.orig/contrib/adminpack/Makefile	2007-11-11 00:59:50.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/adminpack/Makefile	2009-07-09 18:10:56.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-diff -Naur postgresql-8.5alpha3.orig/contrib/dblink/Makefile postgresql-8.5alpha3/contrib/dblink/Makefile
---- postgresql-8.5alpha3.orig/contrib/dblink/Makefile	2007-11-11 00:59:50.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/dblink/Makefile	2009-07-09 22:22:02.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = dblink
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- OBJS	= dblink.o
- SHLIB_LINK = $(libpq)
- 
-diff -Naur postgresql-8.5alpha3.orig/contrib/Makefile postgresql-8.5alpha3/contrib/Makefile
---- postgresql-8.5alpha3.orig/contrib/Makefile	2009-03-26 00:20:01.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/Makefile	2009-07-09 18:13:23.000000000 +0200
-@@ -25,25 +25,18 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
--		passwordcheck	\
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_stat_statements \
- 		pg_trgm		\
--		pg_upgrade	\
--		pg_upgrade_support \
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
- 		seg		\
- 		spi		\
- 		tablefunc	\
-		test_parser	\
- 		tsearch2	\
--		unaccent	\
--		vacuumlo
- 
- ifeq ($(with_openssl),yes)
- WANTED_DIRS += sslinfo
-diff -Naur postgresql-8.5alpha3.orig/contrib/uuid-ossp/Makefile postgresql-8.5alpha3/contrib/uuid-ossp/Makefile
---- postgresql-8.5alpha3.orig/contrib/uuid-ossp/Makefile	2007-11-13 01:13:19.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/uuid-ossp/Makefile	2009-07-09 19:12:44.000000000 +0200
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-diff -Naur postgresql-8.5alpha3.orig/contrib/xml2/Makefile postgresql-8.5alpha3/contrib/xml2/Makefile
---- postgresql-8.5alpha3.orig/contrib/xml2/Makefile	2008-05-08 18:49:37.000000000 +0200
-+++ postgresql-8.5alpha3/contrib/xml2/Makefile	2009-07-09 19:14:32.000000000 +0200
-@@ -4,7 +4,8 @@
- 
- OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
- 
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)
-+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
- 
- DATA_built = pgxml.sql
- DATA = uninstall_pgxml.sql
-diff -Naur postgresql-8.5alpha3.orig/GNUmakefile.in postgresql-8.5alpha3/GNUmakefile.in
---- postgresql-8.5alpha3.orig/GNUmakefile.in	2009-01-15 02:53:49.000000000 +0100
-+++ postgresql-8.5alpha3/GNUmakefile.in	2009-07-09 19:16:19.000000000 +0200
-@@ -11,7 +11,6 @@
- all:
-	$(MAKE) -C doc all
-	$(MAKE) -C src all
--	$(MAKE) -C config all
-	@echo "All of PostgreSQL successfully made. Ready to install."
-
- world:
-@@ -27,7 +26,6 @@
- install:
-	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
--	$(MAKE) -C config $@
-	@echo "PostgreSQL installation complete."
-
- install-world:
-@@ -40,7 +38,6 @@
- installdirs uninstall coverage:
-	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
--	$(MAKE) -C config $@
-
- distprep:
-	$(MAKE) -C doc $@
-diff -Naur postgresql-8.5alpha3.orig/src/bin/initdb/Makefile 
-postgresql-8.5alpha3/src/bin/initdb/Makefile
---- postgresql-8.5alpha3.orig/src/bin/initdb/Makefile	2009-01-01 18:23:53.000000000 +0100
-+++ postgresql-8.5alpha3/src/bin/initdb/Makefile	2009-07-09 19:17:40.000000000 +0200
-@@ -14,7 +14,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-8.5alpha3.orig/src/bin/Makefile postgresql-8.5alpha3/src/bin/Makefile
---- postgresql-8.5alpha3.orig/src/bin/Makefile	2009-01-01 18:23:53.000000000 +0100
-+++ postgresql-8.5alpha3/src/bin/Makefile	2009-07-09 19:18:21.000000000 +0200
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+SUBDIRS = initdb pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur postgresql-8.5alpha3.orig/src/include/pg_config_manual.h postgresql-8.5alpha3/src/include/pg_config_manual.h
---- postgresql-8.5alpha3.orig/src/include/pg_config_manual.h	2009-06-11 16:49:08.000000000 +0200
-+++ postgresql-8.5alpha3/src/include/pg_config_manual.h	2009-07-09 19:19:40.000000000 +0200
-@@ -146,7 +146,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-8.5alpha3.orig/src/Makefile postgresql-8.5alpha3/src/Makefile
---- postgresql-8.5alpha3.orig/src/Makefile	2009-02-24 11:06:32.000000000 +0100
-+++ postgresql-8.5alpha3/src/Makefile	2009-07-09 19:20:44.000000000 +0200
-@@ -19,15 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
--	$(MAKE) -C backend/replication/libpqwalreceiver $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-8.5alpha3.orig/src/Makefile.global.in postgresql-8.5alpha3/src/Makefile.global.in
---- postgresql-8.5alpha3.orig/src/Makefile.global.in	2009-06-23 05:46:00.000000000 +0200
-+++ postgresql-8.5alpha3/src/Makefile.global.in	2009-07-09 19:39:46.000000000 +0200
-@@ -443,6 +441,8 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
-+
- 
- ##########################################################################
- #
-diff -Naur postgresql-8.5alpha3.orig/src/port/Makefile postgresql-8.5alpha3/src/port/Makefile
---- postgresql-8.5alpha3.orig/src/port/Makefile	2008-11-25 19:19:31.000000000 +0100
-+++ postgresql-8.5alpha3/src/port/Makefile	2009-07-09 19:24:34.000000000 +0200
-@@ -39,11 +39,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-diff -Naur postgresql-8.5alpha3.orig/src/test/regress/GNUmakefile postgresql-8.5alpha3/src/test/regress/GNUmakefile
---- postgresql-8.5alpha3.orig/src/test/regress/GNUmakefile	2009-01-01 18:24:04.000000000 +0100
-+++ postgresql-8.5alpha3/src/test/regress/GNUmakefile	2009-07-09 19:28:25.000000000 +0200
-@@ -141,7 +141,7 @@
- pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
- 
- check: all
--	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
-+	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule
diff --git a/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch b/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch
deleted file mode 100644
index ab01e047a606..000000000000
--- a/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -Naur postgresql-9.0beta3.orig/contrib/adminpack/Makefile postgresql-9.0beta3/contrib/adminpack/Makefile
---- postgresql-9.0beta3.orig/contrib/adminpack/Makefile	2007-11-10 18:59:50.000000000 -0500
-+++ postgresql-9.0beta3/contrib/adminpack/Makefile	2010-07-12 08:41:54.894528045 -0400
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-diff -Naur postgresql-9.0beta3.orig/contrib/dblink/Makefile postgresql-9.0beta3/contrib/dblink/Makefile
---- postgresql-9.0beta3.orig/contrib/dblink/Makefile	2007-11-10 18:59:50.000000000 -0500
-+++ postgresql-9.0beta3/contrib/dblink/Makefile	2010-07-12 08:41:54.894528045 -0400
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = dblink
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir)  -I../../src/include/
- OBJS	= dblink.o
- SHLIB_LINK = $(libpq)
- 
-diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile
---- postgresql-9.0beta3.orig/contrib/Makefile	2010-06-14 12:17:56.000000000 -0400
-+++ postgresql-9.0beta3/contrib/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -23,18 +23,13 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
--		passwordcheck	\
- 		pg_archivecleanup \
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_stat_statements \
- 		pg_trgm		\
--		pg_upgrade	\
--		pg_upgrade_support \
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
-@@ -42,9 +37,7 @@
- 		spi		\
- 		tablefunc	\
- 		test_parser	\
--		tsearch2	\
--		unaccent	\
--		vacuumlo
-+		tsearch2
- 
- ifeq ($(with_openssl),yes)
- SUBDIRS += sslinfo
-diff -Naur postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.0beta3/contrib/uuid-ossp/Makefile
---- postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile	2007-11-12 19:13:19.000000000 -0500
-+++ postgresql-9.0beta3/contrib/uuid-ossp/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-diff -Naur postgresql-9.0beta3.orig/contrib/xml2/Makefile postgresql-9.0beta3/contrib/xml2/Makefile
---- postgresql-9.0beta3.orig/contrib/xml2/Makefile	2010-03-01 13:07:59.000000000 -0500
-+++ postgresql-9.0beta3/contrib/xml2/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -4,7 +4,8 @@
- 
- OBJS = xpath.o xslt_proc.o
- 
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)
-+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
- 
- DATA_built = pgxml.sql
- DATA = uninstall_pgxml.sql
-diff -Naur postgresql-9.0beta3.orig/GNUmakefile.in postgresql-9.0beta3/GNUmakefile.in
---- postgresql-9.0beta3.orig/GNUmakefile.in	2010-03-29 20:10:46.000000000 -0400
-+++ postgresql-9.0beta3/GNUmakefile.in	2010-07-12 08:41:54.895528185 -0400
-@@ -10,7 +10,6 @@
- 
- all:
- 	$(MAKE) -C src all
--	$(MAKE) -C config all
- 	@echo "All of PostgreSQL successfully made. Ready to install."
- 
- docs:
-@@ -28,7 +27,6 @@
- 
- install:
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 	@echo "PostgreSQL installation complete."
- 
- install-docs:
-@@ -44,7 +42,6 @@
- installdirs uninstall coverage:
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C src $@
--	$(MAKE) -C config $@
- 
- distprep:
- 	$(MAKE) -C doc $@
-diff -Naur postgresql-9.0beta3.orig/src/bin/initdb/Makefile postgresql-9.0beta3/src/bin/initdb/Makefile
---- postgresql-9.0beta3.orig/src/bin/initdb/Makefile	2010-07-05 14:54:37.000000000 -0400
-+++ postgresql-9.0beta3/src/bin/initdb/Makefile	2010-07-12 08:41:54.895528185 -0400
-@@ -16,7 +16,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile
---- postgresql-9.0beta3.orig/src/bin/Makefile	2010-01-02 11:57:58.000000000 -0500
-+++ postgresql-9.0beta3/src/bin/Makefile	2010-07-12 08:41:54.896527913 -0400
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+SUBDIRS = initdb pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h
---- postgresql-9.0beta3.orig/src/include/pg_config_manual.h	2010-01-06 23:53:35.000000000 -0500
-+++ postgresql-9.0beta3/src/include/pg_config_manual.h	2010-07-12 08:41:54.896527913 -0400
-@@ -141,7 +141,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile
---- postgresql-9.0beta3.orig/src/Makefile	2010-01-20 04:16:23.000000000 -0500
-+++ postgresql-9.0beta3/src/Makefile	2010-07-12 08:41:54.896527913 -0400
-@@ -19,15 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
--	$(MAKE) -C backend/replication/libpqwalreceiver $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-9.0beta3.orig/src/Makefile.global.in postgresql-9.0beta3/src/Makefile.global.in
---- postgresql-9.0beta3.orig/src/Makefile.global.in	2010-07-06 18:03:05.000000000 -0400
-+++ postgresql-9.0beta3/src/Makefile.global.in	2010-07-12 08:41:54.897527811 -0400
-@@ -458,6 +458,7 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
- 
- ##########################################################################
- #
-diff -Naur postgresql-9.0beta3.orig/src/port/Makefile postgresql-9.0beta3/src/port/Makefile
---- postgresql-9.0beta3.orig/src/port/Makefile	2010-07-02 13:03:30.000000000 -0400
-+++ postgresql-9.0beta3/src/port/Makefile	2010-07-12 08:41:54.898529044 -0400
-@@ -39,11 +39,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(MKDIR_P) '$(DESTDIR)$(libdir)'
-diff -Naur postgresql-9.0beta3.orig/src/test/regress/GNUmakefile postgresql-9.0beta3/src/test/regress/GNUmakefile
---- postgresql-9.0beta3.orig/src/test/regress/GNUmakefile	2010-07-05 14:54:38.000000000 -0400
-+++ postgresql-9.0beta3/src/test/regress/GNUmakefile	2010-07-12 08:41:54.898529044 -0400
-@@ -141,7 +141,7 @@
- pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE)
- 
- check: all
--	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
-+	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule
diff --git a/dev-db/postgresql-server/files/postgresql-9.0-server.patch b/dev-db/postgresql-server/files/postgresql-9.0-server.patch
deleted file mode 100644
index 5f0df2b2facc..000000000000
--- a/dev-db/postgresql-server/files/postgresql-9.0-server.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Naur postgresql-8.5alpha3.orig/contrib/adminpack/Makefile postgresql-8.5alpha3/contrib/adminpack/Makefile
---- postgresql-8.5alpha3.orig/contrib/adminpack/Makefile	2007-11-11 00:59:50.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/adminpack/Makefile	2009-07-09 18:10:56.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = adminpack
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- DATA_built = adminpack.sql
- DATA = uninstall_adminpack.sql
- OBJS = adminpack.o
-diff -Naur postgresql-8.5alpha3.orig/contrib/dblink/Makefile postgresql-8.5alpha3/contrib/dblink/Makefile
---- postgresql-8.5alpha3.orig/contrib/dblink/Makefile	2007-11-11 00:59:50.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/dblink/Makefile	2009-07-09 22:22:02.000000000 +0200
-@@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $
- 
- MODULE_big = dblink
--PG_CPPFLAGS = -I$(libpq_srcdir)
-+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
- OBJS	= dblink.o
- SHLIB_LINK = $(libpq)
- 
-diff -Naur postgresql-8.5alpha3.orig/contrib/Makefile postgresql-8.5alpha3/contrib/Makefile
---- postgresql-8.5alpha3.orig/contrib/Makefile	2009-03-26 00:20:01.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/Makefile	2009-07-09 18:13:23.000000000 +0200
-@@ -23,23 +23,18 @@
- 		isn		\
- 		lo		\
- 		ltree		\
--		oid2name	\
- 		pageinspect	\
--		passwordcheck	\
- 		pg_buffercache	\
- 		pg_freespacemap \
- 		pg_standby	\
- 		pg_stat_statements \
- 		pg_trgm		\
--		pgbench		\
- 		pgcrypto	\
- 		pgrowlocks	\
- 		pgstattuple	\
- 		seg		\
- 		spi		\
- 		tablefunc	\
-		test_parser	\
- 		tsearch2	\
--		unaccent	\
--		vacuumlo
- 
- ifeq ($(with_openssl),yes)
- WANTED_DIRS += sslinfo
-diff -Naur postgresql-8.5alpha3.orig/contrib/uuid-ossp/Makefile postgresql-8.5alpha3/contrib/uuid-ossp/Makefile
---- postgresql-8.5alpha3.orig/contrib/uuid-ossp/Makefile	2007-11-13 01:13:19.000000000 +0100
-+++ postgresql-8.5alpha3/contrib/uuid-ossp/Makefile	2009-07-09 19:12:44.000000000 +0200
-@@ -1,11 +1,13 @@
- # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $
- 
-+PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H"
-+
- MODULE_big = uuid-ossp
- OBJS = uuid-ossp.o
- DATA_built = uuid-ossp.sql
- DATA = uninstall_uuid-ossp.sql
- 
--SHLIB_LINK += $(OSSP_UUID_LIBS)
-+SHLIB_LINK += -lossp-uuid
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
-diff -Naur postgresql-8.5alpha3.orig/contrib/xml2/Makefile postgresql-8.5alpha3/contrib/xml2/Makefile
---- postgresql-8.5alpha3.orig/contrib/xml2/Makefile	2008-05-08 18:49:37.000000000 +0200
-+++ postgresql-8.5alpha3/contrib/xml2/Makefile	2009-07-09 19:14:32.000000000 +0200
-@@ -4,7 +4,8 @@
- 
- OBJS = $(if $(filter -lxslt, $(LIBS)), xpath.o xslt_proc.o, xpath.o)
- 
--SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
-+PG_CPPFLAGS = $(shell xml2-config --cflags)
-+SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs)
- 
- DATA_built = pgxml.sql
- DATA = uninstall_pgxml.sql
-diff -Naur postgresql-8.5alpha3.orig/GNUmakefile.in postgresql-8.5alpha3/GNUmakefile.in
---- postgresql-8.5alpha3.orig/GNUmakefile.in	2009-01-15 02:53:49.000000000 +0100
-+++ postgresql-8.5alpha3/GNUmakefile.in	2009-07-09 19:16:19.000000000 +0200
-@@ -11,7 +11,6 @@
- all:
-	$(MAKE) -C doc all
-	$(MAKE) -C src all
--	$(MAKE) -C config all
-	@echo "All of PostgreSQL successfully made. Ready to install."
-
- world:
-@@ -27,7 +26,6 @@
- install:
-	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
--	$(MAKE) -C config $@
-	@echo "PostgreSQL installation complete."
-
- install-world:
-@@ -40,7 +38,6 @@
- installdirs uninstall coverage:
-	$(MAKE) -C doc $@
-	$(MAKE) -C src $@
--	$(MAKE) -C config $@
-
- distprep:
-	$(MAKE) -C doc $@
-diff -Naur postgresql-8.5alpha3.orig/src/bin/initdb/Makefile 
-postgresql-8.5alpha3/src/bin/initdb/Makefile
---- postgresql-8.5alpha3.orig/src/bin/initdb/Makefile	2009-01-01 18:23:53.000000000 +0100
-+++ postgresql-8.5alpha3/src/bin/initdb/Makefile	2009-07-09 19:17:40.000000000 +0200
-@@ -14,7 +14,7 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
- 
--override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
-+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS)
- 
- OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
- 
-diff -Naur postgresql-8.5alpha3.orig/src/bin/Makefile postgresql-8.5alpha3/src/bin/Makefile
---- postgresql-8.5alpha3.orig/src/bin/Makefile	2009-01-01 18:23:53.000000000 +0100
-+++ postgresql-8.5alpha3/src/bin/Makefile	2009-07-09 19:18:21.000000000 +0200
-@@ -13,8 +13,8 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+SUBDIRS = initdb pg_ctl \
-+	pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- SUBDIRS+=pgevent
- endif
-diff -Naur postgresql-8.5alpha3.orig/src/include/pg_config_manual.h postgresql-8.5alpha3/src/include/pg_config_manual.h
---- postgresql-8.5alpha3.orig/src/include/pg_config_manual.h	2009-06-11 16:49:08.000000000 +0200
-+++ postgresql-8.5alpha3/src/include/pg_config_manual.h	2009-07-09 19:19:40.000000000 +0200
-@@ -146,7 +146,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
-diff -Naur postgresql-8.5alpha3.orig/src/Makefile postgresql-8.5alpha3/src/Makefile
---- postgresql-8.5alpha3.orig/src/Makefile	2009-02-24 11:06:32.000000000 +0100
-+++ postgresql-8.5alpha3/src/Makefile	2009-07-09 19:20:44.000000000 +0200
-@@ -19,15 +19,11 @@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
- 	$(MAKE) -C backend/snowball $@
--	$(MAKE) -C include $@
--	$(MAKE) -C interfaces $@
--	$(MAKE) -C backend/replication/libpqwalreceiver $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
--	$(MAKE) -C makefiles $@
- 	$(MAKE) -C test/regress $@
- 
--install: install-local
-+install:
- 
- install-local: installdirs-local
- 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff -Naur postgresql-8.5alpha3.orig/src/Makefile.global.in postgresql-8.5alpha3/src/Makefile.global.in
---- postgresql-8.5alpha3.orig/src/Makefile.global.in	2009-06-23 05:46:00.000000000 +0200
-+++ postgresql-8.5alpha3/src/Makefile.global.in	2009-07-09 19:39:46.000000000 +0200
-@@ -443,6 +441,8 @@
-    LDFLAGS += $(PROFILE)
- endif
- 
-+CFLAGS += -I${top_srcdir}/src/include
-+
- 
- ##########################################################################
- #
-diff -Naur postgresql-8.5alpha3.orig/src/port/Makefile postgresql-8.5alpha3/src/port/Makefile
---- postgresql-8.5alpha3.orig/src/port/Makefile	2008-11-25 19:19:31.000000000 +0100
-+++ postgresql-8.5alpha3/src/port/Makefile	2009-07-09 19:24:34.000000000 +0200
-@@ -39,11 +39,10 @@
- # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
- OBJS_SRV = $(OBJS:%.o=%_srv.o)
- 
--all: libpgport.a libpgport_srv.a
-+all: libpgport_srv.a
- 
- # libpgport is needed by some contrib
--install: all installdirs
--	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
-+install:
- 
- installdirs:
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-diff -Naur postgresql-8.5alpha3.orig/src/test/regress/GNUmakefile postgresql-8.5alpha3/src/test/regress/GNUmakefile
---- postgresql-8.5alpha3.orig/src/test/regress/GNUmakefile	2009-01-01 18:24:04.000000000 +0100
-+++ postgresql-8.5alpha3/src/test/regress/GNUmakefile	2009-07-09 19:28:25.000000000 +0200
-@@ -141,7 +141,7 @@
- pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
- 
- check: all
--	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)
-+	$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
- 
- installcheck: all
- 	$(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule
diff --git a/dev-db/postgresql-server/files/postgresql-server-9.0.4-bool.patch b/dev-db/postgresql-server/files/postgresql-server-9.0.4-bool.patch
deleted file mode 100644
index 5268ea1d0a16..000000000000
--- a/dev-db/postgresql-server/files/postgresql-server-9.0.4-bool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/include/c.h
-+++ src/include/c.h
-@@ -85,6 +85,10 @@
- #include <SupportDefs.h>
- #endif
- 
-+#ifdef __APPLE_CC__
-+#undef bool
-+#endif
-+
- #if defined(WIN32) || defined(__CYGWIN__)
- /* We have to redefine some system functions after they are included above. */
- #include "pg_config_os.h"
---- src/test/thread/thread_test.c
-+++ src/test/thread/thread_test.c
-@@ -23,6 +23,9 @@
- #if !defined(IN_CONFIGURE) && !defined(WIN32)
- #include "postgres.h"
- #else
-+#ifdef __APPLE_CC__
-+#undef bool
-+#endif
- /* From src/include/c.h" */
- #ifndef bool
- typedef char bool;
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.2-r1 b/dev-db/postgresql-server/files/postgresql.conf-8.2-r1
deleted file mode 100644
index 7ff22b7aaa57..000000000000
--- a/dev-db/postgresql-server/files/postgresql.conf-8.2-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.2/data"
-
-# Options to pass to PostgreSQL's initdb.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
-
-# PostgreSQL User
-PGUSER="postgres"
-
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
-
-# Allow server 60 seconds to start or stop.
-# Can disable waiting by changing to '-W' (capital W) 
-WAIT_FOR_START="-w"
-WAIT_FOR_STOP="-w"
-
-# Ignore new connections and wait for clients to disconnect from server
-# before shutting down.
-# Set NICE_QUIT to "NO" to disable.
-NICE_QUIT="YES"
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminating a client results in a rollback of open
-# transactions for that client.
-# Set RUDE_QUIT to "NO" to disable.
-RUDE_QUIT="YES"
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to yes and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable.
-FORCE_QUIT="NO"
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.3-r1 b/dev-db/postgresql-server/files/postgresql.conf-8.3-r1
deleted file mode 100644
index 0a6b858b17b2..000000000000
--- a/dev-db/postgresql-server/files/postgresql.conf-8.3-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.3/data"
-
-# Options to pass to PostgreSQL's initdb.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
-
-# PostgreSQL User
-PGUSER="postgres"
-
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
-
-# Allow *_TIMEOUT to run its course.
-# Can be overriden by changing to '-W' (capital W)
-WAIT_FOR_START="-w"
-WAIT_FOR_STOP="-w"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=60
-
-# Ignore new connections and wait for clients to disconnect from server
-# before shutting down.
-# Set NICE_QUIT to "NO" to disable. NICE_TIMEOUT in seconds.
-NICE_QUIT="YES"
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminating a client results in a rollback of open
-# transactions for that client.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to yes and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.4-r1 b/dev-db/postgresql-server/files/postgresql.conf-8.4-r1
deleted file mode 100644
index 0a6af9c84a67..000000000000
--- a/dev-db/postgresql-server/files/postgresql.conf-8.4-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.4/data"
-
-# Options to pass to PostgreSQL's initdb.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
-
-# PostgreSQL User
-PGUSER="postgres"
-
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
-
-# Allow *_TIMEOUT to run its course.
-# Can be overriden by changing to '-W' (capital W)
-WAIT_FOR_START="-w"
-WAIT_FOR_STOP="-w"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=60
-
-# Ignore new connections and wait for clients to disconnect from server
-# before shutting down.
-# Set NICE_QUIT to "NO" to disable. NICE_TIMEOUT in seconds.
-NICE_QUIT="YES"
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminating a client results in a rollback of open
-# transactions for that client.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to yes and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
diff --git a/dev-db/postgresql-server/files/postgresql.conf-9.0-r1 b/dev-db/postgresql-server/files/postgresql.conf-9.0-r1
deleted file mode 100644
index 8f43360acceb..000000000000
--- a/dev-db/postgresql-server/files/postgresql.conf-9.0-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/9.0/data"
-
-# Options to pass to PostgreSQL's initdb.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
-
-# PostgreSQL User
-PGUSER="postgres"
-
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of
-# these options can be set directly in the configuration file.
-#PGOPTS="-N 512 -B 1024"
-
-# Allow *_TIMEOUT to run its course.
-# Can be overriden by changing to '-W' (capital W)
-WAIT_FOR_START="-w"
-WAIT_FOR_STOP="-w"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=60
-
-# Ignore new connections and wait for clients to disconnect from server before
-# shutting down.
-# Set NICE_QUIT to "NO" to disable. NICE_TIMEOUT in seconds.
-NICE_QUIT="YES"
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminating a client results in a rollback of open
-# transactions for that client.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to yes and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.2-r1 b/dev-db/postgresql-server/files/postgresql.init-8.2-r1
deleted file mode 100644
index 127da8eed3cb..000000000000
--- a/dev-db/postgresql-server/files/postgresql.init-8.2-r1
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.2-r1,v 1.1 2010/06/04 14:18:52 patrick Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-	if [ -L /etc/eselect/postgresql/service ] ; then 
-		local p_service="$(for f in /etc/eselect/postgresql/service/* ; do . $f ; done ; echo $postgres_service )"
-		test "${p_service}" = "${SVCNAME}" && provide postgresql
-	fi
-}
-
-checkconfig() {
-	if [ ! -d "$PGDATA" ] ; then
-		eerror "Directory not found: $PGDATA"
-		eerror "Please make sure that PGDATA points to the right path."
-		eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-
-	if [ -f "$PGDATA/postmaster.pid" ] ; then
-		rm -f "$PGDATA/postmaster.pid"
-	fi
-
-	local retval
-
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.2/bin/pg_ctl start ${WAIT_FOR_START} -s -o '--silent-mode=true ${PGOPTS}'"
-	retval=$?
-
-	if [[ $retval != 0 ]] ; then
-		eend $retval
-		return $retval
-	fi
-
-# The following is to catch the case of an already running server
-# in which pg_ctl doesn't know to which server it connected to and
-# falsely reports the server as 'up'
-	sleep 2
-	if [ ! -f "$PGDATA/postmaster.pid" ] ; then
-		eerror "The PID file doesn't exist but pg_ctl reported a running server."
-		eerror "Please check whether there is another server running on the same port or read the log-file."
-		eend 1
-		return 1
-	fi
-
-	local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
-	ps -p "${pid}" &> /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL (this can take a few minutes)"
-
-	local retval
-
-	if [[ "${NICE_QUIT}" != "NO" ]] ; then
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.2/bin/pg_ctl stop ${WAIT_FOR_STOP} -s -m smart"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-
-		ewarn "Shutting down the server gracefully failed."
-		ewarn "Probably because some clients did not disconnect within 60 seconds."
-	else
-		ewarn "NICE_QUIT disabled."
-		ewarn "You really should have it enabled."
-	fi
-
-	if [[ "${RUDE_QUIT}" != "NO" ]] ; then
-		ewarn "RUDE_QUIT enabled."
-		ewarn "Going to shutdown the server anyway."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.2/bin/pg_ctl stop ${WAIT_FOR_STOP} -s -m fast"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Failed to shutdown server."
-	else
-		ewarn "RUDE_QUIT disabled."
-	fi
-
-	if [[ "${FORCE_QUIT}" == "YES" ]] ; then
-		ewarn "FORCE_QUIT enabled."
-		ewarn "Forcing server to shutdown."
-		ewarn "A recover-run will be executed on the next startup."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.2/bin/pg_ctl stop ${WAIT_FOR_STOP} -s -m immediate"
-
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			ewarn "Server forced down."
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Forced shutdown failed!!!"
-		eerror "Something is wrong with your system."
-		eerror "Please take care of it manually."
-		eerror "Unable to stop server."
-		eend $retval
-		return $retval
-	else
-		ewarn "FORCE_QUIT disabled."
-		eerror "Unable to shutdown server."
-		eend 1
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.2/bin/pg_ctl reload -s"
-	eend $?
-}
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.3-r1 b/dev-db/postgresql-server/files/postgresql.init-8.3-r1
deleted file mode 100644
index e7f6bc38e182..000000000000
--- a/dev-db/postgresql-server/files/postgresql.init-8.3-r1
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3-r1,v 1.1 2010/06/04 14:18:52 patrick Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-	if [ -L /etc/eselect/postgresql/service ] ; then 
-		local p_service="$(for f in /etc/eselect/postgresql/service/* ; do . $f ; done ; echo $postgres_service )"
-		test "${p_service}" = "${SVCNAME}" && provide postgresql
-	fi
-}
-
-checkconfig() {
-	if [ ! -d "$PGDATA" ] ; then
-		eerror "Directory not found: $PGDATA"
-		eerror "Please make sure that PGDATA points to the right path."
-		eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-
-	if [ -f "$PGDATA/postmaster.pid" ] ; then
-		rm -f "$PGDATA/postmaster.pid"
-	fi
-
-	local retval
-
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.3/bin/pg_ctl start ${WAIT_FOR_START} -t ${START_TIMEOUT} -s -o '--silent-mode=true ${PGOPTS}'"
-	retval=$?
-
-	if [[ $retval != 0 ]] ; then
-		eend $retval
-		return $retval
-	fi
-
-# The following is to catch the case of an already running server
-# in which pg_ctl doesn't know to which server it connected to and
-# falsely reports the server as 'up'
-	sleep 2
-	if [ ! -f "$PGDATA/postmaster.pid" ] ; then
-		eerror "The PID file doesn't exist but pg_ctl reported a running server."
-		eerror "Please check whether there is another server running on the same port or read the log-file."
-		eend 1
-		return 1
-	fi
-
-	local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
-	ps -p "${pid}" &> /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL (this can take up to $(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) seconds)"
-
-	local retval
-
-	if [[ "${NICE_QUIT}" != "NO" ]] ; then
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.3/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${NICE_TIMEOUT} -s -m smart"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-
-		ewarn "Shutting down the server gracefully failed."
-		ewarn "Probably because some clients did not disconnect within ${NICE_TIMEOUT} seconds."
-	else
-		ewarn "NICE_QUIT disabled."
-		ewarn "You really should have it enabled."
-	fi
-
-	if [[ "${RUDE_QUIT}" != "NO" ]] ; then
-		ewarn "RUDE_QUIT enabled."
-		ewarn "Going to shutdown the server anyway."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.3/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${RUDE_TIMEOUT} -s -m fast"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Failed to shutdown server."
-	else
-		ewarn "RUDE_QUIT disabled."
-	fi
-
-	if [[ "${FORCE_QUIT}" == "YES" ]] ; then
-		ewarn "FORCE_QUIT enabled."
-		ewarn "Forcing server to shutdown."
-		ewarn "A recover-run will be executed on the next startup."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.3/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${FORCE_TIMEOUT} -s -m immediate"
-
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			ewarn "Server forced down."
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Forced shutdown failed!!!"
-		eerror "Something is wrong with your system."
-		eerror "Please take care of it manually."
-		eerror "Unable to stop server."
-		eend $retval
-		return $retval
-	else
-		ewarn "FORCE_QUIT disabled."
-		eerror "Unable to shutdown server."
-		eend 1
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.3/bin/pg_ctl reload -s"
-	eend $?
-}
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.4-r1 b/dev-db/postgresql-server/files/postgresql.init-8.4-r1
deleted file mode 100644
index a797c5efcf73..000000000000
--- a/dev-db/postgresql-server/files/postgresql.init-8.4-r1
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4-r1,v 1.2 2010/07/11 11:53:55 patrick Exp $
-
-opts="${opts} reload"
-
-depend() {
-    use net
-    if [ -L /etc/eselect/postgresql/service ] ; then 
-	local p_service="$(for f in /etc/eselect/postgresql/service/* ; do . $f ; done ; echo $postgres_service )"
-	test "${p_service}" = "${SVCNAME}" && provide postgresql
-    fi
-}
-
-checkconfig() {
-    if [ ! -d "$PGDATA" ] ; then
-	eerror "Directory not found: $PGDATA"
-	eerror "Please make sure that PGDATA points to the right path."
-	eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster."
-	return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting PostgreSQL"
-
-    if [ -f "$PGDATA/postmaster.pid" ] ; then
-	rm -f "$PGDATA/postmaster.pid"
-    fi
-
-    local retval
-
-    su -l ${PGUSER} \
-	-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -t ${START_TIMEOUT} -s -o '--silent-mode=true ${PGOPTS}'"
-    retval=$?
-
-    if [[ $retval != 0 ]] ; then
-	eend $retval
-	return $retval
-    fi
-
-    # The following is to catch the case of an already running server
-    # in which pg_ctl doesn't know to which server it connected to and
-    # falsely reports the server as 'up'
-    sleep 2
-    if [ ! -f "$PGDATA/postmaster.pid" ] ; then
-	eerror "The PID file doesn't exist but pg_ctl reported a running server."
-	eerror "Please check whether there is another server running on the same port or read the log-file."
-	eend 1
-	return 1
-    fi
-
-    local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
-    ps -p "${pid}" &> /dev/null
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping PostgreSQL (this can take up to $(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) seconds)"
-
-    local retval
-
-    if [[ "${NICE_QUIT}" != "NO" ]] ; then
-	su -l ${PGUSER} \
-	    -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.4/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${NICE_TIMEOUT} -s -m smart"
-	retval=$?
-
-	if [[ $retval == 0 ]] ; then
-	    eend $retval
-	    return $retval
-	fi
-	
-	ewarn "Shutting down the server gracefully failed."
-	ewarn "Probably because some clients did not disconnect within ${NICE_TIMEOUT} seconds."
-    else
-	ewarn "NICE_QUIT disabled."
-	ewarn "You really should have it enabled."
-    fi
-
-    if [[ "${RUDE_QUIT}" != "NO" ]] ; then
-	ewarn "RUDE_QUIT enabled."
-	ewarn "Going to shutdown the server anyway."
-
-	su -l ${PGUSER} \
-	    -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.4/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${RUDE_TIMEOUT} -s -m fast"
-	retval=$?
-
-	if [[ $retval == 0 ]] ; then
-	    eend $retval
-	    return $retval
-	fi
-
-	eerror "Failed to shutdown server."
-    else
-	ewarn "RUDE_QUIT disabled."
-    fi
-
-    if [[ "${FORCE_QUIT}" == "YES" ]] ; then
-	ewarn "FORCE_QUIT enabled."
-	ewarn "Forcing server to shutdown."
-	ewarn "A recover-run will be executed on the next startup."
-
-	su -l ${PGUSER} \
-	    -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.4/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${FORCE_TIMEOUT} -s -m immediate"
-
-	retval=$?
-
-	if [[ $retval == 0 ]] ; then
-	    ewarn "Server forced down."
-	    eend $retval
-	    return $retval
-	fi
-
-	eerror "Forced shutdown failed!!!"
-	eerror "Something is wrong with your system."
-	eerror "Please take care of it manually."
-	eerror "Unable to stop server."
-	eend $retval
-	return $retval
-    else
-	ewarn "FORCE_QUIT disabled."
-	eerror "Unable to shutdown server."
-	eend 1
-	return 1
-    fi
-}
-
-reload() {
-    ebegin "Reloading PostgreSQL configuration"
-    su -l ${PGUSER} \
-	-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-8.4/bin/pg_ctl reload -s"
-    eend $?
-}
diff --git a/dev-db/postgresql-server/files/postgresql.init-9.0-r1 b/dev-db/postgresql-server/files/postgresql.init-9.0-r1
deleted file mode 100644
index 684a8e8f86bd..000000000000
--- a/dev-db/postgresql-server/files/postgresql.init-9.0-r1
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-9.0-r1,v 1.1 2010/06/04 14:18:52 patrick Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-	if [ -L /etc/eselect/postgresql/service ] ; then 
-		local p_service="$(for f in /etc/eselect/postgresql/service/* ; do . $f ; done ; echo $postgres_service )"
-		test "${p_service}" = "${SVCNAME}" && provide postgresql
-	fi
-}
-
-checkconfig() {
-	if [ ! -d "$PGDATA" ] ; then
-		eerror "Directory not found: $PGDATA"
-		eerror "Please make sure that PGDATA points to the right path."
-		eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-
-	if [ -f "$PGDATA/postmaster.pid" ] ; then
-		rm -f "$PGDATA/postmaster.pid"
-	fi
-
-	local retval
-
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl start ${WAIT_FOR_START} -t ${START_TIMEOUT} -s -o '--silent-mode=true ${PGOPTS}'"
-	retval=$?
-
-	if [[ $retval != 0 ]] ; then
-		eend $retval
-		return $retval
-	fi
-
-# The following is to catch the case of an already running server
-# in which pg_ctl doesn't know to which server it connected to and
-# falsely reports the server as 'up'
-	sleep 2
-	if [ ! -f "$PGDATA/postmaster.pid" ] ; then
-		eerror "The PID file doesn't exist but pg_ctl reported a running server."
-		eerror "Please check whether there is another server running on the same port or read the log-file."
-		eend 1
-		return 1
-	fi
-
-	local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid")
-	ps -p "${pid}" &> /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL (this can take up to $(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) seconds)"
-
-	local retval
-
-	if [[ "${NICE_QUIT}" != "NO" ]] ; then
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${NICE_TIMEOUT} -s -m smart"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-	
-		ewarn "Shutting down the server gracefully failed."
-		ewarn "Probably because some clients did not disconnect within ${NICE_TIMEOUT} seconds."
-	else
-		ewarn "NICE_QUIT disabled."
-		ewarn "You really should have it enabled."
-	fi
-
-	if [[ "${RUDE_QUIT}" != "NO" ]] ; then
-		ewarn "RUDE_QUIT enabled."
-		ewarn "Going to shutdown the server anyway."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${RUDE_TIMEOUT} -s -m fast"
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Failed to shutdown server."
-	else
-		ewarn "RUDE_QUIT disabled."
-	fi
-
-	if [[ "${FORCE_QUIT}" == "YES" ]] ; then
-		ewarn "FORCE_QUIT enabled."
-		ewarn "Forcing server to shutdown."
-		ewarn "A recover-run will be executed on the next startup."
-
-		su -l ${PGUSER} \
-			-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${FORCE_TIMEOUT} -s -m immediate"
-
-		retval=$?
-
-		if [[ $retval == 0 ]] ; then
-			ewarn "Server forced down."
-			eend $retval
-			return $retval
-		fi
-
-		eerror "Forced shutdown failed!!!"
-		eerror "Something is wrong with your system."
-		eerror "Please take care of it manually."
-		eerror "Unable to stop server."
-		eend $retval
-		return $retval
-	else
-		ewarn "FORCE_QUIT disabled."
-		eerror "Unable to shutdown server."
-		eend 1
-		return 1
-	fi
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl reload -s"
-	eend $?
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.21-r1.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.21-r1.ebuild
deleted file mode 100644
index ead785754cfe..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.2.21-r1.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.2.21-r1.ebuild,v 1.6 2011/08/07 15:48:57 jer Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.0.1.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EROOT%/}/usr/include/postgresql-${SLOT}/" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-			PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" "${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source ${EROOT%/}/etc/conf.d/postgresql-${SLOT}
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1."
-	einfo "You can enable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$("${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT="${SLOT}"
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.21-r2.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.21-r2.ebuild
deleted file mode 100644
index 5199cdc28b01..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.2.21-r2.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.2.21-r2.ebuild,v 1.4 2011/09/24 17:14:00 armin76 Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.0.1.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" "${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" "${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-			PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" "${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source ${EROOT%/}/etc/conf.d/postgresql-${SLOT}
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1."
-	einfo "You can enable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$("${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT="${SLOT}"
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild
deleted file mode 100644
index 3a26be90ec8b..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild,v 1.9 2011/09/26 19:34:24 halcy0n Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc perl python selinux tcl uuid xml nls kernel_linux ${IUSE_LINGUAS}"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# TODO: test if PPC really cannot work with other CFLAGS settings
-	# use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--disable-thread-safety \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")" \
-		|| die "configure failed"
-}
-
-src_compile() {
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/${PF}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please re-emerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	elog "postgresql.conf."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS"
-	einfo "variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by"
-	einfo "setting the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check \
-			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.15-r1.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.15-r1.ebuild
deleted file mode 100644
index f6d7fb3a5d12..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.15-r1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.15-r1.ebuild,v 1.6 2011/08/07 15:48:57 jer Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch" \
-		"${WORKDIR}/darwin.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EROOT%/}/usr/include/postgresql-${SLOT}/" \
-		--with-system-tzdata="${EROOT%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" "${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.confd
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.init
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized."
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)."
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	einfo "postgresql.conf."
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.15-r2.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.15-r2.ebuild
deleted file mode 100644
index 89f1dcf1b1e7..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.15-r2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.15-r2.ebuild,v 1.4 2011/09/24 17:14:00 armin76 Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" "${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" "${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" "${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.confd
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.init
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized."
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)."
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	einfo "postgresql.conf."
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild
deleted file mode 100644
index 018d66e1cfff..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild,v 1.9 2011/09/26 19:34:24 halcy0n Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-
-# weird test failures.
-RESTRICT="test"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib python versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="pg_legacytimestamp doc perl python selinux tcl uuid xml nls kernel_linux ${IUSE_LINGUAS}"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# TODO: test if PPC really cannot work with other CFLAGS settings
-	# use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in .  contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please reemerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale and character encoding in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	elog "default. You can disable it in the cluster's postgresql.conf."
-	elog
-	elog "The timestamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by setting"
-	einfo "the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check  || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.8-r1.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.8-r1.ebuild
deleted file mode 100644
index 81f006f2a7c3..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.8-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.8-r1.ebuild,v 1.6 2011/08/07 15:48:57 jer Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/ldflags.patch" \
-		"${WORKDIR}/SuperH.patch" \
-		"${WORKDIR}/darwin.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EROOT%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EROOT%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" "${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.confd
-	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} || die "Inserting conf.d file failed"
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.init
-	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} || die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload of enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale and character encoding in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	einfo "default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.8-r2.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.8-r2.ebuild
deleted file mode 100644
index f9cc812a645a..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.8-r2.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.8-r2.ebuild,v 1.4 2011/09/24 17:14:00 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" "${WORKDIR}/ldflags.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" "${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" "${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.confd
-	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} || die "Inserting conf.d file failed"
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.init
-	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} || die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload of enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale and character encoding in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	einfo "default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild
deleted file mode 100644
index 771cdc79c894..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild,v 1.9 2011/09/26 19:34:24 halcy0n Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-
-# weird test failures.
-RESTRICT="test"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib python versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-
-MY_PV=${PV/_/}
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-S=${WORKDIR}/postgresql-${MY_PV}
-
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls perl pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.3.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--disable-thread-safety \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please reemerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale and character encoding in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	elog "default. You can disable it in the cluster's postgresql.conf."
-	elog
-	elog "The timestamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS"
-	einfo "variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by"
-	einfo "setting the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check  || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.4-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.4-r1.ebuild
deleted file mode 100644
index 75a35384f09a..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.4-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.4-r1.ebuild,v 1.6 2011/08/07 15:48:57 jer Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/server.patch"
-	epatch "${FILESDIR}"/${P}-bool.patch
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EROOT%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EROOT%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/
-	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
-		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}/postgresql.confd"
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || die "Inserting conf.d file failed"
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}/postgresql.init"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database cannot start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres \
-			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
-			-U postgres -D "${DATA_DIR}" \
-			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.4-r2.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.4-r2.ebuild
deleted file mode 100644
index 063a7ea2b6d6..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.4-r2.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.4-r2.ebuild,v 1.5 2011/09/24 17:14:00 armin76 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( dev-util/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" "${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${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
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/
-	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
-		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}/postgresql.confd"
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || die "Inserting conf.d file failed"
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}/postgresql.init"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database cannot start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres \
-			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
-			-U postgres -D "${DATA_DIR}" \
-			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}