version bump

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

21 files changed, 2954 insertions, 45 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 9a728e171eee..bbb0db7686ac 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.279 2014/03/12 10:26:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.280 2014/03/20 22:06:23 titanofold Exp $
+
+*postgresql-base-9.3.4 (20 Mar 2014)
+*postgresql-base-9.2.8 (20 Mar 2014)
+*postgresql-base-9.1.13 (20 Mar 2014)
+*postgresql-base-9.0.17 (20 Mar 2014)
+*postgresql-base-8.4.21 (20 Mar 2014)
+
+  20 Mar 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-base-8.4.21.ebuild, +postgresql-base-9.0.17.ebuild,
+  +postgresql-base-9.1.13.ebuild, +postgresql-base-9.2.8.ebuild,
+  +postgresql-base-9.3.4.ebuild:
+  version bump
 
   12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> -postgresql-base-8.4.19.ebuild,
   -postgresql-base-9.0.15.ebuild, -postgresql-base-9.1.11.ebuild,
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 155b70c870b6..ce4e89adbe3d 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -2,37 +2,37 @@
 Hash: SHA256
 
 DIST postgresql-8.4.20.tar.bz2 14642312 SHA256 e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1 SHA512 83c45b54035c2f55de1def66a695c669481d0a75a0a55ac7e0ff352be4ca7ff1c212ac8f7046e44b324386a3bf9c4befdf36fa1207fff7d149c9e9f3c0e775d3 WHIRLPOOL ab9751509a5514fa2106a04e4c27850d9bef9c66034d3c7061a9299d35bbb06f8082a1fb63cc861108e70e3aa8d0d58d1c6186314862d4018de7428e0fb24360
+DIST postgresql-8.4.21.tar.bz2 14645050 SHA256 388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c SHA512 b1d30a7b0bbe5f3fc1046b363d6e76a964576b8161d13ed7e6897cdecffdfdc02f5fa6cf4a4a759f43c1a8ef5f736a46e63abc841834c53f54d9f838aa15d5d2 WHIRLPOOL 657ab021c3760e1babcd6f4bb163f8a99a4724542e6fe94d195b9f2a90ec59cf0cf86fbfb441429a37a6d751c7a322045ea026fdc461dae93a256f0768e1db85
 DIST postgresql-9.0.16.tar.bz2 14956681 SHA256 900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf SHA512 e98931f6f0998fa1fd43c798f8151f49730723e95ec8a80e958ce800e2f03a6e56bc1dd02412045dcf45acc9e4272dcc4d8b4af9c02a69e031369e9170d6c885 WHIRLPOOL e9446e1e328f09b98004170c2a74f8d1f50d649203903a637ccbb42f897de5f8cb326cb8e792ecb99d1f369b75d15cba523743e4e68506c514f565712bbfd75b
+DIST postgresql-9.0.17.tar.bz2 14961682 SHA256 d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad SHA512 95d8d134aa7186ec9dd26419d1ba01ccf1b760adf2e174b00fec9fc0ff58ff0f258c55d43cf38c9f3445f76e6e0bbccdafd2245f8e483847f46b422cb7549ece WHIRLPOOL 280ebde832a4bada0939da6b77bbfb6349fc775e776cda18201b8da144dac8a40b6a48172a3aab17af33eafd6eb94ffa3d5c4006f75a2f85a61c15b70ae5fba2
 DIST postgresql-9.1.12.tar.bz2 15638909 SHA256 0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383 SHA512 cfc256e5aafd4dc96a1dbd086f2d4f37c03550c15f4fc5bcbc51128c659324ac15d05ee2be76c9f333bcfd2e1d8c1af035d461c0479da8fef522128994c33e01 WHIRLPOOL 8a0b0d941ea442ba38b20af1262d5be9a70c8987302062052af251c2acde66c37fffa33364c2d342442132b5d3dbe7956f5ac5c0dbcadde10a888f362cc9b688
+DIST postgresql-9.1.13.tar.bz2 15652239 SHA256 20f8aa5dfcb47688ca6b6c41340cac61712d9cf87c34d58b0a75bb2f85d89b7f SHA512 573dd3a27179ca509b671cddbb271c07dc241a273b38644d2c91e24d0631c7cae90c8e20ffd424d88ab8b9e318923333c13ecdd6165f15be780e5e4e5f090377 WHIRLPOOL dcb2ef384c42b9c40c30f6e716419234863cb92875080c8d9d7db6699a91113b8367194c5d51967812b6154050a8d484ddf36cfa4c929c454fa7077a6ce32b34
 DIST postgresql-9.2.7.tar.bz2 16248445 SHA256 83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86 SHA512 aa9fdc81dca8eaa8e68aa29cd67d519ad3d12aeac1d689be04bd5976c5c569a33861eccd4333a4f6c7456255a2217aebe9d57bebae83540922a255ac32c00be7 WHIRLPOOL 0e6d611dd3dde1ebe9222744bc05fe5972f558113724848830fca939127d6bd5607f91480efac0dcf3e56042ec3ac83f848e5f0ffb8cd5ded55affbfb7be6eab
+DIST postgresql-9.2.8.tar.bz2 16263345 SHA256 568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c SHA512 f10ef949d54222f8b1e8a5e8b5fb4c13a59c1ad52f25191fa2024a24f08076d91d941af943a11118c896cc3cd9d28310c15aa698774f19cd3de6a033ab1f8eb5 WHIRLPOOL 3d3e6e5c81bd037148fdbceb3748a35047dff92069e9cd130f9f908518f89e06db2908db42f128d3a990573567d0931e9693cc1023c5dddb0d8dc5e79a19c044
 DIST postgresql-9.3.3.tar.bz2 16665845 SHA256 e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879 SHA512 2d8163b31042dc66dc52371e265cc081c52783da403652fef4985b177d2961fdf106767112595fde6ef79e3122fcc318a3daeb5dea59a1cd211b8744acd65462 WHIRLPOOL 4ddd166a65c815e3b71872f5dd5cc120d5c12865f3101ca140f7eb36e54223f1e0496d4a9a73ba2278551961787cac5385385d33360fae6e66a692e532dc14c3
+DIST postgresql-9.3.4.tar.bz2 16691447 SHA256 9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621 SHA512 acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4 WHIRLPOOL 7ddc9356690cee3150653f25152082bb6e5eebf6f914bb06f2bd7dea2a27287b3b64048653100b78498383fe52e6182822beee983df758b620233a9bcc194e0f
 DIST postgresql-patches-8.4-r3.tbz2 4821 SHA256 f2c47ff5cf6af20020c87bc34362615af66675d7d44dd020ccfae425880e1ace SHA512 149434a1a55f130b91b87591ac6bbbd263893e90facfdc47418320561a91cb818dea6367af5b8afbb6c9cccea6053692ee3008c62cbe40e8819c7cac04389334 WHIRLPOOL 30d5945bd65e07f114d8ee27bcbc1dc7ae136a2b5a1f62ec44aad325208dc8387ae11f58c21ebf1447822b35fe35b79d64c86cf763e146dc9c2b5da7dc883d47
 DIST postgresql-patches-9.0-r4.tbz2 4525 SHA256 96f9af00dea1c33f9c77754e8ee37334012b8098361c321bd3f562ca9c32f6b8 SHA512 1e792eaf1e194e7a109a860216de98929bc12e6905846524e795fed7e8506f8f0e2e7349ead4fd9ba196c8eb6af2f5b143d0eecdb4cb7061253257acbce37873 WHIRLPOOL 8a32c0cd7f6b845496df8d1f6a0b2497625c0da36c5af1d651be086e9cd4faec48b56b04dca894a0e43e91309868db3014213d9989da5fd1d52d5b3775f8c1ad
 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.20.ebuild 4371 SHA256 76a65b9a51e3978b80a426403bca700b1d8cfdc8063941a36f75f009b7a06c65 SHA512 c45393b823434b5046197ea81bd659f238b2035e0a115a7ad00242c9c87f7ed2c7cfd64c5a3ccf8730a485876991ac88b777942378d6bcce6c92bc39b60b7f37 WHIRLPOOL 5b855ff78750fe6b308110434e27a07d5c944750ce2e50ffb172372bd609720c0b0ac81ceba7df03f90b90899bf0b7d462b602374a2299205aa916fded4142fe
