Added >=sys-apps/sandbox-2.0 as a dependency.

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

7 files changed, 759 insertions, 6 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index bc6fce622e2d..615eb104dfa0 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.120 2011/05/19 16:03:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.121 2011/06/15 13:15:46 titanofold Exp $
+
+*postgresql-base-9.1_beta1-r2 (15 Jun 2011)
+*postgresql-base-9.0.4-r2 (15 Jun 2011)
+*postgresql-base-8.4.8-r2 (15 Jun 2011)
+*postgresql-base-8.3.15-r2 (15 Jun 2011)
+*postgresql-base-8.2.21-r2 (15 Jun 2011)
+
+  15 Jun 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-base-8.2.21-r2.ebuild, +postgresql-base-8.3.15-r2.ebuild,
+  +postgresql-base-8.4.8-r2.ebuild, +postgresql-base-9.0.4-r2.ebuild,
+  +postgresql-base-9.1_beta1-r2.ebuild:
+  Added >=sys-apps/sandbox-2.0 as a dependency.
 
   19 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -postgresql-base-8.2.18.ebuild, -postgresql-base-8.2.19.ebuild,
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 23c4a0067c85..5a5bc6f92519 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX postgresql-8.2-base.patch 4045 RMD160 3cad669ba0db500cd97b17dba376a554617670c4 SHA1 abd2e55ebd6b6d4c342a662b2f8772d02f8f6ed2 SHA256 4402e9d809bf0c994bcc1dea1f20002239799b626f7e494d4c38e6470a7e4010
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
@@ -32,19 +32,24 @@ DIST postgresql-patches-9.0.tbz2 4306 RMD160 225f3d9af435d2628b9841619589af44720
 DIST postgresql-patches-9.1beta1.tbz2 4343 RMD160 a5e714733131afa3361c57cac5595482a9cc0778 SHA1 1c694f50db382c90a3fdd8548322ddf31b1b355d SHA256 216448c1810ef5de4ced5e52277fde2a8edc7979bda74bd8cd78b436dd83c509
 EBUILD postgresql-base-8.2.20.ebuild 4534 RMD160 91df15e17b9a0d5dad60decc95def78fc077248b SHA1 1cc1620f2b8423b4921e9a9894ff2902bb020800 SHA256 89553d881551507928cce6b828a565cefaf6080c7f029e3e6494f6324f5d93d5
 EBUILD postgresql-base-8.2.21-r1.ebuild 3792 RMD160 9de8e0434f5eff88cd6674abcbfd5ebf9b5b6280 SHA1 2549c77de5cdbc5484f446c480a8d0b983e92f48 SHA256 50aac65c424de88bf5a873eba3a8a8d7b7e3d7bfa5fa1dd9066e79f3dab9d6cb
+EBUILD postgresql-base-8.2.21-r2.ebuild 3817 RMD160 9773f7edae8e49dbecb8af863f6f2ceb75871437 SHA1 f041b983d77453f7ed5c5f575f2aa9a6ee06d2d2 SHA256 7ef1852e52e67bc481b00e45d15e0f0ebea73e38c1124954bc9e557142c675ac
 EBUILD postgresql-base-8.3.14.ebuild 4600 RMD160 7d6e89b8242016be1f9f718bc1a65dee22ec4817 SHA1 e0a2a48b13f4d20ee231c17f92e269ecc797370d SHA256 4f435a5e8bd3c958edd3284fe611920762253f794ca8728cb569198670515dc7
 EBUILD postgresql-base-8.3.15-r1.ebuild 3906 RMD160 1a510c925134ac1336ca77efc9dc3a76e310accb SHA1 4e303fd61eac23ea3fa6a40f3ad62204f6684d89 SHA256 f9b51831849b64697dcdd58994a8cf30397ecd4a4f5d6b6925d2e9ed407fbef5
+EBUILD postgresql-base-8.3.15-r2.ebuild 3931 RMD160 a1476b5f6fb9a2a0bb138093e0791cbf2a6f6528 SHA1 d84d77be9db0ed965e87e1fc6dbb26fc2b7fd05e SHA256 8217779c65e8ac6bde977044087e0f7fb1485c7cacead701258a475e00ddbd0b
 EBUILD postgresql-base-8.4.7.ebuild 4715 RMD160 2241df78cd2c80d49bd136521a984434772fb01e SHA1 27fccf76ac58a1a103bf2e9d6555bd92776cf993 SHA256 21120f15f2f8661a7eb3ce00c165002a944b5a5b051c14f65eee718ad1f56012
 EBUILD postgresql-base-8.4.8-r1.ebuild 3840 RMD160 f77dd000ea3feca4ff8b945aa1f8966281713c59 SHA1 3be85b510f4b2b49c7b53d448256b5d3e753d88d SHA256 63588420e49b3b38e6576c952c0556643d7f3e022517154ea0768fa98cb58c1e
