Fixes for #313765, #251046, #294462, #300793, #274836, #296714, #238817, #278228, #263096, #246397, #285953. Thanks to Aaron Swenson for collecting the fixes and testing.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

10 files changed, 1091 insertions, 2 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 42fd7e7a9b25..0f18b7b124a2 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-db/postgresql-base
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.52 2010/05/17 13:20:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.53 2010/06/02 17:21:28 patrick Exp $
+
+*postgresql-base-9.0_beta1-r1 (02 Jun 2010)
+*postgresql-base-8.4.4-r1 (02 Jun 2010)
+*postgresql-base-8.3.11-r1 (02 Jun 2010)
+*postgresql-base-8.2.17-r1 (02 Jun 2010)
+*postgresql-base-8.1.21-r1 (02 Jun 2010)
+*postgresql-base-8.0.25-r1 (02 Jun 2010)
+*postgresql-base-7.4.29-r1 (02 Jun 2010)
+
+  02 Jun 2010; Patrick Lauer <patrick@gentoo.org>
+  +postgresql-base-7.4.29-r1.ebuild, +postgresql-base-8.0.25-r1.ebuild,
+  +postgresql-base-8.1.21-r1.ebuild, +postgresql-base-8.2.17-r1.ebuild,
+  +postgresql-base-8.3.11-r1.ebuild,
+  +files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch,
+  +postgresql-base-8.4.4-r1.ebuild, +postgresql-base-9.0_beta1-r1.ebuild:
+  Fixes for #313765, #251046, #294462, #300793, #274836, #296714, #238817,
+  #278228, #263096, #246397, #285953. Thanks to Aaron Swenson for collecting
+  the fixes and testing.
 
 *postgresql-base-8.4.4 (17 May 2010)
 *postgresql-base-8.3.11 (17 May 2010)
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 709b907c6ed2..3a1ec0a7ceb0 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -23,6 +23,7 @@ AUX postgresql-8.x-relax_ssl_perms.patch 764 RMD160 d1ce5164779c0b0c9229dc13d2ee
 AUX postgresql-9.0-base.patch 4897 RMD160 d2a7ff5b41f47309e1b608ba8fdb9af477a9420d SHA1 72952a69edcd6bd0ac0e3551ef7e72e5d78ef893 SHA256 5654e7ad563efee03357c1eccc0f6b27fa22d8c35a134e16726c23cb0500440c
 AUX postgresql-9.0-common.patch 2062 RMD160 75f622bb99583990431672ffdc376c7a117753d2 SHA1 6f61c8533117658ef5b76db7894e9c9d0b4560be SHA256 87bb675a6dc782e35e6fd90362d06b832bcf163736651bc43a49a1203898cb23
 AUX postgresql-9.0-makefile.patch 468 RMD160 0f6d1d393e224b1c566c167af439e6eb0b282ee3 SHA1 3ce71590a1e41ce49d65fac64a6f49ab8b2d3d67 SHA256 ccf39a7081f7a830bb46af5571a6b58dd6102659ce0721d64123094b85d161a2
+AUX postgresql-base-8.4-9.0-heimdal_strlcpy.patch 1499 RMD160 e2d61c6c6516b650637cf242527de6af50d2f478 SHA1 c0f24d6f2a335e0ce51736e245edf0f7d0827907 SHA256 83f9e31104611fd922e58b7fbe7deef9b1bac8664b97ef30d30201c282cba181
 DIST postgresql-7.4.26.tar.bz2 10340993 RMD160 c92093ffee634ba140ac176182ad80f7226eaa52 SHA1 cb7638b492aeb5a44ce071862bf9f1c2fdcc5515 SHA256 ae91cdcf8cd57336634a40d73a194fafd7128f6a98e61e5f183743abd1100a64
 DIST postgresql-7.4.27.tar.bz2 10348758 RMD160 4888672ba15a8041097ed20d80a81716e6ac7074 SHA1 bb35cc844157b8a0d0b2e9e1ab25b6597c82dd1c SHA256 24453f07d325d77884d43c42868685e0d2c1b63fa5b9ad641252ffcb49a39425
 DIST postgresql-7.4.28.tar.bz2 10347433 RMD160 893502e518612248153d42d233aee8e95cbcbab5 SHA1 28c6d6a04607f4b305e2428c5526f5a8053602ff SHA256 3d2b55a41c4f5a6e66f1a6462b6c2b023dbc439c64d2d21e35a5b7719bda49e4
