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

(Portage version: 2.1.10.11/cvs/Linux i686)

27 files changed, 18 insertions, 2880 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 8aa6f4467ac8..7e014a91e521 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.145 2011/10/01 20:15:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.146 2011/10/02 11:17:22 titanofold Exp $
+
+  02 Oct 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  -postgresql-base-8.2.21-r2.ebuild, -postgresql-base-8.2.21-r3.ebuild,
+  -files/postgresql-8.2-base.patch, -files/postgresql-8.2-common.patch,
+  -postgresql-base-8.3.14.ebuild, -postgresql-base-8.3.15-r2.ebuild,
+  -postgresql-base-8.3.15-r3.ebuild, -files/postgresql-8.3-base.patch,
+  -files/postgresql-8.3-common.patch, -postgresql-base-8.4.7.ebuild,
+  -files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch,
+  -postgresql-base-8.4.8-r2.ebuild, -postgresql-base-8.4.8-r3.ebuild,
+  -files/postgresql-8.4-base.patch, -files/postgresql-8.4-common.patch,
+  -files/postgresql-8.x-relax_ssl_perms.patch, -postgresql-base-9.0.3.ebuild,
+  -postgresql-base-9.0.4-r2.ebuild, -postgresql-base-9.0.4-r3.ebuild,
+  -files/postgresql-base-9.0.4-stdbool.patch,
+  -files/postgresql-9.0-base.2.patch, -files/postgresql-9.0-base.3.patch,
+  -files/postgresql-9.0-base.patch, -files/postgresql-9.0-common.3.patch,
+  -files/postgresql-9.0-common.patch, -files/postgresql-9.0-makefile.patch:
+  Removed versions affected by bug 384539 and cleaned out unused files.
 
   01 Oct 2011; Markos Chandras <hwoarang@gentoo.org>
   postgresql-base-8.2.22.ebuild, postgresql-base-8.3.16.ebuild,