+EBUILD postgresql-base-8.4.8-r2.ebuild 3865 RMD160 dc9d3dc1deede94559bef53b90138f8b128c9837 SHA1 6376fcc5f76430c0fec60d9b3752f0f0c9713bc9 SHA256 b05e01322da3118a776e50d8a83209ab2e29edd6f2299e220e92616f356b81c9
 EBUILD postgresql-base-9.0.3.ebuild 4490 RMD160 2d3b32cc159fad56dd1e0aa96fb43f45417c1a00 SHA1 fc0da39210ac50efa19b00b7c46f965d7f938b6e SHA256 1a034e639b76df1aad6e6c4fc865a1da914b5525b56a3bc2e2d9de773b9dc56f
 EBUILD postgresql-base-9.0.4-r1.ebuild 4031 RMD160 ba47d56ba8945933d45149d3095303d31acb63cb SHA1 1240ebeeea0ac844654847a61ebddd00a85ed650 SHA256 f1239d0d77009b69730424ec7c26aa25167bc5adea382cc277d706a5137ce26f
+EBUILD postgresql-base-9.0.4-r2.ebuild 4056 RMD160 94ac4903f275b33b9b3975b622a8e7818549bfa1 SHA1 dfb64e1b88ec4fac2b283c436f6028f15de7064f SHA256 d8e10afdcf92e8ee0a8b0d0caad08786ca274396c0acb62b6b23132a56e6a4b9
 EBUILD postgresql-base-9.1_beta1-r1.ebuild 4121 RMD160 809dd097435e8ba16d7889484a1c4082780d57e4 SHA1 2141f449903601efc538572b664efff9a51bbc65 SHA256 6c657bd16941f1cc19877a733a021ef8a66fc2e467902f7a12234b4f8a1b0c06
-MISC ChangeLog 34345 RMD160 944617576cd62ef70762c93c1b114b25df0762d7 SHA1 a1bbfd3e849f3d20bf69f39e594803afe4fc854e SHA256 6e380d41fdd380f954ed6bfad4ff35d053ddf39d4533cb9199bd28e24c694f9d
+EBUILD postgresql-base-9.1_beta1-r2.ebuild 4146 RMD160 4f9b17c9f17b1fccb05c9326c601485ddb742f1b SHA1 bb110c2e72d4f17ab0d8e160f4c94947974af48a SHA256 ff38f014d53a3b59ec602494125cb554e9c3e0691904367b68c2324b9ecc05e1
+MISC ChangeLog 34840 RMD160 0b4daf63380aa2e74a4c956bb45abc57ac8fb227 SHA1 75897c6e690104cdf576d598e753343f2c6cae48 SHA256 14cc324ff8aa8aa04a831752006bb2701c41ee28ba5b23d4e7f74806b28c6f34
 MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3VP0EACgkQHB6c3gNBRYe7lQCgvWx779a9Sqr5HgFZSXUEOB7n
-r3sAoJy2USNvR8qX2yHcazk+sIrItdRJ
-=j34w
+iF4EAREIAAYFAk34sIsACgkQCOhwUhu5AEkCMQEAh95U3oH8STWvStGdShgCKUuU
+AfTTB7ZQ9WTpq6NI4YUA+QFq8Viw6a5S/VmNnIEK71HoNdcsQ0WNcQzUdm+P8l/Q
+=qDkQ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.21-r2.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.21-r2.ebuild
new file mode 100644
index 000000000000..aabbb761c6c9
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.2.21-r2.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.2.21-r2.ebuild,v 1.1 2011/06/15 13:15:46 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}.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-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.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}/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/" || die
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--with-locale-dir=${EROOT%/}/usr/share/postgresql-${SLOT}/locale \
+		--enable-depend \
+		--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-r2.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.15-r2.ebuild
new file mode 100644
index 000000000000..e04754a7cba7
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.3.15-r2.ebuild
@@ -0,0 +1,146 @@
+# 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-r2.ebuild,v 1.1 2011/06/15 13:15:46 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}.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-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.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}/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/" || die
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--with-locale-dir=${EROOT%/}/usr/share/postgresql-${SLOT}/locale \
+		--enable-depend \
+		--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-r2.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.8-r2.ebuild
new file mode 100644
index 000000000000..3f797e134122
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.8-r2.ebuild
@@ -0,0 +1,144 @@
+# 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-r2.ebuild,v 1.1 2011/06/15 13:15:46 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}.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=">=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}/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}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--docdir=${EROOT%/}/usr/share/doc/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--enable-depend \
+		--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-r2.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.4-r2.ebuild
new file mode 100644
index 000000000000..d6875e97be58
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0.4-r2.ebuild
@@ -0,0 +1,150 @@
+# 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-r2.ebuild,v 1.1 2011/06/15 13:15:46 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}.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=">=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"
+	epatch "${FILESDIR}"/${P}-stdbool.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}"
+	econf --prefix=${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT} \
+		--datadir=${EROOT%/}/usr/share/postgresql-${SLOT} \
+		--docdir=${EROOT%/}/usr/share/doc/postgresql-${SLOT} \
+		--includedir=${EROOT%/}/usr/include/postgresql-${SLOT} \
+		--mandir=${EROOT%/}/usr/share/postgresql-${SLOT}/man \
+		--sysconfdir=${EROOT%/}/etc/postgresql-${SLOT} \
+		--enable-depend \
+		--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_beta1-r2.ebuild b/dev-db/postgresql-base/postgresql-base-9.1_beta1-r2.ebuild
new file mode 100644
index 000000000000..9b720c52128f
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.1_beta1-r2.ebuild
@@ -0,0 +1,153 @@
+# 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_beta1-r2.ebuild,v 1.1 2011/06/15 13:15:46 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}.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 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.9
+		 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
+		>=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"
+	epatch "${FILESDIR}"/${PN}-9.0.4-stdbool.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}"
+	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
+
+	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
+}