@@ -53,21 +54,26 @@ DIST postgresql-9.0beta1.tar.bz2 13606310 RMD160 3d938b394d330f66987b1b8d387a576
 EBUILD postgresql-base-7.4.26.ebuild 4674 RMD160 24ae29e171c7af0b50da8a913314644627aceed0 SHA1 c473d61237751434707360f7f88e32dcbaafafc1 SHA256 7c1490894737fc70d2da109eca08b377306697745d3dc9e54dae22c0e3f6dd75
 EBUILD postgresql-base-7.4.27.ebuild 4683 RMD160 a0bf335b5d402608bcb6bfacd8559388c7a78dcb SHA1 e2f9ac1486622061d20cb8d24ecd09fe848a4b83 SHA256 5045d942fe86d4296158c663bf9ea8d88fef0069a5117699da3f0204cbcad566
 EBUILD postgresql-base-7.4.28.ebuild 4657 RMD160 ec48a979c473f5763ae321e9c81759efdf48b3f9 SHA1 82d1b7ba9c088d57d172f9232deeacfbec47c9ca SHA256 95d8539f9ca9d6595b188bde15503e92fd6bd10f15be31499f7b371c65362bb5
+EBUILD postgresql-base-7.4.29-r1.ebuild 4633 RMD160 6650df0cd8d7c0910d207e181bf903c25a261e91 SHA1 e724d1c9727f111ff1b62c613989c069ae8d6f8f SHA256 b3d2d20143e8b3e84ade3fa62887017fdb5159251c20ab0b8d98bfb7ab514fb5
 EBUILD postgresql-base-7.4.29.ebuild 4657 RMD160 4fa6aca6641c98e30b1f3c5704eca9606391f7bb SHA1 9bd604af8337561bb7f6d8dbd61178856c84df21 SHA256 2c491cbd30966bc3c91d3e910b61b1d7fd10e1e132ba03307e8a9cf6fc1789bd
 EBUILD postgresql-base-8.0.22.ebuild 4525 RMD160 4e3c2d8464ed93d0915b158723129578dc768e22 SHA1 ff9452461873f5c93c2f2ad09bb031b1d770285c SHA256 3ae18bb1e6bd07e90b2c103b1add9338d6c93a34c984e3b7543705cddfc4e785
 EBUILD postgresql-base-8.0.23.ebuild 4534 RMD160 a594c22e33d4e906d06b55104cf61c0ab7a631c4 SHA1 178eba08c9b424e6c472146bd46eaa1d78f490e1 SHA256 800f37d92b0dfcd0b460d296218a5ae711ea71fa2f7fa20ddf6fa8dcbd6aa549
 EBUILD postgresql-base-8.0.24.ebuild 4508 RMD160 ae626985c6aff1915c4594411e3a77c32661a923 SHA1 745ffdee35b0104bf6898d3479742157709b72e9 SHA256 531753b396649e1c392fc34997fca44f0f6574beb480f85dea48195400b965e4
+EBUILD postgresql-base-8.0.25-r1.ebuild 4438 RMD160 2b87f6f03b719ac9a8da35f50a312c4cf893bccb SHA1 bedf840f7eccc066010d8034b6d076ccd98a7e29 SHA256 62c584c44a488a4b93e9318ea8d4a5ec26c52a288f85381e850983e7aced58b0
 EBUILD postgresql-base-8.0.25.ebuild 4508 RMD160 0ef12e674a9ae22c85e3bac97d4e92c42a478d70 SHA1 1d8383221925733f5f1bcccb82b2b8fdf2e9379a SHA256 28cd79465304d54850dc90018ef32c8f15701f2f88420ded0111527da9496952
 EBUILD postgresql-base-8.1.11.ebuild 4545 RMD160 74fe10bf989714aca46ed7db8373d357cc8046f0 SHA1 293465b58e85ad16e6da8594e5aeddd2d950c471 SHA256 45161e2bd83b6e5e732e97fd8ea387b15d49b5a6786684b351c2af889bcb17d4
 EBUILD postgresql-base-8.1.18.ebuild 4525 RMD160 c5d7d0fca668e07280f0e338b96bd42a94aded3e SHA1 c0de227770597bf93d55ff0d9f0c9b4f4dc58e19 SHA256 08451c2844fd3c87935a567c2cf6cc0d16d70cf6ec017ba8d3e5ab83aa1cd374
 EBUILD postgresql-base-8.1.19.ebuild 4534 RMD160 4621f3567646dbd05dffcee664358643641d9c78 SHA1 a84f91fddaadf0d0716c051349ef6a08cd1d6982 SHA256 bb0c46ade2e36084101c46581a051815c7a49b87c2ccfdfb9d06277784b17a8c
 EBUILD postgresql-base-8.1.20.ebuild 4508 RMD160 e6c7bf40871b864b83068d2466b9debe02853790 SHA1 5d4cb6bbab7da55783b7bc303165e582c3321b16 SHA256 21944cd21afd2146aa3e94bcaa57377f5918be1aff4c72d52358d91767b136c0
