Remove old

(Portage version: 2.1.11.52/cvs/Linux ppc64, signed Manifest commit with key 7194459F)

20 files changed, 14 insertions, 6592 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 97f26a72b0d6..f43bc47fb8ce 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.243 2013/02/26 18:52:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.244 2013/02/26 19:14:08 ago Exp $
+
+  26 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
+  -postgresql-server-8.3.20.ebuild, -postgresql-server-8.3.21.ebuild,
+  -postgresql-server-8.3.22-r1.ebuild, -postgresql-server-8.3.22.ebuild,
+  -postgresql-server-8.4.13.ebuild, -postgresql-server-8.4.14.ebuild,
+  -postgresql-server-8.4.15-r1.ebuild, -postgresql-server-8.4.15.ebuild,
+  -postgresql-server-9.0.10.ebuild, -postgresql-server-9.0.11-r1.ebuild,
+  -postgresql-server-9.0.11.ebuild, -postgresql-server-9.0.9.ebuild,
+  -postgresql-server-9.1.5.ebuild, -postgresql-server-9.1.6.ebuild,
+  -postgresql-server-9.1.7-r1.ebuild, -postgresql-server-9.1.7.ebuild,
+  -postgresql-server-9.2.1.ebuild, -postgresql-server-9.2.2-r1.ebuild,
+  -postgresql-server-9.2.2.ebuild:
+  Remove old
 
   26 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
   postgresql-server-8.3.23-r1.ebuild, postgresql-server-8.4.16-r1.ebuild,
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.20.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.20.ebuild
deleted file mode 100644
index dfc61b202f77..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.20.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.20.ebuild,v 1.8 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized."
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)."
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			ebegin "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections"
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			eend
-		else
-			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	einfo "postgresql.conf."
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild
deleted file mode 100644
index fb1e6cfe0993..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild,v 1.6 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized."
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)."
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			ebegin "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections"
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			eend
-		else
-			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	einfo "postgresql.conf."
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.22-r1.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.22-r1.ebuild
deleted file mode 100644
index b1e3a43814e5..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.22-r1.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.22-r1.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized."
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)."
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			ebegin "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections"
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			eend
-		else
-			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	einfo "postgresql.conf."
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.22.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.22.ebuild
deleted file mode 100644
index 4bf82e2ac3fd..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.22.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.22.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/${PF}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source ${EROOT%/}/etc/env.d/02locale
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized."
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "Tests not supported on this OS (yet)."
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			ebegin "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections"
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			eend
-		else
-			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	einfo "postgresql.conf."
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
-			emake check \
-			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.13.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.13.ebuild
deleted file mode 100644
index ff791638d57c..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.13.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.13.ebuild,v 1.8 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/ldflags.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" \
-			"${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-			|| die "emake install in $bd failed"
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload of enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	einfo "default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild
deleted file mode 100644
index a3d65df20d5e..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild,v 1.6 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/ldflags.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" \
-			"${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-			|| die "emake install in $bd failed"
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload of enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	einfo "default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.15-r1.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.15-r1.ebuild
deleted file mode 100644
index cc86ac56ece7..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.15-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.15-r1.ebuild,v 1.1 2013/01/12 19:10:13 titanofold Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/ldflags.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" \
-			"${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-			|| die "emake install in $bd failed"
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload of enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	einfo "default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.15.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.15.ebuild
deleted file mode 100644
index 55fd51aae929..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.15.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.15.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/ldflags.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" \
-			"${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" \
-			> "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-			|| die "emake install in $bd failed"
-	done
-
-	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
-		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload of enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-	elog
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z ${PG_INITDB_OPTS} ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "  - Change the mentioned system parameter"
-					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	einfo "default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild
deleted file mode 100644
index c609bc643f2d..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild,v 1.6 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/
-	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
-		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres \
-			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
-			-U postgres -D "${DATA_DIR}" \
-			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.11-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.11-r1.ebuild
deleted file mode 100644
index 525eae79f7cd..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.11-r1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.11-r1.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/
-	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
-		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres \
-			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
-			-U postgres -D "${DATA_DIR}" \
-			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.11.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.11.ebuild
deleted file mode 100644
index 03a588d6d6b4..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.11.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.11.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/
-	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
-		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres \
-			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
-			-U postgres -D "${DATA_DIR}" \
-			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.9.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.9.ebuild
deleted file mode 100644
index e3f41b9270e5..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.9.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.9.ebuild,v 1.8 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib pam prefix python user versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-		 perl? ( >=dev-lang/perl-5.8 )
-		 selinux? ( sec-policy/selinux-postgresql )
-		 tcl? ( >=dev-lang/tcl-8 )
-		 uuid? ( dev-libs/ossp-uuid )
-		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-DEPEND="${RDEPEND}
-		sys-devel/flex
-		xml? ( virtual/pkgconfig )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/
-	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
-		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} \
-		|| die "Inserting conf.d file failed"
-
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} \
-		|| die "Inserting init.d file failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[[ -n ${LANG} ]] && export LANG
-		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
-		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
-		[[ -n ${LC_TIME} ]] && export LC_TIME
-		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
-		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
-		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
-		[[ -n ${LC_ALL} ]] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [[ $correct != "true" ]] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	if [[ ${EUID} == 0 ]] ; then
-		einfo "Creating the data directory ..."
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres \
-			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
-			-U postgres -D "${DATA_DIR}" \
-			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [[ ${UID} != 0 ]] ; then
-		emake check || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.5.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.5.ebuild
deleted file mode 100644
index 13bbed79612d..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.1.5.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.5.ebuild,v 1.8 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/postgresql-${PV}"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake -j1 check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild
deleted file mode 100644
index abd43dd62f92..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild,v 1.6 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/postgresql-${PV}"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake -j1 check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.7-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.7-r1.ebuild
deleted file mode 100644
index 82a60863b141..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.1.7-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.7-r1.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/postgresql-${PV}"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake -j1 check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.7.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.7.ebuild
deleted file mode 100644
index 37dde317b84b..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.1.7.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.7.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/postgresql-${PV}"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
-LICENSE="POSTGRESQL GPL-2"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake -j1 check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild
deleted file mode 100644
index 80b2992a9576..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild,v 1.6 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-# Comment the following six lines when not a beta or rc.
-#MY_PV="${PV//_}"
-#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
-#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
-#SRC_URI="mirror://postgresql/source/v${MY_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
-
-# Comment the following four lines when a beta or rc.
-S="${WORKDIR}/postgresql-${PV}"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-#		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-#			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.2-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.2-r1.ebuild
deleted file mode 100644
index 3b25a0ea884d..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.2.2-r1.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.2-r1.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-# Comment the following six lines when not a beta or rc.
-#MY_PV="${PV//_}"
-#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
-#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
-#SRC_URI="mirror://postgresql/source/v${MY_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
-
-# Comment the following four lines when a beta or rc.
-S="${WORKDIR}/postgresql-${PV}"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-#		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-#			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.2.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.2.ebuild
deleted file mode 100644
index a059360f3f97..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.2.2.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.2.ebuild,v 1.2 2013/01/29 10:09:22 patrick Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-# Comment the following six lines when not a beta or rc.
-#MY_PV="${PV//_}"
-#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
-#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
-#SRC_URI="mirror://postgresql/source/v${MY_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
-
-# Comment the following four lines when a beta or rc.
-S="${WORKDIR}/postgresql-${PV}"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( virtual/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" \
-		"${WORKDIR}/bool.patch" \
-		"${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-#		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
-#			-i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
-		die "RUNDIR sed failed"
-	sed -e "s|@SLOT@|${SLOT}|g" \
-		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
-		die "SLOT sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	local PO="${EPREFIX%/}"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
-
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
-		die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	if use prefix ; then
-		keepdir ${RUNDIR}/run/postgresql
-		fperms 0770 ${RUNDIR}/run/postgresql
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "Gentoo specific documentation:"
-	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
-	elog
-	elog "Official documentation:"
-	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-	elog
-	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the"
-	elog "socket, you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-	elog "so that it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
-
-		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	if [ ${UID} -ne 0 ] ; then
-		emake check  || die "Make check failed. See above for details."
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		ewarn "Tests cannot be run as root. Skipping."
-		ewarn "HINT: FEATURES=\"userpriv\""
-	fi
-}