+EBUILD postgresql-base-8.4.21.ebuild 4386 SHA256 79e4c03e1c3fd53b06aae3cdfd031b3f722ea8364a8a08d3b407ee1ac6121e83 SHA512 9442de85298d02445110353e392413880d2a3c752bc051dddc3f0a00b8753af9d9cb61d5ff1328e4ddea9f78adf948eb6519eb1815fc8c0e2ce6c8140ed4eefa WHIRLPOOL 92770b724bcede336d25e8dbb97b2cfb85dced5fcf8c518f1885d9861e5b53d4d4add78149eeaf24856542b0ac0b8ca8f2c731497df700c5b534c38a3ec172ce
 EBUILD postgresql-base-9.0.16.ebuild 4537 SHA256 5a7d6ef2010ee9e40e1c20ee36f8da47debe6699f5b29a04ca111fe75e8d6327 SHA512 59b4c250ac28bf09defacb7107816cfea3dc8bb8b7438418e73de699543901c25f11b5791725813b0e948de5fd82fe35fce80aee213298faa45beeecd16aa6ce WHIRLPOOL 2f55bb82330e6448843d1370ee975e0ccf6ab2eba11426701385d2fba786443d2102ba2c58a4bd53f679b6015557219e3196fd5377d4461f840f12b678989c38
+EBUILD postgresql-base-9.0.17.ebuild 4552 SHA256 e4852823954e59164b3611919ed9f1cec6720886585467973b33d36ba696bd47 SHA512 2893fb8f6c8f59548a97bf743faec4a76dec301b36b0dabe7efb57c545fdda6af6ce47506cff7cef10f86851fb60736e7c730c9195cf6bd95d43fd95d321b9ea WHIRLPOOL fd56206c43c831d4ed22a951de7bf64a93ea5b95284b63dad80876d241ea4df56c9fc30ee28525a7fe442c50c65254e1996b24f9d63258b5210f977e4876466a
 EBUILD postgresql-base-9.1.12.ebuild 4548 SHA256 4ec611a9d167a2b9289215ebe71cdf4f3eaaa104fafa7a9863c215cfc0d26ca4 SHA512 ef1fc9b93b768ef941fc61ea7ff3067d95a17ecbbd83abab346220dfc369de9e83d8e889544cf24ddd720d10dfbd75a25cde4f1f5def29330ad02e97c4b9f8da WHIRLPOOL 83ddf1e49586a11958e84f9c34336e7839d464f158e6a83e9bcd6e7545a6576ee58d5b024ccdf1e42f88e2eb784904d267e3a8931cde46de48e01a2689912224
+EBUILD postgresql-base-9.1.13.ebuild 4563 SHA256 f321afd2d0ba7f6a54f4eb3e9d6f9622bd8edf9b2655af0a2c37050ec0991f18 SHA512 b8f336c6dab763261351f862f1b38935213be604be3965f9ceac8bddb09d73b12550449f44253eca5c7ff3e861701a80abc0f48e5d751fb434cc0221f3cb69fa WHIRLPOOL f50f3701bc9509de5ca86909126c01f907ce1cf1a1d5242a5799d6b6c200d5885300f4cc5d0475883b9aae6b6a61f48b528dfac8ff5b144747d97aa4e364f86d
 EBUILD postgresql-base-9.2.7.ebuild 4392 SHA256 e48d643878758c8354a80f32af383f82b27d2b1177ceed7e9536eb6a6379d92e SHA512 8d37ca03ac633f5aba5c0e7ad842361d2d513db50dd41f5389cb0cada34475eee9dc8b027208523761275fb089deaacc11871b724e2f85286bc7faf3254b2da1 WHIRLPOOL c754adcd01cd12476c8703726d6a9419de4d2342da2cb92ee9cbc4eed24d777f691f12e572ef91de2bb5a13d9dc1844fc6984349f14d5419270aa4e14627e6cf
+EBUILD postgresql-base-9.2.8.ebuild 4407 SHA256 bd8793b6ecb2888542585204e8a76dfd25bd183fd0acf45ad0923436643e5aab SHA512 b176040f32d9c02eb678cb4c6d9528762abd987b67aaf1058741957c6d13d2b07ee4b39b4f42b82c5f96996317eb71c196557e9e797021182132091182a764c8 WHIRLPOOL 97287155522820ed1f1d3c3cdfdedf752a8668f84dba307c2edf19c1c09f14c6f5c8eb0e4aeaae8d8a72d138d8600aa53e16be6d99e99d6d90f7204beee8363e
 EBUILD postgresql-base-9.3.3.ebuild 4426 SHA256 89f97c1b39128adf313dddc9a9f7dc4bf1b2fcab229c80e53306480d8be40c7c SHA512 b331c0007a9f82c26b85c09de8ba39638c95a08b9cdee2553d613a87f2894dd5b50382e167af85961c5b662f3b3689705b4d228c3fe2251ed092bc2c2a881b0a WHIRLPOOL aad6dff9aee35513ec3f9e30d172b6a3e2e630ef4009cdee4908b89cbf66bcecc1a4e90ca2dfb26a610227aa646cf54650a8525474146474e8d5b50bf409a823
+EBUILD postgresql-base-9.3.4.ebuild 4441 SHA256 b33d55ed95a2de60a9cda12bb3e461744449d4880f6111b98546bab50913a2ad SHA512 363a94fe0a39cd460ea49885c0787565380e7c03fc5cb55ec8f21971f2c9417472dedc4a01633b2d6a9645b4401213185588d002a396fe6cd324f6fb8312251b WHIRLPOOL 1437ea71aeac086d6d69984f8cc584c1b0b86bd73302151ac875ac5fecbabc8943fc15c7d65f80b172dbc6ce6c3ab15bd662787bd3b8e4e3e47c7f5741fe451f
 EBUILD postgresql-base-9999.ebuild 4553 SHA256 798137f052575935a45c871912b1f4668a35a6f17c1f99f1d51ff3b6d80a0cfd SHA512 99b15fcc52a4ce837f00167686d755a2a347a3a58e3282fcb6902164106d90f837b172632a9d0cb863266a3054f559c60c6e7421ade49de330a52dd117ba14b8 WHIRLPOOL 5ab702706d62b38e988e16092315248fe9ba4e6719c8a9399d3e5e82309537fbd2b52256050e29cb733baaa9460d229d79921c68a6eb35fd44b406413d4a7306