+EBUILD postgresql-base-8.1.21-r1.ebuild 4438 RMD160 ea6de52c0559864df835424fdbd5078e11fa9c43 SHA1 fac5ca573a8a54184d4ce42c94c5a9f436016801 SHA256 92063106e93fa7ffee29f4b4c32d8b89e64686ec31b794fe4146fbc5e1a6df2e
 EBUILD postgresql-base-8.1.21.ebuild 4508 RMD160 5a7a6c28c83631ae5262c874cc168bc76bd0d466 SHA1 10cd459ffb355945b174b437cefae004a5b59e75 SHA256 20d531355b615ff8b854b4584de269ba8b09e5311ca92a84bcd78155c4c88dbc
 EBUILD postgresql-base-8.2.14.ebuild 4635 RMD160 0adc5c4973d080f3e2a47131d041d67bcd8bcc5f SHA1 475a75261506e48c81d5a1c622957bc32ef4f884 SHA256 6dd6a960b108727cc02cb262a1fc03050556bd9c6158dc20426f9dbb9b0a6e44
 EBUILD postgresql-base-8.2.15.ebuild 4644 RMD160 75302660898c5ddec1ad6a9e391836b077f54340 SHA1 9ff6401b342339951f3f2d441c52802af12c047f SHA256 c37e29e2d9c2b967ce1ac026e352e1302b2568203535f2bdfe81bd76c2f7385d
 EBUILD postgresql-base-8.2.16.ebuild 4618 RMD160 cd01b0ce750443126763bfa47c90f4c14eea890f SHA1 c697cd48ae3fc43bd18100de30adfff60d675ce2 SHA256 81bc4c7c2de836a2cede0460134deddbdb269e58b5427575c4c5c70c2ae40e0b
+EBUILD postgresql-base-8.2.17-r1.ebuild 4512 RMD160 059e3125795dbfe558a0103b19770a1ba70df271 SHA1 701658b04b1c09c7eb37b0fef76542d452d729c0 SHA256 7e7cc1cd9a7ef53f02a30fa7a03953b1378a76ec3f7479a088541e71eccb2a23
 EBUILD postgresql-base-8.2.17.ebuild 4618 RMD160 8cf889d32b45d1f386501ab86ef75f4b8725a8a5 SHA1 7df4c95f1181b9a545e1468c8b355bc998c712b5 SHA256 6a748eae166aad3f73ab7e6f558ca2bbb52750fbff0b1d05ffb1a4cb802346c3
 EBUILD postgresql-base-8.3.10.ebuild 4663 RMD160 2d9757142ca116dcb86dbd0205d04a942e8f3d7b SHA1 927dd3b9c94dd2498d302b1eff277ec8f066ddb1 SHA256 fa579d7e0b6daa4d4a3a707d1a6a2af0fa7f0ce79d8e505bf03e7220b10f6a77
+EBUILD postgresql-base-8.3.11-r1.ebuild 4614 RMD160 a6ed8d2561dbfa9530c0379afed052ddea4d3ad2 SHA1 bbffe6e430f7fdb258f9f16b7c07f7f30bd825a9 SHA256 9e237c2a63ce9087dddd8f6ce4a9ceef30346bc170611e4edf21dc2d7ae3957e
 EBUILD postgresql-base-8.3.11.ebuild 4663 RMD160 74e51be36f5d771e552686b56f994c400b5dcdd4 SHA1 136a97618c2d9e59bc8adfbb03a71bcb6f8283cb SHA256 5d03c49b46a22a935ce9349cbd3a1ae2f79070aa1ad5527f7f52d385731a6c50
 EBUILD postgresql-base-8.3.8.ebuild 4679 RMD160 20cf8c1af893660cd4e65737edcc54a4880aeda8 SHA1 fdf899b1948275c0c642eaea5686b8749294041d SHA256 5fc8b8ca251f9256eaefc5767f2594e7a6a71f578a933182293e7aa0fc91c34e
 EBUILD postgresql-base-8.3.9.ebuild 4688 RMD160 a9e449e02fbaf44e58686a21897f06c25b0a7256 SHA1 2ee7125568dba3b6e30518a1d081acd3709fde7d SHA256 b6dd91748faa981f0b6663d2180a7cdc8303cf0dcd9eb71ff0aba55097b949d3
