Fixes bugs 353750, 326699 and 355945.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

6 files changed, 659 insertions, 2 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 3fb8f4fd9292..052fc6bef4ac 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,16 @@
 # 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.108 2011/03/20 14:29:20 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.109 2011/03/21 02:51:06 titanofold Exp $
+
+*postgresql-base-9.0.3-r1 (21 Mar 2011)
+*postgresql-base-8.4.7-r1 (21 Mar 2011)
+*postgresql-base-8.3.14-r1 (21 Mar 2011)
+*postgresql-base-8.2.20-r1 (21 Mar 2011)
+
+  21 Mar 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-base-8.2.20-r1.ebuild, +postgresql-base-8.3.14-r1.ebuild,
+  +postgresql-base-8.4.7-r1.ebuild, +postgresql-base-9.0.3-r1.ebuild:
+  Fixes bugs 353750, 326699 and 355945.
 
 *postgresql-base-9.1_alpha4 (20 Mar 2011)
 
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 58e132c52df1..ffbc20927e96 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -18,6 +18,7 @@ DIST postgresql-8.2.20.tar.bz2 12756288 RMD160 9fbcf8cfb3dc5efdd29579f44b18112ea
 DIST postgresql-8.3.12.tar.bz2 14273431 RMD160 00fd0e09b2c300069e616d7f7a116b93b8c2e402 SHA1 1c78ba53f4a37c8f9d12a4abe37ac47e0049f46a SHA256 596bd677dee6153ddc42391b33b6346ebc86f60f8d935fedff775ed46d02f070
 DIST postgresql-8.3.13.tar.bz2 14337117 RMD160 029c77475a3412f10596fd36c85437233597b63c SHA1 59236fc88ede4aa756970e53575a50233ebb6c19 SHA256 192ece18834af0fe001e11794df1bc266b056050d3c74804c6c0442c7f99d4fc
 DIST postgresql-8.3.14.tar.bz2 14345092 RMD160 353996ca82141186f67d59a8ae37b91586413807 SHA1 aec29d9be73e90b88b2d1d5eadff8fffc5681e59 SHA256 5673e0191f623a2f6607808e63c5290d5f33de6da7d9c2b15cb9e8817fa93c99
+DIST postgresql-8.4-patches.tbz2 4618 RMD160 ced4a4b9d3b2aa893b89677f9f90cb523f7d3700 SHA1 f56f66fe31db2f94030419a5de05a0a4c23bc126 SHA256 eef664fe37e2efe1f42161305b4ea3f2c228270148c2cc7df31a89c7e2a3124d
 DIST postgresql-8.4.5.tar.bz2 14114152 RMD160 5dc9b2a894c4b09af5a83a98527ebd5dff9a52b3 SHA1 6e6213c3a93b86c2a6eda1e76fd73881e48af09b SHA256 300022ae2d998a0291a1e91978c48468fdc9c389afca05d6e5f18209ff5732bf
 DIST postgresql-8.4.6.tar.bz2 14130201 RMD160 62b21be252c532d62e6096a5e8280e3728c8f504 SHA1 17cef72e99cea533caab28a463a082b523a423f7 SHA256 8110c576e9055286d7b04b8930f7a378e483f0530b41dd3098f6e35528ed7d3c
 DIST postgresql-8.4.7.tar.bz2 14133535 RMD160 15721cddd4ee916d44ed7e656c0570ef4cb6c102 SHA1 078c2fc6c3e7d6832012eab790de805ea6526060 SHA256 08032849da121e67e318f7ff4e68d3ac88f29050e242641f717c4270839b597b
@@ -26,18 +27,25 @@ DIST postgresql-9.0.2.tar.bz2 14024244 RMD160 3313b4bafe3af6282f68f198da7d50af4d
 DIST postgresql-9.0.3.tar.bz2 14040705 RMD160 9f5e0584018265282a75be8597fb7ac51ccaa23a SHA1 ea7b4729427f668cbf36184efbc58fd828a2d3ab SHA256 cf429421dea73a7bd5ef9fbdd1212a0d01c0f63c2059e0218a0e350891867b35
 DIST postgresql-9.1alpha4-patches.tbz2 4326 RMD160 d30f1e3ea673eddba0821c07b3335723d9331769 SHA1 8ac563990d6b0ad5845f68d0eb6f22e7a01acde9 SHA256 5a8297ffb61e9f93ec1b828caddf15d89a9fcc5d1d839501caf47f8a199c1399
 DIST postgresql-9.1alpha4.tar.bz2 14296555 RMD160 71962c5e0833bd42bbea3e7494c24aedbdab6f76 SHA1 9f7d5a663e14caebecb22dbedd07f7d28223ee9a SHA256 5d09764d05dca68cbafc133fd079d312751b0b22722c3ee9e2f33b1f26f78dc6