-MISC ChangeLog 71437 SHA256 9a29c6df00bb015a2beb9768c6190e439d09769dd388f59853c3184a6939ed40 SHA512 60aba6c854edac529d65ac60860a47cfa2592ede66b6c081a51be47a2070ddea55bdcc9e3d885fee2ccfa909a8acd64d1d7ec4da3e9c153ce3ae2ac54070e70b WHIRLPOOL de6110fa0add7d49cba9062f8caada69be6557ce36cd455602f41c5623cb0f65bdf3cd617387a288663d96c5cffe659d3e7e338ddd3e2ecb9437ab95c62a2e5e
+MISC ChangeLog 71869 SHA256 2fbc560d373423ea9ab37a6fad9b950ef9a70ba9748dd39184c0b20f22a5103e SHA512 347f4dd18086ecb0f8e2aedaa52eed153b8271ac6b31b2b34a1ce05e9259c64ae4431f6930c1aeedf71bdd1b6b08b1fff2666ed535045c61caff624430621253 WHIRLPOOL a2f01f13c65597a031414ee043de4014367f13c4d56b9ce47ca8a00a8439b6a05e0d679afa754afe2d977db08a5cd933222bb3f962fcb24ffab67c802fcb82ed
 MISC metadata.xml 319 SHA256 8ce157b48f2da128f1b40b0d59c3c06e51ba71173689ff7a86c4429a7055c471 SHA512 248b60da17006a89acb1d8b6f62f59e4d414421422d2d4445bc7efc4f0abf13d048fe52c09af6b3e10a7afad341a5edb0e8d48b9ec2ead5f84b40f4016448cf9 WHIRLPOOL d1cf97f5d676ef43d677cebf8f9c97f6823c1c7b31e1a40a6f22729771a6bdcc851ac7c27ace768509307f4d0774384805cf4125541acd7a785d48117c0d5e07
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIDZtAAoJELp701BxlEWf2hgP/0rI3lM25wC4iFKn0avFFkSn
-PVrW8tvpxXU569LyyC7UCF/lL50h4Kp1+GtK5H/fB35zBUE75axUnp7e8eqtVSDD
-tqhPspK/sg85ifS+r3PKPHBv1kVq+goDPRSOUO4WrTo/c6sUkKk4n46O1aWma4Ta
-T010DsBYdG4RinwMjcFuWbLNBnyEo+5XSqIEqoUYZ/NgoNQqCC96HwPCEcNUO4t1
-vzsx64ArUf9JGEFnClA0KSxQJYHI9wEyOWv8y9WQ34mEYlXU+Ce00O+tetvyUrID
-sS1WHuiUafsR7MSEl5bGDaIemJjl0MpxbTnVKH4jrFFJ8kSnEmAKEkEeTLn8jU7E
-4Aq83eIh0U6eqGUEYvH+kVLYls3BJo3jwDJfktm1oKrrTJQJBZWQ0AvN7VEyDGv6
-p3taEXtxeyhRgd6iUlHgHIdtRtNqGhOg6kZT5+C4OoAEDXx8jnJ6I1CjJHBzNnzX
-HrVtHAoilzlT/DUw1ZDodc3mzTNOygNDS0GF/kmTBjpKmq0/PnB8aW108+BINX7X
-FqV7e0b4CbSg7tu44TyHvT/ATSUQsYSJoru1j5V6+mkKqlIHf7WwLmV84S4hZXl/
-OxPV5dYNXElN6uAAwZpZ8sjT1gul/G84cDm/k6UWmQCM+HdbNUicTIIVm2z2ZUz9
-TPZLd2vf7fUNiX4YHaRl
-=5c1E
+iF4EAREIAAYFAlMrZmQACgkQVxOqA9G7/aA9+gD8DhITlsw9jlSkZdV9QrfoyskW
+NzyAyUuVqiTFdKM/9rQBAJ4H6Xfcdd+kQf4k20keb5RvgKE3561+kt6kGmk0+Rh0
+=TgUg
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-base/postgresql-base-8.4.21.ebuild b/dev-db/postgresql-base/postgresql-base-8.4.21.ebuild
new file mode 100644
index 000000000000..c0c5c692e48f
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-8.4.21.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 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.21.ebuild,v 1.1 2014/03/20 22:06:23 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.17.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.17.ebuild
new file mode 100644
index 000000000000..3e17ef90220c
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.0.17.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 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.17.ebuild,v 1.1 2014/03/20 22:06:23 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.13.ebuild b/dev-db/postgresql-base/postgresql-base-9.1.13.ebuild
new file mode 100644
index 000000000000..d08656423225
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.1.13.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2014 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.13.ebuild,v 1.1 2014/03/20 22:06:23 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.8.ebuild b/dev-db/postgresql-base/postgresql-base-9.2.8.ebuild
new file mode 100644
index 000000000000..d99dce5d5e5b
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.2.8.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2014 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.8.ebuild,v 1.1 2014/03/20 22:06:23 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.4.ebuild b/dev-db/postgresql-base/postgresql-base-9.3.4.ebuild
new file mode 100644
index 000000000000..95a7ff8e2bb2
--- /dev/null
+++ b/dev-db/postgresql-base/postgresql-base-9.3.4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 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.4.ebuild,v 1.1 2014/03/20 22:06:23 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-docs/ChangeLog b/dev-db/postgresql-docs/ChangeLog
index 55fd8529f68a..092b23f3051e 100644
--- a/dev-db/postgresql-docs/ChangeLog
+++ b/dev-db/postgresql-docs/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-db/postgresql-docs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.235 2014/03/12 10:26:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.236 2014/03/20 22:03:48 titanofold Exp $
+
+*postgresql-docs-9.3.4 (20 Mar 2014)
+*postgresql-docs-9.2.8 (20 Mar 2014)
+*postgresql-docs-9.1.13 (20 Mar 2014)
+*postgresql-docs-9.0.17 (20 Mar 2014)
+*postgresql-docs-8.4.21 (20 Mar 2014)
+
+  20 Mar 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-docs-8.4.21.ebuild, +postgresql-docs-9.0.17.ebuild,
+  +postgresql-docs-9.1.13.ebuild, +postgresql-docs-9.2.8.ebuild,
+  +postgresql-docs-9.3.4.ebuild:
+  version bump
 
   12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> -postgresql-docs-8.4.19.ebuild,
   -postgresql-docs-9.0.15.ebuild, -postgresql-docs-9.1.11.ebuild,
diff --git a/dev-db/postgresql-docs/Manifest b/dev-db/postgresql-docs/Manifest
index ff0cc7d443e5..97cf97dec7b6 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -2,31 +2,31 @@
 Hash: SHA256
 
 DIST postgresql-8.4.20.tar.bz2 14642312 SHA256 e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1 SHA512 83c45b54035c2f55de1def66a695c669481d0a75a0a55ac7e0ff352be4ca7ff1c212ac8f7046e44b324386a3bf9c4befdf36fa1207fff7d149c9e9f3c0e775d3 WHIRLPOOL ab9751509a5514fa2106a04e4c27850d9bef9c66034d3c7061a9299d35bbb06f8082a1fb63cc861108e70e3aa8d0d58d1c6186314862d4018de7428e0fb24360
+DIST postgresql-8.4.21.tar.bz2 14645050 SHA256 388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c SHA512 b1d30a7b0bbe5f3fc1046b363d6e76a964576b8161d13ed7e6897cdecffdfdc02f5fa6cf4a4a759f43c1a8ef5f736a46e63abc841834c53f54d9f838aa15d5d2 WHIRLPOOL 657ab021c3760e1babcd6f4bb163f8a99a4724542e6fe94d195b9f2a90ec59cf0cf86fbfb441429a37a6d751c7a322045ea026fdc461dae93a256f0768e1db85
 DIST postgresql-9.0.16.tar.bz2 14956681 SHA256 900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf SHA512 e98931f6f0998fa1fd43c798f8151f49730723e95ec8a80e958ce800e2f03a6e56bc1dd02412045dcf45acc9e4272dcc4d8b4af9c02a69e031369e9170d6c885 WHIRLPOOL e9446e1e328f09b98004170c2a74f8d1f50d649203903a637ccbb42f897de5f8cb326cb8e792ecb99d1f369b75d15cba523743e4e68506c514f565712bbfd75b
+DIST postgresql-9.0.17.tar.bz2 14961682 SHA256 d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad SHA512 95d8d134aa7186ec9dd26419d1ba01ccf1b760adf2e174b00fec9fc0ff58ff0f258c55d43cf38c9f3445f76e6e0bbccdafd2245f8e483847f46b422cb7549ece WHIRLPOOL 280ebde832a4bada0939da6b77bbfb6349fc775e776cda18201b8da144dac8a40b6a48172a3aab17af33eafd6eb94ffa3d5c4006f75a2f85a61c15b70ae5fba2
 DIST postgresql-9.1.12.tar.bz2 15638909 SHA256 0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383 SHA512 cfc256e5aafd4dc96a1dbd086f2d4f37c03550c15f4fc5bcbc51128c659324ac15d05ee2be76c9f333bcfd2e1d8c1af035d461c0479da8fef522128994c33e01 WHIRLPOOL 8a0b0d941ea442ba38b20af1262d5be9a70c8987302062052af251c2acde66c37fffa33364c2d342442132b5d3dbe7956f5ac5c0dbcadde10a888f362cc9b688
+DIST postgresql-9.1.13.tar.bz2 15652239 SHA256 20f8aa5dfcb47688ca6b6c41340cac61712d9cf87c34d58b0a75bb2f85d89b7f SHA512 573dd3a27179ca509b671cddbb271c07dc241a273b38644d2c91e24d0631c7cae90c8e20ffd424d88ab8b9e318923333c13ecdd6165f15be780e5e4e5f090377 WHIRLPOOL dcb2ef384c42b9c40c30f6e716419234863cb92875080c8d9d7db6699a91113b8367194c5d51967812b6154050a8d484ddf36cfa4c929c454fa7077a6ce32b34
 DIST postgresql-9.2.7.tar.bz2 16248445 SHA256 83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86 SHA512 aa9fdc81dca8eaa8e68aa29cd67d519ad3d12aeac1d689be04bd5976c5c569a33861eccd4333a4f6c7456255a2217aebe9d57bebae83540922a255ac32c00be7 WHIRLPOOL 0e6d611dd3dde1ebe9222744bc05fe5972f558113724848830fca939127d6bd5607f91480efac0dcf3e56042ec3ac83f848e5f0ffb8cd5ded55affbfb7be6eab
+DIST postgresql-9.2.8.tar.bz2 16263345 SHA256 568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c SHA512 f10ef949d54222f8b1e8a5e8b5fb4c13a59c1ad52f25191fa2024a24f08076d91d941af943a11118c896cc3cd9d28310c15aa698774f19cd3de6a033ab1f8eb5 WHIRLPOOL 3d3e6e5c81bd037148fdbceb3748a35047dff92069e9cd130f9f908518f89e06db2908db42f128d3a990573567d0931e9693cc1023c5dddb0d8dc5e79a19c044
 DIST postgresql-9.3.3.tar.bz2 16665845 SHA256 e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879 SHA512 2d8163b31042dc66dc52371e265cc081c52783da403652fef4985b177d2961fdf106767112595fde6ef79e3122fcc318a3daeb5dea59a1cd211b8744acd65462 WHIRLPOOL 4ddd166a65c815e3b71872f5dd5cc120d5c12865f3101ca140f7eb36e54223f1e0496d4a9a73ba2278551961787cac5385385d33360fae6e66a692e532dc14c3
