Add Python support for clients and libraries. Fixes bug 392673.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

8 files changed, 890 insertions, 38 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 853c72910938..c278e155c687 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.251 2013/09/10 05:50:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.252 2013/09/15 21:15:12 titanofold Exp $
+
+*postgresql-base-9.3.0-r1 (15 Sep 2013)
+*postgresql-base-9.2.4-r1 (15 Sep 2013)
+*postgresql-base-9.1.9-r1 (15 Sep 2013)
+*postgresql-base-9.0.13-r1 (15 Sep 2013)
+*postgresql-base-8.4.17-r1 (15 Sep 2013)
+
+  15 Sep 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-base-8.4.17-r1.ebuild, +postgresql-base-9.0.13-r1.ebuild,
+  +postgresql-base-9.1.9-r1.ebuild, +postgresql-base-9.2.4-r1.ebuild,
+  +postgresql-base-9.3.0-r1.ebuild, postgresql-base-9999.ebuild:
+  Add Python support for clients and libraries. Fixes bug 392673.
 
 *postgresql-base-9.3.0 (10 Sep 2013)
 
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 6d122cf4753b..c5d10e69ef0e 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST postgresql-8.4.17.tar.bz2 14795028 SHA256 dc884c34ec3535d9f8b579155948a703def0574aca47292b97b82a8189cd0436 SHA512 9b8de2373d196847610329c33b21229245690f1587ca94b5c6fa770a7ace9fb29811e858debe1656fcee7b0e229d989b2786c12dfad01266501c5dbf1503d7ac WHIRLPOOL 899e787e6a3c4f4012946e8ec230ed8c049fcd1cb02572ea4f6d2e286da0f6b99a8bf732c6c7d7fe85a8a778e7e97f576b47821c61fdcdaa67dc87093c69b54f
 DIST postgresql-9.0.13.tar.bz2 15139873 SHA256 51aea4d099defaee307ec3b9900837446931d1aa0c6717070fa25ed033af9977 SHA512 abd29176c88485444b3b324191533b8f243624a6e391c654833ae5fe90fab93b55d04f778a3837c4b9a538264474458fa6bc2166800d3546fec0196965cf38e2 WHIRLPOOL 88a3a7736d96b259772eb4e55b472f0441e71aadfedc004cbe2fd2ae7e579a0f71e29485fdb1158c973865fb51017093f84a9629e2c3c7f05e35daf6f34f67a2
 DIST postgresql-9.1.9.tar.bz2 15815421 SHA256 28a533e181009308722e8b3c51f1ea7224ab910c380ac1a86f07118667602dd8 SHA512 f35c11afba347ebc818f058986af9dfd9af573937bb2c3160f71c7ef84ae3471eab2aa998975fb44a63a09e5a487f11624375e08c3c380bf1e0ba463b82d81bf WHIRLPOOL 7bbef51db715f55a9353867f94512e2351ea1d0b7d2b8777664afadae85c8ddfc4b5c39441ad6dfc09ea79094d00f534957917efd8a9e887564b42316411f357
@@ -8,11 +11,23 @@ DIST postgresql-patches-9.0-r4.tbz2 4525 SHA256 96f9af00dea1c33f9c77754e8ee37334
 DIST postgresql-patches-9.1-r2.tbz2 4552 SHA256 e33a684be93d2bf70566245601da5ea3f831f4ed4b2ff1fa91f8083be3d3bc21 SHA512 3154616884615fea9e826f347e32b89bbddf18256875b3a23b1b6b5d9c0a1bf6159230ab0c6c6245782987d12156ecaa8e51ab1d25a27b5bae7f72cd565784af WHIRLPOOL 8820ea3a96b31baf3b3294c56ed95c9d2d916fdf9584fef38a0b6299b292883af6dda93e4818af09d1ab4b4d66dde258beb56ab2121bb48adbd806f7038b5b82
 DIST postgresql-patches-9.2.tbz2 4431 SHA256 8ce635671d5af4d2c8d9a0fc741b26f82f1fda16bb6a36726a32dae47021a632 SHA512 4c971bd3f4ae86a48f5e21a1e4ab087865d41f2445f5a9ddfcd7d11f1abab7be8968e5a1bcfbe4a1f7799e7ca1728604aa01641883c47746ebfab658c189f6e5 WHIRLPOOL 712fae68cdf5b06e05f98e23760d896c7361fe0b548839082b8b0c488597bd0f38b80585677d380f8ccb7ded39e759ee42fa9eff838439468b5ac3a501004e8d
 DIST postgresql-patches-9.3-r1.tbz2 4488 SHA256 41e31bb02fa54f33e1248031841112d4600d87b8655800bc600daa02b640071f SHA512 33bdc26280d6b8c39634ef86590be388b4a4548827b66d91c62454426cb1f628b16ee1323c91bff6b469bfc5eba1de128c30a9d531905b5a2ef194af28dba6fb WHIRLPOOL 06e1c95dcce241bf436ffd99c75fac7481aab3f415993dfb33adc337476305a755fef864f242254f534d40b57b16912d888f46e87a626a74132bf0ed52334470