@@ -75,8 +81,10 @@ EBUILD postgresql-base-8.4.1.ebuild 4649 RMD160 1518a5c6e6b671035e72c468aca24b08
 EBUILD postgresql-base-8.4.2-r1.ebuild 4655 RMD160 816a9994a9103f76e8e6126aae20d5e472d742ba SHA1 05a8e4edd1c907c641afc6b105db283f6903fb75 SHA256 01417bf70a302e86d3a347948c50fa40e017dfa3ef824c5de61942b9286b584d
 EBUILD postgresql-base-8.4.2.ebuild 4652 RMD160 af60b1a04ccc310d14cad1e821289f1b7b99eba2 SHA1 1729294daa83e30a4817aee2a3426c0075e2ae47 SHA256 5713b8236cca52b3a8f552df8452fed69d224b34c465813d7b5fbc1fa5dfc942
 EBUILD postgresql-base-8.4.3.ebuild 4635 RMD160 853a7af30e0a7931c13366f048ecd52f920cdbbb SHA1 88a534eb0ca96895360b983dbc32a2c00c874670 SHA256 49be0b76d6243ef9fad7a0ab8c05bb06707b3a745494b34db2d2ab33869ff98f
+EBUILD postgresql-base-8.4.4-r1.ebuild 4650 RMD160 ec73101f9f846852700c8e5d74e7d681273b3a47 SHA1 d80be65fc7554d86939abd0a44ce5a242ada8f32 SHA256 3954f82545772a28529b1438bb76e21b97c55ca761ae69628bccf6bd967ef2ed
 EBUILD postgresql-base-8.4.4.ebuild 4635 RMD160 e186bc82b78e5e7d3d8f5339846bd9e36e9ae1df SHA1 278a2f5586455e7982392b32a43cdae9447f73d5 SHA256 dd138e51aa30559d7c6816b0f54c8928b62ee6e3767b9aa07c74594f6b13d574
 EBUILD postgresql-base-9.0_alpha4.ebuild 4676 RMD160 8f89109d20dd48a0bfbf1e0efe7aea5c499f9bf6 SHA1 21e82137a7c182b0680030235fec2e9b3b5776cd SHA256 dd7904c71b763d5b3285a8f39eb43e7d68daacc26e9f0b1da29597715cc24def
+EBUILD postgresql-base-9.0_beta1-r1.ebuild 4685 RMD160 70bb66ed0c4cbd96ca8de79e20732874bda80ef6 SHA1 c2588a4d2a61f7c72b7b81d2bbd50f7b5121b3fe SHA256 8d6cc182cc35a2435a211d3e1b347b741e235fad21cdc5db77f77f88806e9eaa
 EBUILD postgresql-base-9.0_beta1.ebuild 4626 RMD160 470895df1a27a704ce73b6dd07f8fadacb757d24 SHA1 f5f653ed4ee72080ac6322c785ce21ea40415471 SHA256 572319c583827603f90c1ece1b1e32700a5dfe0f5aaa5021c444e50b84452387
-MISC ChangeLog 18184 RMD160 e13bf1fd2bcc281e194bb6a8a7838c609716fc01 SHA1 aa035966e5f635196669a7bd4fa31df88bd997c8 SHA256 c244692ddff1997f33a0de8c83a70f32846673d533d1155a94a5a9fe05ba0c0e
+MISC ChangeLog 19013 RMD160 06e70b42ac0ce2532757cb775b9429cf88d624c0 SHA1 6e8a25c43e69250591392f69b9b43f43c832ff6d SHA256 18b94ed99dfbe3c8cdecfad1c8e5802c5eb892e0c94fe6c13c6ed416885d441e
 MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