+DIST postgresql-patches-8.2.tbz2 4640 RMD160 d00ff2f4e573ba33bb77cb39374d20d28cd8e771 SHA1 e69fc03250a360d8b9bfed047c8ed6c18a8d7c9d SHA256 00bc4a97e0270310117d9114da7c5540aa990619d85670d871f7208c28703f42
+DIST postgresql-patches-8.3.tbz2 5274 RMD160 b12f362a9f6795ef2180d2e9f09b049fffb328e8 SHA1 de6aba5ee191995758f79844b748d067ea8a8707 SHA256 fb29b45e6cdb58ed46a035e946e1e15c58fdf61328ab55fe81de88c96a352cc2
+DIST postgresql-patches-9.0.tbz2 4306 RMD160 225f3d9af435d2628b9841619589af4472049ad7 SHA1 b8492037190382c0fba851f85945bdba643f2a2f SHA256 b8e35bf966caa3e434d4b76527a0b234658db6b3a82e6c3486731ed618a839a9
 EBUILD postgresql-base-8.2.18.ebuild 4534 RMD160 d5721a17aed398d3d7a8ce2598b4b0f2b664d1a0 SHA1 275819092d79505665600db9cc1c28e6b0d0d29a SHA256 f5a2674d8d4f20d5e7fb03547fa3dee691f4ddeb6ac4583c4c2f0b085520fed9
 EBUILD postgresql-base-8.2.19.ebuild 4544 RMD160 b9d3eda9f598602afbecb735f418d1f34b017b7f SHA1 de0bb6ad3993b35cada5a85967bb626bf075e953 SHA256 45d2c8552758b8d204a0770a5cc7008c33940f9587657e055972fab92e438cfe
+EBUILD postgresql-base-8.2.20-r1.ebuild 4851 RMD160 d819e2b9990d4a86e9507ac304f2dd4f3f2d3247 SHA1 654d2eedb88095aff107bfa7e68240fc577100ac SHA256 607fd3d1ca84a168c1d037a75630ac9f8e7c1dfd71e25a2b28724a0f164eb740
 EBUILD postgresql-base-8.2.20.ebuild 4534 RMD160 91df15e17b9a0d5dad60decc95def78fc077248b SHA1 1cc1620f2b8423b4921e9a9894ff2902bb020800 SHA256 89553d881551507928cce6b828a565cefaf6080c7f029e3e6494f6324f5d93d5
 EBUILD postgresql-base-8.3.12.ebuild 4603 RMD160 5bb0ad323b64e0c7451284d2125a5e2d86c389cc SHA1 e7c76216be64a1c18ce8ebcbbaf8ddf7d9f6a6f2 SHA256 1e778cf7c065ddaf117e15a6c7fcbce0049c6db9a3c6cfcafbc250a177061fa2
 EBUILD postgresql-base-8.3.13.ebuild 4611 RMD160 0af267880a3775395f36ff1b1989743b9e72d02d SHA1 5f4ec8227307bb3d8edc6e070ecdeb89e606038a SHA256 e3caf5a9e65977959899824fd8de190604a6e4b8d0a2d6ebee577e95a66d0996
+EBUILD postgresql-base-8.3.14-r1.ebuild 4918 RMD160 ff307b144c2a4e7e346d3b222c3ddd8750da8d0e SHA1 03e4c21d9bcb3ad3c19dfe21b2ce6c27d6c71895 SHA256 0c8b17182c671deda18bc56351575d55a639ebb64a34c8b1a17b01ba45d9855a
 EBUILD postgresql-base-8.3.14.ebuild 4600 RMD160 7d6e89b8242016be1f9f718bc1a65dee22ec4817 SHA1 e0a2a48b13f4d20ee231c17f92e269ecc797370d SHA256 4f435a5e8bd3c958edd3284fe611920762253f794ca8728cb569198670515dc7
 EBUILD postgresql-base-8.4.5.ebuild 4718 RMD160 ca3004d5d8e75cdc4f8c9d2f1df5263d0785b3e3 SHA1 36c430e29de38f628d8226ef938bb8ef21108972 SHA256 f79f199aaabd540a93e920fa1aa35b84330a338213fdc63a9f64c52ea2adbe29
 EBUILD postgresql-base-8.4.6.ebuild 4726 RMD160 9ecc9ce5769826a20a41e2a9ce381610b887a6d5 SHA1 09a5a57c4433497f0fa75a3e007d468e4320a61f SHA256 206574c84fc7043fae3f8633797e3bbc66da421a548ca1a5387833f24177297e