+EBUILD postgresql-base-8.4.17-r1.ebuild 4389 SHA256 dd399d0466f5aef3d85bd0789127db88c004b1f637c482d455992cc580deb385 SHA512 4354105692b18dbc710352bd7c3aafca42c09c2a605f5f66b306b38732d4a9fd241b78911fe6ec3a21a2b9ef8f54cf0ee15d8a824e219f8c25dfbb90e342422a WHIRLPOOL 401ed5a31b598fe3353aacbd75556c2f56266e7ea34e25df77c7192679a3894091276a3d36c3828a14a72eab213b95de8dda7c941cbe736a2b0b7e59a0b531d4
 EBUILD postgresql-base-8.4.17.ebuild 4334 SHA256 c21a974e20b017d46d9e266b055d3de6510df14c7f4add514616ed780398e886 SHA512 8ef71b48589e69b11d960ee7e3f947845c8bacc75d7c9e63811fccd48b0477017bca549b49ae93bbb586b24c2467b4ce576e13f9f1c14591ae17cc6ec28f9f80 WHIRLPOOL 371b2acb5bae9d139e9aa45a5c2a952a89734a71c496df92906ad216b5b75963c7481c58f52ebf893dbbbe7fb1afbd85741f6c1d35ad70d2fa9442cb4fbec305
+EBUILD postgresql-base-9.0.13-r1.ebuild 4555 SHA256 9e9ce66d4b6d0973aa685d746ceb8886080ead123b8bc3bf33c4829ab4c2c411 SHA512 d4b5991f486269c0b515655f9e46a018b9ce14c1960edccc30c907aa53821e8d7ec6e239f9a62f1447d5b17946e6030c638ead0b88f60035f6fc4ade7f8ef09d WHIRLPOOL a49b54fb7eb2f4c9709b48417e36950d30a87965bf0254c04e6f53d5eaf85e73e095ff0ca90d3713f33a36c3ca788959d134369eb1de7d2a280c331278f84a7e
 EBUILD postgresql-base-9.0.13.ebuild 4488 SHA256 f96e7e8811e61a5efb73022501e95f5cfaf9699d1fccb915dce7471b0182f0ae SHA512 f7d1a58023570f450d4c2192a004b14b047b13426f94576cb157bb1066978c16760e0e93c51150e0f3f4074b56d5cff577981daaaf59e12e5260b3470dd9340a WHIRLPOOL efcb81985d2d0bebe2102569366c582796a74403d8d82b516156c6fc463a4a07e72c7f7dcf220ae6647d22da6e88b5806996e1e7c04c7d2d69e63a24df182214
+EBUILD postgresql-base-9.1.9-r1.ebuild 4565 SHA256 dd2ee21418a7a4094dcac63977b05a292a606dd48884f6b6cdc551e54e3fd5c6 SHA512 6027c0d1c5a652d245974928b29ccd0a2fd00c22413223f0763219fd2d708617ba423d52dcce11311af19ad2d51f1fbba73da88d9adea4e76bf8aca839c79d32 WHIRLPOOL 4bd2a5db67bb43f4d7b1ba1130be7b698e3f448124509acb99922741ebb2b0d95e0d6d194668725fc28680be20a83e4dc09baafd1aacec0851fd06ac4382ff55
 EBUILD postgresql-base-9.1.9.ebuild 4501 SHA256 e2bf6172c79c51a35ddbee9a147f19b1ecf4cb03298f230258b010fe5ce07cf3 SHA512 e15bb245a55dc0d7e40557aa03cefe6e2503f5401066302bfce8f0cd0a4488e12bede408945333b05c04035b45bbd267569173cc95c1b1233f0e52c5665a6ed0 WHIRLPOOL 1a203a9e1bfcdda996ea2966087436ae3210ed287bd640ab058e0de1ffc4222bd075e874af02b94006fc5e0e318c84f55c719132729dec7a5dccf41a22908678
