dev-db/postgresql-server: Version bump to final 8.3.0. Changed dependencies to match postgresql-base (will likely break people's update scripts since we now block libpq. Transition will be: 1.put virtual/postgresql-{server,base} in the tree and let them depend on ||(dev-db/libpq dev-db/postgresql-libs) (respective dev-db/postgresql and postgresql-server), 2. change all ebuilds in the tree to depend on virtual/..., 3. people only have to unmerge libpq and postgresql and merge dev-db/postgresql-{base,server} with _no_ revdep-rebuild run needed.

svn path=/experimental/; revision=312

8 files changed, 70 insertions, 192 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index b2f7fe6..4daac16 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,7 +1,21 @@
 # ChangeLog for dev-db/postgresql-server
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-server-7.3.21.ebuild, postgresql-server-7.4.19.ebuild,
+  postgresql-server-8.0.15.ebuild, postgresql-server-8.1.11.ebuild,
+  postgresql-server-8.2.6.ebuild, -postgresql-server-8.3_rc1.ebuild,
+  +postgresql-server-8.3.0.ebuild:
+  Version bump to final 8.3.0. Changed dependencies to match postgresql-base
+  (will likely break people's update scripts since we now block libpq.
+  Transition will be: 1.put virtual/postgresql-{server,base} in the tree and
+  let them depend on ||(dev-db/libpq dev-db/postgresql-libs) (respective
+  dev-db/postgresql and postgresql-server), 2. change all ebuilds in the tree
+  to depend on virtual/..., 3. people only have to unmerge libpq and
+  postgresql and merge dev-db/postgresql-{base,server} with _no_
+  revdep-rebuild run needed.
+
   20 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-server-7.3.18.ebuild, postgresql-server-7.4.16.ebuild,
   postgresql-server-8.0.12.ebuild, postgresql-server-8.1.8.ebuild,
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 15af8f6..227d360 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -1,164 +1,41 @@
 AUX postgresql-7.3-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
-MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3-cubeparse.patch 1296
-RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3-cubeparse.patch 1296
-SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada files/postgresql-7.3-cubeparse.patch 1296
 AUX postgresql-7.3-regress.patch 3354 RMD160 9283301c6782048a5350c03194cf966318ff4399 SHA1 59d0997e2529a8416a72a71ff4005f31b780ceac SHA256 724e75da0aaf06f7ae51dd8c38601897ffcd3aca8d0755e07e91c2a71984271d
-MD5 8262c9f959228f2951272db219aa4312 files/postgresql-7.3-regress.patch 3354
-RMD160 9283301c6782048a5350c03194cf966318ff4399 files/postgresql-7.3-regress.patch 3354
-SHA256 724e75da0aaf06f7ae51dd8c38601897ffcd3aca8d0755e07e91c2a71984271d files/postgresql-7.3-regress.patch 3354
 AUX postgresql-7.3-server.patch 2392 RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 SHA1 878478c8eac3949a217cce448eec418d93cda5ad SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821
-MD5 8563ce00d25ffb102fbe8ee54b0b0526 files/postgresql-7.3-server.patch 2392
-RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 files/postgresql-7.3-server.patch 2392
-SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821 files/postgresql-7.3-server.patch 2392
 AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8
-MD5 c5f90d21354c3a73b68ed583da9320df files/postgresql-7.3.21-autoconf.patch 2141
-RMD160 3bff01abeeeb094f04469960d4725c977657fb1c files/postgresql-7.3.21-autoconf.patch 2141
-SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8 files/postgresql-7.3.21-autoconf.patch 2141
 AUX postgresql-7.4-regress.patch 3397 RMD160 59c5c292eab17cb358a498d4a9b408a118dedabc SHA1 27f2d2d07f8acb70b754a09efede17e9e69cf4ec SHA256 62ebfe599b75cadf6c967727da70cea1eca4b50fa0ba840cb57214270b02db1f
-MD5 ba333c32a7f335bd82762ae640a87850 files/postgresql-7.4-regress.patch 3397
-RMD160 59c5c292eab17cb358a498d4a9b408a118dedabc files/postgresql-7.4-regress.patch 3397
-SHA256 62ebfe599b75cadf6c967727da70cea1eca4b50fa0ba840cb57214270b02db1f files/postgresql-7.4-regress.patch 3397
 AUX postgresql-7.4-server.patch 2482 RMD160 8f5f4c5e07b8c2b9616a82dd97992f7e5da372b1 SHA1 24f1b2cd0b831766b2f9cb423707e16d1f75d2e7 SHA256 dafa7ecb1dbf033c484c0f8d0a77ec1bac10f1088c17086e344da4793814fee0
-MD5 b2acf4d0948f999b183a26561223df3b files/postgresql-7.4-server.patch 2482
-RMD160 8f5f4c5e07b8c2b9616a82dd97992f7e5da372b1 files/postgresql-7.4-server.patch 2482
-SHA256 dafa7ecb1dbf033c484c0f8d0a77ec1bac10f1088c17086e344da4793814fee0 files/postgresql-7.4-server.patch 2482
 AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4-vacuum-delay.patch 8918
-RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 files/postgresql-7.4-vacuum-delay.patch 8918
-SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123 files/postgresql-7.4-vacuum-delay.patch 8918
 AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 SHA1 a42d03a9c4d7b5df7a69a3d23c9e527c6d901eba SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e
-MD5 e70130009db4999da7c71240e01bab56 files/postgresql-7.4.19-autoconf.patch 1870
-RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 files/postgresql-7.4.19-autoconf.patch 1870
-SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e files/postgresql-7.4.19-autoconf.patch 1870
 AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
-MD5 bac29f949dff50568abc3b298d2402d6 files/postgresql-8.0-common.patch 2294
-RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 files/postgresql-8.0-common.patch 2294
-SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681 files/postgresql-8.0-common.patch 2294
 AUX postgresql-8.0-server.patch 6585 RMD160 2ca5906bd037fa04bab36d4536ee1c1bc7777b99 SHA1 3e2b9e0eff38eb02a84e373808c5b94bf91f761d SHA256 8e956e5f483da78b341dd3b4faecfa4eb6506716b01f8a3bdc283c67ca0a9daf
-MD5 1b28c1af55dea12052d350a9e0746485 files/postgresql-8.0-server.patch 6585
-RMD160 2ca5906bd037fa04bab36d4536ee1c1bc7777b99 files/postgresql-8.0-server.patch 6585
-SHA256 8e956e5f483da78b341dd3b4faecfa4eb6506716b01f8a3bdc283c67ca0a9daf files/postgresql-8.0-server.patch 6585
 AUX postgresql-8.1-common.patch 2290 RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb8cf6 SHA1 facf27b2c396fe9f2347eb4cec3b2714a8587b70 SHA256 f80c8dd5a31b88df330c15de4331db1600ae078a789650ab28d61620f27056f5
-MD5 824168c489f9f0c020e3ec9a0bbf7329 files/postgresql-8.1-common.patch 2290
-RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb8cf6 files/postgresql-8.1-common.patch 2290
-SHA256 f80c8dd5a31b88df330c15de4331db1600ae078a789650ab28d61620f27056f5 files/postgresql-8.1-common.patch 2290
 AUX postgresql-8.1-server.patch 6546 RMD160 62dcae54757e71616d9c9c37afde0ed3b0a53b28 SHA1 70afb0581a7916501faceb7aa793426ace3f9658 SHA256 82470c7156757fe5005d7ec6c3216f1b32f39d1344ddff012ff59e94e9893f14
-MD5 2de8d21973fb1c1ef0329b5f64245a4a files/postgresql-8.1-server.patch 6546
-RMD160 62dcae54757e71616d9c9c37afde0ed3b0a53b28 files/postgresql-8.1-server.patch 6546
-SHA256 82470c7156757fe5005d7ec6c3216f1b32f39d1344ddff012ff59e94e9893f14 files/postgresql-8.1-server.patch 6546
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
-MD5 510f7cca742d90f09d5fd32d05ddaa08 files/postgresql-8.2-common.patch 2640
-RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 files/postgresql-8.2-common.patch 2640
-SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8 files/postgresql-8.2-common.patch 2640
 AUX postgresql-8.2-server.patch 4926 RMD160 362010d4ccf9efabdeeac1acc6a8d6c215d7a683 SHA1 0d2b93dda23f04d10976c9183f3d11be941748d0 SHA256 4c03ee3e8160a06e51c92dddd766d00a677d7d8e45a68ccdb0940612f5452de1
-MD5 98d5715d668f69c4af2f772300851498 files/postgresql-8.2-server.patch 4926
-RMD160 362010d4ccf9efabdeeac1acc6a8d6c215d7a683 files/postgresql-8.2-server.patch 4926
-SHA256 4c03ee3e8160a06e51c92dddd766d00a677d7d8e45a68ccdb0940612f5452de1 files/postgresql-8.2-server.patch 4926
 AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
-MD5 e1d116082e50ab3c8c00da5cff4cb5a4 files/postgresql-8.3-common.patch 2641
-RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 files/postgresql-8.3-common.patch 2641
-SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197 files/postgresql-8.3-common.patch 2641
 AUX postgresql-8.3-server.patch 5944 RMD160 a1e198aea16a19d21c454a3e9677a00751a9cf35 SHA1 a896132e246d973595dc6732492c3cd792372ccd SHA256 bb20ccecbab477315b7ee4c22a6f628e951aaa1c3ee0d36bb1771478ad59f348
-MD5 82ce8eb7041ee97b21e87513d3a854e7 files/postgresql-8.3-server.patch 5944
-RMD160 a1e198aea16a19d21c454a3e9677a00751a9cf35 files/postgresql-8.3-server.patch 5944
-SHA256 bb20ccecbab477315b7ee4c22a6f628e951aaa1c3ee0d36bb1771478ad59f348 files/postgresql-8.3-server.patch 5944
 AUX postgresql.conf-7.3 1515 RMD160 d2a5175d176bb1039a195c61762464769e86266a SHA1 7b33b242c5aa39bb56917b216aa7495c8cb3d100 SHA256 9e93fe9780bea82c9ef31f311cb556737aa940f749edf3d2a7f8dc36e12e93a4
-MD5 e2d90b6770bd37663fec2e1e3146a859 files/postgresql.conf-7.3 1515
-RMD160 d2a5175d176bb1039a195c61762464769e86266a files/postgresql.conf-7.3 1515
-SHA256 9e93fe9780bea82c9ef31f311cb556737aa940f749edf3d2a7f8dc36e12e93a4 files/postgresql.conf-7.3 1515
 AUX postgresql.conf-7.4 1515 RMD160 6e5ffcdc845b13061a565021d09926f7fcf63c94 SHA1 ca6f8a32c6d91bc57336930b1f91feb5cd4c0fdb SHA256 9aeb9dae2e058804fd3e821b10cf620dc9cbd54cae94f8bc5eb34950badd4125
-MD5 4c7ff27df3ae41f0f062a32c1a327727 files/postgresql.conf-7.4 1515
-RMD160 6e5ffcdc845b13061a565021d09926f7fcf63c94 files/postgresql.conf-7.4 1515
-SHA256 9aeb9dae2e058804fd3e821b10cf620dc9cbd54cae94f8bc5eb34950badd4125 files/postgresql.conf-7.4 1515
 AUX postgresql.conf-8.0 1515 RMD160 e866990bd42af8941f95bec7df1a325aff5f89b6 SHA1 ab7aee171705e3f74c93014d5519569fcc9a885e SHA256 68044a2a7e000691b2ed0995b3176c0b5507af1e9a395b24d104c16c66ad7d42
-MD5 7a25bac4580e8651f5a2ea9b3019b4aa files/postgresql.conf-8.0 1515
-RMD160 e866990bd42af8941f95bec7df1a325aff5f89b6 files/postgresql.conf-8.0 1515
-SHA256 68044a2a7e000691b2ed0995b3176c0b5507af1e9a395b24d104c16c66ad7d42 files/postgresql.conf-8.0 1515
 AUX postgresql.conf-8.1 1515 RMD160 1eb23d12c69068de7208ca6647bd3da0a0bd3b1b SHA1 f0081d5522c8e71ea3ed9bce482ed80ad6327dd6 SHA256 f9a681e70beb5a1b07c97d82f6ed0c74985a1c6bd472b69d767e1144474ff3f6
-MD5 c7c4728eca74c7acff95e61942b84bd0 files/postgresql.conf-8.1 1515
-RMD160 1eb23d12c69068de7208ca6647bd3da0a0bd3b1b files/postgresql.conf-8.1 1515
-SHA256 f9a681e70beb5a1b07c97d82f6ed0c74985a1c6bd472b69d767e1144474ff3f6 files/postgresql.conf-8.1 1515
 AUX postgresql.conf-8.2 1515 RMD160 75df0bf679f1e79c32914819151c597a5648210d SHA1 386615e01688f41970358eb8a9ae32449f4ed839 SHA256 a3d2cfa6d5c81db3657f35a61be35fbd7fbc2829274e138ac2644a495fd3ad82
-MD5 a2e1ff832a0dc8e86485bf7f7b279092 files/postgresql.conf-8.2 1515
-RMD160 75df0bf679f1e79c32914819151c597a5648210d files/postgresql.conf-8.2 1515
-SHA256 a3d2cfa6d5c81db3657f35a61be35fbd7fbc2829274e138ac2644a495fd3ad82 files/postgresql.conf-8.2 1515
 AUX postgresql.conf-8.3 1515 RMD160 bc3f75cfc9085b45daea522ce0d8c970c3c60ef5 SHA1 068af62cfc6ae21699d541152230ec0ac06d38e3 SHA256 ebbc5f2a5ed4c9911300d08b258677b3e8952fb784a68046a054f9bd04b74297
-MD5 178cc726cc819a09767820346b7c7616 files/postgresql.conf-8.3 1515
-RMD160 bc3f75cfc9085b45daea522ce0d8c970c3c60ef5 files/postgresql.conf-8.3 1515
-SHA256 ebbc5f2a5ed4c9911300d08b258677b3e8952fb784a68046a054f9bd04b74297 files/postgresql.conf-8.3 1515
 AUX postgresql.init-7.3 1574 RMD160 96132dcb711eeff955cd675094ebaa498992c88e SHA1 6df2d666ce65082b5dbfa3acabdf31b7cd27cc97 SHA256 d9838db05996696fceab71b3027aac7d22ed951f20039d6cdfc5f5384ad5f103
-MD5 5a9b4f822ec64baf8d1de82ba2cb7423 files/postgresql.init-7.3 1574
-RMD160 96132dcb711eeff955cd675094ebaa498992c88e files/postgresql.init-7.3 1574
-SHA256 d9838db05996696fceab71b3027aac7d22ed951f20039d6cdfc5f5384ad5f103 files/postgresql.init-7.3 1574
 AUX postgresql.init-7.4 1574 RMD160 8823070010a54f029ec600504b1b27ddab0eebc2 SHA1 add78ddfa24cc95fae6e8247da5c2a485815368b SHA256 123005f0758a192d04709032f182688138063d07518728dba70fcfd02cf6595f
-MD5 f4cb168f39e70ad007b0d28835c05f78 files/postgresql.init-7.4 1574
-RMD160 8823070010a54f029ec600504b1b27ddab0eebc2 files/postgresql.init-7.4 1574
-SHA256 123005f0758a192d04709032f182688138063d07518728dba70fcfd02cf6595f files/postgresql.init-7.4 1574
 AUX postgresql.init-8.0 1574 RMD160 0af9e62cacc19a5879d76224b3d7b1c7f3fe6273 SHA1 975363339c257fc73f9b7d9d2a4148f882008754 SHA256 bfd8bce41e8e1ab14126e1eb337cc7096b49c058f3d0d28f81e2bb1c012ceefd
-MD5 d41764f65850652a7037c62c5c3f2fb9 files/postgresql.init-8.0 1574
-RMD160 0af9e62cacc19a5879d76224b3d7b1c7f3fe6273 files/postgresql.init-8.0 1574
-SHA256 bfd8bce41e8e1ab14126e1eb337cc7096b49c058f3d0d28f81e2bb1c012ceefd files/postgresql.init-8.0 1574
 AUX postgresql.init-8.1 1574 RMD160 8766350e06793159ec45b7c0c7e77b1aa7312a06 SHA1 22ad2f0f70e58347c9e3ca46c539893b53598c0f SHA256 fde11ce4936f5b4cc40a7602f46833f8cf94bd73d0ff4b13028ea5c1c16deda4
-MD5 a198eb38993cb7e83cd45c8ffd8b74ec files/postgresql.init-8.1 1574
-RMD160 8766350e06793159ec45b7c0c7e77b1aa7312a06 files/postgresql.init-8.1 1574
-SHA256 fde11ce4936f5b4cc40a7602f46833f8cf94bd73d0ff4b13028ea5c1c16deda4 files/postgresql.init-8.1 1574
 AUX postgresql.init-8.2 1574 RMD160 d498118cc84403ad6041bd0dba4819ab4792164d SHA1 549f1b20fab4dcf7185d88b2334519c6c8218b24 SHA256 0f2cbfb519a9f0c7fda4178fc2f74fb0e3409177e2fbbb159c493a070ff275ad
-MD5 2e2c2bbcbf7022f2735327176958dd7c files/postgresql.init-8.2 1574
-RMD160 d498118cc84403ad6041bd0dba4819ab4792164d files/postgresql.init-8.2 1574
-SHA256 0f2cbfb519a9f0c7fda4178fc2f74fb0e3409177e2fbbb159c493a070ff275ad files/postgresql.init-8.2 1574
 AUX postgresql.init-8.3 1574 RMD160 36441e4742f7b2af7178ac9b4e62cdf8c7f35446 SHA1 536a0fae273e595bff664abf67f01217f60ee4b7 SHA256 a584384a8e041668b3162be21da7894f16e35c07845122b31d6709b6dcdb4f2b
-MD5 6d194d6ecdca9e283135929aeb2bb884 files/postgresql.init-8.3 1574
-RMD160 36441e4742f7b2af7178ac9b4e62cdf8c7f35446 files/postgresql.init-8.3 1574
-SHA256 a584384a8e041668b3162be21da7894f16e35c07845122b31d6709b6dcdb4f2b files/postgresql.init-8.3 1574
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 SHA1 8934dfbd4c1d8c4f2945cb80f02072611681f967 SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114
-DIST postgresql-8.3RC1.tar.bz2 13801207 RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 SHA1 b58a3a3e26198469e23829697cdc33d02b2530f5 SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a
-EBUILD postgresql-server-7.3.21.ebuild 8116 RMD160 5bad5b4f23d5d680a40a1941c7a2da61bc4fa90f SHA1 a0bbe7f4f8cb6537a8eec77a7b12614111f9662c SHA256 87db9e8bc1b910b972e0d6f450d3d6231ea1b126530d40c8d825ac7cf241c1fe
-MD5 824ab4e705584a5a8bef6e2d3cd70951 postgresql-server-7.3.21.ebuild 8116
-RMD160 5bad5b4f23d5d680a40a1941c7a2da61bc4fa90f postgresql-server-7.3.21.ebuild 8116
-SHA256 87db9e8bc1b910b972e0d6f450d3d6231ea1b126530d40c8d825ac7cf241c1fe postgresql-server-7.3.21.ebuild 8116
-EBUILD postgresql-server-7.4.19.ebuild 8019 RMD160 d8de543d6fd2b195a7c4937e5d5f6dd22e2af6ed SHA1 fd04b6c4066d1f7404ade2ef6c11be92f3a313ef SHA256 657d7db1e8442705f776574dcbb4ddc4c96122f24b8fb46298199e848c2ee5ce
-MD5 0960803de5a259080af6468c389670d2 postgresql-server-7.4.19.ebuild 8019
-RMD160 d8de543d6fd2b195a7c4937e5d5f6dd22e2af6ed postgresql-server-7.4.19.ebuild 8019
-SHA256 657d7db1e8442705f776574dcbb4ddc4c96122f24b8fb46298199e848c2ee5ce postgresql-server-7.4.19.ebuild 8019
-EBUILD postgresql-server-8.0.15.ebuild 8023 RMD160 746eecd846357cbd20d25acac27dcc357c889a7f SHA1 8cc63df0bad03c0f434bb11767011f1883f0b4e4 SHA256 194bc89e54a1d968a0b72ae39e48525183a474a39f3bd94fa7ba298f2ee991fb
-MD5 acbde9ab1685db59447e5ffc23826e86 postgresql-server-8.0.15.ebuild 8023
-RMD160 746eecd846357cbd20d25acac27dcc357c889a7f postgresql-server-8.0.15.ebuild 8023
-SHA256 194bc89e54a1d968a0b72ae39e48525183a474a39f3bd94fa7ba298f2ee991fb postgresql-server-8.0.15.ebuild 8023
-EBUILD postgresql-server-8.1.11.ebuild 8240 RMD160 740d9d699ecd5b8c6d922eea7d877162c8bf1e51 SHA1 9e07b460b550012d6b35c121efbf7ca9d107b1e0 SHA256 53613953bff7a71733cb24c03d2651ceba9bea4c11c5001822db848d2e0cc480
-MD5 980883886841217083c70575cfe7ae94 postgresql-server-8.1.11.ebuild 8240
-RMD160 740d9d699ecd5b8c6d922eea7d877162c8bf1e51 postgresql-server-8.1.11.ebuild 8240
-SHA256 53613953bff7a71733cb24c03d2651ceba9bea4c11c5001822db848d2e0cc480 postgresql-server-8.1.11.ebuild 8240
-EBUILD postgresql-server-8.2.6.ebuild 8505 RMD160 5e62177c0dacc53c0da3d77bddca301068e72d98 SHA1 20b727fedf9467b6acf1093a53f7000cfbf6c7cb SHA256 b4eb992e22fd63fb63f1adea581c44359d24520523c96ce2aecdc4ecb22fd278
-MD5 f620ffb08235cee4d48b9a58fea48f34 postgresql-server-8.2.6.ebuild 8505
-RMD160 5e62177c0dacc53c0da3d77bddca301068e72d98 postgresql-server-8.2.6.ebuild 8505
-SHA256 b4eb992e22fd63fb63f1adea581c44359d24520523c96ce2aecdc4ecb22fd278 postgresql-server-8.2.6.ebuild 8505
-EBUILD postgresql-server-8.3_rc1.ebuild 8525 RMD160 d9f90bdab12c404356b2cdc328734fdf7e7e6121 SHA1 e081c24e0291283dad346fee714ebd3edceb1675 SHA256 c1efa666ff81b89a47ace56b0c0ac4e29e52273fd4cae5a994b0beea44ca9da8
-MD5 30deb8833f2a2a213bd8ccf3bb20f4cf postgresql-server-8.3_rc1.ebuild 8525
-RMD160 d9f90bdab12c404356b2cdc328734fdf7e7e6121 postgresql-server-8.3_rc1.ebuild 8525
-SHA256 c1efa666ff81b89a47ace56b0c0ac4e29e52273fd4cae5a994b0beea44ca9da8 postgresql-server-8.3_rc1.ebuild 8525
-MISC ChangeLog 412 RMD160 b99776c6be65236f0156bd78bf2fcaeba2b1550f SHA1 e9c8045024dd160b67736cc1283d49aa113ca7d7 SHA256 a6571ecd9b91edf7ce97759df9c320417b1e67ee7538163cffdfca05b6d167ff
-MD5 47127296a7cfb06f8b9c5768748a6c5e ChangeLog 412
-RMD160 b99776c6be65236f0156bd78bf2fcaeba2b1550f ChangeLog 412
-SHA256 a6571ecd9b91edf7ce97759df9c320417b1e67ee7538163cffdfca05b6d167ff ChangeLog 412
-MD5 6a3445a4a42effc608ada08460d79d23 files/digest-postgresql-server-7.3.21 259
-RMD160 ae6f019781a5bec259542ac5a4dbb9fd0727e24f files/digest-postgresql-server-7.3.21 259
-SHA256 4a09b60d4700c7feb998b1d07118eab0b930bee7a325ab3a138246c2c7e86ec6 files/digest-postgresql-server-7.3.21 259
-MD5 d98b405b951efbaa919ed890118f3262 files/digest-postgresql-server-7.4.19 262
-RMD160 fa3e756851fbf3b72ea22b402837260263e6371c files/digest-postgresql-server-7.4.19 262
-SHA256 e68f25453b492b1b956e0fe7a6511d375befb38d43a3a456f52db0af80b6c18a files/digest-postgresql-server-7.4.19 262
-MD5 e0438519efec2797b6430212965d56eb files/digest-postgresql-server-8.0.15 262
-RMD160 1ad7b4f3a03631b3b6dbcf2fcf75bd8b3facb344 files/digest-postgresql-server-8.0.15 262
-SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/digest-postgresql-server-8.0.15 262
-MD5 8e0b9ba7ccb589a185904e1b7e564181 files/digest-postgresql-server-8.1.11 262
-RMD160 7f74888cad6f2898b7066b15796e33793986bfc7 files/digest-postgresql-server-8.1.11 262
-SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/digest-postgresql-server-8.1.11 262
-MD5 82e0a8c26d6b4ca23a88e14f9c1364dd files/digest-postgresql-server-8.2.6 259
-RMD160 eaeca374a581f849a0d441e81a9a195696422978 files/digest-postgresql-server-8.2.6 259
-SHA256 dd2fd7fd45f83726f1cdcdd60e97ae51bb222030679916ff44a3f623a41930e9 files/digest-postgresql-server-8.2.6 259
-MD5 f2a20168d6f9484e0ace623b4ce6de6e files/digest-postgresql-server-8.3_rc1 262
-RMD160 019bc970caed3347a76f9e7099c8b6a2cf70385d files/digest-postgresql-server-8.3_rc1 262
-SHA256 8584bc879e3ab91baac2b3d7a4e5041ec2e13d74a00b603272af761d88c1554a files/digest-postgresql-server-8.3_rc1 262
+DIST postgresql-8.3.0.tar.bz2 13923051 RMD160 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e SHA1 b221e9a82fdb10af1a2b527551a4e30b7ccb958d SHA256 85356d6ab577e21bb528eb5d672e4373b21fe98ac046e77a0eed975608066ea6
+EBUILD postgresql-server-7.3.21.ebuild 7929 RMD160 29c531bbbc3cb50953acde5140b98b22a889465f SHA1 291dbc223047f86c90620d4eb1a11cd370038c1e SHA256 d4abdf22d2024d68eeea7a60f9a9715f623ed9c0da913538bb0091380e748e90
+EBUILD postgresql-server-7.4.19.ebuild 7847 RMD160 4ef6e34429eb1f6ed334cf030379d6b3e4c44050 SHA1 157f43a32f197f6dd1b0e905b3594c56435f72a4 SHA256 9ce520ed728c88cd10004fb60d85ca16dc79bb04e0c2dc73fd07efc8a551586c
+EBUILD postgresql-server-8.0.15.ebuild 7851 RMD160 230f759924a1297a2800b9640675682e202410ef SHA1 cb93479dad7228fc590506e91c014ddeddfdeacb SHA256 8d36ee428c810556fa7365006314c23aa3ac91edb8a4f9da3514fa9bc574cb44
+EBUILD postgresql-server-8.1.11.ebuild 8085 RMD160 297a9e803254b9b2f8d64562d55d3d5116e8955d SHA1 c132b4ec0caa9f4635032ba304e6f07871060705 SHA256 e00d6b9e877cf963948223ac3b649120cf8834ac08e9a2a6af51e33284f528a0
+EBUILD postgresql-server-8.2.6.ebuild 8315 RMD160 88754051df6f6e75a947435679d3b2f64dfb51d6 SHA1 251adf6583689249fcf090a9afda6ff70e74bd49 SHA256 e701ee6e587de667dea1b48030e1767fac53f7fb5e75a9ceb205c2dabe67a180
+EBUILD postgresql-server-8.3.0.ebuild 8342 RMD160 a60103d1c5270767e4a3ce89cdb1b924e19f41b8 SHA1 5d67df7647b8b1499917803baa0120092ab517ee SHA256 43f22efbd4381502c05274246bfcfe416b0ad72f932f6f39a96bbca54474ca2c
+MISC ChangeLog 1245 RMD160 1e8ef2e5d7d2f4c8ef21586ef6b73540491c8846 SHA1 22f4982f2724b18308fb6072623120c5a91b7ee3 SHA256 6a9a3e8442695563b052121ae79b7b11b472839e97c233233156555f2c118dab
diff --git a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
index be72114..35ee51c 100644
--- a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils gnuconfig multilib toolchain-funcs versionator autotools
@@ -13,7 +15,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu
 	linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN
@@ -198,10 +199,7 @@ src_test() {
 	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || {
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	}
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."
diff --git a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
index dfd89e5..c1668c8 100644
--- a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils gnuconfig multilib toolchain-funcs versionator autotools
@@ -13,7 +15,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu
 	linguas_it linguas_nb linguas_pt_BR linguas_ru linguas_sl linguas_sv
@@ -26,7 +27,7 @@ wanted_languages() {
 	done
 }
 
-RDEPEND="~dev-db/postgresql-libs-${PV}
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		perl? ( >=dev-lang/perl-5.6.1-r2 )
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
@@ -34,8 +35,8 @@ RDEPEND="~dev-db/postgresql-libs-${PV}
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-client-${PV} )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
@@ -197,10 +198,7 @@ src_test() {
 	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || {
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	}
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."
diff --git a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
index 6b4291b..e7fb735 100644
--- a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils multilib toolchain-funcs versionator autotools
@@ -13,7 +15,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
@@ -27,7 +28,7 @@ wanted_languages() {
 	done
 }
 
-RDEPEND="~dev-db/postgresql-libs-${PV}
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		perl? ( >=dev-lang/perl-5.6.1-r2 )
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
@@ -35,8 +36,8 @@ RDEPEND="~dev-db/postgresql-libs-${PV}
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-client-${PV} )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
@@ -196,10 +197,7 @@ src_test() {
 	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || {
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	}
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."
diff --git a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
index 0f5668f..749f2b3 100644
--- a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils multilib toolchain-funcs versionator autotools
@@ -13,7 +15,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
@@ -27,7 +28,7 @@ wanted_languages() {
 	done
 }
 
-RDEPEND="~dev-db/postgresql-libs-${PV}
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		perl? ( >=dev-lang/perl-5.6.1-r2 )
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
@@ -35,8 +36,8 @@ RDEPEND="~dev-db/postgresql-libs-${PV}
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-client-${PV} )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
@@ -132,7 +133,7 @@ pkg_postinst() {
 	elog
 	elog "The autovacuum function, which was in contrib, has been moved to the main"
 	elog "PostgreSQL functions starting with 8.1."
-	elog "You can enable it in ${ROOT}/etc/postgresql-${SLOT}/postgresql.conf."
+	elog "You can enable it for all clusters in ${ROOT}/etc/postgresql-${SLOT}/postgresql.conf."
 }
 
 pkg_postrm() {
@@ -199,10 +200,7 @@ src_test() {
 	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || {
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	}
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
index 9330494..08d61c5 100644
--- a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils multilib toolchain-funcs versionator autotools
@@ -13,7 +15,6 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
@@ -27,7 +28,7 @@ wanted_languages() {
 	done
 }
 
-RDEPEND="~dev-db/postgresql-libs-${PV}
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		perl? ( >=dev-lang/perl-5.6.1-r2 )
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
@@ -35,8 +36,8 @@ RDEPEND="~dev-db/postgresql-libs-${PV}
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-client-${PV} )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
@@ -69,7 +70,6 @@ src_unpack() {
 	if use test ; then
 		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
 	else
-		mkdir -p "${S}/src/test/regress"
 		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
 	fi
 
@@ -87,7 +87,7 @@ src_compile() {
 		$(use_with python) \
 		$(use_with tcl) \
 		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		"$(built_with_use ~dev-db/postgresql-libs-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
+		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
@@ -138,7 +138,7 @@ pkg_postinst() {
 	elog
 	elog "The autovacuum function, which was in contrib, has been moved to the main"
 	elog "PostgreSQL functions starting with 8.1."
-	elog "You can enable it in ${ROOT}/etc/postgresql-${SLOT}/postgresql.conf."
+	elog "You can enable it for all clusters in ${ROOT}/etc/postgresql-${SLOT}/postgresql.conf."
 }
 
 pkg_postrm() {
@@ -205,10 +205,7 @@ src_test() {
 	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || {
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	}
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."
diff --git a/dev-db/postgresql-server/postgresql-server-8.3_rc1.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
index f3cc95c..6b43b84 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3_rc1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
 inherit eutils multilib toolchain-funcs versionator autotools
@@ -10,10 +12,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
 
 DESCRIPTION="PostgreSQL server"
 HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV/_rc/RC}/postgresql-${PV/_rc/RC}.tar.bz2"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
-# find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
 IUSE_LINGUAS="
 	linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr
 	linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl
@@ -27,7 +28,7 @@ wanted_languages() {
 	done
 }
 
-RDEPEND="~dev-db/postgresql-libs-${PV}
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}
 		perl? ( >=dev-lang/perl-5.6.1-r2 )
 		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 		selinux? ( sec-policy/selinux-postgresql )
@@ -35,19 +36,19 @@ RDEPEND="~dev-db/postgresql-libs-${PV}
 		xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 DEPEND="${RDEPEND}
 		xml? ( dev-util/pkgconfig )
-		test? ( ~dev-db/postgresql-client-${PV} )"
-PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+		test? ( ~dev-db/postgresql-base-${PV}:${SLOT} )"
+PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
 [[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
-S="${WORKDIR}/postgresql-${PV/_rc/RC}"
+S="${WORKDIR}/postgresql-${PV}"
 
 pkg_setup() {
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		if [[ $(cat "${PGDATA}/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			eerror "PostgreSQL ${PV/_rc/RC} cannot upgrade your existing databases, you must"
+			eerror "PostgreSQL ${PV} cannot upgrade your existing databases, you must"
 			eerror "use pg_dump to export your existing databases to a file, and then"
 			eerror "pg_restore to import them when you have upgraded completely."
 			eerror "You must remove your entire database directory to continue."
@@ -87,7 +88,7 @@ src_compile() {
 		$(use_with tcl) \
 		$(use_with xml libxml) \
 		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		"$(built_with_use ~dev-db/postgresql-libs-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
+		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
@@ -138,7 +139,7 @@ pkg_postinst() {
 	elog
 	elog "The autovacuum function, which was in contrib, has been moved to the main"
 	elog "PostgreSQL functions starting with 8.1."
-	elog "You can enable it in ${ROOT}/etc/postgresql-${SLOT}/postgresql.conf."
+	elog "You can enable it for all clusters in ${ROOT}/etc/postgresql-${SLOT}/postgresql.conf."
 }
 
 pkg_postrm() {
@@ -205,10 +206,7 @@ src_test() {
 	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || {
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	}
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."