+EBUILD postgresql-base-8.4.7-r1.ebuild 4974 RMD160 4ceeb2203c4717539658f86d1b82259f56f23f9b SHA1 55d6adfafadba65b86bd7ce42a0d70afb003b63b SHA256 0ac4fdbf474c0336434c290b1fe0cde067d653ce80bd3981399de908e6cc140c
 EBUILD postgresql-base-8.4.7.ebuild 4715 RMD160 2241df78cd2c80d49bd136521a984434772fb01e SHA1 27fccf76ac58a1a103bf2e9d6555bd92776cf993 SHA256 21120f15f2f8661a7eb3ce00c165002a944b5a5b051c14f65eee718ad1f56012
 EBUILD postgresql-base-9.0.1.ebuild 4488 RMD160 a1bd7a90981047ea68f6932d84c530c19b354e12 SHA1 79d74c9d228cbf4336cbe46e569d20512c69c502 SHA256 28d053233c5c50316bf33dc785048e1d75011770acd269a3296b9aff6fe7945b
 EBUILD postgresql-base-9.0.2.ebuild 4488 RMD160 41684e42472f81c7889409c9e4c8ebad5470ed30 SHA1 7792b105f59685d04efca4903170434ed7161d83 SHA256 10e6dc31e530172e9064c000e6474d7dcd831af47807e59ea63f8a80dc6fad0d
+EBUILD postgresql-base-9.0.3-r1.ebuild 4757 RMD160 b1983e98f2be6e822743fb50a266863c7a6d64c9 SHA1 b272bf62bc69f67e815307fa996cdf66b6cbadb3 SHA256 56f4d2bed76d08fa9b35ecf17cd3f2db064b4e21e895112c13f9d71710a70c53
 EBUILD postgresql-base-9.0.3.ebuild 4477 RMD160 746291742489351659b61016218849ab2a8e5b26 SHA1 c3c949920fe3b5c1269db9a6e9cdc13b71cd23db SHA256 4f32350dad7785250a4e8dfaf792c2bc96d24f8618a4263adbf9ea2af4d69396
 EBUILD postgresql-base-9.1_alpha4.ebuild 4757 RMD160 0fa419ba116c0265f0f1eeff6ed38da2d957453f SHA1 1df565ff2f7aabfec4fac5d6674d3fb5052d9431 SHA256 6229f3ae1d92a7790d6e81153b73a03c266a4c983769918858fe5360decc5b07
-MISC ChangeLog 30849 RMD160 fda0357f77f485525e25e24f2b99779a3d32b142 SHA1 daba12c2977b4926190c37c942b0126779625589 SHA256 f433b171c5dc29ea25d1bbfd80961780da6b87b19d96bbb84f9c41473871be3a
+MISC ChangeLog 31251 RMD160 84418143c9e0fe0cf0b71a111726d4f209aea122 SHA1 0b8ea4c71cc754940644e1e0b00817003a2ee945 SHA256 34e66d1d89a4f894bf7e4f01b622816fb6f0cd7a73df949f825350b208c02adc
 MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.20-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.20-r1.ebuild