diff --git a/dev-db/postgresql-base/files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch b/dev-db/postgresql-base/files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch
new file mode 100644
index 000000000000..66ab3be66bbc
--- /dev/null
+++ b/dev-db/postgresql-base/files/postgresql-base-8.4-9.0-heimdal_strlcpy.patch
@@ -0,0 +1,32 @@
+diff -Naur tmp-old/configure tmp-new/configure
+--- configure	2009-12-24 08:50:48.000000000 +0000
++++ configure	2009-12-24 09:12:00.000000000 +0000
+@@ -10258,10 +10258,10 @@
+ 
+ fi
+ 
+-# Some versions of libedit contain strlcpy(); so disregard that library while
++# Some versions of libedit and libroken contain strlcpy(); so disregard that library while
+ # checking for these standard libc functions.
+ pgac_save_LIBS="$LIBS"
+-LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
++LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g' -e 's/-lgssapi//g' -e 's/-lkrb5//g'`
+ 
+ for ac_func in crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
+ do :
+diff -Naur tmp-old/configure.in tmp-new/configure.in
+--- configure.in	2009-12-24 09:12:39.000000000 +0000
++++ configure.in	2009-12-24 09:21:38.000000000 +0000
+@@ -1240,10 +1240,10 @@
+   AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
+ fi
+ 
+-# Some versions of libedit contain strlcpy(); so disregard that library while
++# Some versions of libedit and libroken contain strlcpy(); so disregard that library while
+ # checking for these standard libc functions.
+ pgac_save_LIBS="$LIBS"
+-LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
++LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g' -e 's/-lgssapi//g' -e 's/-lkrb5//g'`
+ 
+ AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
+ 
diff --git a/dev-db/postgresql-base/postgresql-base-7.4.29-r1.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.29-r1.ebuild
new file mode 100644
index 000000000000..ba8e585aff8d
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-7.4.29-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-7.4.29-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick Exp $
+
+EAPI="2"
+
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib versionator autotools
+
+KEYWORDS="~amd64 ~hppa ~ppc ~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_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu
+	linguas_it linguas_nb linguas_pt_BR linguas_ru linguas_sl linguas_sv
+	linguas_tr linguas_zh_CN linguas_zh_TW"
+IUSE="doc kerberos nls pam pg-intdatetime readline ssl threads zlib ${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"
+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-${PV}-autoconf.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-hppa.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-com_err.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/"
+
+	eautoreconf
+}
+
+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 \
+		--host=${CHOST} \
+		--docdir=/usr/share/doc/${PF} \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		"$(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) \
+		|| 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
+
+	# Install missing libpgport.a
+	insinto /usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+	doins "${S}/src/port/libpgport.a"
+
+	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 -rf "${D}/usr/share/doc/${PF}/html"
+	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,initlocation,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-98-${SLOT}" <<-__EOF__
+		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=/usr/share/postgresql-${SLOT}/man
+	__EOF__
+	doenvd "${T}/50postgresql-98-${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.0.25-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.25-r1.ebuild
new file mode 100644
index 000000000000..05750cc8adfb
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.0.25-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2010 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.0.25-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick Exp $
+
+EAPI="2"
+
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib versionator autotools
+
+KEYWORDS="~amd64 ~hppa ~ppc ~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 ${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"
+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 \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		"$(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) \
+		|| 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-97-${SLOT}" <<-__EOF__
+		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=/usr/share/postgresql-${SLOT}/man
+	__EOF__
+	doenvd "${T}/50postgresql-97-${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.1.21-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.21-r1.ebuild
new file mode 100644
index 000000000000..592d3d3d30d6
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.1.21-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2010 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.1.21-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick Exp $
+
+EAPI="2"
+
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib versionator autotools
+
+KEYWORDS="~amd64 ~hppa ~ppc ~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 ${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"
+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 \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		"$(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) \
+		|| 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-96-${SLOT}" <<-__EOF__
+		LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)
+		MANPATH=/usr/share/postgresql-${SLOT}/man
+	__EOF__
+	doenvd "${T}/50postgresql-96-${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.2.17-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.17-r1.ebuild
new file mode 100644
index 000000000000..e37d66389913
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.2.17-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2010 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.17-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick Exp $
+
+EAPI="2"
+
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib versionator autotools
+
+KEYWORDS="~amd64 ~hppa ~ppc ~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.11-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.11-r1.ebuild
new file mode 100644
index 000000000000..c108a1720fab
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.3.11-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2010 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.11-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick 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.4-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.4-r1.ebuild
new file mode 100644
index 000000000000..eed6c3935305
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.4-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2010 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.4-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick 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" \
+		"${FILESDIR}/postgresql-base-8.4-9.0-heimdal_strlcpy.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} \
+		--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_beta1-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..ccd7d7655bd6
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0_beta1-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2010 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_beta1-r1.ebuild,v 1.1 2010/06/02 17:21:28 patrick 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/"
+
+MY_PV=${PV/_/}
+SRC_URI="mirror://postgresql/source/${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+S=${WORKDIR}/postgresql-${MY_PV}
+
+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} )"
+
+src_prepare() {
+	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-base-8.4-9.0-heimdal_strlcpy.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/"
+	cd "${S}"
+	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
+}