+DIST postgresql-9.3.4.tar.bz2 16691447 SHA256 9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621 SHA512 acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4 WHIRLPOOL 7ddc9356690cee3150653f25152082bb6e5eebf6f914bb06f2bd7dea2a27287b3b64048653100b78498383fe52e6182822beee983df758b620233a9bcc194e0f
 EBUILD postgresql-docs-8.4.20.ebuild 1304 SHA256 b759fd45f4a1fcee8af5443cd1f7d1bbe06bddfc50b1678a3355b3560a043ef3 SHA512 622705d1a732b3af94722bb70bac61ebdc4108863aff45b0f61e9c301065ad9b655218b673c939d76f607f4952dc18231725611833f3119acf872bf8a81d40d9 WHIRLPOOL 0a44bc5f176549d1c50cecf95fc555184f65ce445ae569464653c6f3ef0fa96bb370f2ab3052e2e421c7fb619ebabf48a227e2b2d3e82d072d100e6cafb97e50
+EBUILD postgresql-docs-8.4.21.ebuild 1319 SHA256 eb5dc0dc4aca494be71667f6daa67b87a1afb5a63cc5ca5cb94090a3acc4cb20 SHA512 b72a5a3ab406980d57ce974e849386f904e2d86ca1b87f210d902f5c4c9f9d94c07d5bde54d9dc87b9025c732a4710c1a8f4d4be80ad23c5fffc4dec63ff9158 WHIRLPOOL d204610ec17cf60225b885a55bfa608edc4b5b947882dee5cd0df004431333b3f0d3e08ba48a715fdcb9c39e6ed535814f0f301243e853aac54f2daab4c45d79
 EBUILD postgresql-docs-9.0.16.ebuild 1293 SHA256 e4596972d9e725fd17ab958198b03310e3422bec7ab9e20e522ee18f2d1c15b5 SHA512 3edeeef89f41f494baf5d9bb0d3ecde78efa3de46521813a6304a182c434ddd698548388bbf31a131fa520d3ab64fd37d61aeeff6795782d63a1eba890d13f19 WHIRLPOOL fbba3172f392130c8f3a503aeb3552a9cd2c6d8e73801229f9675c250f19bf3bd9b2b734bfb128fc24aeacd5d345490f947a07369272b02ebf3b62b74e99ea5e
+EBUILD postgresql-docs-9.0.17.ebuild 1308 SHA256 c425467a9977295cb36f8d7fa58c4b7c6a67c17fd2eb7339e9d829a294e3dd9d SHA512 aafa20082c8a576de0010307c78f3b4dcb7088162531bffc72fcb8eba57040575967b953209cc15c0e8f3eaeb1b8e9e1e87fd6c0c3957726e717c5bac1f43ddf WHIRLPOOL 8afe2dfebe092b79b613798377730c474c637593c3d3e5db0695f9688d8e75656725498f49698ee3ce9dff48690bb570a5635472974b5d910af850e1798cf3a2
 EBUILD postgresql-docs-9.1.12.ebuild 1307 SHA256 64c0833d1a15627fd32f0047d22881ec9f2b8d330c480818aafecea75a6fd05d SHA512 dce3ab0f941aa8796ced05468687ccccd4cfc6f55b88a4a9cc1ce5df18d54fcece5b04c98632c467979bd44a83ba64871063262642f07d970d4e159ac64121bc WHIRLPOOL 8dcd9724159b34d7eba5029ad7c7bf1a7712ad39cf0d9630a7407073391360c580cd68b78c302fe37a3c3f401f53b8284fde74b906fb04b17d9e7d88407688dc
+EBUILD postgresql-docs-9.1.13.ebuild 1322 SHA256 d04dd47e9dee0fc7db577be41f98449dc6d3e1339a4801505004918cd448bc1e SHA512 25f4343f5591f8b69bd494e31060d61afe2affe676f1129d1dc7842b680a0807887f4de8dc0daaa82b8b92ed6e84698e5404909f5ac86c5607ada12bff7dcf58 WHIRLPOOL 21c4b374393e042c6e5af80779e2a31f2167f770ff8de1ce0bf8a27d0c82508f19cfc4460509d5a1f70e9388b6d6497043bf1a3147a6f84070168442a5bdc105
 EBUILD postgresql-docs-9.2.7.ebuild 1618 SHA256 2fa26961bab5afb3844c9b6ef6dfb49a2419b60d8325b98cd78de18d579612e2 SHA512 c6f2f96f2211542b85c7f28d18edd5e35a4ca9137b5855b34de194aa805d01fabfba3afc72a560f55a7d7fcaab2bd84776f2e54e2405ed960053c2bdd3ec4df5 WHIRLPOOL e5d69199e89c25eea2b6e98fedc5250ef84af3204fd3d7e58a5943fd3d5bb44cd5c3137570fe63ed118698be0eedfccef79b3529dd5ddf45e5ee0a54ad7940ff
+EBUILD postgresql-docs-9.2.8.ebuild 1633 SHA256 cda7ccfed41de31fdeec3357b4721faa2a2181a6839f5e5c6b01117b827fee0b SHA512 d4679bf37558ee44926447ae85d358800550e77e07671212e2bd8fe3aa964f2f44ea3676d2cd4ce4b03c50570e71303cf8cc0b4598a7b2333f53df1e42fadaf6 WHIRLPOOL e737d6dd6c676f1651755aa513fc7d14fd8c1d1c04cad9bc55857c71e59371b67897d47e044671edec65f353a707c8fdbd7ffc8819ef15841d83abcc81b3e5d2
 EBUILD postgresql-docs-9.3.3.ebuild 1618 SHA256 a55fbc3c8369c8789bcfece8e3e8feb78f33b50992c4d466481f1a11f0a0c146 SHA512 673faf950c5292bfd6997fe3e9aae24cbd86f0bd3a5c8dc0420d8a4284a2a12c01a526ed5e5fba0b75aa2882e8b622a5db82fcf0e247df60ac77a92479b3bc6a WHIRLPOOL 535fc7af73e7de7cf9563dc2fcc75bcbd354241c77b063969c6fb68611c473fc250f4efa5c0376507571c3f8040c84de37daf6723ebd1c22e9391b5a77380fed
-MISC ChangeLog 52337 SHA256 ecd77fc7dddd44b06da6aa4d616573b9c7c0a49c4f9d271dd54d7ccc1d02b49d SHA512 481d41726a3a431bc28518c8706045578fe3c103460b1c2f3e61d11a09719dc0f44a4eaa02a2edd8c4583102ba029d5509f46db263a08dd378ac20b867d6dadc WHIRLPOOL e30d4fb10027e0f6c39ffc15d6e337ac7810da025b4296167db1db31bcf78d72d70dd1a8c85afcf8a8c9de43af0a87ab4a6a0cded3ccb77208988bfcdd453c27
+EBUILD postgresql-docs-9.3.4.ebuild 1633 SHA256 5648b2c21b69d81a2fa323ba7a237166507c42e3759dc1abe6757173fbeb2fe6 SHA512 db641342043d54d7afdd3527f730a4bec3ae13c19d00b55d7495d3146471342a3fd22aaca3bdb7746d0ec69efc22162c1e5b523a67abd20041faa90260abcb66 WHIRLPOOL 28d1b0c8cc0b518b8f15311a055342274bd358ddf8f0a33ce8ba4d08c826b459964fc23a39aaa17401e5b0187096a51f4438053d3c7e2824f01df8333cb86a38
+MISC ChangeLog 52769 SHA256 2e60a30a493c44330075eea9fcd1200f28385455ea966d60056e1a635ae0aefe SHA512 e041fc0b5a57270980818aa4cd2aac3fe35400238b32c73c48f3588077f4e360ba4d6df0933c80ef8b563e7668ff85a540d67315e413dc99d5f2988d245befdc WHIRLPOOL 23d2c739b015d659770ce53fb6e70f6bf8f4b3c2dbe6ca1f2c3b6e7a1839504d8700000f2dc40fcd8593fd17c9ad7957202850b78127c3032147aed340c40ca5
 MISC metadata.xml 164 SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b SHA512 45b3f5ba6ebbeb2f990e5612b545bee41bb8c9f29e7f31de34021384760fcfc4694de0782fc0bdf556fe81ed3b334fc96c33563b0fddc2545484099a2cd76bb2 WHIRLPOOL 5fd1b0fc651f51ed3d1715cff87d86e7c0fe9c7825529069c7c3fed13641aee24bee1971b6e1057797b7b191ef0d50a1ea68c9f24588872d7d960787f9f02bfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIDZhAAoJELp701BxlEWf36sQAI6DLO4ZrD70WONy2PaaFT7g
