Clean out cruft and insecure.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

9 files changed, 8 insertions, 1204 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 1409d1b9fd1e..5520a44bce70 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.175 2012/04/08 14:48:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.176 2012/04/08 22:16:09 titanofold Exp $
+
+  08 Apr 2012; Aaron W. Swenson <titanofold@gentoo.org>
+  -postgresql-base-8.3.16.ebuild, -postgresql-base-8.3.17.ebuild,
+  -postgresql-base-8.4.9.ebuild, -postgresql-base-8.4.10.ebuild,
+  -postgresql-base-9.0.5.ebuild, -postgresql-base-9.0.6.ebuild,
+  -postgresql-base-9.1.1.ebuild, -postgresql-base-9.1.2.ebuild:
+  Clean out cruft and insecure.
 
   08 Apr 2012; Raúl Porcel <armin76@gentoo.org> postgresql-base-8.3.18.ebuild,
   postgresql-base-8.4.11.ebuild, postgresql-base-9.0.7.ebuild,
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.16.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.16.ebuild
deleted file mode 100644
index 271ff83a091e..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.3.16.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.16.ebuild,v 1.6 2011/10/01 20:15:34 hwoarang Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND=">=app-admin/eselect-postgresql-1.0.10
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch" \
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-docdir \
-		--without-perl \
-		--without-python \
-		--without-tcl \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild
deleted file mode 100644
index b00a1ca37287..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.3.17.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 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.17.ebuild,v 1.8 2012/02/19 11:38:06 klausman Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND=">=app-admin/eselect-postgresql-1.0.10
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		!!<sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch" \
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h || \
-		die "RUNDIR sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-docdir \
-		--without-perl \
-		--without-python \
-		--without-tcl \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-	dodir /usr/share/postgresql-${SLOT}/man/man1
-
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild
deleted file mode 100644
index 5d3eb5c4f97d..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.4.10.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 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.10.ebuild,v 1.8 2012/02/19 12:10:38 klausman Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		!!<sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h || \
-		die "RUNDIR sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.9.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.9.ebuild
deleted file mode 100644
index 3b1e4b9f0545..000000000000
--- a/dev-db/postgresql-base/postgresql-base-8.4.9.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.9.ebuild,v 1.6 2011/10/01 20:15:34 hwoarang Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( >=sys-libs/readline-4.1 )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( >=sys-libs/zlib-1.1.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sandbox-2.0
-		>=sys-devel/bison-1.875
-		sys-devel/flex
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
-		"${WORKDIR}/SuperH.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	export LDFLAGS_SL="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes ) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
-	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.5.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.5.ebuild
deleted file mode 100644
index 3ac9f397ef4b..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.0.5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.5.ebuild,v 1.6 2011/10/01 20:15:34 hwoarang Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r2.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( sys-libs/readline )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-		sys-devel/bison
-		sys-devel/flex
-		>=sys-apps/sandbox-2.0
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-src_prepare() {
-	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
-		"${WORKDIR}/bool.patch"
-
-	eprefixify src/include/pg_config_manual.h
-
-	# to avoid collision - it only should be installed by server
-	rm "${S}/src/backend/nls.mk"
-
-	# because psql/help.c includes the file
-	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-		;;
-	esac
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	dodir /usr/share/postgresql-${SLOT}/man/
-	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
-	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,postgres,postmaster}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild
deleted file mode 100644
index 5cc248d0282f..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.0.6.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 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.6.ebuild,v 1.8 2012/02/19 12:44:07 klausman Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib prefix versionator
-
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-DESCRIPTION="PostgreSQL libraries and clients"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2"
-LICENSE="POSTGRESQL"
-
-S="${WORKDIR}/postgresql-${PV}"
-
-# No tests to be done for clients and libraries
-RESTRICT="test"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
-
-for lingua in ${LINGUAS} ; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-RDEPEND=">=app-admin/eselect-postgresql-1.0.7
-		 virtual/libintl
-		 !!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( sys-libs/readline )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-		sys-devel/bison
-		sys-devel/flex
-		!!<sys-apps/sandbox-2.0
-		nls? ( sys-devel/gettext )"
-
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-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
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h || \
-		die "RUNDIR sed failed"
-
-	eautoconf
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-		;;
-	esac
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-	local PO="${EPREFIX%/}"
-	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--without-tcl \
-		--without-perl \
-		--without-python \
-		$(use_with kerberos krb5) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		"$(use_enable nls nls "$(wanted_languages)")" \
-		$(use_with pam) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_enable threads thread-safety) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	cd "${S}/contrib"
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /usr/include/postgresql-${SLOT}/postmaster
-	doins "${S}"/src/include/postmaster/*.h
-
-	dodir /usr/share/postgresql-${SLOT}/man/
-	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
-	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,postgres,postmaster}.1
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
-
-	dodoc README HISTORY doc/{README.*,TODO,bug.template}
-
-	cd "${S}/contrib"
-	emake DESTDIR="${D}" install
-	cd "${S}"
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
-		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	keepdir /etc/postgresql-${SLOT}
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
diff --git a/dev-db/postgresql-base/postgresql-base-9.1.1.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.1.ebuild
deleted file mode 100644
index 72e4b9a13002..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.1.1.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.1.ebuild,v 1.6 2011/12/17 18:01:29 armin76 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-base/postgresql-base-9.1.2.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild
deleted file mode 100644
index cd1c4bb4475a..000000000000
--- a/dev-db/postgresql-base/postgresql-base-9.1.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2012 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.2.ebuild,v 1.8 2012/02/19 13:24:51 klausman 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-9.1-r1.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} )"
-
-# Support /var/run or /run for the socket directory
-[[ ! -d /run ]] && RUNDIR=/var
-
-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
-
-	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
-		-i src/include/pg_config_manual.h || \
-		die "RUNDIR sed failed"
-
-	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
-}