+EBUILD postgresql-base-9.2.4-r1.ebuild 4410 SHA256 a7ee951ba799b5649ff798335a81bbe0c86ed9e3ebcb857c67aca9676ad47afa SHA512 81207bdc5ef516d44d52ffbdc80a740286fb64c885566d09cce89564bcef715d5a1dd5b49f708aed64f949f2cd6f0325ea3c05f0e6609746da0ac425c3d41ef2 WHIRLPOOL ae7ed94e9e9c57b434e50cdd38b972e993b5055a0ed4159ee3972c2c8ce30ec99946f695a63048bb406573dad794ef23d5ee9a1964ca5e69e9476ba84b0514ae
 EBUILD postgresql-base-9.2.4.ebuild 4747 SHA256 05f88149f5b2f26ffa84849b75a80a01412ef29a7bd2d29ce64530e0a235432c SHA512 2df5de70a2b6776f83ae0311490fb66ca0200f6329475acea74d857e00f218ef939a3b1b89d20c0459880c048a834c6efc802fe087414b5caf1016616a1268d1 WHIRLPOOL 8c85d9563b67f662ffce15fabed4dbc3a392bb0d5a06123d3794adba7ca932000f518736f5574c849d902684e32fd14f58b0e2fe685d52a799b539357a4e3f0c
+EBUILD postgresql-base-9.3.0-r1.ebuild 4444 SHA256 f7ca054c273281e46cbf6b3f4fc85d2eadb79b502fe612b9117bef8db144af97 SHA512 1c76a5c7ac347dbdf93ca3187275515723777095baf502bf498363d173fc5e049ed5d5d08747e10820ac792536aa51964ce08f514b23ed83b1fffe21a70e71c6 WHIRLPOOL 97cab7405e82ca0b87e269a42823d1fe23b58e2644726711dff080c29b79220e6c02dd8d5a2857668325d720ec399d082dc3f87cf85f69f89919050bdd0f4745
 EBUILD postgresql-base-9.3.0.ebuild 4650 SHA256 909cb3ae3d4c780c49b79bec27ccfe219e3f4a58a8cbf3178592706663331264 SHA512 0c311a1084b9b246cbf73f0547fd01f499905389fd2f4fb15f517993a3323bb8d6b3d2be1e8b031de8e0af320fc438444a2ca219d33102890e372111f20d2d89 WHIRLPOOL 32c212bb83a88689e0bb73213d8105aa8f6091e472fcffa8d43fd587c482ab69b353ad670c00e210798b267e8a4ab77fa9062cee2ebdddc9f5bbee0e98a99fa7