-l2ARbQep8owNt62Ab/GuwbyGY0mMRLrliIt5RTDKdoSNqbFK8w+HkABICpLfsbAU
-amjj3kqpenrl0WtCN7sIr2fWK/W4zVisXDLTpMoj5I/Tp3q5NORX0GZpFKJXJZbC
-e181S/hU7a3gy1V6p37prCc1/KoPS1f8uWSI0btaG5ckziPO1XbHAXPkd8u1Curg
-yIg2mDQ6FUTkIiWZtp1tF1aHU8bs9LOkiyq0NkHPGngHZNwkZhs2FVTp+caeRc8+
-8mWKnHG1ok+FRIRvub1XkQRDb8ySf40TAV1lDf/x3PUjbT4pF55zf3awfCyNOfSL
-U4XjDnLAfq9oNeuGcD1h8zRA/rZpdXGn2etSd4Jf/Ldp9reVJnc+Mh+h7BSqEKPE
-AIaH871fCquCL1epnjQAcj2aVNEt3aWQ2HoAPP2g6X2GVgF1FFuAFdHix8Sm5Gd+
-2LlMveyURUggArPXyDfStwVDXpyLzOctkVjP0Pp4lYR1FHf7egVgmK0qoIFEWNxN
-fWbfz5R3K8pB6Zky/Slp251IPDZ0PISVpQ8cqQ/OQWNpD+uSUH/2VSHhUP/sbvbW
-sV+/9dnEav6Zh1hCXRC3G7NDDOdkrYCI+uzblDS9y9VCvkiXuGBlPGL7XPEaV+IP
-v9nZurNElu0s3qC0nt33
-=FXOG
+iF4EAREIAAYFAlMrZcgACgkQVxOqA9G7/aCjrAD9FB6vI0ksTSqf+CshanLA/dvL
+O1UQMSdbbv2gWxcZRYYA/1h2sJT8zUMMhUNms86jeLOQ/2Y1pBYSh9o+7bhqw6Bc
+=YFuH
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.4.21.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.4.21.ebuild
new file mode 100644
index 000000000000..a55db8a6ae6e
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-8.4.21.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.4.21.ebuild,v 1.1 2014/03/20 22:03:48 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	local mypath=/usr/share/doc/postgresql-${SLOT}
+
+	cd "${S}/doc"
+
+	dodir ${mypath}/html
+	tar -zxf "postgres.tar.gz" -C "${ED}${mypath}/html" || die
+
+	insinto ${mypath}/sgml
+	doins src/sgml/*.{sgml,dsl}
+
+	insinto ${mypath}/sgml/ref
+	doins src/sgml/ref/*.sgml
+
+	fowners root:0 -R ${mypath}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.0.17.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.0.17.ebuild
new file mode 100644
index 000000000000..466bbd8d264d
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-9.0.17.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.0.17.ebuild,v 1.1 2014/03/20 22:03:48 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	local mypath=/usr/share/doc/postgresql-${SLOT}
+
+	cd "${S}/doc"
+
+	insinto ${mypath}/html
+	doins src/sgml/html/*
+
+	insinto ${mypath}/sgml
+	doins src/sgml/*.{sgml,dsl}
+
+	insinto ${mypath}/sgml/ref
+	doins src/sgml/ref/*.sgml
+
+	fowners root:0 -R ${mypath}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.1.13.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.1.13.ebuild
new file mode 100644
index 000000000000..3ff00a24143f
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-9.1.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1.13.ebuild,v 1.1 2014/03/20 22:03:48 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RESTRICT="test"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	local mypath=/usr/share/doc/postgresql-${SLOT}
+
+	cd "${S}/doc"
+
+	insinto ${mypath}/html
+	doins src/sgml/html/*
+
+	insinto ${mypath}/sgml
+	doins src/sgml/*.{sgml,dsl}
+
+	insinto ${mypath}/sgml/ref
+	doins src/sgml/ref/*.sgml
+
+	fowners root:0 -R ${mypath}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.2.8.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.2.8.ebuild
new file mode 100644
index 000000000000..d0ea7187a9e3
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-9.2.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.2.8.ebuild,v 1.1 2014/03/20 22:03:48 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+LICENSE="POSTGRESQL"
+
+SLOT="$(get_version_component_range 1-2)"
+
+# Comment the following four 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_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2"
+
+# Comment the following two lines when a beta or rc.
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	local mypath=/usr/share/doc/postgresql-${SLOT}
+
+	cd "${S}/doc"
+
+	insinto ${mypath}/html
+	doins src/sgml/html/*
+
+	insinto ${mypath}/sgml
+	doins src/sgml/*.{sgml,dsl}
+
+	insinto ${mypath}/sgml/ref
+	doins src/sgml/ref/*.sgml
+
+	fowners root:0 -R ${mypath}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-docs/postgresql-docs-9.3.4.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.3.4.ebuild
new file mode 100644
index 000000000000..0b50fd12214f
--- /dev/null
+++ b/dev-db/postgresql-docs/postgresql-docs-9.3.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.3.4.ebuild,v 1.1 2014/03/20 22:03:48 titanofold Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+LICENSE="POSTGRESQL"
+
+SLOT="$(get_version_component_range 1-2)"
+
+# Comment the following four 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_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2"
+
+# Comment the following two lines when a beta or rc.
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	# Don't use ${PF} here as three packages
+	# (dev-db/postgresql-{docs,base,server}) have the same set of docs.
+	local mypath=/usr/share/doc/postgresql-${SLOT}
+
+	cd "${S}/doc"
+
+	insinto ${mypath}/html
+	doins src/sgml/html/*
+
+	insinto ${mypath}/sgml
+	doins src/sgml/*.{sgml,dsl}
+
+	insinto ${mypath}/sgml/ref
+	doins src/sgml/ref/*.sgml
+
+	fowners root:0 -R ${mypath}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index fad37da71fc5..5b61a9dd7568 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.291 2014/03/12 10:27:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.292 2014/03/20 22:08:37 titanofold Exp $
+
+*postgresql-server-9.3.4 (20 Mar 2014)
+*postgresql-server-9.2.8 (20 Mar 2014)
+*postgresql-server-9.1.13 (20 Mar 2014)
+*postgresql-server-9.0.17 (20 Mar 2014)
+*postgresql-server-8.4.21 (20 Mar 2014)
+
+  20 Mar 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-server-8.4.21.ebuild, +postgresql-server-9.0.17.ebuild,
+  +postgresql-server-9.1.13.ebuild, +postgresql-server-9.2.8.ebuild,
+  +postgresql-server-9.3.4.ebuild:
+  version bump
 
   12 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   -postgresql-server-8.4.19.ebuild, -postgresql-server-9.0.15.ebuild,
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 433b8fdac185..a5b297a95dac 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -2,10 +2,15 @@
 Hash: SHA256
 
 DIST postgresql-8.4.20.tar.bz2 14642312 SHA256 e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1 SHA512 83c45b54035c2f55de1def66a695c669481d0a75a0a55ac7e0ff352be4ca7ff1c212ac8f7046e44b324386a3bf9c4befdf36fa1207fff7d149c9e9f3c0e775d3 WHIRLPOOL ab9751509a5514fa2106a04e4c27850d9bef9c66034d3c7061a9299d35bbb06f8082a1fb63cc861108e70e3aa8d0d58d1c6186314862d4018de7428e0fb24360
+DIST postgresql-8.4.21.tar.bz2 14645050 SHA256 388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c SHA512 b1d30a7b0bbe5f3fc1046b363d6e76a964576b8161d13ed7e6897cdecffdfdc02f5fa6cf4a4a759f43c1a8ef5f736a46e63abc841834c53f54d9f838aa15d5d2 WHIRLPOOL 657ab021c3760e1babcd6f4bb163f8a99a4724542e6fe94d195b9f2a90ec59cf0cf86fbfb441429a37a6d751c7a322045ea026fdc461dae93a256f0768e1db85
 DIST postgresql-9.0.16.tar.bz2 14956681 SHA256 900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf SHA512 e98931f6f0998fa1fd43c798f8151f49730723e95ec8a80e958ce800e2f03a6e56bc1dd02412045dcf45acc9e4272dcc4d8b4af9c02a69e031369e9170d6c885 WHIRLPOOL e9446e1e328f09b98004170c2a74f8d1f50d649203903a637ccbb42f897de5f8cb326cb8e792ecb99d1f369b75d15cba523743e4e68506c514f565712bbfd75b
+DIST postgresql-9.0.17.tar.bz2 14961682 SHA256 d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad SHA512 95d8d134aa7186ec9dd26419d1ba01ccf1b760adf2e174b00fec9fc0ff58ff0f258c55d43cf38c9f3445f76e6e0bbccdafd2245f8e483847f46b422cb7549ece WHIRLPOOL 280ebde832a4bada0939da6b77bbfb6349fc775e776cda18201b8da144dac8a40b6a48172a3aab17af33eafd6eb94ffa3d5c4006f75a2f85a61c15b70ae5fba2
 DIST postgresql-9.1.12.tar.bz2 15638909 SHA256 0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383 SHA512 cfc256e5aafd4dc96a1dbd086f2d4f37c03550c15f4fc5bcbc51128c659324ac15d05ee2be76c9f333bcfd2e1d8c1af035d461c0479da8fef522128994c33e01 WHIRLPOOL 8a0b0d941ea442ba38b20af1262d5be9a70c8987302062052af251c2acde66c37fffa33364c2d342442132b5d3dbe7956f5ac5c0dbcadde10a888f362cc9b688
+DIST postgresql-9.1.13.tar.bz2 15652239 SHA256 20f8aa5dfcb47688ca6b6c41340cac61712d9cf87c34d58b0a75bb2f85d89b7f SHA512 573dd3a27179ca509b671cddbb271c07dc241a273b38644d2c91e24d0631c7cae90c8e20ffd424d88ab8b9e318923333c13ecdd6165f15be780e5e4e5f090377 WHIRLPOOL dcb2ef384c42b9c40c30f6e716419234863cb92875080c8d9d7db6699a91113b8367194c5d51967812b6154050a8d484ddf36cfa4c929c454fa7077a6ce32b34
 DIST postgresql-9.2.7.tar.bz2 16248445 SHA256 83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86 SHA512 aa9fdc81dca8eaa8e68aa29cd67d519ad3d12aeac1d689be04bd5976c5c569a33861eccd4333a4f6c7456255a2217aebe9d57bebae83540922a255ac32c00be7 WHIRLPOOL 0e6d611dd3dde1ebe9222744bc05fe5972f558113724848830fca939127d6bd5607f91480efac0dcf3e56042ec3ac83f848e5f0ffb8cd5ded55affbfb7be6eab
+DIST postgresql-9.2.8.tar.bz2 16263345 SHA256 568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c SHA512 f10ef949d54222f8b1e8a5e8b5fb4c13a59c1ad52f25191fa2024a24f08076d91d941af943a11118c896cc3cd9d28310c15aa698774f19cd3de6a033ab1f8eb5 WHIRLPOOL 3d3e6e5c81bd037148fdbceb3748a35047dff92069e9cd130f9f908518f89e06db2908db42f128d3a990573567d0931e9693cc1023c5dddb0d8dc5e79a19c044
 DIST postgresql-9.3.3.tar.bz2 16665845 SHA256 e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879 SHA512 2d8163b31042dc66dc52371e265cc081c52783da403652fef4985b177d2961fdf106767112595fde6ef79e3122fcc318a3daeb5dea59a1cd211b8744acd65462 WHIRLPOOL 4ddd166a65c815e3b71872f5dd5cc120d5c12865f3101ca140f7eb36e54223f1e0496d4a9a73ba2278551961787cac5385385d33360fae6e66a692e532dc14c3
+DIST postgresql-9.3.4.tar.bz2 16691447 SHA256 9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621 SHA512 acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4 WHIRLPOOL 7ddc9356690cee3150653f25152082bb6e5eebf6f914bb06f2bd7dea2a27287b3b64048653100b78498383fe52e6182822beee983df758b620233a9bcc194e0f
 DIST postgresql-initscript-2.4.tbz2 2604 SHA256 4f17a2a26ec078b7f73d2b5fa7338402829fe195676d6c3f2cda6cd75c3d1e23 SHA512 2e92bb4f2ddbdfbafa9a6451ebf8be121cf66b7731c42c61f9978a4a896e7d8987fc3b2e5c6feef22a5f7b5759c3456c91e1869ba30019f71ed6b6088adf955e WHIRLPOOL 6df5d827a9fc2d78084d5c300fefa767f87af4a6918abefeea99396ecdace8966ee2c2b4f2276454a3f77df64ec7522aeb2cc1fcac8e321d091f60cc1071a13f
 DIST postgresql-initscript-2.5.tbz2 3280 SHA256 723b2564572722171e097b165a72453b788cb4451638677dcc5f853cbd2d3c09 SHA512 3de3c113cc121b7c1e1a28580ad83fa95f613ba082bffaec9c5feba8bf022ce069246553cd027cc82fbc7a8ea72a5782c2b04186a9765612571ab876c38555bf WHIRLPOOL 8bd84f0a58a3cebf078aeaba2cf9f8eaaeb0933aac0b89f4f8f981604c42ae43a06ca1fdf37a635f90d8957440049d9d7d4ad76bf143d42f44b5374fa98ef2de
 DIST postgresql-initscript-2.6.tbz2 3499 SHA256 0ab0e175a2ed735c330fd2e1c659c1130ae7217fea8d3804d5b5eb74c68ddac1 SHA512 b5c8add696b755e422db4b419c3aa8078b8f3b63e15ad2d100c8f81e654c02eee6c1971a7129d72de201afacdc72dcc50674b79e054be81d575ae1339b2e239b WHIRLPOOL 7bfc03a83f24f2a1a88bab86c71bdecaa14f4a4bb3eb12c46d6a164f9c1aad891e94445a59c55e1168a5dd5c85c78aa5198425c1914d26de86d0f22de5d031af
@@ -16,27 +21,22 @@ DIST postgresql-patches-9.1-r2.tbz2 4552 SHA256 e33a684be93d2bf70566245601da5ea3
 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-server-8.4.20.ebuild 11764 SHA256 d86dd9e0ad680ed3ee1af7d4decb6da2f778bb58e68f6c0d688de08fa453157b SHA512 5c036629e14b883ca4bbfda7af48caee08bbb87bef6a2a4a1a64059d3ee15e9c70ec475cd16bfd2cfabd8feea32eebeacbab0e80434d299ff271b5f09a3eeb68 WHIRLPOOL 3cd6a4fd21ca0835655f609ad4dce81a8150ef48f1e2be4e696c9d6a0ac4672962561f3d9e7c6f6932bd2154115007173f1b322341a7facc7f4cab07f416c495
+EBUILD postgresql-server-8.4.21.ebuild 11779 SHA256 c1551c356ed86ad4e112c96857bc6763f66f142bd698be9be7d539944b0dec42 SHA512 c97e1bc8e692c102bf14c82f173d49e8833089134f80058d75bfcaffe49e1ba7edd85f562f8d1a59d231928697d8c92c3b81179cfadf1085acc9283f9a301c9c WHIRLPOOL a27b706fd81e8a330be5f6c21227e747352c83cbf38782c7fd1744a242dc5d8476833de806f85d54a2162572ca415ffad7a735f190ee92d6fbe78f799c143a97
 EBUILD postgresql-server-9.0.16.ebuild 11745 SHA256 bcba9eb86a1d89bb077290999163528dbae5732cf737a7eea0b14c0fa378fc34 SHA512 b8bb800be33740d3ad1ca6acdb0be5af9ed774266281376f22d61ec608fd31f628dd551a4467fef04708c3c6ed75f1ea79cc5cc55fdc54658bc199f2b68e0d0b WHIRLPOOL 4ffd29c0b2e05e302546019ae40956970c5bbe904ebda750b7260450563f41962f4b88c8f4f9d627850092b91686ec1c6590e0a4983989b920fc38ee08279946
+EBUILD postgresql-server-9.0.17.ebuild 11760 SHA256 a00dfb0f546b26e8644abea8494e53dc5464f49286816dc9a2cc8f6cb03cde0a SHA512 b903ed525c5afac97b40c3de8691ce2693265f24f448367caf1a7f6d58f6c4341778ffa8af7e433dfa4e3618a6af91c7d75e35af03e1b6fef2d594d9b469f430 WHIRLPOOL cddf0e884348628045b6af0375beec219f0cc9ab6f83485c01708ec852712005c1b532560f7a350f354fb88c88d9c6cfc7575e84e4a3f9fd48be9bdf69eeaae1
 EBUILD postgresql-server-9.1.12.ebuild 11473 SHA256 7e344727e8997f0496c9d7893876695973c08b27bb26ff931d094aa012045786 SHA512 a53675e4d8659121d37a22ddefaa3ddba40be7ff7761313c4a083fdabcf87a0059eb24c95c53c089397a791a52e1b24dc31d9f7f729df8c7a5488fabb235bd37 WHIRLPOOL c56c3415ca9978cd9e15495ac2c0735aed4458bcbe23cefb62bd7ce34099c057497afa4748a4360bbd0a8f56715c8a3bfdfcd688563636f8e2e1e50d13354b72
+EBUILD postgresql-server-9.1.13.ebuild 11488 SHA256 bd179f5a9ed2fb06d31700b0eaf5261d213d81d808f97072c0fed921394106c1 SHA512 00c5acbd89ad35041e3a69a5c9f2210e1b9c0e829c1a31ab8a5d52b7cd3e72aa017c2d7e8b1b0acd0f14b22b6da146bba1b43d2d491828c67cd0ab13c1458260 WHIRLPOOL efc0e7da1d99e64bc1019f310f86d423405fb96e9736b84a1a552bc66a615cd1e7f34dc7a3d48d01267ccbd8fa7f50c1f438d20ea5fa5bdadb4ecffe83b68360
 EBUILD postgresql-server-9.2.7.ebuild 11175 SHA256 ba87b3e1ecf88bdd4488b72eb9ff74ddb53d1d2ac5437a8eb744c911682e5adb SHA512 384a7a821e2275998ed7745657c667fb49ef8da0fb2e3a8a2eee50563ebb89293483d91619b0ec8a6aecf84e09d35afa834481234c1bcc31c913cb4ddc78bcc3 WHIRLPOOL cfc76da68a6a58a3cef591d300c3f282abdc089c34d01d02326de2b1aba5b0cec193ff23856c7d1b180197d6e4795d6a5bce0f46fd0320bf6a02d9d3c0ab3419
+EBUILD postgresql-server-9.2.8.ebuild 11190 SHA256 3c2faac32c245e5489490be7a7678c7467626d04d0dd4df3104bed55de9d099f SHA512 5196cd1c3163fc3c847e4b035d6c7c2e3a41a8d7cfd90ba4945248c14b0b9999c688091f35dbc0cb7ad7c09abcfcfd4e45ac73ad6326a90586525ab56b6876d5 WHIRLPOOL 4e889ac5bc6b51907b0b61a8f338823478c12f836fedf1e1482e5e5095655d4c377b2a38390a6bbe9735b5d028aa5ba6b81f53af7aa552537681b990709b7d55
 EBUILD postgresql-server-9.3.3.ebuild 11111 SHA256 42601de389a861a90a77ae71dfbfe632d563cf26b3347bb5b7011973c896dddb SHA512 9ca3fb7a69c8ab1933ed3c794df9079065aa6ac3c83c70df237d06c0363efd247ac89a549d35aff784092fe84d64ddd91a4e7fafe377e84c96e16df03f046eaf WHIRLPOOL bb76875b15973e2e685115a635d63d11a51bb8a54c228915f90a2e976dd4d22f9ce0f03de33e482d70c1f0d8e5fc297a7dff28fb1e73d7e5359e104bc4944674
+EBUILD postgresql-server-9.3.4.ebuild 11126 SHA256 fc208b8b1ef6dd901b2c0d5b52374867c0f5ae980de3b578cc19b25ebe6eaab3 SHA512 72034a95b1952a207b36206577bd851caa7920e0b669eb3296f4d3cb76f208eb9e15b05dccca9051301213f5b90afc73290519d4c6c7e9cc30482024a1899a15 WHIRLPOOL b5fff2da140ad715dde7a5f2c60270ef1f681acf972630e78bcd951d950ef7df1fda440f18aa58bfec0ecd8b3c355b286315ded48db00b7cf16944ffd0742dcc
 EBUILD postgresql-server-9999.ebuild 11314 SHA256 e96f777733e21610b22f694ab54f80b9d462e9fceaf606229db72daade373c64 SHA512 f55ede543176ba8026ee3946ed0030a4db09064990be7bdbe48708f313d632158eb5024932b1dfb79f0c5b3cc0a166240996c0df15f01b7e9039452019273494 WHIRLPOOL ab481a330b68fe677fb4321a36fdfc7b7855cf9eb4c8f3100024a1054a934392d7bed01f61da0376a801f325507bd8b459994f4cb46a5617e3dd67497a97ebb8
-MISC ChangeLog 84603 SHA256 f99094b408a8d364a2b3c5f258ac61533985994384c0e4c81259e98f2dec2992 SHA512 a0326c08c0051dbf87bdd32ff3f54e142b820906ddc04092d08b45ff28c6afadda4f4c12ce18e2284ad37fb3631e9d2cbf647b83e3758aa3e14b84b9082b684d WHIRLPOOL d89df05fe672eccdda0edbb9175480e8f3042ffe0d5983b5baf19d021ed4bed97e752363691d73b360cc9a8bd4fdec1b0b8cd07628a35e7e8aa8c752d1c7c112
+MISC ChangeLog 85055 SHA256 98582b4d5304bb2d496ed200a67f631e6de904befcd2a7ff8258dbd2573be912 SHA512 56c03e0aa84184420a4af7f7376bd51ad3570b11cdc82f9a251bffb3e5c7498a771e7110687eb9ff9035ac015987dc71bd7973f82619c740686c6067b5e10e4d WHIRLPOOL cc8fa83898507a93866a882895c2458e5524cc7b4f35e565d371c734c559b2f2e9dae81c1ceb18cb183e5acded235f6f32d8cca225b38875483db751bce7a1af
 MISC metadata.xml 420 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62 SHA512 1731bced1ac398d90c6aca6ec209a9ea42deb0f7033d49952a6216349aeb992479c3e868b33cc1be2434cdead6185026503a58e779965455d0198edd87bf5b4c WHIRLPOOL 3bbd5598492cb7d90f4199fac80f27bcba281e1188f7f1d40ee3dd1561e530de13de109142f0add7221b49ec3a9c6a0bdb3add1446b1cc5a6cb3909fd193d19b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIDZ5AAoJELp701BxlEWfSE4QAJUkUVcTktpneE0rJmMGhFx1
-bsWPaZMu884AHz7aZelpevnAbBABtL7MctKs6lf86yURvtxxDkaU2T+9kAacMjt/
-gWU6yDwv/Zj/V+Ze2Ru+fP4Yq9LB1oD4Wc0e3aQA/9ghUIRfmo0mKdp0BGkLA+0U
-1YhyOZCWnvN7/Q8G1N4Ma0cbAqLgIExlQRYrY1S4F87QJpeLZpVlmTKYgOoCWtMl
-zpc84bqv/dKDLFBqro6kmd8IYaA6yerZCxVo3Cb3lQM3a6TU0OxIIqz4oMYud+HA
-MRsia2ljQAjI7L9rlEjEhBLar9Ow90UDBU92IMgCTXES3gLyarUR6yqXS7jitjnH
-iBxsHdp3SRiYxzIIYXRAjyoiGU/dWBT07z78cgknfLj3dKQ6UnXaltUrbsXEK6kj
-NEgR40JtYT4MwjsBvkSJONStn2Zj+5imWUjoO7oeSdSEGIZatnsZnsdryrOrWLz3
-rHc+2NzAqFdMuazS4RBWqHSrFIwxy+PY2DKm2QtLPmVwA55aPgTKDi2sPIgCRdTi
-qpD4Wny0eXmBMEsae2etrBRjSugSsAFOXB7ncRlhzRQEIQJJnOVXtkn6lUkdbpIP
-ttTrNg3pdC2J9IWt+40k5VEetZjz6HiYF0muB7cS6ttDc7c/d3dSgzVNfPiBS7fM
-y4Eo2oeIFFikobo7dXW0
-=qlIl
+iF4EAREIAAYFAlMrZuwACgkQVxOqA9G7/aB0TQD+KB7a1A3tgK/ILrOP06A6yxRT
+V5F8j5KT+ZmhG8G+JMQA/RqGUHppLBF7eRBk2s15QGIEC6iqSkc/IlYMeyQ4qC0s
+=mGR1
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.21.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.21.ebuild
new file mode 100644
index 000000000000..c979c6b78419
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-8.4.21.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.21.ebuild,v 1.1 2014/03/20 22:08:37 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{5,6,7} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib pam prefix python-single-r1 systemd user versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL server"
+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
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.6.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+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 kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl test uuid xml"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="
+~dev-db/postgresql-base-${PV}[kerberos?,pam?,pg_legacytimestamp=,python=,nls=]
+perl? ( >=dev-lang/perl-5.8 )
+selinux? ( sec-policy/selinux-postgresql )
+tcl? ( >=dev-lang/tcl-8 )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+"
+
+DEPEND="${RDEPEND}
+sys-devel/flex
+xml? ( virtual/pkgconfig )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/ldflags.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	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
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	for x in .init .confd .service -check-db-dir
+	do
+		sed -e "s|@SLOT@|${SLOT}|g" -i "${WORKDIR}"/postgresql${x}
+		[[ $? -ne 0 ]] && eerror "Failed sed on $x" && die 'Failed slot sed'
+	done
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" \
+			"${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" \
+			> "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" \
+			|| die "emake install in $bd failed"
+	done
+
+	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
+		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT}
+	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT}
+
+	systemd_newunit "${WORKDIR}"/postgresql.service postgresql-${SLOT}.service
+	systemd_newtmpfilesd "${WORKDIR}"/postgresql.tmpfilesd postgresql-${SLOT}.conf
+
+	insinto /usr/bin/
+	newbin "${WORKDIR}"/postgresql-check-db-dir postgresql-${SLOT}-check-db-dir
+
+	use pam && pamd_mimic system-auth postgresql-${SLOT} auth account session
+
+	if use prefix ; then
+		keepdir /run/postgresql
+		fperms 0770 /run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
+	elog "databases, this may force you to either do a dump and reload of enable"
+	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
+	elog "please try enabling pg_legacytimestamp and rebuild."
+	elog
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z ${PG_INITDB_OPTS} ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "  - Change the mentioned system parameter"
+					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
+	einfo "default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.17.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.17.ebuild
new file mode 100644
index 000000000000..e3a2bcdbcf65
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.0.17.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.17.ebuild,v 1.1 2014/03/20 22:08:37 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib pam prefix python-single-r1 systemd user versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+DESCRIPTION="PostgreSQL server"
+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
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.6.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+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 kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl test uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="
+~dev-db/postgresql-base-${PV}[kerberos?,pam?,pg_legacytimestamp=,python=,nls=]
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+selinux? ( sec-policy/selinux-postgresql )
+tcl? ( >=dev-lang/tcl-8 )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+"
+
+DEPEND="${RDEPEND}
+sys-devel/flex
+xml? ( virtual/pkgconfig )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	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
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	for x in .init .confd .service -check-db-dir
+	do
+		sed -e "s|@SLOT@|${SLOT}|g" -i "${WORKDIR}"/postgresql${x}
+		[[ $? -ne 0 ]] && eerror "Failed sed on $x" && die 'Failed slot sed'
+	done
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodir /usr/share/postgresql-${SLOT}/man/man1/
+	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
+		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
+
+	systemd_newunit "${WORKDIR}"/postgresql.service postgresql-${SLOT}.service
+	systemd_newtmpfilesd "${WORKDIR}"/postgresql.tmpfilesd postgresql-${SLOT}.conf
+
+	insinto /usr/bin/
+	newbin "${WORKDIR}"/postgresql-check-db-dir postgresql-${SLOT}-check-db-dir
+
+	use pam && pamd_mimic system-auth postgresql-${SLOT} auth account session
+
+	if use prefix ; then
+		keepdir /run/postgresql
+		fperms 0770 /run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres \
+			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
+			-U postgres -D "${DATA_DIR}" \
+			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		emake check || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.13.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.13.ebuild
new file mode 100644
index 000000000000..b2dbc47ee542
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.1.13.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.13.ebuild,v 1.1 2014/03/20 22:08:37 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 pam prefix python-single-r1 systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL server"
+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
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.6.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+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 kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl test uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="
+~dev-db/postgresql-base-${PV}[kerberos?,pam?,pg_legacytimestamp=,python=,nls=]
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+selinux? ( sec-policy/selinux-postgresql )
+tcl? ( >=dev-lang/tcl-8 )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+"
+
+DEPEND="${RDEPEND}
+sys-devel/flex
+xml? ( virtual/pkgconfig )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	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
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	for x in .init .confd .service -check-db-dir
+	do
+		sed -e "s|@SLOT@|${SLOT}|g" -i "${WORKDIR}"/postgresql${x}
+		[[ $? -ne 0 ]] && eerror "Failed sed on $x" && die 'Failed slot sed'
+	done
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	local PO="${EPREFIX%/}"
+
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
+
+	systemd_newunit "${WORKDIR}"/postgresql.service postgresql-${SLOT}.service
+	systemd_newtmpfilesd "${WORKDIR}"/postgresql.tmpfilesd postgresql-${SLOT}.conf
+
+	insinto /usr/bin/
+	newbin "${WORKDIR}"/postgresql-check-db-dir postgresql-${SLOT}-check-db-dir
+
+	use pam && pamd_mimic system-auth postgresql-${SLOT} auth account session
+
+	if use prefix ; then
+		keepdir /run/postgresql
+		fperms 0770 /run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal in 10 seconds. Control-C to cancel"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake -j1 check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.8.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.8.ebuild
new file mode 100644
index 000000000000..92de822cb2c0
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.2.8.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.8.ebuild,v 1.1 2014/03/20 22:08:37 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 pam prefix python-single-r1 systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.6.tbz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+
+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 kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl test uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="
+~dev-db/postgresql-base-${PV}[kerberos?,pam?,pg_legacytimestamp=,python=,nls=]
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+selinux? ( sec-policy/selinux-postgresql )
+tcl? ( >=dev-lang/tcl-8 )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+"
+
+DEPEND="${RDEPEND}
+sys-devel/flex
+xml? ( virtual/pkgconfig )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	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
+
+	if use perl ; then
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			-i "${S}/src/pl/plperl/GNUmakefile" || die 'sed plperl failed'
+	fi
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c \
+			|| die 'Failed regress sed'
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	for x in .init .confd .service -check-db-dir
+	do
+		sed -e "s|@SLOT@|${SLOT}|g" -i "${WORKDIR}"/postgresql${x}
+		[[ $? -ne 0 ]] && eerror "Failed sed on $x" && die 'Failed slot sed'
+	done
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	local PO="${EPREFIX%/}"
+
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
+
+	systemd_newunit "${WORKDIR}"/postgresql.service postgresql-${SLOT}.service
+	systemd_newtmpfilesd "${WORKDIR}"/postgresql.tmpfilesd postgresql-${SLOT}.conf
+
+	insinto /usr/bin/
+	newbin "${WORKDIR}"/postgresql-check-db-dir postgresql-${SLOT}-check-db-dir
+
+	use pam && pamd_mimic system-auth postgresql-${SLOT} auth account session
+
+	if use prefix ; then
+		keepdir /run/postgresql
+		fperms 0775 /run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}/run/postgresql/"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
diff --git a/dev-db/postgresql-server/postgresql-server-9.3.4.ebuild b/dev-db/postgresql-server/postgresql-server-9.3.4.ebuild
new file mode 100644
index 000000000000..b72931616671
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.3.4.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3.4.ebuild,v 1.1 2014/03/20 22:08:37 titanofold Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.5.tbz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+
+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 kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl test uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="
+~dev-db/postgresql-base-${PV}[kerberos?,pam?,pg_legacytimestamp=,python=,nls=]
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+selinux? ( sec-policy/selinux-postgresql )
+tcl? ( >=dev-lang/tcl-8 )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+"
+
+DEPEND="${RDEPEND}
+sys-devel/flex
+xml? ( virtual/pkgconfig )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/server.patch" \
+		"${WORKDIR}/run-dir.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	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
+
+	if use perl ; then
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			-i "${S}/src/pl/plperl/GNUmakefile" || die 'sed plperl failed'
+	fi
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}"/postgresql.{init,confd,service} || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	local PO="${EPREFIX%/}"
+
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	# Avoid file collision with -base.
+	rm "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)/libpgcommon.a"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
+
+	systemd_newunit "${WORKDIR}"/postgresql.service postgresql-${SLOT}.service
+	systemd_newtmpfilesd "${WORKDIR}"/postgresql.tmpfilesd postgresql-${SLOT}.conf
+
+	use pam && pamd_mimic system-auth postgresql-${SLOT} auth account session
+
+	if use prefix ; then
+		keepdir /run/postgresql
+		fperms 0775 /run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}/run/postgresql/"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}