Hopefully fixes bug 341729

(Portage version: 2.1.10.3/cvs/Linux i686)

6 files changed, 743 insertions, 1 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index f5033ab10c8f..6455fef58321 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,18 @@
 # 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.130 2011/07/23 17:04:54 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.131 2011/08/02 02:51:02 titanofold Exp $
+
+*postgresql-base-9.1_beta3-r1 (02 Aug 2011)
+*postgresql-base-9.0.4-r3 (02 Aug 2011)
+*postgresql-base-8.4.8-r3 (02 Aug 2011)
+*postgresql-base-8.3.15-r3 (02 Aug 2011)
+*postgresql-base-8.2.21-r3 (02 Aug 2011)
+
+  02 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-base-8.2.21-r3.ebuild, +postgresql-base-8.3.15-r3.ebuild,
+  +postgresql-base-8.4.8-r3.ebuild, +postgresql-base-9.0.4-r3.ebuild,
+  +postgresql-base-9.1_beta3-r1.ebuild:
+  Hopefully fixes bug 341729
 
   23 Jul 2011; Aaron W. Swenson <titanofold@gentoo.org>
   -postgresql-base-8.2.21-r1.ebuild, -postgresql-base-8.3.15-r1.ebuild,
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild
new file mode 100644
index 000000000000..c636f304c22c
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.2.21-r3.ebuild,v 1.1 2011/08/02 02:51:02 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( >=sys-libs/readline-4.1 )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( >=sys-libs/zlib-1.1.3 )"
+
+DEPEND="${RDEPEND}
+		>=sys-apps/sandbox-2.0
+		>=sys-devel/bison-1.875
+		sys-devel/flex
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-docdir \
+		--without-perl \
+		--without-python \
+		--without-tcl \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable pg-intdatetime integer-datetimes ) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild
new file mode 100644
index 000000000000..b9f3b1127cda
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.15-r3.ebuild,v 1.1 2011/08/02 02:51:02 titanofold Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( >=sys-libs/readline-4.1 )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( >=sys-libs/zlib-1.1.3 )"
+
+DEPEND="${RDEPEND}
+		>=sys-apps/sandbox-2.0
+		>=sys-devel/bison-1.875
+		sys-devel/flex
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch" \
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-docdir \
+		--without-perl \
+		--without-python \
+		--without-tcl \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable pg-intdatetime integer-datetimes ) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+	dodir /usr/share/postgresql-${SLOT}/man/man1
+
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild
new file mode 100644
index 000000000000..fa09b79697c2
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.8-r3.ebuild,v 1.1 2011/08/02 02:51:02 titanofold 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.4-r3.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.4-r3.ebuild
new file mode 100644
index 000000000000..5a804aad6bcf
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0.4-r3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.4-r3.ebuild,v 1.1 2011/08/02 02:51:02 titanofold 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.1_beta3-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.1_beta3-r1.ebuild
new file mode 100644
index 000000000000..2b5bf28667d7
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.1_beta3-r1.ebuild
@@ -0,0 +1,155 @@
+# 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_beta3-r1.ebuild,v 1.1 2011/08/02 02:51:02 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"
+
+# Upstream doesn't have an underscore in the file name
+MY_PV=${PV/_/}
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${MY_PV}-r1.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${MY_PV}"
+SLOT="$(get_version_component_range 1-2)"
+
+# 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/{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
+}