new file mode 100644
index 000000000000..558dd7c78d04
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.2.20-r1.ebuild
@@ -0,0 +1,160 @@
+# 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-r1.ebuild,v 1.1 2011/03/21 02:51:06 titanofold Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ldap"
+
+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="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} )"
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/SuperH.patch" \
+		"${WORKDIR}/relax_ssl_perms.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--with-locale-dir=${EROOT%/}/usr/share/postgresql-${SLOT}/locale \
+		--mandir=${EROOT%/}/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 "${ED}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
+
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 || die
+	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="${EROOT%/}/usr/include/postgresql-${SLOT}"
+	cat > "${ED}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
+postgres_ebuilds="\${postgres_ebuilds} ${PF}"
+postgres_prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}
+postgres_datadir=${EROOT%/}/usr/share/postgresql-${SLOT}
+postgres_bindir=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin
+postgres_symlinks=(
+	${IDIR} ${EROOT%/}/usr/include/postgresql
+	${IDIR}/libpq-fe.h ${EROOT%/}/usr/include/libpq-fe.h
+	${IDIR}/pg_config_manual.h ${EROOT%/}/usr/include/pg_config_manual.h
+	${IDIR}/libpq ${EROOT%/}/usr/include/libpq
+	${IDIR}/postgres_ext.h ${EROOT%/}/usr/include/postgres_ext.h
+)
+__EOF__
+
+	cat >"${T}/50postgresql-95-${SLOT}" <<-__EOF__
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=${EROOT%/}/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:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	eselect postgresql update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.14-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.14-r1.ebuild
new file mode 100644
index 000000000000..0bb26f423d7d
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.3.14-r1.ebuild
@@ -0,0 +1,161 @@
+# 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-r1.ebuild,v 1.1 2011/03/21 02:51:06 titanofold Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ldap"
+
+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="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} )"
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/SuperH.patch" \
+		"${WORKDIR}/relax_ssl_perms.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--with-locale-dir=${EROOT%/}/usr/share/postgresql-${SLOT}/locale \
+		--mandir=${EROOT%/}/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 "${ED}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
+
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 || die
+	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="${EROOT%/}/usr/include/postgresql-${SLOT}"
+	cat > "${ED}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
+postgres_ebuilds="\${postgres_ebuilds} ${PF}"
+postgres_prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}
+postgres_datadir=${EROOT%/}/usr/share/postgresql-${SLOT}
+postgres_bindir=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin
+postgres_symlinks=(
+	${IDIR} ${EROOT%/}/usr/include/postgresql
+	${IDIR}/libpq-fe.h ${EROOT%/}/usr/include/libpq-fe.h
+	${IDIR}/pg_config_manual.h ${EROOT%/}/usr/include/pg_config_manual.h
+	${IDIR}/libpq ${EROOT%/}/usr/include/libpq
+	${IDIR}/postgres_ext.h ${EROOT%/}/usr/include/postgres_ext.h
+)
+__EOF__
+
+	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=${EROOT%/}/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:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	eselect postgresql update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.7-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.7-r1.ebuild
new file mode 100644
index 000000000000..0215ba8ba5db
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.7-r1.ebuild
@@ -0,0 +1,160 @@
+# 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-r1.ebuild,v 1.1 2011/03/21 02:51:06 titanofold Exp $
+
+EAPI="3"
+
+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-${SLOT}-patches.tbz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos nls pam readline ssl threads zlib ldap pg_legacytimestamp"
+
+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="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} )"
+
+src_prepare() {
+	epatch "${WORKDIR}/postgresql-${SLOT}-autoconf.patch" \
+		"${WORKDIR}/postgresql-${SLOT}-base.patch" \
+		"${WORKDIR}/postgresql-${SLOT}-darwin.patch" \
+		"${WORKDIR}/postgresql-${SLOT}-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/"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--docdir=${EROOT%/}/usr/share/doc/postgresql-${SLOT} \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--mandir=${EROOT%/}/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 "${ED}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
+
+	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 || die
+	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="${EROOT%/}/usr/include/postgresql-${SLOT}"
+	cat > "${ED}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
+postgres_ebuilds="\${postgres_ebuilds} ${PF}"
+postgres_prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}
+postgres_datadir=${EROOT%/}/usr/share/postgresql-${SLOT}
+postgres_bindir=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin
+postgres_symlinks=(
+	${IDIR} ${EROOT%/}/usr/include/postgresql
+	${IDIR}/libpq-fe.h ${EROOT%/}/usr/include/libpq-fe.h
+	${IDIR}/pg_config_manual.h ${EROOT%/}/usr/include/pg_config_manual.h
+	${IDIR}/libpq ${EROOT%/}/usr/include/libpq
+	${IDIR}/postgres_ext.h ${EROOT%/}/usr/include/postgres_ext.h
+)
+__EOF__
+
+	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=${EROOT%/}/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:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	eselect postgresql update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.3-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.3-r1.ebuild
new file mode 100644
index 000000000000..02f3baf6fd09
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0.3-r1.ebuild
@@ -0,0 +1,158 @@
+# 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-r1.ebuild,v 1.1 2011/03/21 02:51:06 titanofold Exp $
+
+EAPI="3"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="!!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 "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	econf \
+		--prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--docdir=${EROOT%/}/usr/share/doc/postgresql-${SLOT} \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--mandir=${EROOT%/}/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/* "${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
+
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 || die
+	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="${EROOT%/}/usr/include/postgresql-${SLOT}"
+	cat > "${ED}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__
+postgres_ebuilds="\${postgres_ebuilds} ${PF}"
+postgres_prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}
+postgres_datadir=${EROOT%/}/usr/share/postgresql-${SLOT}
+postgres_bindir=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin
+postgres_symlinks=(
+	${IDIR} ${EROOT%/}/usr/include/postgresql
+	${IDIR}/libpq-fe.h ${EROOT%/}/usr/include/libpq-fe.h
+	${IDIR}/pg_config_manual.h ${EROOT%/}/usr/include/pg_config_manual.h
+	${IDIR}/libpq ${EROOT%/}/usr/include/libpq
+	${IDIR}/postgres_ext.h ${EROOT%/}/usr/include/postgres_ext.h
+)
+__EOF__
+
+	cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__
+LDPATH=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/lib
+MANPATH=${EROOT%/}/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 "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	eselect postgresql update
+}