Remove old

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

18 files changed, 21 insertions, 2425 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 0f98f99e2722..0a8b5856e1f1 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.138 2011/09/26 18:01:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.139 2011/09/26 18:06:47 patrick Exp $
+
+  26 Sep 2011; Patrick Lauer <patrick@gentoo.org>
+  -postgresql-base-8.2.20.ebuild, -postgresql-base-8.3.14.ebuild,
+  -postgresql-base-8.4.7.ebuild, -postgresql-base-9.0.3.ebuild,
+  -postgresql-base-9.1.0.ebuild:
+  Remove old
 
 *postgresql-base-9.1.1 (26 Sep 2011)
 *postgresql-base-9.0.5 (26 Sep 2011)
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.20.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.20.ebuild
deleted file mode 100644
index a6d859f5a1fd..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.2.20.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.20.ebuild,v 1.7 2011/03/06 17:49:40 armin76 Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
-RESTRICT="test"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-devel/bison-1.875
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
-		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--without-docdir \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
-
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__
-		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-		MANPATH=/usr/share/postgresql-${SLOT}/man
-	__EOF__
-	doenvd "${T}/50postgresql-95-${SLOT}"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild
deleted file mode 100644
index 32aa5cd43534..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.14.ebuild,v 1.7 2011/03/06 17:49:40 armin76 Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ldap ${IUSE_LINGUAS}"
-RESTRICT="test"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-devel/bison-1.875
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
-		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--without-docdir \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
-
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-		MANPATH=/usr/share/postgresql-${SLOT}/man
-	__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild
deleted file mode 100644
index 6dfd36a8f7ab..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.7.ebuild,v 1.7 2011/03/06 17:49:40 armin76 Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc kerberos nls pam readline ssl threads zlib ldap pg_legacytimestamp ${IUSE_LINGUAS}"
-RESTRICT="test"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	pam? ( virtual/pam )
-	readline? ( >=sys-libs/readline-4.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-devel/bison-1.875
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
-
-	if use kerberos && has_version "<app-crypt/heimdal-1.3.2-r1" ; then
-		epatch "${FILESDIR}/postgresql-base-8.4-9.0-heimdal_strlcpy.patch"
-	fi
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--docdir=/usr/share/doc/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes ) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
-
-	rm -r "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-		MANPATH=/usr/share/postgresql-${SLOT}/man
-	__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql-${SLOT}/'."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild
deleted file mode 100644
index 69e4e5776740..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.3.ebuild,v 1.8 2011/04/23 17:50:54 grobian Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-solaris"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-
-MY_PV=${PV/_/}
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-S=${WORKDIR}/postgresql-${MY_PV}
-
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-RESTRICT="test"
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="!!dev-db/postgresql-libs
-	!!dev-db/postgresql-client
-	!!dev-db/libpq
-	!!dev-db/postgresql
-	>=app-admin/eselect-postgresql-0.3
-	virtual/libintl
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	readline? ( sys-libs/readline )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.3.patch"
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	econf \
-		--prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
-		--datadir=/usr/share/postgresql-${SLOT} \
-		--docdir=/usr/share/doc/postgresql-${SLOT} \
-		--sysconfdir=/etc/postgresql-${SLOT} \
-		--includedir=/usr/include/postgresql-${SLOT} \
-		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--enable-depend \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd "${S}/contrib"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h || die
-
-	dodir /usr/share/postgresql-${SLOT}/man/man1/ || die
-	cp  "${S}"/doc/src/sgml/man1/* "${D}"/usr/share/postgresql-${SLOT}/man/man1/ || die
-
-	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
-	dodoc README HISTORY doc/{README.*,TODO,bug.template} || die
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install || die "emake install failed"
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT} || die
-
-	IDIR="/usr/include/postgresql-${SLOT}"
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
-postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT}
-postgres_datadir=/usr/share/postgresql-${SLOT}
-postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin
-postgres_symlinks=(
-	${IDIR} /usr/include/postgresql
-	${IDIR}/libpq-fe.h /usr/include/libpq-fe.h
-	${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h
-	${IDIR}/libpq /usr/include/libpq
-	${IDIR}/postgres_ext.h /usr/include/postgres_ext.h
-)
-__EOF__
-
-	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
-LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
-MANPATH=/usr/share/postgresql-${SLOT}/man
-__EOF__
-	doenvd "${T}/50postgresql-94-${SLOT}" || die
-
-	keepdir /etc/postgresql-${SLOT} || die
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    '${ROOT}/etc/postgresql-${SLOT}/'"
-	elog
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.1.0.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.0.ebuild
deleted file mode 100644
index 37c0f59378e4..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.1.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.1.0.ebuild,v 1.1 2011/09/17 17:47:28 titanofold Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib prefix versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/postgresql-${PV}"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2"
-LICENSE="POSTGRESQL"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="!!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 >=app-admin/eselect-postgresql-1.0.10
-		 virtual/libintl
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( sys-libs/readline )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		sys-devel/bison
-		sys-devel/flex
-		nls? ( sys-devel/gettext )
-"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with readline) \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake -j1
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	dodir /usr/share/postgresql-${SLOT}/man/
-	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
-	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-docs/ChangeLog b/dev-db/postgresql-docs/ChangeLog
index ef593e83f205..1dfbe5840753 100644
--- a/dev-db/postgresql-docs/ChangeLog
+++ b/dev-db/postgresql-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql-docs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.108 2011/09/26 18:01:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.109 2011/09/26 18:07:12 patrick Exp $
+
+  26 Sep 2011; Patrick Lauer <patrick@gentoo.org>
+  -postgresql-docs-8.2.20.ebuild, -postgresql-docs-8.3.14.ebuild,
+  -postgresql-docs-8.4.7.ebuild, -postgresql-docs-9.0.3.ebuild,
+  -postgresql-docs-9.1.0.ebuild:
+  Remove old
 
 *postgresql-docs-9.1.1 (26 Sep 2011)
 *postgresql-docs-9.0.5 (26 Sep 2011)
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.2.20.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.2.20.ebuild
deleted file mode 100644
index 618bb81b8460..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-8.2.20.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.2.20.ebuild,v 1.7 2011/03/06 17:47:01 armin76 Exp $
-
-inherit versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-	tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-	fowners root:0 -R /usr/share/doc/${PF}/html
-	cd "${S}/doc"
-	docinto FAQ_html
-	dodoc src/FAQ/*
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-	docinto TODO.detail
-	dodoc TODO.detail/*
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	{
-		echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\""
-	} >"${D}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.3.14.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.3.14.ebuild
deleted file mode 100644
index fd886efdc08c..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-8.3.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.3.14.ebuild,v 1.7 2011/03/06 17:47:01 armin76 Exp $
-
-inherit versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-# Nothing to test here per 232157
-RESTRICT="test"
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-	tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-	fowners root:0 -R /usr/share/doc/${PF}/html
-	cd "${S}/doc"
-	docinto FAQ_html
-	dodoc src/FAQ/*
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-	docinto TODO.detail
-	dodoc TODO.detail/*
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	{
-		echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\""
-	} >"${D}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.4.7.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.4.7.ebuild
deleted file mode 100644
index ae923b0b21a0..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-8.4.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.4.7.ebuild,v 1.7 2011/03/06 17:47:01 armin76 Exp $
-
-inherit versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-# Nothing to test here per 232157
-RESTRICT="test"
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/postgresql-${PV}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-	tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-	fowners root:0 -R /usr/share/doc/${PF}/html
-	cd "${S}/doc"
-	docinto FAQ_html
-	#dodoc src/FAQ/* # no longer there?
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-	docinto
-	dodoc TODO
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	{
-		echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\""
-	} >"${D}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.0.3.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.0.3.ebuild
deleted file mode 100644
index f89838963d9c..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-9.0.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.0.3.ebuild,v 1.7 2011/03/06 17:47:01 armin76 Exp $
-
-EAPI=2
-
-inherit versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-# Nothing to test here per 232157
-RESTRICT="test"
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-
-MY_PV=${PV/_/}
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-S=${WORKDIR}/postgresql-${MY_PV}
-
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-DEPEND="app-text/openjade
-	app-text/docbook2X
-	app-text/docbook-sgml
-	app-text/docbook-sgml-dtd:4.2
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-dsssl-stylesheets
-	app-text/sgmltools-lite"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch"
-	eautoconf || die "Failed to eautoconf"
-}
-
-src_compile() {
-	cd doc
-	emake html || die
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-	#tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
-	cd "${S}/doc"
-	docinto FAQ_html
-	#dodoc src/FAQ/* # no longer there?
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-	docinto html
-	dodoc src/sgml/html/*.html
-	dodoc src/sgml/html/stylesheet.css
-	docinto
-	dodoc TODO
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	{
-		echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\""
-	} >"${D}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild
deleted file mode 100644
index 67ea26118896..000000000000
--- a/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1.0.ebuild,v 1.1 2011/09/17 17:46:25 titanofold Exp $
-
-EAPI="4"
-
-inherit versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-S="${WORKDIR}/postgresql-${PV}"
-
-DESCRIPTION="PostgreSQL documentation"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-
-	cd "${S}/doc"
-
-	docinto sgml
-	dodoc src/sgml/*.{sgml,dsl}
-
-	docinto sgml/ref
-	dodoc src/sgml/ref/*.sgml
-
-	docinto html
-	dodoc src/sgml/html/*.html
-	dodoc src/sgml/html/stylesheet.css
-
-	docinto
-	dodoc TODO
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
-}
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index c9cea751189e..755e9c26d206 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.142 2011/09/26 18:02:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.143 2011/09/26 18:07:43 patrick Exp $
+
+  26 Sep 2011; Patrick Lauer <patrick@gentoo.org>
+  -postgresql-server-8.2.20.ebuild, -postgresql-server-8.3.14.ebuild,
+  -postgresql-server-8.4.7.ebuild, -postgresql-server-9.0.3.ebuild,
+  -postgresql-server-9.1.0.ebuild:
+  Remove old
 
 *postgresql-server-9.1.1 (26 Sep 2011)
 *postgresql-server-9.0.5 (26 Sep 2011)
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.20.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.20.ebuild
deleted file mode 100644
index cadd36b95b7c..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.2.20.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.2.20.ebuild,v 1.7 2011/05/19 16:05:01 scarabeus Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# TODO: test if PPC really cannot work with other CFLAGS settings
-	# use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--disable-thread-safety \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")" \
-		|| die "configure failed"
-}
-src_compile() {
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/${PF}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	# Workaround for paludis
-	[ -f "${ROOT}/var/run/postgresql/.keep" ] || keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp"
-	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
-	ewarn "the socket."
-	ewarn "This can break applications which have the standard location hard-coded."
-	ewarn "If such an application links against the libpq, please re-emerge it,"
-	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
-	ewarn "please file a bug-report."
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1."
-	elog "You can enable it in the clusters postgresql.conf."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS"
-	einfo "variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by"
-	einfo "setting the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check \
-			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild
deleted file mode 100644
index 32fefcbd6d3a..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.14.ebuild,v 1.7 2011/05/19 16:05:01 scarabeus Exp $
-
-EAPI="2"
-
-WANT_AUTOMAKE="none"
-inherit eutils multilib versionator autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc perl python selinux tcl uuid xml nls kernel_linux ${IUSE_LINGUAS}"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
-
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# TODO: test if PPC really cannot work with other CFLAGS settings
-	# use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--disable-thread-safety \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")" \
-		|| die "configure failed"
-}
-
-src_compile() {
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/${PF}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please re-emerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
-	elog "postgresql.conf."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS"
-	einfo "variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by"
-	einfo "setting the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check \
-			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild
deleted file mode 100644
index 3cada7abba3d..000000000000
--- a/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.7.ebuild,v 1.7 2011/05/19 16:05:01 scarabeus Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-
-# weird test failures.
-RESTRICT="test"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib python versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-IUSE_LINGUAS="
-	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
-	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
-	linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv
-	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="pg_legacytimestamp doc perl python selinux tcl uuid xml nls kernel_linux ${IUSE_LINGUAS}"
-
-wanted_languages() {
-	for u in ${IUSE_LINGUAS} ; do
-		use $u && echo -n "${u#linguas_} "
-	done
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# TODO: test if PPC really cannot work with other CFLAGS settings
-	# use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in .  contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please reemerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale and character encoding in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	elog "default. You can disable it in the cluster's postgresql.conf."
-	elog
-	elog "The timestamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by setting"
-	einfo "the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check  || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild
deleted file mode 100644
index c8cfa3bd567e..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.3.ebuild,v 1.7 2011/03/06 17:51:28 armin76 Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2"
-
-# weird test failures.
-RESTRICT="test"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils multilib python versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL server"
-HOMEPAGE="http://www.postgresql.org/"
-
-MY_PV=${PV/_/}
-SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-S=${WORKDIR}/postgresql-${MY_PV}
-
-LICENSE="POSTGRESQL"
-SLOT="$(get_version_component_range 1-2)"
-LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls perl pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( dev-python/egenix-mx-base )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-server.3.patch"
-
-	if use test; then
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
-		--disable-thread-safety \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with tcl) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with uuid ossp-uuid) \
-		--with-system-tzdata="/usr/share/zoneinfo" \
-		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	local bd
-	for bd in . contrib $(use xml && echo contrib/xml2); do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 || die "emake in $bd failed"
-	done
-}
-
-src_install() {
-	if use perl ; then
-		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
-		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
-			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
-	fi
-
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
-	done
-
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
-		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
-		postgres_service="postgresql-${SLOT}"
-	__EOF__
-
-	newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed"
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	eselect postgresql update
-	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
-	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
-
-	ewarn "Please note that the standard location of the socket has changed from /tmp to"
-	ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the"
-	ewarn "socket. This can break applications which have the standard location"
-	ewarn "hard-coded. If such an application links against the libpq, please reemerge"
-	ewarn "it. If that doesn't help or the application accesses the socket without using"
-	ewarn "libpq, please file a bug-report."
-	ewarn
-	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the"
-	ewarn "original location."
-	ewarn
-
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it"
-	elog "contains your preferred locale and character encoding in:"
-	elog
-	elog "    /etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database environment:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
-	elog "default. You can disable it in the cluster's postgresql.conf."
-	elog
-	elog "The timestamp format is 64 bit integers now. If you upgrade from older"
-	elog "databases, this may force you to either do a dump and reload or enable"
-	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
-	elog "please try enabling pg_legacytimestamp and rebuild."
-}
-
-pkg_postrm() {
-	eselect postgresql update
-}
-
-pkg_config() {
-	[[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
-	[[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f /etc/env.d/02locale ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source /etc/env.d/02locale
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
-	einfo "More information can be found here:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS"
-	einfo "variable."
-	einfo
-	einfo "You can change the directory where the database cluster is being created by"
-	einfo "setting the PGDATA variable."
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	einfo "    \"${PG_INITDB_OPTS}\""
-	einfo "and the database cluster will be created in:"
-	einfo "    \"${PGDATA}\""
-	einfo "Are you ready to continue? (Y/n)"
-	read answer
-	[ -z $answer ] && answer=Y
-	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
-
-	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
-		eerror "The given directory \"${PGDATA}\" already contains a database cluster."
-		die "cluster already exists"
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		SKIP_SYSTEM_TESTS=yes
-		einfo "  Tests not supported on this OS (yet)"
-	fi
-
-	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-		einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-		local SHMMAX=$(sysctl -n kernel.shmmax)
-
-		local SEMMSL_MIN=17
-		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-				eerror "You have now several options:"
-				eerror "  - Change the mentioned system parameter"
-				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
-				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-				eerror "More information can be found here:"
-				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-				die "System test failed."
-			fi
-		done
-		einfo "Passed."
-	else
-		einfo "Skipped."
-	fi
-
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
-
-	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
-
-	einfo
-	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-	einfo "instead of 'pg_ctl'."
-	einfo
-}
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check  || die "Make check failed. See above for details."
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice. If you think other tests are"
-	einfo "necessary, please submit a bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.0.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.0.ebuild
deleted file mode 100644
index 2f2be966ee8e..000000000000
--- a/dev-db/postgresql-server/postgresql-server-9.1.0.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.0.ebuild,v 1.1 2011/09/17 17:48:36 titanofold Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE="none"
-inherit autotools eutils flag-o-matic multilib pam prefix python versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-${SLOT}.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
-LICENSE="POSTGRESQL"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
-	perl? ( >=dev-lang/perl-5.8 )
-	selinux? ( sec-policy/selinux-postgresql )
-	tcl? ( >=dev-lang/tcl-8 )
-	uuid? ( dev-libs/ossp-uuid )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	xml? ( dev-util/pkgconfig )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-pkg_setup() {
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-
-	use python && python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/bool.patch" \
-		"${WORKDIR}/pg_ctl-exit-status.patch" "${WORKDIR}/server.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	if use test ; then
-		epatch "${WORKDIR}/regress.patch"
-		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-	else
-		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
-	fi
-
-	eautoconf
-
-#	use perl && epatch "${WORKDIR}/perl-ExtUtils-ParseXS.patch"
-}
-
-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"
-
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.confd
-	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || die "Inserting conf failed"
-	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.init
-	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || die "Inserting conf failed"
-
-	use pam && pamd_mimic system-auth postgresql auth account session
-
-	keepdir /var/run/postgresql
-	fperms 0770 /var/run/postgresql
-	use prefix || fowners postgres:postgres /var/run/postgresql
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "The Unix-domain socket is located in:"
-	elog "    ${EROOT%/}/var/run/postgresql/"
-	elog
-	elog "If you have users and/or services that you would like to utilize the socket,"
-	elog "you must add them to the 'postgres' system group:"
-	elog "    usermod -a -G postgres <user>"
-	elog
-	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
-	elog "it contains your preferred locale in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	elog
-	elog "Then, execute the following command to setup the initial database"
-	elog "environment:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
-	einfo "Checking system parameters..."
-
-	if ! use kernel_linux ; then
-		einfo "Skipped."
-		einfo "  Tests not supported on this OS (yet)"
-	else
-		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
-			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
-
-			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
-			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
-			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
-			local SHMMAX=$(sysctl -n kernel.shmmax)
-
-			local SEMMSL_MIN=17
-			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
-			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
-			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
-
-			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
-				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
-					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
-					eerror "You have now several options:"
-					eerror "    - Change the mentioned system parameter"
-					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
-					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
-					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
-					eerror "More information can be found here:"
-					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
-					die "System test failed."
-				fi
-			done
-			einfo "Passed."
-		else
-			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
-		fi
-	fi
-
-	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
-}