-EBUILD postgresql-base-9999.ebuild 5131 SHA256 c12e0c76c79f7d67e20c1821b18051e0b10492dac2204d1d68d2967241c9716b SHA512 a64beddacf910a8a45651343ff0c4b65538fe28142b38b40c7b784e5b9320528edae712ee852df583a111cdf53f241fd9e8c73a0f99d037febfcfd9b01faeb55 WHIRLPOOL 171a45fefc09197150b83f63912d4ba4da1b9af526ee47afbef5a05f1e688ac0e0bd574bea9f5c0069cd571cb7f33f1cc237c749b5ca340000eb038260e38065
-MISC ChangeLog 63760 SHA256 f7703a13c886814ee6d9fad643bc80b308979b2393cf58dfd6ac2231784b6792 SHA512 8bd50760d39ebd773d1fd45533f302eb4db648539662a69cd321a47448a587ff10f290792e8ed2e89e8e5b61a5468b7fef2980599c1105f2915e1d7bc98a04a6 WHIRLPOOL b1883a14be69853d0607582f2707df1db1b7f04d6118cc1f9a5fe440dc8c46dfd0517535a1f073450bcc74e70429a1d30cb731a826e1c0dcc1363c35cdca4dbb
+EBUILD postgresql-base-9999.ebuild 4554 SHA256 3235a7289749debcc0717a36da9f828a3d46aa79410286f2a4d7cdcf6942765c SHA512 4b26149bc6d9bd7b9835e34f82f6e7ed6fc03a8f2654f20d71c7cda89fd4ad157fc1b0a1444b656ac61dcd20adec16876d1b9c69642c1d0ae4944d21800d229e WHIRLPOOL 636a5f662528768e83c318778b763dbee3b7436bf294542829f826072d756124caba2bc437bb0a586f6858dcc3af26adb8525cb5597380e69e1285088a34a519
+MISC ChangeLog 64296 SHA256 dfbd9e36c77cbd07e28b123cd2882a303ca1942330a7d718e2b4c032780eefc8 SHA512 b8d250189f729f6bc16f07110827862f418a539fc472270206ef91c65e7b021f38abdcdd60105d838c6b92595051d937e3375dc80019db3c2780fe0720b8e52e WHIRLPOOL f16ce27106f67260358302fccf8ba16dbcbf4b9d7f04da29dc16b269eb7de6f3bd883f79e7639112784cf3739685781afc5005931d3fc74730cadbfebdd6c60a
 MISC metadata.xml 319 SHA256 8ce157b48f2da128f1b40b0d59c3c06e51ba71173689ff7a86c4429a7055c471 SHA512 248b60da17006a89acb1d8b6f62f59e4d414421422d2d4445bc7efc4f0abf13d048fe52c09af6b3e10a7afad341a5edb0e8d48b9ec2ead5f84b40f4016448cf9 WHIRLPOOL d1cf97f5d676ef43d677cebf8f9c97f6823c1c7b31e1a40a6f22729771a6bdcc851ac7c27ace768509307f4d0774384805cf4125541acd7a785d48117c0d5e07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlI2I28ACgkQVxOqA9G7/aCxzQD/XR6oZrNLWUOTcX8aKcfTNqon