diff --git a/dev-db/postgresql-base/files/postgresql-8.2-base.patch b/dev-db/postgresql-base/files/postgresql-8.2-base.patch
deleted file mode 100644
index a4881ed4f4c0..000000000000
--- a/dev-db/postgresql-base/files/postgresql-8.2-base.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-=== contrib/Makefile
-==================================================================
---- contrib/Makefile	(revision 10)
-+++ contrib/Makefile	(local)
-@@ -5,37 +5,10 @@
- include $(top_builddir)/src/Makefile.global
- 
- WANTED_DIRS = \
--		adminpack	\
--		btree_gist	\
--		chkpass		\
--		cube		\
--		dblink		\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_trgm		\
- 		pgbench		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		seg		\
--		spi		\
--		tablefunc	\
--		tsearch2	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--WANTED_DIRS += sslinfo
--endif
--
- # Missing:
- #		start-scripts	\ (does not have a makefile)
- #		xml2		\ (requires libxml installed)
-=== src/Makefile
-==================================================================
---- src/Makefile	(revision 10)
-+++ src/Makefile	(local)
-@@ -15,15 +15,11 @@
- 
- all install installdirs uninstall dep depend distprep:
- 	$(MAKE) -C port $@
--	$(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
- 
-=== src/backend/Makefile
-==================================================================
---- src/backend/Makefile	(revision 10)
-+++ src/backend/Makefile	(local)
-@@ -33,7 +33,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -105,8 +105,7 @@
- 
- .PHONY: $(DIRS:%=%-recursive)
- # Update the commonly used headers before building the subdirectories
--$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
--	$(MAKE) -C $(subst -recursive,,$@) all
-+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
- 
- 
- # The postgres.o target is needed by the rule in Makefile.global that
-@@ -153,22 +152,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-=== src/bin/Makefile
-==================================================================
---- src/bin/Makefile	(revision 10)
-+++ 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 := pg_dump \
-+	psql scripts pg_config
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-=== src/include/pg_config_manual.h
-==================================================================
---- src/include/pg_config_manual.h	(revision 10)
-+++ 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
diff --git a/dev-db/postgresql-base/files/postgresql-8.2-common.patch b/dev-db/postgresql-base/files/postgresql-8.2-common.patch
deleted file mode 100644
index e6e8e46f3a0b..000000000000
--- a/dev-db/postgresql-base/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-base/files/postgresql-8.3-base.patch b/dev-db/postgresql-base/files/postgresql-8.3-base.patch
deleted file mode 100644
index 582e59983f9e..000000000000
--- a/dev-db/postgresql-base/files/postgresql-8.3-base.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-=== contrib/Makefile
-==================================================================
---- contrib/Makefile	(revision 2)
-+++ contrib/Makefile	(local)
-@@ -5,41 +5,10 @@
- include $(top_builddir)/src/Makefile.global
- 
- WANTED_DIRS = \
--		adminpack	\
--		btree_gist	\
--		chkpass		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		pageinspect	\
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_standby	\
--		pg_trgm		\
- 		pgbench		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		seg		\
--		spi		\
--		tablefunc	\
--		test_parser	\
--		tsearch2	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--WANTED_DIRS += sslinfo
--endif
- 
- ifeq ($(with_ossp_uuid),yes)
- WANTED_DIRS += uuid-ossp
-=== src/Makefile
-==================================================================
---- src/Makefile	(revision 2)
-+++ src/Makefile	(local)
-@@ -15,16 +15,11 @@
- 
- all install installdirs uninstall distprep:
- 	$(MAKE) -C port $@
--	$(MAKE) -C timezone $@
- 	$(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
- 
-=== src/backend/Makefile
-==================================================================
---- src/backend/Makefile	(revision 2)
-+++ src/backend/Makefile	(local)
-@@ -34,7 +34,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -107,8 +107,7 @@
- 
- .PHONY: $(DIRS:%=%-recursive)
- # Update the commonly used headers before building the subdirectories
--$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
--	$(MAKE) -C $(subst -recursive,,$@) all
-+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
- 
- 
- # The postgres.o target is needed by the rule in Makefile.global that
-@@ -155,23 +154,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-=== src/bin/Makefile
-==================================================================
---- src/bin/Makefile	(revision 2)
-+++ 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 = pg_dump \
-+	psql scripts pg_config
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-=== src/include/pg_config_manual.h
-==================================================================
---- src/include/pg_config_manual.h	(revision 2)
-+++ 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
diff --git a/dev-db/postgresql-base/files/postgresql-8.3-common.patch b/dev-db/postgresql-base/files/postgresql-8.3-common.patch
deleted file mode 100644
index c9f2ad22052a..000000000000
--- a/dev-db/postgresql-base/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-base/files/postgresql-8.4-base.patch b/dev-db/postgresql-base/files/postgresql-8.4-base.patch
deleted file mode 100644
index d2b51dd186db..000000000000
--- a/dev-db/postgresql-base/files/postgresql-8.4-base.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-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 21:17:38.000000000 +0200
-@@ -5,46 +5,10 @@
- include $(top_builddir)/src/Makefile.global
- 
- WANTED_DIRS = \
--		adminpack	\
--		auto_explain	\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		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
- 
--ifeq ($(with_openssl),yes)
--WANTED_DIRS += sslinfo
--endif
--
- ifeq ($(with_ossp_uuid),yes)
- WANTED_DIRS += uuid-ossp
- endif
-diff -Naur postgresql-8.4.0.orig/src/backend/Makefile postgresql-8.4.0/src/backend/Makefile
---- postgresql-8.4.0.orig/src/backend/Makefile	2009-01-01 18:23:34.000000000 +0100
-+++ postgresql-8.4.0/src/backend/Makefile	2009-07-09 21:22:13.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -105,7 +105,7 @@
- endif # aix
- 
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
- 
- # The postgres.o target is needed by the rule in Makefile.global that
-@@ -161,23 +161,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-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 21:27:09.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 = pg_dump \
-+	psql scripts pg_config
- 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 21:27:44.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 21:18:20.000000000 +0200
-@@ -15,16 +15,11 @@
- 
- all install installdirs uninstall distprep:
- 	$(MAKE) -C port $@
--	$(MAKE) -C timezone $@
- 	$(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
- 
diff --git a/dev-db/postgresql-base/files/postgresql-8.4-common.patch b/dev-db/postgresql-base/files/postgresql-8.4-common.patch
deleted file mode 100644
index 3ca9f6cd98c2..000000000000
--- a/dev-db/postgresql-base/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-base/files/postgresql-8.x-relax_ssl_perms.patch b/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch
deleted file mode 100644
index 242aa33e0812..000000000000
--- a/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur postgresql-8.0.15.orig/src/backend/libpq/be-secure.c postgresql-8.0.15/src/backend/libpq/be-secure.c
---- postgresql-8.0.15.orig/src/backend/libpq/be-secure.c	2008-02-21 04:06:04.334289203 +0100
-+++ postgresql-8.0.15/src/backend/libpq/be-secure.c	2008-02-21 04:08:47.309426324 +0100
-@@ -737,8 +737,8 @@
- 		 * data directory permission check in postmaster.c)
- 		 */
- #if !defined(WIN32) && !defined(__CYGWIN__)
--		if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) ||
--			buf.st_uid != geteuid())
-+		if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IWGRP | S_IRWXO)) ||
-+			(buf.st_uid != geteuid()) && buf.st_uid != 0)
- 			ereport(FATAL,
- 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
- 				  errmsg("unsafe permissions on private key file \"%s\"",
diff --git a/dev-db/postgresql-base/files/postgresql-9.0-base.2.patch b/dev-db/postgresql-base/files/postgresql-9.0-base.2.patch
deleted file mode 100644
index e092e1c15966..000000000000
--- a/dev-db/postgresql-base/files/postgresql-9.0-base.2.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-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 21:17:38.000000000 +0200
-@@ -5,48 +5,12 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		auto_explain	\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		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)
--SUBDIRS += sslinfo
--endif
--
- ifeq ($(with_ossp_uuid),yes)
- SUBDIRS += uuid-ossp
- endif
-diff -Naur postgresql-8.5alpha3.orig/src/backend/Makefile postgresql-8.5alpha3/src/backend/Makefile
---- postgresql-8.5alpha3.orig/src/backend/Makefile	2009-01-01 18:23:34.000000000 +0100
-+++ postgresql-8.5alpha3/src/backend/Makefile	2009-07-09 21:22:13.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -105,7 +105,7 @@
- endif # aix
- 
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
- 
- # The postgres.o target is needed by the rule in Makefile.global that
-@@ -161,23 +161,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-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 21:27:09.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 = pg_dump \
-+	psql scripts pg_config
- 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 21:27:44.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 21:18:20.000000000 +0200
-@@ -15,17 +15,12 @@
- 
- all install installdirs uninstall distprep:
- 	$(MAKE) -C port $@
--	$(MAKE) -C timezone $@
- 	$(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
- 
diff --git a/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch b/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch
deleted file mode 100644
index ba6a92688bb8..000000000000
--- a/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-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-11 23:41:57.680531730 -0400
-@@ -5,51 +5,14 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		auto_explain	\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		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	\
--		seg		\
--		spi		\
--		tablefunc	\
--		test_parser	\
--		tsearch2	\
- 		unaccent	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--endif
--
- ifeq ($(with_ossp_uuid),yes)
- SUBDIRS += uuid-ossp
- endif
-diff -Naur postgresql-9.0beta3.orig/src/backend/Makefile postgresql-9.0beta3/src/backend/Makefile
---- postgresql-9.0beta3.orig/src/backend/Makefile	2010-07-05 14:54:37.000000000 -0400
-+++ postgresql-9.0beta3/src/backend/Makefile	2010-07-11 23:46:58.347527452 -0400
-@@ -45,7 +45,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -114,7 +114,7 @@
- endif # aix
- 
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
- # run this unconditionally to avoid needing to know its dependencies here:
- submake-schemapg:
-@@ -191,23 +191,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-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-11 23:50:10.762585482 -0400
-@@ -13,8 +13,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+SUBDIRS = pg_dump psql scripts pg_config
- 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-11 23:51:39.925527262 -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-11 23:53:43.768528995 -0400
-@@ -15,17 +15,12 @@
- 
- all install installdirs uninstall distprep:
- 	$(MAKE) -C port $@
--	$(MAKE) -C timezone $@
- 	$(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
- 
diff --git a/dev-db/postgresql-base/files/postgresql-9.0-base.patch b/dev-db/postgresql-base/files/postgresql-9.0-base.patch
deleted file mode 100644
index a310e2234a9c..000000000000
--- a/dev-db/postgresql-base/files/postgresql-9.0-base.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-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 21:17:38.000000000 +0200
-@@ -5,48 +5,12 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		auto_explain	\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		earthdistance	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		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)
--SUBDIRS += sslinfo
--endif
--
- ifeq ($(with_ossp_uuid),yes)
- SUBDIRS += uuid-ossp
- endif
-diff -Naur postgresql-8.5alpha3.orig/src/backend/Makefile postgresql-8.5alpha3/src/backend/Makefile
---- postgresql-8.5alpha3.orig/src/backend/Makefile	2009-01-01 18:23:34.000000000 +0100
-+++ postgresql-8.5alpha3/src/backend/Makefile	2009-07-09 21:22:13.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -105,7 +105,7 @@
- endif # aix
- 
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
- 
- # The postgres.o target is needed by the rule in Makefile.global that
-@@ -161,23 +161,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-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 21:27:09.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 = pg_dump \
-+	psql scripts pg_config
- 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 21:27:44.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 21:18:20.000000000 +0200
-@@ -15,17 +15,12 @@
- 
- all install installdirs uninstall distprep:
- 	$(MAKE) -C port $@
--	$(MAKE) -C timezone $@
- 	$(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
- 
diff --git a/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch b/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch
deleted file mode 100644
index ab47b0cb9707..000000000000
--- a/dev-db/postgresql-base/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-base/files/postgresql-9.0-common.patch b/dev-db/postgresql-base/files/postgresql-9.0-common.patch
deleted file mode 100644
index a10346ee092b..000000000000
--- a/dev-db/postgresql-base/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-base/files/postgresql-9.0-makefile.patch b/dev-db/postgresql-base/files/postgresql-9.0-makefile.patch
deleted file mode 100644
index c5b60a5c5d02..000000000000
--- a/dev-db/postgresql-base/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-base/files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch b/dev-db/postgresql-base/files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch
deleted file mode 100644
index 66ab3be66bbc..000000000000
--- a/dev-db/postgresql-base/files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur tmp-old/configure tmp-new/configure
---- configure	2009-12-24 08:50:48.000000000 +0000
-+++ configure	2009-12-24 09:12:00.000000000 +0000
-@@ -10258,10 +10258,10 @@
- 
- fi
- 
--# Some versions of libedit contain strlcpy(); so disregard that library while
-+# Some versions of libedit and libroken contain strlcpy(); so disregard that library while
- # checking for these standard libc functions.
- pgac_save_LIBS="$LIBS"
--LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
-+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g' -e 's/-lgssapi//g' -e 's/-lkrb5//g'`
- 
- for ac_func in crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
- do :
-diff -Naur tmp-old/configure.in tmp-new/configure.in
---- configure.in	2009-12-24 09:12:39.000000000 +0000
-+++ configure.in	2009-12-24 09:21:38.000000000 +0000
-@@ -1240,10 +1240,10 @@
-   AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
- fi
- 
--# Some versions of libedit contain strlcpy(); so disregard that library while
-+# Some versions of libedit and libroken contain strlcpy(); so disregard that library while
- # checking for these standard libc functions.
- pgac_save_LIBS="$LIBS"
--LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
-+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g' -e 's/-lgssapi//g' -e 's/-lkrb5//g'`
- 
- AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
- 
diff --git a/dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch b/dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch
deleted file mode 100644
index 989cf92ba5a3..000000000000
--- a/dev-db/postgresql-base/files/postgresql-base-9.0.4-stdbool.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Darwin defines bool to something on G5 with AltiVec
-
---- src/include/c.h
-+++ src/include/c.h
-@@ -76,6 +76,9 @@
- #include <stdint.h>
- #endif
- #include <sys/types.h>
-+#ifdef __APPLE_CC__
-+#undef bool
-+#endif
- 
- #include <errno.h>
- #if defined(WIN32) || defined(__CYGWIN__)
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.21-r2.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.21-r2.ebuild
deleted file mode 100644
index 79e7689f42b8..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.2.21-r2.ebuild
+++ /dev/null
@@ -1,143 +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-base/postgresql-base-8.2.21-r2.ebuild,v 1.6 2011/08/07 15:47:53 jer Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/base.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch" \
-		"${WORKDIR}/relax_ssl_perms.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
-		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
-		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
-		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
-		--with-locale-dir=${EROOT%/}/usr/share/postgresql-${SLOT}/locale \
-		--enable-depend \
-		--without-docdir \
-		--without-perl \
-		--without-python \
-		--without-tcl \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild
deleted file mode 100644
index d815065a8320..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild
+++ /dev/null
@@ -1,140 +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-base/postgresql-base-8.2.21-r3.ebuild,v 1.4 2011/09/24 17:11:35 armin76 Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.10
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-docdir \
-		--without-perl \
-		--without-python \
-		--without-tcl \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild
deleted file mode 100644
index 9e73bdec61ae..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild
+++ /dev/null
@@ -1,148 +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-base/postgresql-base-8.3.14.ebuild,v 1.9 2011/09/26 19:33:27 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 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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 kerberos nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
-RESTRICT="test"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-devel/bison-1.875
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
-		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--without-docdir \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
-
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-		MANPATH=/usr/share/postgresql-${SLOT}/man
-	__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.15-r2.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.15-r2.ebuild
deleted file mode 100644
index 587d8f4bdbd2..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.3.15-r2.ebuild
+++ /dev/null
@@ -1,146 +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-base/postgresql-base-8.3.15-r2.ebuild,v 1.6 2011/08/07 15:47:53 jer Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/base.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch" \
-		"${WORKDIR}/relax_ssl_perms.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
-		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
-		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
-		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
-		--with-locale-dir=${EROOT%/}/usr/share/postgresql-${SLOT}/locale \
-		--enable-depend \
-		--without-docdir \
-		--without-perl \
-		--without-python \
-		--without-tcl \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild
deleted file mode 100644
index 39f75d12d354..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild
+++ /dev/null
@@ -1,143 +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-base/postgresql-base-8.3.15-r3.ebuild,v 1.4 2011/09/24 17:11:35 armin76 Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.10
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch" \
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-docdir \
-		--without-perl \
-		--without-python \
-		--without-tcl \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild
deleted file mode 100644
index 99a8f2ea7c01..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild
+++ /dev/null
@@ -1,151 +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-base/postgresql-base-8.4.7.ebuild,v 1.9 2011/09/26 19:33:27 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 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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 kerberos nls pam readline ssl threads zlib ldap pg_legacytimestamp ${IUSE_LINGUAS}"
-RESTRICT="test"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-devel/bison-1.875
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
-
-	if use kerberos && has_version "<app-crypt/heimdal-1.3.2-r1" ; then
-		epatch "${FILESDIR}/postgresql-base-8.4-9.0-heimdal_strlcpy.patch"
-	fi
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--docdir=/usr/share/doc/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes ) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
-
-	rm -r "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-		MANPATH=/usr/share/postgresql-${SLOT}/man
-	__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.8-r2.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.8-r2.ebuild
deleted file mode 100644
index 7919896f18df..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.4.8-r2.ebuild
+++ /dev/null
@@ -1,144 +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-base/postgresql-base-8.4.8-r2.ebuild,v 1.6 2011/08/07 15:47:53 jer Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/base.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
-		--docdir=${EROOT%/}/usr/share/doc/postgresql-${SLOT} \
-		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
-		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
-		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild
deleted file mode 100644
index b2cce1c78762..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild
+++ /dev/null
@@ -1,143 +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-base/postgresql-base-8.4.8-r3.ebuild,v 1.4 2011/09/24 17:11:35 armin76 Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild
deleted file mode 100644
index 0d0e6f250327..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild
+++ /dev/null
@@ -1,155 +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-base/postgresql-base-9.0.3.ebuild,v 1.10 2011/09/26 19:33:27 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 ~sparc-fbsd ~x86-fbsd ~x86-solaris"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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 kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-RESTRICT="test"
-
-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-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	readline? ( sys-libs/readline )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.3.patch"
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf \
-		--prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--docdir=/usr/share/doc/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h || die
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/ || die
-	cp  "${S}"/doc/src/sgml/man1/* "${D}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template} || die
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT} || die
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-MANPATH=/usr/share/postgresql-${SLOT}/man
-__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}" || die
-
-	keepdir /etc/postgresql-${SLOT} || die
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    '${ROOT}/etc/postgresql-${SLOT}/'"
-	elog
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.4-r2.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.4-r2.ebuild
deleted file mode 100644
index abb611136226..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.0.4-r2.ebuild
+++ /dev/null
@@ -1,150 +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-base/postgresql-base-9.0.4-r2.ebuild,v 1.6 2011/08/07 15:47:53 jer Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( sys-libs/readline )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-		sys-devel/bison
-		sys-devel/flex
-		>=sys-apps/sandbox-2.0
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/base.patch"
-	epatch "${FILESDIR}"/${P}-stdbool.patch
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-		;;
-	esac
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
-		--docdir=${EROOT%/}/usr/share/doc/postgresql-${SLOT} \
-		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
-		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
-		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	dodir /usr/share/postgresql-${SLOT}/man/
-	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
-	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,postgres,postmaster}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.4-r3.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.4-r3.ebuild
deleted file mode 100644
index 813daa17aeb7..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.0.4-r3.ebuild
+++ /dev/null
@@ -1,149 +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-base/postgresql-base-9.0.4-r3.ebuild,v 1.4 2011/09/24 17:11:35 armin76 Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-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"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-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 kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-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=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( sys-libs/readline )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-		sys-devel/bison
-		sys-devel/flex
-		>=sys-apps/sandbox-2.0
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-		;;
-	esac
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	dodir /usr/share/postgresql-${SLOT}/man/
-	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
-	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,postgres,postmaster}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}