+DTsc4ngdbo37T94gz/UBAImNeyONxCfmpwavPq02Tta7bEeu9WkV0AsyNLLQqx/S
+=D16n
+-----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.17-r1.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.17-r1.ebuild
new file mode 100644
index 000000000000..721abb59873e
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.17-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2013 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.17-r1.ebuild,v 1.1 2013/09/15 21:15:12 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{5,6,7} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix python-single-r1 versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r3.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp python 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.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+python? ( ${PYTHON_DEPS} )
+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} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c \
+			|| die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-tcl \
+		--without-perl \
+		$(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 python) \
+		$(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}
+
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	insinto /usr/share/doc/postgresql-${SLOT}
+	doins 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}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.0.13-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.13-r1.ebuild
new file mode 100644
index 000000000000..9cc3aae3eac4
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0.13-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2013 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.13-r1.ebuild,v 1.1 2013/09/15 21:15:12 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix python-single-r1 versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r4.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp python 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
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline )
+ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c \
+			|| die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+		;;
+	esac
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-tcl \
+		--without-perl \
+		$(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 python) \
+		$(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}
+
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	insinto /usr/share/doc/postgresql-${SLOT}
+	doins 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}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.1.9-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.9-r1.ebuild
new file mode 100644
index 000000000000..8feac6214ef0
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.1.9-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 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.9-r1.ebuild,v 1.1 2013/09/15 21:15:12 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix python-single-r1 versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r2.tbz2"
+LICENSE="POSTGRESQL"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp python 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.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline )
+ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c \
+			|| die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--without-tcl \
+		--without-perl \
+		$(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 python) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib) \
+		$(use_with ldap)
+}
+
+src_compile() {
+	emake -j1
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	dodir /usr/share/postgresql-${SLOT}/man/
+	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	insinto /usr/share/doc/postgresql-${SLOT}
+	doins README HISTORY doc/{TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.2.4-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.2.4-r1.ebuild
new file mode 100644
index 000000000000..3d2496013ed6
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.2.4-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2013 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.2.4-r1.ebuild,v 1.1 2013/09/15 21:15:12 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix python-single-r1 versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}.tbz2"
+
+LICENSE="POSTGRESQL"
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp python 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.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline )
+ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c \
+			|| die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--without-tcl \
+		--without-perl \
+		$(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 python) \
+		$(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}
+
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	insinto /usr/share/doc/postgresql-${SLOT}
+	doins README HISTORY doc/{TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9.3.0-r1.ebuild b/dev-db/postgresql-base/postgresql-base-9.3.0-r1.ebuild
new file mode 100644
index 000000000000..bc2c89e6877d
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.3.0-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2013 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.3.0-r1.ebuild,v 1.1 2013/09/15 21:15:12 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix python-single-r1 versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}-r1.tbz2"
+
+LICENSE="POSTGRESQL"
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp python 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.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline )
+ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/run-dir.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
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c \
+			|| die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--without-tcl \
+		--without-perl \
+		$(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 python) \
+		$(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}
+
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	insinto /usr/share/doc/postgresql-${SLOT}
+	doins README HISTORY doc/{TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
diff --git a/dev-db/postgresql-base/postgresql-base-9999.ebuild b/dev-db/postgresql-base/postgresql-base-9999.ebuild
index 19ebbe8b7455..7963416c4a43 100644
--- a/dev-db/postgresql-base/postgresql-base-9999.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9999.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9999.ebuild,v 1.8 2013/08/14 09:28:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9999.ebuild,v 1.9 2013/09/15 21:15:12 titanofold Exp $
 
-EAPI="4"
+EAPI="5"
 
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
 WANT_AUTOMAKE="none"
 
-inherit autotools eutils flag-o-matic multilib prefix versionator base git-2
+inherit autotools eutils flag-o-matic multilib prefix python-single-r1 versionator base git-2
 
 KEYWORDS=""
 
@@ -16,18 +17,6 @@ SLOT="9.4"
 EGIT_REPO_URI="git://git.postgresql.org/git/postgresql.git"
 SRC_URI="http://dev.gentoo.org/~titanofold/postgresql-patches-9.3-r1.tbz2"
 
-# Comment the following five lines when not a beta or rc.
-#MY_PV="${PV//_}"
-#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
-#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
-#SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_FILE_PV}.tar.bz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-patches-${MY_FILE_PV}.tbz2"
-
-# Comment the following three lines when a beta or rc.
-#S="${WORKDIR}/postgresql-${PV}"
-#SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
-#		 http://dev.gentoo.org/~titanofold/postgresql-patches-${PV}.tbz2"
-
 LICENSE="POSTGRESQL"
 DESCRIPTION="PostgreSQL libraries and clients"
 HOMEPAGE="http://www.postgresql.org/"
@@ -36,7 +25,7 @@ HOMEPAGE="http://www.postgresql.org/"
 RESTRICT="test"
 
 LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
-IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp python readline ssl threads zlib"
 
 for lingua in ${LINGUAS} ; do
 	IUSE+=" linguas_${lingua}"
@@ -52,29 +41,29 @@ wanted_languages() {
 	echo -n ${enable_langs}
 }
 
-RDEPEND="!!dev-db/libpq
-		 !!dev-db/postgresql
-		 !!dev-db/postgresql-client
-		 !!dev-db/postgresql-libs
-		 sys-apps/less
-		 >=app-admin/eselect-postgresql-1.0.10
-		 virtual/libintl
-		 kerberos? ( virtual/krb5 )
-		 ldap? ( net-nds/openldap )
-		 pam? ( virtual/pam )
-		 readline? ( sys-libs/readline )
-		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		 zlib? ( sys-libs/zlib )
+RDEPEND="
+>=app-admin/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline )
+ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+zlib? ( sys-libs/zlib )
 "
 
 DEPEND="${RDEPEND}
-		!!<sys-apps/sandbox-2.0
-		sys-devel/bison
-		sys-devel/flex
-		nls? ( sys-devel/gettext )
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
 "
 
-#PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
 
 src_unpack() {
 	base_src_unpack
@@ -130,13 +119,13 @@ src_configure() {
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--without-tcl \
 		--without-perl \
-		--without-python \
 		$(use_with readline) \
 		$(use_with kerberos krb5) \
 		$(use_with kerberos gssapi) \
 		"$(use_enable nls nls "$(wanted_languages)")" \
 		$(use_with pam) \
 		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_with python) \
 		$(use_with ssl openssl) \
 		$(use_enable threads thread-safety) \
 		$(use_with zlib) \