Dropped old versions.

(Portage version: 2.1.2.10)

44 files changed, 29 insertions, 3971 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index ceb0ef499e51..2e7856ceb213 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.346 2007/05/06 22:17:43 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.347 2007/06/09 13:19:57 dev-zero Exp $
+
+  09 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/postgresql-7.3.16-cubeparse.patch,
+  -files/postgresql-7.3.16-gentoo.patch,
+  -files/postgresql-7.3.18-cubeparse.patch,
+  -files/postgresql-7.3.18-gentoo.patch,
+  -files/postgresql-7.3-cubeparse.patch, -files/postgresql-7.3-gentoo.patch,
+  -files/postgresql-7.4.14-gentoo.patch,
+  -files/postgresql-7.4.14-hppa-testandset.patch,
+  -files/postgresql-7.4.16-gentoo.patch,
+  -files/postgresql-7.4.16-hppa-testandset.patch,
+  -files/postgresql-7.4-gentoo.patch,
+  -files/postgresql-7.4-hppa-testandset.patch,
+  -files/postgresql-7.4-vacuum-delay.patch,
+  -files/postgresql-8.0.9-gentoo.patch, -files/postgresql-8.0.9-sh.patch,
+  -files/postgresql-8.1.5-gentoo.patch,
+  -files/postgresql-8.1.5-regress_fix.patch,
+  -files/postgresql-8.1.5-regress_su.patch,
+  -files/postgresql-8.1.5-sh.patch, -files/postgresql-8.1.8-gentoo.patch,
+  -files/postgresql-8.1.8-regress_fix.patch,
+  -files/postgresql-8.1.8-regress_su.patch,
+  -files/postgresql-8.1.8-sh.patch, -files/postgresql-8.1-gentoo.patch,
+  -files/postgresql-8.1-sh.patch, -postgresql-7.3.15-r1.ebuild,
+  -postgresql-7.3.16.ebuild, -postgresql-7.3.18.ebuild,
+  -postgresql-7.4.13.ebuild, -postgresql-7.4.14.ebuild,
+  -postgresql-7.4.16.ebuild, -postgresql-8.0.9-r1.ebuild,
+  -postgresql-8.1.5-r1.ebuild, -postgresql-8.1.8.ebuild:
+  Dropped old versions.
 
   07 May 2007; Jose Luis Rivero <yoswink@gentoo.org>
   postgresql-7.3.19.ebuild, postgresql-7.4.17.ebuild,
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.15-r1 b/dev-db/postgresql/files/digest-postgresql-7.3.15-r1
deleted file mode 100644
index 974d3ea5fcc8..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.15-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 dd23ef0e9cbd1a9bca19f8ee66a021db postgresql-base-7.3.15.tar.bz2 5695061
-RMD160 55cc363e1ce26ea0c7f79c5adfd90714988afb46 postgresql-base-7.3.15.tar.bz2 5695061
-SHA256 81da1ab6c3d9e19aef068cc1db81ca696771dfa5c8ff262bcb1bf977ac7429dc postgresql-base-7.3.15.tar.bz2 5695061
-MD5 9d18a5262a3a9b8a2b2c7962645572ab postgresql-docs-7.3.15.tar.bz2 2361345
-RMD160 7330f8f5e3d4061e28ec4fb28939011ae5038551 postgresql-docs-7.3.15.tar.bz2 2361345
-SHA256 832239ebdef5501a8b32f3d2b2f1684c2e9c18fa6cec0370e950b20a62f07cf9 postgresql-docs-7.3.15.tar.bz2 2361345
-MD5 f70a6f9163e204a116f44e752f4695ca postgresql-opt-7.3.15.tar.bz2 341753
-RMD160 8057276fff0ae87f49fb4853e6f3df681de405b9 postgresql-opt-7.3.15.tar.bz2 341753
-SHA256 9b513f3bdd2d63579698ecc9226866ca72fe2e13fd9f0367a07c5041dd8386f6 postgresql-opt-7.3.15.tar.bz2 341753
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.16 b/dev-db/postgresql/files/digest-postgresql-7.3.16
deleted file mode 100644
index d68088475ae1..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.16
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 ae269400f68118233e9e65b4c2c93a68 postgresql-base-7.3.16.tar.bz2 5696231
-RMD160 aaf7e4743bc67c0a45d8d44cef840283e7ead6f9 postgresql-base-7.3.16.tar.bz2 5696231
-SHA256 96046fc13596e4d9f7a4dcd5882fed51ec5905760cc828594443272a69c140e5 postgresql-base-7.3.16.tar.bz2 5696231
-MD5 12123bfca15f077260a6fbcd952abbf2 postgresql-docs-7.3.16.tar.bz2 2361886
-RMD160 ae36bf748e8a8a0b4842ddab48c2d8a2471b2940 postgresql-docs-7.3.16.tar.bz2 2361886
-SHA256 2d8cc0d745a3f8edd773a06c462f98c143388060feb1775e97ecf85bb5260b2f postgresql-docs-7.3.16.tar.bz2 2361886
-MD5 8025d8314993b9e57d0f308e01c37b40 postgresql-opt-7.3.16.tar.bz2 341908
-RMD160 00e0f059910eed3021ba5b096e86bdc6878c34d6 postgresql-opt-7.3.16.tar.bz2 341908
-SHA256 0e1ab00b1439c5930b6c74ed5c4382c01fdb54434857ac3c1599d32fcce2c8d1 postgresql-opt-7.3.16.tar.bz2 341908
-MD5 9da7ff0ef77b87053804838a1f40f15a postgresql-test-7.3.16.tar.bz2 891104
-RMD160 7510ed474d4c86610c14c232cf5be13c4ca0b32b postgresql-test-7.3.16.tar.bz2 891104
-SHA256 5844984770b326cfc62580d88f878196e304867fa339925fef20c017bb298d56 postgresql-test-7.3.16.tar.bz2 891104
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.18 b/dev-db/postgresql/files/digest-postgresql-7.3.18
deleted file mode 100644
index 73a8e3fcd61e..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.18
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 e9205d6835933401db4c5991504f264b postgresql-base-7.3.18.tar.bz2 5695073
-RMD160 62607d50fbf97ae0b954943e2e27052bcf2c5aa0 postgresql-base-7.3.18.tar.bz2 5695073
-SHA256 648c7bddcab5477c5d7800795f8392a3ecdd361828c4374d9804bfa61a07b048 postgresql-base-7.3.18.tar.bz2 5695073
-MD5 621d4499418469248db2318b85a89c19 postgresql-docs-7.3.18.tar.bz2 2363625
-RMD160 5c95e654b7029f1d6289987ad0a08266ab6e54fa postgresql-docs-7.3.18.tar.bz2 2363625
-SHA256 24f509b444dc1a9009ffdb6a8e484f038762b971cea60fb9bdc8943fd6a0fa55 postgresql-docs-7.3.18.tar.bz2 2363625
-MD5 02c53c28a92b7bfc229c71c4b18dee49 postgresql-opt-7.3.18.tar.bz2 342315
-RMD160 fa7cb704ff7bb131f6108217c645821413ecd5b8 postgresql-opt-7.3.18.tar.bz2 342315
-SHA256 6d422a3d4d56192952c035d01aff59b90c7ab7b3cdb7f300572e40dd20db5e4b postgresql-opt-7.3.18.tar.bz2 342315
-MD5 256553aa18822775c63924c787ded200 postgresql-test-7.3.18.tar.bz2 891032
-RMD160 f18fa7025a37bf85936ba78f5cdbb4e26e0a9bfb postgresql-test-7.3.18.tar.bz2 891032
-SHA256 61bf71f0b09fa0a0dc667f636fe7a338f33d7b337159b16820a0a6240318a48e postgresql-test-7.3.18.tar.bz2 891032
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.13 b/dev-db/postgresql/files/digest-postgresql-7.4.13
deleted file mode 100644
index e64fd1b299a8..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.13
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
-RMD160 758a67262ad3dbad649cc8a6b3ef610e6123dd68 hier-Pg7.4-0.5.3.tar.gz 34662
-SHA256 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c hier-Pg7.4-0.5.3.tar.gz 34662
-MD5 2e4574f84f6312909de87126bd2859f8 postgresql-base-7.4.13.tar.bz2 6576973
-RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef postgresql-base-7.4.13.tar.bz2 6576973
-SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7 postgresql-base-7.4.13.tar.bz2 6576973
-MD5 bad02bd460bccdcdc17c51c2ab555109 postgresql-docs-7.4.13.tar.bz2 2426721
-RMD160 4500c150a1638279394bf6f6882682f019ddf8ae postgresql-docs-7.4.13.tar.bz2 2426721
-SHA256 31d91342f23dc842839ee9f5b7475582a2e232c6831c6d514c3a414ed28ebdf8 postgresql-docs-7.4.13.tar.bz2 2426721
-MD5 1c92e80c8d5296ea4bbd83ad378368c3 postgresql-opt-7.4.13.tar.bz2 333860
-RMD160 9fd1caacd6d842a473725450a0973173f68ae7b8 postgresql-opt-7.4.13.tar.bz2 333860
-SHA256 8139a7161b2a55eba304b027896f0bfc81523dd41f7d1df222274b7a55e5aeab postgresql-opt-7.4.13.tar.bz2 333860
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.14 b/dev-db/postgresql/files/digest-postgresql-7.4.14
deleted file mode 100644
index 14709e723e84..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.14
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 8fb231e5cdf7fe4d8954edaa63fd9410 postgresql-base-7.4.14.tar.bz2 6575201
-RMD160 c5b8ecd20ad2783c3f254f0e7402aab9ad722d0a postgresql-base-7.4.14.tar.bz2 6575201
-SHA256 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9 postgresql-base-7.4.14.tar.bz2 6575201
-MD5 213c668f072aa56c77f85a23d11ad0ab postgresql-docs-7.4.14.tar.bz2 2427724
-RMD160 dd67ae2c4552986ced80d1ba52df50a5ae63db9b postgresql-docs-7.4.14.tar.bz2 2427724
-SHA256 6739dcb6876e1f76933f88feae0b7d0a5e528e9677dac4175e3223ef379ed789 postgresql-docs-7.4.14.tar.bz2 2427724
-MD5 5ad27f2d9673dcabaaad7729a6838cc2 postgresql-opt-7.4.14.tar.bz2 333417
-RMD160 a6279f5b9d52f72ce786bc468c114befb5a1f29a postgresql-opt-7.4.14.tar.bz2 333417
-SHA256 e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d postgresql-opt-7.4.14.tar.bz2 333417
-MD5 3e7fccb8c02e4b4c2822ea5e5d054f07 postgresql-test-7.4.14.tar.bz2 902074
-RMD160 c6e1f57c77815b5395882cd482ef8bc952adabbf postgresql-test-7.4.14.tar.bz2 902074
-SHA256 39c87c0227f8c757d29141bb8c24e2a95d3a06d9bc459667fdee4d0028d6d12d postgresql-test-7.4.14.tar.bz2 902074
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.16 b/dev-db/postgresql/files/digest-postgresql-7.4.16
deleted file mode 100644
index a8ad8607b8ec..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.16
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 a876404e4186537cba0ba9d2afe5e554 postgresql-base-7.4.16.tar.bz2 6586435
-RMD160 8536d5f6f26a101240c64084e6adeb260efef891 postgresql-base-7.4.16.tar.bz2 6586435
-SHA256 d8e7df2f06f248e66023452fa9cf565640b93ae43433dade7515f54e643f5c21 postgresql-base-7.4.16.tar.bz2 6586435
-MD5 f0465262c56f9d150fb2d4d717c14851 postgresql-docs-7.4.16.tar.bz2 2429657
-RMD160 f6b50b3b7c1c5bad00b9a33694eef46634bd95f1 postgresql-docs-7.4.16.tar.bz2 2429657
-SHA256 7478f43e5071756434526259895f16ffeffa4c8a11dbd9af2df34250a7f463be postgresql-docs-7.4.16.tar.bz2 2429657
-MD5 51aa935cac1a13483ff76d8770b51fe3 postgresql-opt-7.4.16.tar.bz2 333683
-RMD160 fec0e9b68c4868f4e2b85c002103089fbdbedf6f postgresql-opt-7.4.16.tar.bz2 333683
-SHA256 13a3063570c27ecc8ae163c86439b3c0b95d21bd55cac2506b105a486d410469 postgresql-opt-7.4.16.tar.bz2 333683
-MD5 d4dbef48016d11345868fa9f04e4501f postgresql-test-7.4.16.tar.bz2 901854
-RMD160 37a1ca493bd35534636dd82c1dd2468c4e37cf6c postgresql-test-7.4.16.tar.bz2 901854
-SHA256 851d5de0f66e3a13a57acffc50f15288a2d367160902e08d0bd1a0deb72b0f39 postgresql-test-7.4.16.tar.bz2 901854
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.9-r1 b/dev-db/postgresql/files/digest-postgresql-8.0.9-r1
deleted file mode 100644
index f2e11e02313b..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 f9a044227ad6dc9c937d4853100733cb postgresql-base-8.0.9.tar.bz2 7824961
-RMD160 40cbea0b0a3a0f67670dfbe1670e08b48dbb1999 postgresql-base-8.0.9.tar.bz2 7824961
-SHA256 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417 postgresql-base-8.0.9.tar.bz2 7824961
-MD5 0529eb29ac2c248a3b244b7bfc007456 postgresql-docs-8.0.9.tar.bz2 2262698
-RMD160 55df79bfc347147c33db925a1138c2341043f887 postgresql-docs-8.0.9.tar.bz2 2262698
-SHA256 b55d4a77c0c3b0f42c7233c08112b884e1463157160007efd70a63806ede632b postgresql-docs-8.0.9.tar.bz2 2262698
-MD5 363e009214bfde8235d900da09c7c675 postgresql-opt-8.0.9.tar.bz2 134706
-RMD160 be148e079c20c13aec1767180d993933b91c2116 postgresql-opt-8.0.9.tar.bz2 134706
-SHA256 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020 postgresql-opt-8.0.9.tar.bz2 134706
-MD5 8992a878fe5aa32e3da7fb84270614db postgresql-test-8.0.9.tar.bz2 931363
-RMD160 ae38c2225daff32449ebe6b483096f2f35aa8067 postgresql-test-8.0.9.tar.bz2 931363
-SHA256 f2b81b3cf7ade17a748fa84570c295817d82fd05b53d2e0fb9d9e922b0c613ea postgresql-test-8.0.9.tar.bz2 931363
diff --git a/dev-db/postgresql/files/digest-postgresql-8.1.5-r1 b/dev-db/postgresql/files/digest-postgresql-8.1.5-r1
deleted file mode 100644
index ac72d06c9b7b..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.1.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 30a42fd5fc5326edc217e28651e5053b postgresql-base-8.1.5.tar.bz2 8044522
-RMD160 3460f38b720ce3a9687052d5523bcbd027655d6e postgresql-base-8.1.5.tar.bz2 8044522
-SHA256 cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df postgresql-base-8.1.5.tar.bz2 8044522
-MD5 d104e7e645ea36407831ca59470c7a12 postgresql-docs-8.1.5.tar.bz2 2489400
-RMD160 a29a5d1738f6f776597d162d9fc6d69805c74943 postgresql-docs-8.1.5.tar.bz2 2489400
-SHA256 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9 postgresql-docs-8.1.5.tar.bz2 2489400
-MD5 bcd3eec7cfc759dbfdde4f9e8fa07d27 postgresql-opt-8.1.5.tar.bz2 144784
-RMD160 5ac9b1ffdf1357316ceb1736f7b9be3ee339be3b postgresql-opt-8.1.5.tar.bz2 144784
-SHA256 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c postgresql-opt-8.1.5.tar.bz2 144784
-MD5 b3e050a0af7998d78f928b96d95fa6d7 postgresql-test-8.1.5.tar.bz2 947271
-RMD160 644b352354743eb5250bf422c62e1f2c340c1ed2 postgresql-test-8.1.5.tar.bz2 947271
-SHA256 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166 postgresql-test-8.1.5.tar.bz2 947271
diff --git a/dev-db/postgresql/files/digest-postgresql-8.1.8 b/dev-db/postgresql/files/digest-postgresql-8.1.8
deleted file mode 100644
index 2c580c1eedc3..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 5da7d5bf67e01ddc1fbd92a072ccd3f3 postgresql-base-8.1.8.tar.bz2 8094972
-RMD160 fa3801e9dd25c5d8e9de8fd9f015371824204d78 postgresql-base-8.1.8.tar.bz2 8094972
-SHA256 7a7fdab1993af6de06aa3264cdb3df3618e4a6216b574833c352b50efd5454af postgresql-base-8.1.8.tar.bz2 8094972
-MD5 7d552916141e2686682f2e01f0a88c9d postgresql-docs-8.1.8.tar.bz2 2499550
-RMD160 7c812e4c4d07f00ff933dea9adaddf2211fe6044 postgresql-docs-8.1.8.tar.bz2 2499550
-SHA256 b5f0e095f8e1533ba69cdb1d599d7e2bfa07549a6a75bb6be899991339d30859 postgresql-docs-8.1.8.tar.bz2 2499550
-MD5 58b437f38a1214cff80b7076cbbc967c postgresql-opt-8.1.8.tar.bz2 144643
-RMD160 2a31e70be662ee6753bcc8e712ea5a693079f692 postgresql-opt-8.1.8.tar.bz2 144643
-SHA256 ffcc9519a7a697b370630ab1afb1280d3d9e62a25a7904291153d0de6fca6750 postgresql-opt-8.1.8.tar.bz2 144643
-MD5 a953a4b1f5eddaea326242ce9571cb3f postgresql-test-8.1.8.tar.bz2 946918
-RMD160 5f8e591e29ffd4adec8d130a73c1a916e7ea63fd postgresql-test-8.1.8.tar.bz2 946918
-SHA256 3dd46fea627951cf85cd6b5f0318cc4f1f04ed19814fdaf0f919868699f656dc postgresql-test-8.1.8.tar.bz2 946918
diff --git a/dev-db/postgresql/files/postgresql-7.3-cubeparse.patch b/dev-db/postgresql/files/postgresql-7.3-cubeparse.patch
deleted file mode 100644
index 705e073c8e45..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3-cubeparse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- contrib/cube/cubescan.l.orig	2006-07-05 06:56:04.000000000 +0000
-+++ contrib/cube/cubescan.l	2006-07-05 06:56:12.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int cube_yylex YY_PROTO(( void )); \
- int cube_yylex YY_PROTO(( void ))
- #define yylval cube_yylval
---- contrib/seg/segscan.l.orig	2006-07-05 07:08:26.000000000 +0000
-+++ contrib/seg/segscan.l	2006-07-05 07:08:51.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int seg_yylex YY_PROTO(( void )); \
- int seg_yylex YY_PROTO(( void ))
- #define yylval seg_yylval
---- contrib/tsearch/parser.l.orig	2006-07-05 07:22:36.000000000 +0000
-+++ contrib/tsearch/parser.l	2006-07-05 07:23:33.000000000 +0000
-@@ -18,6 +18,7 @@
- char *s     = NULL;  /* to return WHOLE hyphenated-word */
- 
- YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
-+static YY_BUFFER_STATE yy_current_buffer = 0;
- 
- int lrlimit = -1;	/* for limiting read from filehandle ( -1 - unlimited read ) */
- int bytestoread = 0;	/* for limiting read from filehandle */
diff --git a/dev-db/postgresql/files/postgresql-7.3-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3-gentoo.patch
deleted file mode 100644
index 3c0776ef2fde..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naru postgresql-7.3.14.org/src/interfaces/Makefile postgresql-7.3.14/src/interfaces/Makefile
---- postgresql-7.3.14.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-7.3.14/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Naru postgresql-7.3.14.org/src/Makefile postgresql-7.3.14/src/Makefile
---- postgresql-7.3.14.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
-+++ postgresql-7.3.14/src/Makefile	2005-05-09 21:59:54.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
-diff -Naru postgresql-7.3.14.org/configure postgresql-7.3.14/configure
---- postgresql-7.3.14.org/configure	2004-08-15 01:51:58.000000000 +0100
-+++ postgresql-7.3.14/configure	2004-10-03 00:24:38.477010826 +0100
-@@ -5871,7 +5871,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   pgac_cv_check_readline=no
--for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+for pgac_lib in "" " -lncurses" " -lcurses" ; do
-   for pgac_rllib in -lreadline -ledit ; do
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
diff --git a/dev-db/postgresql/files/postgresql-7.3.16-cubeparse.patch b/dev-db/postgresql/files/postgresql-7.3.16-cubeparse.patch
deleted file mode 100644
index 705e073c8e45..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.16-cubeparse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- contrib/cube/cubescan.l.orig	2006-07-05 06:56:04.000000000 +0000
-+++ contrib/cube/cubescan.l	2006-07-05 06:56:12.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int cube_yylex YY_PROTO(( void )); \
- int cube_yylex YY_PROTO(( void ))
- #define yylval cube_yylval
---- contrib/seg/segscan.l.orig	2006-07-05 07:08:26.000000000 +0000
-+++ contrib/seg/segscan.l	2006-07-05 07:08:51.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int seg_yylex YY_PROTO(( void )); \
- int seg_yylex YY_PROTO(( void ))
- #define yylval seg_yylval
---- contrib/tsearch/parser.l.orig	2006-07-05 07:22:36.000000000 +0000
-+++ contrib/tsearch/parser.l	2006-07-05 07:23:33.000000000 +0000
-@@ -18,6 +18,7 @@
- char *s     = NULL;  /* to return WHOLE hyphenated-word */
- 
- YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
-+static YY_BUFFER_STATE yy_current_buffer = 0;
- 
- int lrlimit = -1;	/* for limiting read from filehandle ( -1 - unlimited read ) */
- int bytestoread = 0;	/* for limiting read from filehandle */
diff --git a/dev-db/postgresql/files/postgresql-7.3.16-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3.16-gentoo.patch
deleted file mode 100644
index 079f7c6a9f50..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.16-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru postgresql-7.3.16.orig/configure postgresql-7.3.16/configure
---- postgresql-7.3.16.orig/configure	2006-11-05 13:20:08.000000000 +0100
-+++ postgresql-7.3.16/configure	2006-11-05 14:10:03.000000000 +0100
-@@ -5871,7 +5871,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   pgac_cv_check_readline=no
--for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+for pgac_lib in "" " -lncurses" " -lcurses" ; do
-   for pgac_rllib in -lreadline -ledit ; do
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-diff -Nru postgresql-7.3.16.orig/src/bin/Makefile postgresql-7.3.16/src/bin/Makefile
---- postgresql-7.3.16.orig/src/bin/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/src/bin/Makefile	2006-11-05 15:46:42.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
--	psql scripts pg_config pg_controldata pg_resetxlog \
-+	psql scripts pg_controldata pg_resetxlog \
- 	pg_encoding
- 
- ifeq ($(with_tcl), yes)
-diff -Nru postgresql-7.3.16.orig/src/interfaces/Makefile postgresql-7.3.16/src/interfaces/Makefile
---- postgresql-7.3.16.orig/src/interfaces/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/src/interfaces/Makefile	2006-11-05 14:10:03.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) libpgtcl python jdbc
- 
-diff -Nru postgresql-7.3.16.orig/src/Makefile postgresql-7.3.16/src/Makefile
---- postgresql-7.3.16.orig/src/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/src/Makefile	2006-11-05 14:10:03.000000000 +0100
-@@ -17,7 +17,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -28,7 +27,6 @@
- clean:
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -39,7 +37,6 @@
- distclean maintainer-clean:
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-7.3.18-cubeparse.patch b/dev-db/postgresql/files/postgresql-7.3.18-cubeparse.patch
deleted file mode 100644
index 705e073c8e45..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.18-cubeparse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- contrib/cube/cubescan.l.orig	2006-07-05 06:56:04.000000000 +0000
-+++ contrib/cube/cubescan.l	2006-07-05 06:56:12.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int cube_yylex YY_PROTO(( void )); \
- int cube_yylex YY_PROTO(( void ))
- #define yylval cube_yylval
---- contrib/seg/segscan.l.orig	2006-07-05 07:08:26.000000000 +0000
-+++ contrib/seg/segscan.l	2006-07-05 07:08:51.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int seg_yylex YY_PROTO(( void )); \
- int seg_yylex YY_PROTO(( void ))
- #define yylval seg_yylval
---- contrib/tsearch/parser.l.orig	2006-07-05 07:22:36.000000000 +0000
-+++ contrib/tsearch/parser.l	2006-07-05 07:23:33.000000000 +0000
-@@ -18,6 +18,7 @@
- char *s     = NULL;  /* to return WHOLE hyphenated-word */
- 
- YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
-+static YY_BUFFER_STATE yy_current_buffer = 0;
- 
- int lrlimit = -1;	/* for limiting read from filehandle ( -1 - unlimited read ) */
- int bytestoread = 0;	/* for limiting read from filehandle */
diff --git a/dev-db/postgresql/files/postgresql-7.3.18-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3.18-gentoo.patch
deleted file mode 100644
index 079f7c6a9f50..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.18-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru postgresql-7.3.16.orig/configure postgresql-7.3.16/configure
---- postgresql-7.3.16.orig/configure	2006-11-05 13:20:08.000000000 +0100
-+++ postgresql-7.3.16/configure	2006-11-05 14:10:03.000000000 +0100
-@@ -5871,7 +5871,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   pgac_cv_check_readline=no
--for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+for pgac_lib in "" " -lncurses" " -lcurses" ; do
-   for pgac_rllib in -lreadline -ledit ; do
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-diff -Nru postgresql-7.3.16.orig/src/bin/Makefile postgresql-7.3.16/src/bin/Makefile
---- postgresql-7.3.16.orig/src/bin/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/src/bin/Makefile	2006-11-05 15:46:42.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
--	psql scripts pg_config pg_controldata pg_resetxlog \
-+	psql scripts pg_controldata pg_resetxlog \
- 	pg_encoding
- 
- ifeq ($(with_tcl), yes)
-diff -Nru postgresql-7.3.16.orig/src/interfaces/Makefile postgresql-7.3.16/src/interfaces/Makefile
---- postgresql-7.3.16.orig/src/interfaces/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/src/interfaces/Makefile	2006-11-05 14:10:03.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) libpgtcl python jdbc
- 
-diff -Nru postgresql-7.3.16.orig/src/Makefile postgresql-7.3.16/src/Makefile
---- postgresql-7.3.16.orig/src/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/src/Makefile	2006-11-05 14:10:03.000000000 +0100
-@@ -17,7 +17,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -28,7 +27,6 @@
- clean:
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -39,7 +37,6 @@
- distclean maintainer-clean:
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-7.4-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4-gentoo.patch
deleted file mode 100644
index 536189faed33..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naru postgresql-7.4.12.org/configure postgresql-7.4.12/configure
---- postgresql-7.4.12.org/configure	2004-08-18 04:11:24.000000000 +0100
-+++ postgresql-7.4.12/configure	2004-09-15 20:28:46.933631781 +0100
-@@ -6003,7 +6003,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   pgac_cv_check_readline=no
--for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+for pgac_lib in "" " -lncurses" " -lcurses" ; do
-   for pgac_rllib in -lreadline -ledit ; do
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-diff -Naru postgresql-7.4.12.org/src/interfaces/Makefile postgresql-7.4.12/src/interfaces/Makefile
---- postgresql-7.4.12.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-7.4.12/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Naru postgresql-7.4.12.org/src/Makefile postgresql-7.4.12/src/Makefile
---- postgresql-7.4.12.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
-+++ postgresql-7.4.12/src/Makefile	2005-05-09 21:59:54.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-7.4-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4-hppa-testandset.patch
deleted file mode 100644
index dc3313146d7a..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.12.orig/src/include/port/linux.h postgresql-7.4.12/src/include/port/linux.h
---- postgresql-7.4.12.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.12/src/include/port/linux.h	2004-01-09 20:22:50.000000000 +0000
-@@ -3,6 +3,11 @@
- 
- #define HAS_TEST_AND_SET
- 
-+#elif defined(__hppa__)
-+typedef struct { int sema[4]; } slock_t;
-+
-+#define HAS_TEST_AND_SET
-+
- #elif defined(__sparc__)
- typedef unsigned char slock_t;
- 
-diff -urN postgresql-7.4.12.orig/src/include/storage/s_lock.h postgresql-7.4.12/src/include/storage/s_lock.h
---- postgresql-7.4.12.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.12/src/include/storage/s_lock.h	2004-01-09 20:12:15.000000000 +0000
-@@ -112,6 +112,33 @@
- 
- #endif	 /* __i386__ || __x86_64__ */
- 
-+#if defined(__hppa__) || defined(__hppa)
-+#define TAS(lock) tas(lock)
-+
-+#define __ldcw(a) ({ \
-+	unsigned int __ret;						\
-+	__asm__ __volatile__("ldcw 0(%2),%0"				\
-+				: "=r" (__ret), "=m" (*(a)) : "r" (a));	\
-+	__ret;								\
-+})
-+
-+#define __PA_LDCW_ALIGNMENT 16
-+#define __ldcw_align(a) ({ \
-+	volatile unsigned int __ret = (unsigned int) a;					\
-+	if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a)			\
-+		__ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT;	\
-+	(unsigned int *) __ret;								\
-+})
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	volatile unsigned int *a = __ldcw_align (lock);
-+	return (__ldcw(a) == 0);
-+}
-+
-+#endif	/* __hppa__ || __hppa */
-+
- 
- /* Intel Itanium */
- #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/files/postgresql-7.4-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4-vacuum-delay.patch
deleted file mode 100644
index e0f499859009..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4-vacuum-delay.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-    * From: Jan Wieck <JanWieck ( at ) Yahoo ( dot ) com>

-    * To: "Matthew T. O'Connor" <matthew ( at ) zeut ( dot ) net>

-    * Subject: Re: Performance features the 4th

-    * Date: Sun, 09 Nov 2003 18:42:53 -0500

-

-Matthew T. O'Connor wrote:

-

-    ----- Original Message ----- From: "Jan Wieck" <JanWieck ( at ) Yahoo ( dot ) com>

-

-Tom Lane wrote:

-> Gaetano and a couple of other people did experiments that seemed to show

-> it was useful.  I think we'd want to change the shape of the knob per

-> later suggestions (sleep 10 ms every N blocks, instead of N ms every

-> block) but it did seem that there was useful bang for little buck there.

-

-

-        I thought it was "sleep N ms every M blocks".

-

-Have we seen any numbers? Anything at all? Something that gives us a

-clue by what factor one has to multiply the total time a "VACUUM

-ANALYZE" takes, to get what effect in return?

-

-

-I have some time on sunday to do some testing.  Is there a patch that I can

-apply that implements either of the two options? (sleep 10ms every M blocks

-or sleep N ms every M blocks).

-

-

-I know Tom posted the original patch that sleept N ms every 1 block (where N

-is > 10 due to OS limitations).  Jan can you post a patch that has just the

-sleep code in it? Or should it be easy enough for me to cull out of the

-larger patch you posted?

-

-

-Sorry for the delay, had to finish some other concept yesterday (will be published soon).

-

-The attached patch adds

-

-    vacuum_group_delay_size = 10 (range 1-1000)

-    vacuum_group_delay_msec = 0  (range 0-1000)

-

-

-and does the sleeping via select(2). It does it only at the same places where Tom had done the usleep() in his hack, so I guess there is still some more to do besides the documentation, before it can be added to 7.4.1. But it should be enough to get some testing done.

-

-

-Jan

-

---

-#======================================================================#

-# It's easier to get forgiveness for being wrong than for being right. #

-# Let's break this rule - forgive me.                                  #

-#================================================== JanWieck ( at ) Yahoo ( dot ) com #

-

-Index: src/backend/access/nbtree/nbtree.c

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/access/nbtree/nbtree.c,v

-retrieving revision 1.106

-diff -c -b -r1.106 nbtree.c

-*** src/backend/access/nbtree/nbtree.c	2003/09/29 23:40:26	1.106

---- src/backend/access/nbtree/nbtree.c	2003/11/09 23:39:36

-***************

-*** 27,32 ****

---- 27,40 ----

-  #include "storage/smgr.h"

-  

-  

-+ /*

-+  * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)

-+  */

-+ extern int	vacuum_group_delay_size;	/* vacuum N pages */

-+ extern int	vacuum_group_delay_msec;	/* then sleep M msec */

-+ extern int	vacuum_group_delay_count;

-+ 

-+ 

-  /* Working state for btbuild and its callback */

-  typedef struct

-  {

-***************

-*** 610,615 ****

---- 618,632 ----

-  

-  			CHECK_FOR_INTERRUPTS();

-  

-+ 			if (vacuum_group_delay_msec > 0)

-+ 			{

-+ 				if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 				{

-+ 					PG_DELAY(vacuum_group_delay_msec);

-+ 					vacuum_group_delay_count = 0;

-+ 				}

-+ 			}

-+ 

-  			ndeletable = 0;

-  			page = BufferGetPage(buf);

-  			opaque = (BTPageOpaque) PageGetSpecialPointer(page);

-***************

-*** 736,741 ****

---- 753,769 ----

-  		Buffer		buf;

-  		Page		page;

-  		BTPageOpaque opaque;

-+ 

-+ 		CHECK_FOR_INTERRUPTS();

-+ 

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-  

-  		buf = _bt_getbuf(rel, blkno, BT_READ);

-  		page = BufferGetPage(buf);

-Index: src/backend/commands/vacuumlazy.c

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/commands/vacuumlazy.c,v

-retrieving revision 1.32

-diff -c -b -r1.32 vacuumlazy.c

-*** src/backend/commands/vacuumlazy.c	2003/09/25 06:57:59	1.32

---- src/backend/commands/vacuumlazy.c	2003/11/09 23:40:13

-***************

-*** 88,93 ****

---- 88,100 ----

-  static TransactionId OldestXmin;

-  static TransactionId FreezeLimit;

-  

-+ /*

-+  * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)

-+  */

-+ int	vacuum_group_delay_size = 10;	/* vacuum N pages */

-+ int	vacuum_group_delay_msec = 0;	/* then sleep M msec */

-+ int	vacuum_group_delay_count = 0;

-+ 

-  

-  /* non-export function prototypes */

-  static void lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,

-***************

-*** 228,233 ****

---- 235,249 ----

-  

-  		CHECK_FOR_INTERRUPTS();

-  

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-+ 

-  		/*

-  		 * If we are close to overrunning the available space for

-  		 * dead-tuple TIDs, pause and do a cycle of vacuuming before we

-***************

-*** 469,474 ****

---- 485,499 ----

-  

-  		CHECK_FOR_INTERRUPTS();

-  

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-+ 

-  		tblk = ItemPointerGetBlockNumber(&vacrelstats->dead_tuples[tupindex]);

-  		buf = ReadBuffer(onerel, tblk);

-  		LockBufferForCleanup(buf);

-***************

-*** 799,804 ****

---- 824,838 ----

-  					hastup;

-  

-  		CHECK_FOR_INTERRUPTS();

-+ 

-+ 		if (vacuum_group_delay_msec > 0)

-+ 		{

-+ 			if (++vacuum_group_delay_count >= vacuum_group_delay_size)

-+ 			{

-+ 				PG_DELAY(vacuum_group_delay_msec);

-+ 				vacuum_group_delay_count = 0;

-+ 			}

-+ 		}

-  

-  		blkno--;

-  

-Index: src/backend/utils/misc/guc.c

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/guc.c,v

-retrieving revision 1.164.2.1

-diff -c -b -r1.164.2.1 guc.c

-*** src/backend/utils/misc/guc.c	2003/11/07 21:27:50	1.164.2.1

---- src/backend/utils/misc/guc.c	2003/11/09 23:27:49

-***************

-*** 73,78 ****

---- 73,80 ----

-  extern int	CommitDelay;

-  extern int	CommitSiblings;

-  extern char *preload_libraries_string;

-+ extern int	vacuum_group_delay_size;

-+ extern int	vacuum_group_delay_msec;

-  

-  #ifdef HAVE_SYSLOG

-  extern char *Syslog_facility;

-***************

-*** 1188,1193 ****

---- 1190,1213 ----

-  		},

-  		&log_min_duration_statement,

-  		-1, -1, INT_MAX / 1000, NULL, NULL

-+ 	},

-+ 

-+ 	{

-+ 		{"vacuum_group_delay_msec", PGC_USERSET, RESOURCES,

-+ 			gettext_noop("Sets VACUUM's delay in milliseconds between processing groups of pages."),

-+ 			NULL

-+ 		},

-+ 		&vacuum_group_delay_msec,

-+ 		0, 0, 1000, NULL, NULL

-+ 	},

-+ 

-+ 	{

-+ 		{"vacuum_group_delay_size", PGC_USERSET, RESOURCES,

-+ 			gettext_noop("Sets VACUUM's group size for the vacuum_group_delay_msec option."),

-+ 			NULL

-+ 		},

-+ 		&vacuum_group_delay_size,

-+ 		10, 1, 1000, NULL, NULL

-  	},

-  

-  	/* End-of-list marker */

-Index: src/backend/utils/misc/postgresql.conf.sample

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v

-retrieving revision 1.92

-diff -c -b -r1.92 postgresql.conf.sample

-*** src/backend/utils/misc/postgresql.conf.sample	2003/10/08 03:49:38	1.92

---- src/backend/utils/misc/postgresql.conf.sample	2003/11/09 23:04:21

-***************

-*** 69,74 ****

---- 69,79 ----

-  #max_files_per_process = 1000	# min 25

-  #preload_libraries = ''

-  

-+ # - Vacuum napping -

-+ 

-+ #vacuum_group_delay_size = 10	# range 1-1000 pages ; vacuum this many pages

-+ #vacuum_group_delay_msec = 0	# range 0-1000 msec  ; then nap this long

-+ 

-  

-  #---------------------------------------------------------------------------

-  # WRITE AHEAD LOG

-Index: src/include/miscadmin.h

-===================================================================

-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/include/miscadmin.h,v

-retrieving revision 1.134

-diff -c -b -r1.134 miscadmin.h

-*** src/include/miscadmin.h	2003/09/24 18:54:01	1.134

---- src/include/miscadmin.h	2003/11/09 23:02:03

-***************

-*** 96,101 ****

---- 96,111 ----

-  		CritSectionCount--; \

-  	} while(0)

-  

-+ /*

-+  * Macro using select(2) to nap for milliseconds

-+  */

-+ #define PG_DELAY(_msec) \

-+ { \

-+     struct timeval _delay; \

-+ 	_delay.tv_sec  = (_msec) / 1000; \

-+ 	_delay.tv_usec = ((_msec) % 1000) * 1000; \

-+ 	(void) select(0, NULL, NULL, NULL, &_delay);\

-+ }

-  

-  /*****************************************************************************

-   *	  globals.h --															 *

diff --git a/dev-db/postgresql/files/postgresql-7.4.14-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.14-gentoo.patch
deleted file mode 100644
index e50f94adaaad..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.14-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru postgresql-7.4.14.orig/configure postgresql-7.4.14/configure
---- postgresql-7.4.14.orig/configure	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/configure	2006-11-05 15:48:27.000000000 +0100
-@@ -6003,7 +6003,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   pgac_cv_check_readline=no
--for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+for pgac_lib in "" " -lncurses" " -lcurses" ; do
-   for pgac_rllib in -lreadline -ledit ; do
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-diff -Nru postgresql-7.4.14.orig/src/bin/Makefile postgresql-7.4.14/src/bin/Makefile
---- postgresql-7.4.14.orig/src/bin/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/bin/Makefile	2006-11-05 15:49:06.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
--	psql scripts pg_config pg_controldata pg_resetxlog \
-+	psql scripts pg_controldata pg_resetxlog \
- 	pg_encoding
- 
- ifeq ($(with_tcl), yes)
-diff -Nru postgresql-7.4.14.orig/src/interfaces/Makefile postgresql-7.4.14/src/interfaces/Makefile
---- postgresql-7.4.14.orig/src/interfaces/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/interfaces/Makefile	2006-11-05 15:48:27.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) libpgtcl jdbc
- 
-diff -Nru postgresql-7.4.14.orig/src/Makefile postgresql-7.4.14/src/Makefile
---- postgresql-7.4.14.orig/src/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/Makefile	2006-11-05 15:48:27.000000000 +0100
-@@ -17,7 +17,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -28,7 +27,6 @@
- clean:
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -39,7 +37,6 @@
- distclean maintainer-clean:
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-7.4.14-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.14-hppa-testandset.patch
deleted file mode 100644
index d5f916d455eb..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.14-hppa-testandset.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- postgresql-7.4.12.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.12/src/include/port/linux.h	2004-01-09 20:22:50.000000000 +0000
-@@ -3,6 +3,11 @@
- 
- #define HAS_TEST_AND_SET
- 
-+#elif defined(__hppa__)
-+typedef struct { int sema[4]; } slock_t;
-+
-+#define HAS_TEST_AND_SET
-+
- #elif defined(__sparc__)
- typedef unsigned char slock_t;
- 
---- postgresql-7.4.12.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.12/src/include/storage/s_lock.h	2004-01-09 20:12:15.000000000 +0000
-@@ -112,6 +112,33 @@
- 
- #endif	 /* __i386__ || __x86_64__ */
- 
-+#if defined(__hppa__) || defined(__hppa)
-+#define TAS(lock) tas(lock)
-+
-+#define __ldcw(a) ({ \
-+	unsigned int __ret;						\
-+	__asm__ __volatile__("ldcw 0(%2),%0"				\
-+				: "=r" (__ret), "=m" (*(a)) : "r" (a));	\
-+	__ret;								\
-+})
-+
-+#define __PA_LDCW_ALIGNMENT 16
-+#define __ldcw_align(a) ({ \
-+	volatile unsigned int __ret = (unsigned int) a;					\
-+	if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a)			\
-+		__ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT;	\
-+	(unsigned int *) __ret;								\
-+})
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	volatile unsigned int *a = __ldcw_align (lock);
-+	return (__ldcw(a) == 0);
-+}
-+
-+#endif	/* __hppa__ || __hppa */
-+
- 
- /* Intel Itanium */
- #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/files/postgresql-7.4.16-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.16-gentoo.patch
deleted file mode 100644
index e50f94adaaad..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.16-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru postgresql-7.4.14.orig/configure postgresql-7.4.14/configure
---- postgresql-7.4.14.orig/configure	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/configure	2006-11-05 15:48:27.000000000 +0100
-@@ -6003,7 +6003,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   pgac_cv_check_readline=no
--for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
-+for pgac_lib in "" " -lncurses" " -lcurses" ; do
-   for pgac_rllib in -lreadline -ledit ; do
-     pgac_save_LIBS=$LIBS
-     LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-diff -Nru postgresql-7.4.14.orig/src/bin/Makefile postgresql-7.4.14/src/bin/Makefile
---- postgresql-7.4.14.orig/src/bin/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/bin/Makefile	2006-11-05 15:49:06.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
--	psql scripts pg_config pg_controldata pg_resetxlog \
-+	psql scripts pg_controldata pg_resetxlog \
- 	pg_encoding
- 
- ifeq ($(with_tcl), yes)
-diff -Nru postgresql-7.4.14.orig/src/interfaces/Makefile postgresql-7.4.14/src/interfaces/Makefile
---- postgresql-7.4.14.orig/src/interfaces/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/interfaces/Makefile	2006-11-05 15:48:27.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) libpgtcl jdbc
- 
-diff -Nru postgresql-7.4.14.orig/src/Makefile postgresql-7.4.14/src/Makefile
---- postgresql-7.4.14.orig/src/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/Makefile	2006-11-05 15:48:27.000000000 +0100
-@@ -17,7 +17,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -28,7 +27,6 @@
- clean:
- 	$(MAKE) -C port $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -39,7 +37,6 @@
- distclean maintainer-clean:
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-7.4.16-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.16-hppa-testandset.patch
deleted file mode 100644
index d5f916d455eb..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.16-hppa-testandset.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- postgresql-7.4.12.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.12/src/include/port/linux.h	2004-01-09 20:22:50.000000000 +0000
-@@ -3,6 +3,11 @@
- 
- #define HAS_TEST_AND_SET
- 
-+#elif defined(__hppa__)
-+typedef struct { int sema[4]; } slock_t;
-+
-+#define HAS_TEST_AND_SET
-+
- #elif defined(__sparc__)
- typedef unsigned char slock_t;
- 
---- postgresql-7.4.12.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.12/src/include/storage/s_lock.h	2004-01-09 20:12:15.000000000 +0000
-@@ -112,6 +112,33 @@
- 
- #endif	 /* __i386__ || __x86_64__ */
- 
-+#if defined(__hppa__) || defined(__hppa)
-+#define TAS(lock) tas(lock)
-+
-+#define __ldcw(a) ({ \
-+	unsigned int __ret;						\
-+	__asm__ __volatile__("ldcw 0(%2),%0"				\
-+				: "=r" (__ret), "=m" (*(a)) : "r" (a));	\
-+	__ret;								\
-+})
-+
-+#define __PA_LDCW_ALIGNMENT 16
-+#define __ldcw_align(a) ({ \
-+	volatile unsigned int __ret = (unsigned int) a;					\
-+	if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a)			\
-+		__ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT;	\
-+	(unsigned int *) __ret;								\
-+})
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	volatile unsigned int *a = __ldcw_align (lock);
-+	return (__ldcw(a) == 0);
-+}
-+
-+#endif	/* __hppa__ || __hppa */
-+
- 
- /* Intel Itanium */
- #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/files/postgresql-8.0.9-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.9-gentoo.patch
deleted file mode 100644
index f1308ee0e898..000000000000
--- a/dev-db/postgresql/files/postgresql-8.0.9-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nru postgresql-8.0.9.orig/src/bin/Makefile postgresql-8.0.9/src/bin/Makefile
---- postgresql-8.0.9.orig/src/bin/Makefile	2006-11-05 13:20:26.000000000 +0100
-+++ postgresql-8.0.9/src/bin/Makefile	2006-11-05 15:50:05.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+	psql scripts pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-diff -Nru postgresql-8.0.9.orig/src/interfaces/Makefile postgresql-8.0.9/src/interfaces/Makefile
---- postgresql-8.0.9.orig/src/interfaces/Makefile	2006-11-05 13:20:26.000000000 +0100
-+++ postgresql-8.0.9/src/interfaces/Makefile	2006-11-05 15:50:05.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Nru postgresql-8.0.9.orig/src/Makefile postgresql-8.0.9/src/Makefile
---- postgresql-8.0.9.orig/src/Makefile	2006-11-05 13:20:26.000000000 +0100
-+++ postgresql-8.0.9/src/Makefile	2006-11-05 15:50:05.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-8.0.9-sh.patch b/dev-db/postgresql/files/postgresql-8.0.9-sh.patch
deleted file mode 100644
index fc1dafe83d15..000000000000
--- a/dev-db/postgresql/files/postgresql-8.0.9-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/include/storage/s_lock.h	2005-01-01 07:03:42.000000000 +0900
-+++ src/include/storage/s_lock.h	2005-08-17 23:09:19.000000000 +0900
-@@ -239,6 +239,31 @@
- #endif	 /* __s390__ || __s390x__ */
- 
- 
-+#if defined(__sh__)
-+#define HAS_TEST_AND_SET
-+
-+typedef unsigned char slock_t;
-+
-+#define TAS(lock) tas(lock)
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	register int _res = 1;
-+
-+	__asm__ __volatile__(
-+		"tas.b	@%1\n\t"
-+		"movt	%0\n\t"
-+		"xor	#1,%0"
-+:		"=z"(_res)
-+:		"r"(lock)
-+:		"t","memory");
-+	return _res;
-+}
-+
-+#endif	 /* __sh__ */
-+
-+
- #if defined(__sparc__)
- #define HAS_TEST_AND_SET
- 
diff --git a/dev-db/postgresql/files/postgresql-8.1-gentoo.patch b/dev-db/postgresql/files/postgresql-8.1-gentoo.patch
deleted file mode 100644
index 942617ae0d08..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1-gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naru postgresql-8.1.3.org/src/interfaces/Makefile postgresql-8.1.3/src/interfaces/Makefile
---- postgresql-8.1.3.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-8.1.3/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Naru postgresql-8.1.3.org/src/Makefile postgresql-8.1.3/src/Makefile
---- postgresql-8.1.3.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
-+++ postgresql-8.1.3/src/Makefile	2005-05-09 21:59:54.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-8.1-sh.patch b/dev-db/postgresql/files/postgresql-8.1-sh.patch
deleted file mode 100644
index fc59d52af0e8..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/include/storage/s_lock.h~	2005-01-01 07:03:42.000000000 +0900
-+++ src/include/storage/s_lock.h	2005-08-17 23:09:19.000000000 +0900
-@@ -239,6 +239,31 @@
- #endif	 /* __s390__ || __s390x__ */
- 
- 
-+#if defined(__sh__)
-+#define HAS_TEST_AND_SET
-+
-+typedef unsigned char slock_t;
-+
-+#define TAS(lock) tas(lock)
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	register int _res = 1;
-+
-+	__asm__ __volatile__(
-+		"tas.b	@%1\n\t"
-+		"movt	%0\n\t"
-+		"xor	#1,%0"
-+:		"=z"(_res)
-+:		"r"(lock)
-+:		"t","memory");
-+	return _res;
-+}
-+
-+#endif	 /* __sh__ */
-+
-+
- #if defined(__sparc__)
- #define HAS_TEST_AND_SET
- 
diff --git a/dev-db/postgresql/files/postgresql-8.1.5-gentoo.patch b/dev-db/postgresql/files/postgresql-8.1.5-gentoo.patch
deleted file mode 100644
index 13c36350e049..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.5-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nru postgresql-8.1.5.orig/src/bin/Makefile postgresql-8.1.5/src/bin/Makefile
---- postgresql-8.1.5.orig/src/bin/Makefile	2006-11-05 13:20:34.000000000 +0100
-+++ postgresql-8.1.5/src/bin/Makefile	2006-11-05 15:50:53.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+	psql scripts pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-diff -Nru postgresql-8.1.5.orig/src/interfaces/Makefile postgresql-8.1.5/src/interfaces/Makefile
---- postgresql-8.1.5.orig/src/interfaces/Makefile	2006-11-05 13:20:34.000000000 +0100
-+++ postgresql-8.1.5/src/interfaces/Makefile	2006-11-05 15:50:53.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Nru postgresql-8.1.5.orig/src/Makefile postgresql-8.1.5/src/Makefile
---- postgresql-8.1.5.orig/src/Makefile	2006-11-05 13:20:34.000000000 +0100
-+++ postgresql-8.1.5/src/Makefile	2006-11-05 15:50:53.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-8.1.5-regress_fix.patch b/dev-db/postgresql/files/postgresql-8.1.5-regress_fix.patch
deleted file mode 100644
index 0cb39d576f34..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.5-regress_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/test/regress/sql/interval.sql	2006-08-05 14:45:52.000000000 +0200
-+++ src/test/regress/sql/interval.sql	2006-08-05 14:46:15.000000000 +0200
-@@ -61,12 +61,6 @@
- 
- SELECT '' AS ten, * FROM INTERVAL_TBL;
- 
---- test avg(interval), which is somewhat fragile since people have been
---- known to change the allowed input syntax for type interval without
---- updating pg_aggregate.agginitval
--
--select avg(f1) from interval_tbl;
--
- -- test long interval input
- select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
- 
---- src/test/regress/expected/interval.out	2006-08-05 14:46:23.000000000 +0200
-+++ src/test/regress/expected/interval.out	2006-08-05 14:46:51.000000000 +0200
-@@ -212,15 +212,6 @@
-      | @ 5 mons 12 hours
- (10 rows)
- 
---- test avg(interval), which is somewhat fragile since people have been
---- known to change the allowed input syntax for type interval without
---- updating pg_aggregate.agginitval
--select avg(f1) from interval_tbl;
--                       avg                       
---------------------------------------------------
-- @ 4 years 1 mon 9 days 28 hours 18 mins 23 secs
--(1 row)
--
- -- test long interval input
- select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
-                   interval                  
diff --git a/dev-db/postgresql/files/postgresql-8.1.5-regress_su.patch b/dev-db/postgresql/files/postgresql-8.1.5-regress_su.patch
deleted file mode 100644
index 28e29253dacb..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.5-regress_su.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/test/regress/pg_regress.sh	2006-08-01 10:57:17.000000000 +0200
-+++ src/test/regress/pg_regress.sh	2006-08-04 00:14:39.000000000 +0200
-@@ -81,8 +81,8 @@
- # Initialize default settings
- # ----------
- 
--: ${inputdir=.}
--: ${outputdir=.}
-+: ${inputdir=PORTAGETEMPDIRPG}
-+: ${outputdir=PORTAGETEMPDIRPG}
- 
- libdir='@libdir@'
- bindir='@bindir@'
-@@ -410,7 +410,8 @@
-     message "initializing database system"
-     [ "$debug" = yes ] && initdb_options="--debug"
-     [ "$nolocale" = yes ] && initdb_options="$initdb_options --no-locale"
--    "$bindir/initdb" -D "$PGDATA" -L "$datadir" --noclean $initdb_options >"$LOGDIR/initdb.log" 2>&1
-+    chown portage "${datadir}" "${temp_install}" "${inputdir}/testtablespace"
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/initdb -D '$PGDATA' -L '$datadir' --noclean $initdb_options" >"$LOGDIR/initdb.log" 2>&1
- 
-     if [ $? -ne 0 ]
-     then
-@@ -433,7 +434,7 @@
-     else
-         postmaster_options="$postmaster_options -c listen_addresses="
-     fi
--    "$bindir/postmaster" -D "$PGDATA" -F $postmaster_options >"$LOGDIR/postmaster.log" 2>&1 &
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/postmaster -D '$PGDATA' -F $postmaster_options" >"$LOGDIR/postmaster.log" 2>&1 &
-     postmaster_pid=$!
- 
-     # Wait till postmaster is able to accept connections (normally only
-@@ -441,7 +442,7 @@
-     # wait forever, however.
-     i=0
-     max=60
--    until "$bindir/psql" -X $psql_options postgres </dev/null 2>/dev/null
-+    until su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/psql -X $psql_options postgres </dev/null 2>/dev/null"
-     do
-         i=`expr $i + 1`
-         if [ $i -ge $max ]
-@@ -498,7 +499,7 @@
-     fi
- 
-     message "dropping database \"$dbname\""
--    "$bindir/dropdb" $psql_options "$dbname"
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/dropdb $psql_options '$dbname'"
-     # errors can be ignored
- fi
- 
-@@ -538,17 +539,17 @@
- # ----------
- 
- message "creating database \"$dbname\""
--"$bindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/createdb $encoding_opt $psql_options --template template0 '$dbname'"
- if [ $? -ne 0 ]; then
-     echo "$me: createdb failed"
-     (exit 2); exit
- fi
- 
--"$bindir/psql" -q -X $psql_options -c "\
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/psql -q -X $psql_options -c \"\
- alter database \"$dbname\" set lc_messages to 'C';
- alter database \"$dbname\" set lc_monetary to 'C';
- alter database \"$dbname\" set lc_numeric to 'C';
--alter database \"$dbname\" set lc_time to 'C';" "$dbname"
-+alter database \"$dbname\" set lc_time to 'C';\" '$dbname'"
- if [ $? -ne 0 ]; then
-     echo "$me: could not set database default locales"
-     (exit 2); exit
-@@ -560,7 +561,7 @@
- # ----------
- 
- message "dropping regression test user accounts"
--"$bindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/psql -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' '$dbname' 2>/dev/null"
- if [ $? -eq 2 ]; then
-     echo "$me: could not drop user accounts"
-     (exit 2); exit
-@@ -575,7 +576,7 @@
-     for lang in xyzzy $load_langs ; do    
-         if [ "$lang" != "xyzzy" ]; then
-             message "installing $lang"
--            "$bindir/createlang" $psql_options $lang $dbname
-+            su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/createlang $psql_options $lang '$dbname'"
-             if [ $? -ne 0 ] && [ $? -ne 2 ]; then
-                 echo "$me: createlang $lang failed"
-                 (exit 2); exit
-@@ -635,7 +636,7 @@
-         # Run a single test
-         formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'`
-         $ECHO_N "test $formatted ... $ECHO_C"
--        ( $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 )&
-+        ( su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' ${PSQL} -d '${dbname}' < '${inputdir}/sql/${1}.sql' > '${outputdir}/results/${1}.out' 2>&1" )&
-         wait
-     else
-         # Start a parallel group
-@@ -646,7 +647,7 @@
-         fi
-         for name do
-             ( 
--              $PSQL -d "$dbname" <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1
-+              su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' ${PSQL} -d '${dbname}' < '${inputdir}/sql/${name}.sql' > '${outputdir}/results/${name}.out' 2>&1"
-               $ECHO_N " $name$ECHO_C"
-             ) &
-             if [ $maxconnections -gt 0 ] ; then
-@@ -740,7 +741,7 @@
- 
- if [ -n "$postmaster_pid" ]; then
-     message "shutting down postmaster"
--    "$bindir/pg_ctl" -s -D "$PGDATA" stop
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/pg_ctl -s -D '$PGDATA' stop"
-     wait "$postmaster_pid"
-     unset postmaster_pid
- fi
diff --git a/dev-db/postgresql/files/postgresql-8.1.5-sh.patch b/dev-db/postgresql/files/postgresql-8.1.5-sh.patch
deleted file mode 100644
index 6350771080e8..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.5-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/include/storage/s_lock.h	2005-01-01 07:03:42.000000000 +0900
-+++ src/include/storage/s_lock.h	2005-08-17 23:09:19.000000000 +0900
-@@ -300,6 +300,31 @@
- #endif	 /* __s390__ || __s390x__ */
- 
- 
-+#if defined(__sh__)
-+#define HAS_TEST_AND_SET
-+
-+typedef unsigned char slock_t;
-+
-+#define TAS(lock) tas(lock)
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	register int _res = 1;
-+
-+	__asm__ __volatile__(
-+		"tas.b	@%1\n\t"
-+		"movt	%0\n\t"
-+		"xor	#1,%0"
-+:		"=z"(_res)
-+:		"r"(lock)
-+:		"t","memory");
-+	return _res;
-+}
-+
-+#endif	 /* __sh__ */
-+
-+
- #if defined(__sparc__)
- #define HAS_TEST_AND_SET
- 
diff --git a/dev-db/postgresql/files/postgresql-8.1.8-gentoo.patch b/dev-db/postgresql/files/postgresql-8.1.8-gentoo.patch
deleted file mode 100644
index 13c36350e049..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.8-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Nru postgresql-8.1.5.orig/src/bin/Makefile postgresql-8.1.5/src/bin/Makefile
---- postgresql-8.1.5.orig/src/bin/Makefile	2006-11-05 13:20:34.000000000 +0100
-+++ postgresql-8.1.5/src/bin/Makefile	2006-11-05 15:50:53.000000000 +0100
-@@ -14,7 +14,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- DIRS := initdb ipcclean pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog
-+	psql scripts pg_controldata pg_resetxlog
- ifeq ($(PORTNAME), win32)
- DIRS+=pgevent
- endif
-diff -Nru postgresql-8.1.5.orig/src/interfaces/Makefile postgresql-8.1.5/src/interfaces/Makefile
---- postgresql-8.1.5.orig/src/interfaces/Makefile	2006-11-05 13:20:34.000000000 +0100
-+++ postgresql-8.1.5/src/interfaces/Makefile	2006-11-05 15:50:53.000000000 +0100
-@@ -12,7 +12,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--DIRS := libpq ecpg 
-+DIRS := ecpg 
- 
- ALLDIRS := $(DIRS) 
- 
-diff -Nru postgresql-8.1.5.orig/src/Makefile postgresql-8.1.5/src/Makefile
---- postgresql-8.1.5.orig/src/Makefile	2006-11-05 13:20:34.000000000 +0100
-+++ postgresql-8.1.5/src/Makefile	2006-11-05 15:50:53.000000000 +0100
-@@ -18,7 +18,6 @@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
- 	$(MAKE) -C backend/utils/mb/conversion_procs $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -47,7 +46,6 @@
- 	$(MAKE) -C port $@
- 	$(MAKE) -C timezone $@
- 	$(MAKE) -C backend $@
--	$(MAKE) -C include $@
- 	$(MAKE) -C interfaces $@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
-@@ -61,7 +59,6 @@
- 	-$(MAKE) -C port $@
- 	-$(MAKE) -C timezone $@
- 	-$(MAKE) -C backend $@
--	-$(MAKE) -C include $@
- 	-$(MAKE) -C interfaces $@
- 	-$(MAKE) -C bin $@
- 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql-8.1.8-regress_fix.patch b/dev-db/postgresql/files/postgresql-8.1.8-regress_fix.patch
deleted file mode 100644
index 0cb39d576f34..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.8-regress_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/test/regress/sql/interval.sql	2006-08-05 14:45:52.000000000 +0200
-+++ src/test/regress/sql/interval.sql	2006-08-05 14:46:15.000000000 +0200
-@@ -61,12 +61,6 @@
- 
- SELECT '' AS ten, * FROM INTERVAL_TBL;
- 
---- test avg(interval), which is somewhat fragile since people have been
---- known to change the allowed input syntax for type interval without
---- updating pg_aggregate.agginitval
--
--select avg(f1) from interval_tbl;
--
- -- test long interval input
- select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
- 
---- src/test/regress/expected/interval.out	2006-08-05 14:46:23.000000000 +0200
-+++ src/test/regress/expected/interval.out	2006-08-05 14:46:51.000000000 +0200
-@@ -212,15 +212,6 @@
-      | @ 5 mons 12 hours
- (10 rows)
- 
---- test avg(interval), which is somewhat fragile since people have been
---- known to change the allowed input syntax for type interval without
---- updating pg_aggregate.agginitval
--select avg(f1) from interval_tbl;
--                       avg                       
---------------------------------------------------
-- @ 4 years 1 mon 9 days 28 hours 18 mins 23 secs
--(1 row)
--
- -- test long interval input
- select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
-                   interval                  
diff --git a/dev-db/postgresql/files/postgresql-8.1.8-regress_su.patch b/dev-db/postgresql/files/postgresql-8.1.8-regress_su.patch
deleted file mode 100644
index 28e29253dacb..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.8-regress_su.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/test/regress/pg_regress.sh	2006-08-01 10:57:17.000000000 +0200
-+++ src/test/regress/pg_regress.sh	2006-08-04 00:14:39.000000000 +0200
-@@ -81,8 +81,8 @@
- # Initialize default settings
- # ----------
- 
--: ${inputdir=.}
--: ${outputdir=.}
-+: ${inputdir=PORTAGETEMPDIRPG}
-+: ${outputdir=PORTAGETEMPDIRPG}
- 
- libdir='@libdir@'
- bindir='@bindir@'
-@@ -410,7 +410,8 @@
-     message "initializing database system"
-     [ "$debug" = yes ] && initdb_options="--debug"
-     [ "$nolocale" = yes ] && initdb_options="$initdb_options --no-locale"
--    "$bindir/initdb" -D "$PGDATA" -L "$datadir" --noclean $initdb_options >"$LOGDIR/initdb.log" 2>&1
-+    chown portage "${datadir}" "${temp_install}" "${inputdir}/testtablespace"
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/initdb -D '$PGDATA' -L '$datadir' --noclean $initdb_options" >"$LOGDIR/initdb.log" 2>&1
- 
-     if [ $? -ne 0 ]
-     then
-@@ -433,7 +434,7 @@
-     else
-         postmaster_options="$postmaster_options -c listen_addresses="
-     fi
--    "$bindir/postmaster" -D "$PGDATA" -F $postmaster_options >"$LOGDIR/postmaster.log" 2>&1 &
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/postmaster -D '$PGDATA' -F $postmaster_options" >"$LOGDIR/postmaster.log" 2>&1 &
-     postmaster_pid=$!
- 
-     # Wait till postmaster is able to accept connections (normally only
-@@ -441,7 +442,7 @@
-     # wait forever, however.
-     i=0
-     max=60
--    until "$bindir/psql" -X $psql_options postgres </dev/null 2>/dev/null
-+    until su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/psql -X $psql_options postgres </dev/null 2>/dev/null"
-     do
-         i=`expr $i + 1`
-         if [ $i -ge $max ]
-@@ -498,7 +499,7 @@
-     fi
- 
-     message "dropping database \"$dbname\""
--    "$bindir/dropdb" $psql_options "$dbname"
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='ISO, MDY' $bindir/dropdb $psql_options '$dbname'"
-     # errors can be ignored
- fi
- 
-@@ -538,17 +539,17 @@
- # ----------
- 
- message "creating database \"$dbname\""
--"$bindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/createdb $encoding_opt $psql_options --template template0 '$dbname'"
- if [ $? -ne 0 ]; then
-     echo "$me: createdb failed"
-     (exit 2); exit
- fi
- 
--"$bindir/psql" -q -X $psql_options -c "\
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/psql -q -X $psql_options -c \"\
- alter database \"$dbname\" set lc_messages to 'C';
- alter database \"$dbname\" set lc_monetary to 'C';
- alter database \"$dbname\" set lc_numeric to 'C';
--alter database \"$dbname\" set lc_time to 'C';" "$dbname"
-+alter database \"$dbname\" set lc_time to 'C';\" '$dbname'"
- if [ $? -ne 0 ]; then
-     echo "$me: could not set database default locales"
-     (exit 2); exit
-@@ -560,7 +561,7 @@
- # ----------
- 
- message "dropping regression test user accounts"
--"$bindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
-+su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/psql -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' '$dbname' 2>/dev/null"
- if [ $? -eq 2 ]; then
-     echo "$me: could not drop user accounts"
-     (exit 2); exit
-@@ -575,7 +576,7 @@
-     for lang in xyzzy $load_langs ; do    
-         if [ "$lang" != "xyzzy" ]; then
-             message "installing $lang"
--            "$bindir/createlang" $psql_options $lang $dbname
-+            su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/createlang $psql_options $lang '$dbname'"
-             if [ $? -ne 0 ] && [ $? -ne 2 ]; then
-                 echo "$me: createlang $lang failed"
-                 (exit 2); exit
-@@ -635,7 +636,7 @@
-         # Run a single test
-         formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'`
-         $ECHO_N "test $formatted ... $ECHO_C"
--        ( $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 )&
-+        ( su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' ${PSQL} -d '${dbname}' < '${inputdir}/sql/${1}.sql' > '${outputdir}/results/${1}.out' 2>&1" )&
-         wait
-     else
-         # Start a parallel group
-@@ -646,7 +647,7 @@
-         fi
-         for name do
-             ( 
--              $PSQL -d "$dbname" <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1
-+              su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' ${PSQL} -d '${dbname}' < '${inputdir}/sql/${name}.sql' > '${outputdir}/results/${name}.out' 2>&1"
-               $ECHO_N " $name$ECHO_C"
-             ) &
-             if [ $maxconnections -gt 0 ] ; then
-@@ -740,7 +741,7 @@
- 
- if [ -n "$postmaster_pid" ]; then
-     message "shutting down postmaster"
--    "$bindir/pg_ctl" -s -D "$PGDATA" stop
-+    su -s /bin/sh -l portage -c "PGTZ='PST8PDT' PGDATESTYLE='Postgres, MDY' $bindir/pg_ctl -s -D '$PGDATA' stop"
-     wait "$postmaster_pid"
-     unset postmaster_pid
- fi
diff --git a/dev-db/postgresql/files/postgresql-8.1.8-sh.patch b/dev-db/postgresql/files/postgresql-8.1.8-sh.patch
deleted file mode 100644
index 6350771080e8..000000000000
--- a/dev-db/postgresql/files/postgresql-8.1.8-sh.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/include/storage/s_lock.h	2005-01-01 07:03:42.000000000 +0900
-+++ src/include/storage/s_lock.h	2005-08-17 23:09:19.000000000 +0900
-@@ -300,6 +300,31 @@
- #endif	 /* __s390__ || __s390x__ */
- 
- 
-+#if defined(__sh__)
-+#define HAS_TEST_AND_SET
-+
-+typedef unsigned char slock_t;
-+
-+#define TAS(lock) tas(lock)
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	register int _res = 1;
-+
-+	__asm__ __volatile__(
-+		"tas.b	@%1\n\t"
-+		"movt	%0\n\t"
-+		"xor	#1,%0"
-+:		"=z"(_res)
-+:		"r"(lock)
-+:		"t","memory");
-+	return _res;
-+}
-+
-+#endif	 /* __sh__ */
-+
-+
- #if defined(__sparc__)
- #define HAS_TEST_AND_SET
- 
diff --git a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild b/dev-db/postgresql/postgresql-7.3.15-r1.ebuild
deleted file mode 100644
index 3cb3c86367e2..000000000000
--- a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.13 2007/04/28 22:04:20 tove Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-DESCRIPTION="sophisticated Object-Relational DBMS"
-
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 s390 sh sparc x86"
-IUSE="doc java libg++ nls pam perl python readline ssl tcl tk zlib threads selinux"
-
-DEPEND="~dev-db/libpq-7.3.15
-	!>=dev-db/libpq-7.3.16
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcl? ( >=dev-lang/tcl-8 )
-	tk? ( >=dev-lang/tk-8.3.3-r1 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
-		dev-java/java-config )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	nls? ( sys-devel/gettext )"
-# java dep workaround for portage bug
-# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-RDEPEND="virtual/libc
-	=dev-db/libpq-7.3.15*
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcl? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3 )
-	selinux? ( sec-policy/selinux-postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-PG_DIR="/var/lib/postgresql"
-
-pkg_setup() {
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${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."
-			eerror "(database directory = ${PG_DIR})."
-			exit 1
-		fi
-	fi
-	enewgroup postgres 70 \
-		|| die "problem adding group postgres"
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
-		|| die "problem adding user postgres"
-}
-
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [[ -z "${JDKHOME}" || ! -d "${JDKHOME}" ]]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV%.*}-cubeparse.patch"
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcl && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	use java && myconf="$myconf --with-java"
-	use ssl && myconf="$myconf --with-openssl"
-	use nls && myconf="$myconf --enable-nls"
-	use libg++ && myconf="$myconf --with-CXX"
-	use pam && myconf="$myconf --with-pam"
-	use readline || myconf="$myconf --without-readline"
-	use zlib || myconf="$myconf --without-zlib"
-	use threads && myconf="$myconf --enable-thread-safety"
-
-	# these are the only working CFLAGS I could get on ppc, so locking them
-	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
-	# Gerk - Nov 26, 2002
-	use ppc && CFLAGS="-pipe -fsigned-char"
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-maxbackends=1024 \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-}
-
-src_install() {
-	if use perl; then
-		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/$(get_libdir):" \
-			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
-		mv ${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
-
-	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server \
-		includedir_internal=/usr/include/postgresql/internal \
-		LIBDIR=${D}/usr/$(get_libdir) \
-		python_moduleexecdir="${python_execprefix}/$(get_libdir)/python${python_version}/site-packages" \
-		install || die
-	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
-	cd ${S}
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	dodoc contrib/adddepend/*
-
-	if use java; then
-		# we need to remove jar file after dojar; otherwise two same jar
-		# file are installed.
-		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	# backward compatibility
-	for i in ${D}/usr/include/postgresql/pgsql/*
-	do
-		ln -s ${i} ${D}/usr/include/
-	done
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	cd ${S}
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die
-
-	keepdir /var/lib/postgresql
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "emerge --config =${PF}"
-	einfo "to setup the initial database environment."
-	einfo ""
-	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p ${PG_DIR}/data
-	chown -Rf postgres:postgres ${PG_DIR}
-	chmod 700 ${PG_DIR}/data
-
-	einfo "Initializing the database ..."
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			exit 1
-		else
-			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
-			einfo "Read the documentation to check how to upgrade to version ${PV}."
-		fi
-	else
-		# On hppa, postgresql need way more than the default sem index and shmmax
-		if [ "${ARCH}" = "hppa" ]; then
-			SEM_IDX_MIN=1024
-			SHMMAX_MIN=100000000
-			SEM_IDX=`sysctl kernel.sem | awk '{ print $6 }'`
-			if [ $SEM_IDX -lt ${SEM_IDX_MIN} ]; then
-				eerror "The last value of /proc/sys/kernel/sem is too low for postgresql to run"
-				eerror "Temporary setting this value to ${SEM_IDX_MIN} while creating the initial database."
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX}/\t${SEM_IDX_MIN}/" > /proc/sys/kernel/sem
-			fi
-		fi
-		su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-		if [ "${ARCH}" = "hppa" ]; then
-			if [ ! `sysctl kernel.sem | awk '{ print $6 }'` -eq ${SEM_IDX} ] ; then
-				cat /proc/sys/kernel/sem | sed -e "s/\t${SEM_IDX_MIN}/\t${SEM_IDX}/" > /proc/sys/kernel/sem
-				ewarn "Restoring the sem idx value to the previous value"
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEM_IDX_MIN}"
-			fi
-
-			if [ `sysctl kernel.shmmax | awk '{ print $3 }'` -lt ${SHMMAX_MIN} ]; then
-				eerror "The current value of /proc/sys/kernel/shmmax is too low"
-				eerror "for postgresql to run. Please edit /etc/sysctl.conf and set"
-				eerror "this value to at least ${SHMMAX_MIN}."
-
-			fi
-		fi
-
-		einfo "If you are upgrading from a pre-7.3 version of PostgreSQL, please read"
-		einfo "the README.adddepend file for information on how to properly migrate"
-		einfo "all serial columns, unique keys and foreign keys to this version."
-
-		einfo ""
-		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
-		einfo ""
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.3.16.ebuild b/dev-db/postgresql/postgresql-7.3.16.ebuild
deleted file mode 100644
index afaadd1d88dc..000000000000
--- a/dev-db/postgresql/postgresql-7.3.16.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.16.ebuild,v 1.12 2007/02/05 23:17:51 vapier Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-pkg_setup() {
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			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."
-			eerror "(database directory = ${PG_DIR})."
-			die "Remove your database directory to continue"
-		fi
-	fi
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-cubeparse.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we
-		# don't support that in this version of PostgreSQL ... :)
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Correctly support the XML stuff
-	if use xml ; then
-		CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-		LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
-	fi
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		--without-tk \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check ; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		eerror "Tests won't be run if FEATURES=userpriv is disabled!"
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-7.3.18.ebuild b/dev-db/postgresql/postgresql-7.3.18.ebuild
deleted file mode 100644
index 2480588ddc10..000000000000
--- a/dev-db/postgresql/postgresql-7.3.18.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.18.ebuild,v 1.8 2007/03/03 16:21:03 beandog Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-pkg_setup() {
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			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."
-			eerror "(database directory = ${PG_DIR})."
-			die "Remove your database directory to continue"
-		fi
-	fi
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-cubeparse.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we
-		# don't support that in this version of PostgreSQL ... :)
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Correctly support the XML stuff
-	if use xml ; then
-		CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-		LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
-	fi
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		--without-tk \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check ; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		eerror "Tests won't be run if FEATURES=userpriv is disabled!"
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-7.4.13.ebuild b/dev-db/postgresql/postgresql-7.4.13.ebuild
deleted file mode 100644
index 4ceb6cab589d..000000000000
--- a/dev-db/postgresql/postgresql-7.4.13.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.14 2007/04/28 22:04:20 tove Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-P_HIERPG="hier-Pg7.4-0.5.3"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( ftp://gborg.postgresql.org/pub/hierpg/stable/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls java python tcl tk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
-
-DEPEND="~dev-db/libpq-7.4.13
-	!>=dev-db/libpq-7.4.14
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2
-	>=sys-devel/bison-1.875
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcl? ( >=dev-lang/tcl-8 )
-	tk? ( >=dev-lang/tk-8.3.3-r1 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
-		dev-java/java-config )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	nls? ( sys-devel/gettext )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
-# java dep workaround for portage bug
-# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
-RDEPEND="virtual/libc
-	=dev-db/libpq-7.4.13*
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcl? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3 )
-	selinux? ( sec-policy/selinux-postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-PG_DIR="/var/lib/postgresql"
-MAX_CONNECTIONS=1024
-
-pkg_setup() {
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 4 ] ; then
-			eerror "Postgres ${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."
-			eerror "(database directory = ${PG_DIR})."
-			exit 1
-		fi
-	fi
-	enewgroup postgres 70 \
-		|| die "problem adding group postgres"
-	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
-		|| die "problem adding user postgres"
-}
-
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [[ -z "${JDKHOME}" || ! -d "${JDKHOME}" ]]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV%.*}-gentoo.patch"
-
-	if use pg-hier ; then
-		epatch "${WORKDIR}/${P_HIERPG}.diff"
-	fi
-
-	if use pg-vacuumdelay ; then
-		epatch "${FILESDIR}/${PN}-${PV%.*}-vacuum-delay.patch"
-	fi
-
-	if [[ "${ARCH}" = "hppa" ]] ; then
-		epatch "${FILESDIR}/${PN}-${PV%.*}-hppa-testandset.patch"
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcl && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	use java && myconf="$myconf --with-java"
-	use ssl && myconf="$myconf --with-openssl"
-	use nls && myconf="$myconf --enable-nls"
-	use libg++ && myconf="$myconf --with-CXX"
-	use pam && myconf="$myconf --with-pam"
-	use readline || myconf="$myconf --without-readline"
-	use zlib || myconf="$myconf --without-zlib"
-	use pg-intdatetime && myconf="$myconf --enable-integer-datetimes"
-	use threads && myconf="$myconf --enable-thread-safety"
-
-	# these are the only working CFLAGS I could get on ppc, so locking them
-	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
-	# Gerk - Nov 26, 2002
-	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$myconf || die
-
-	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	cd contrib
-	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml; then
-		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	fi
-}
-
-src_install() {
-	if use perl; then
-		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
-			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
-		mv ${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
-
-	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml; then
-		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
-	fi
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html
-	fi
-	dodoc README HISTORY COPYRIGHT INSTALL
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	if use java; then
-		# we need to remove jar file after dojar; otherwise two same jar
-		# file are installed.
-		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
-	fi
-
-	# backward compatibility
-	for i in ${D}/usr/include/postgresql/pgsql/*
-	do
-		ln -s ${i} ${D}/usr/include/
-	done
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	cd ${S}
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die
-	newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die
-	newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die
-}
-
-pkg_postinst() {
-	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
-
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -eq 4 ] ; then
-			ewarn ""
-			ewarn "If you are upgrading from PostgreSQL 7.4 or 7.4.1, it is strongly recommended"
-			ewarn "that you read the release notes concerning changes to the system catalogs."
-			ewarn "You can run 7.4.2 without rerunning initdb, however you may still experience"
-			ewarn "random crashes due to an error in pg_statistic."
-			ewarn ""
-			ewarn "If you prefer not to re-initdb your installation, the release notes contain"
-			ewarn "a procedure for manually correcting the problem."
-			ewarn ""
-		fi
-
-		if use pg-hier; then
-			ewarn ""
-			ewarn "REQUIRED!! After installing patched PostgreSQL by pg-hier"
-			ewarn "it is required to run 'initdb'. Without this Pg will fail "
-			ewarn "with error "
-			ewarn "ERROR: did not find '}' at end of input node. "
-			ewarn ""
-		fi
-	else
-		einfo ""
-		einfo "Execute the following command"
-		einfo "emerge --config =${PF}"
-		einfo "to setup the initial database environment."
-		einfo ""
-	fi
-
-	einfo ""
-	einfo "Python modules was removed from PostgreSQL package."
-	einfo "If you need it, please run \"emerge dev-db/pygresql\"."
-	einfo ""
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p ${PG_DIR}/data
-	chown -Rf postgres:postgres ${PG_DIR}
-	chmod 700 ${PG_DIR}/data
-
-	einfo "Initializing the database ..."
-	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
-		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
-		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
-		if [ ${PG_MAJOR} -lt 7 ] || [ ${PG_MAJOR} -eq 7 -a ${PG_MINOR} -lt 3 ] ; then
-			eerror "Postgres ${PV} cannot upgrade your existing databases."
-			eerror "You must remove your entire database directory to continue."
-			eerror "(database directory = ${PG_DIR})."
-			exit 1
-		else
-			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
-			einfo "Read the documentation to check how to upgrade to version ${PV}."
-		fi
-	else
-		local SEM=`sysctl -n kernel.sem | cut -f-3`
-		local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-		local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
-		local SHMMAX=`sysctl -n kernel.shmmax`
-		local SHMMAX_MIN=`expr 250000 + 30600 \* ${MAX_CONNECTIONS}`
-
-		if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
-			eerror "The current value of SEMMNI is too low"
-			eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
-			eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-			echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-		fi
-		su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-		if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-			echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-			ewarn "Restoring the SEMMNI value to the previous value"
-			ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-			ewarn "and set it to at least ${SEMMNI_MIN}"
-			ewarn ""
-			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-			ewarn ""
-		fi
-
-		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
-			eerror "The current value of SHMMAX is too low for postgresql to run."
-			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
-			eerror ""
-			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-			eerror ""
-
-		fi
-		einfo ""
-		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
-		einfo ""
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.14.ebuild b/dev-db/postgresql/postgresql-7.4.14.ebuild
deleted file mode 100644
index 511820cec567..000000000000
--- a/dev-db/postgresql/postgresql-7.4.14.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.14.ebuild,v 1.16 2007/02/05 23:17:51 vapier Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-cluster_exists() {
-	[[ -f "${PG_DIR}/data/PG_VERSION" ]] && return 0
-	return 1
-}
-
-pkg_setup() {
-	if hasq pg-hier ${USE} ; then
-		ewarn "Warning: pg-hier USE-flag detected:"
-		ewarn "The hier-patch has been dropped for this version and the pg-hier USE-flag is therefore deprecated."
-		ewarn "If you really used the 'hier' patch in your database with the 'CONNECT BY' statement,"
-		ewarn "you should stop now and reconsider. You will be able to reuse your data, but not"
-		ewarn "any VIEWS or QUERIES based on that statement."
-		ewarn "Please disable the pg-hier USE-flag!"
-		ebeep 3
-		if cluster_exists ; then
-			eerror "There is already a database in '${PG_DIR}/data' and you have the pg-hier USE-flag set."
-			eerror "Please read the message above first. If you decide that the warnings there don't"
-			eerror "apply to your situation, dump the database using pg_dump and move the '${PG_DIR}/data'"
-			eerror "away. Then restart the merge. After that create a new database cluster and use pg_restore to"
-			eerror "re-import the previously dumped data."
-			eerror "Moving '${PG_DIR}/data' temporarely away or just disable the 'pg-hier' USE-flag won't work."
-			die "Can't update this database."
-		fi
-	fi
-	if cluster_exists ; then
-		local cluster_version=$(cat "${PG_DIR}/data/PG_VERSION")
-		if [[ ${cluster_version} != $(get_version_component_range 1-2) ]] ; then
-			eerror "There is a database in '${PG_DIR}/data' from PostgreSQL version ${cluster_version}."
-			eerror "PostgreSQL doesn't support upgrades between major versions, you have to use pg_dump"
-			eerror "to dump your existing database. Then move your '${PG_DIR}/data' directory away and"
-			eerror "restart the merge. After that create a new database cluster and use pg_restore to"
-			eerror "re-import the previously dumped data."
-			die "Can't update this database."
-		fi
-	fi
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-hppa-testandset.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we
-		# don't support that in this version of PostgreSQL ... :)
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Correctly support the XML stuff
-	if use xml ; then
-		CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-		LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
-	fi
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		--without-tk \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-
-	newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum init.d-file failed"
-	newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum conf.d-file failed"
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check ; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		eerror "Tests won't be run if FEATURES=userpriv is disabled!"
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-7.4.16.ebuild b/dev-db/postgresql/postgresql-7.4.16.ebuild
deleted file mode 100644
index c632eca86084..000000000000
--- a/dev-db/postgresql/postgresql-7.4.16.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.16.ebuild,v 1.8 2007/03/04 11:14:50 blubb Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-cluster_exists() {
-	[[ -f "${PG_DIR}/data/PG_VERSION" ]] && return 0
-	return 1
-}
-
-pkg_setup() {
-	if hasq pg-hier ${USE} ; then
-		ewarn "Warning: pg-hier USE-flag detected:"
-		ewarn "The hier-patch has been dropped for this version and the pg-hier USE-flag is therefore deprecated."
-		ewarn "If you really used the 'hier' patch in your database with the 'CONNECT BY' statement,"
-		ewarn "you should stop now and reconsider. You will be able to reuse your data, but not"
-		ewarn "any VIEWS or QUERIES based on that statement."
-		ewarn "Please disable the pg-hier USE-flag!"
-		ebeep 3
-		if cluster_exists ; then
-			eerror "There is already a database in '${PG_DIR}/data' and you have the pg-hier USE-flag set."
-			eerror "Please read the message above first. If you decide that the warnings there don't"
-			eerror "apply to your situation, dump the database using pg_dump and move the '${PG_DIR}/data'"
-			eerror "away. Then restart the merge. After that create a new database cluster and use pg_restore to"
-			eerror "re-import the previously dumped data."
-			eerror "Moving '${PG_DIR}/data' temporarely away or just disable the 'pg-hier' USE-flag won't work."
-			die "Can't update this database."
-		fi
-	fi
-	if cluster_exists ; then
-		local cluster_version=$(cat "${PG_DIR}/data/PG_VERSION")
-		if [[ ${cluster_version} != $(get_version_component_range 1-2) ]] ; then
-			eerror "There is a database in '${PG_DIR}/data' from PostgreSQL version ${cluster_version}."
-			eerror "PostgreSQL doesn't support upgrades between major versions, you have to use pg_dump"
-			eerror "to dump your existing database. Then move your '${PG_DIR}/data' directory away and"
-			eerror "restart the merge. After that create a new database cluster and use pg_restore to"
-			eerror "re-import the previously dumped data."
-			die "Can't update this database."
-		fi
-	fi
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-hppa-testandset.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we
-		# don't support that in this version of PostgreSQL ... :)
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Correctly support the XML stuff
-	if use xml ; then
-		CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-		LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
-	fi
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		--without-tk \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-
-	newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum init.d-file failed"
-	newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum conf.d-file failed"
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check ; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		eerror "Tests won't be run if FEATURES=userpriv is disabled!"
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-8.0.9-r1.ebuild b/dev-db/postgresql/postgresql-8.0.9-r1.ebuild
deleted file mode 100644
index a63e7470e906..000000000000
--- a/dev-db/postgresql/postgresql-8.0.9-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.9-r1.ebuild,v 1.12 2007/01/13 23:14:27 vapier Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-cluster_exists() {
-	[[ -f "${PG_DIR}/data/PG_VERSION" ]] && return 0
-	return 1
-}
-
-pkg_setup() {
-	if hasq pg-hier ${USE} ; then
-		ewarn "Warning: pg-hier USE-flag detected:"
-		ewarn "The hier-patch has been dropped for this version and the pg-hier USE-flag is therefore deprecated."
-		ewarn "If you really used the 'hier' patch in your database with the 'CONNECT BY' statement,"
-		ewarn "you should stop now and reconsider. You will be able to reuse your data, but not"
-		ewarn "any VIEWS or QUERIES based on that statement."
-		ewarn "Please disable the pg-hier USE-flag!"
-		ebeep 3
-		if cluster_exists ; then
-			eerror "There is already a database in '${PG_DIR}/data' and you have the pg-hier USE-flag set."
-			eerror "Please read the message above first. If you decide that the warnings there don't"
-			eerror "apply to your situation, dump the database using pg_dump and move the '${PG_DIR}/data'"
-			eerror "away. Then restart the merge. After that create a new database cluster and use pg_restore to"
-			eerror "re-import the previously dumped data."
-			eerror "Moving '${PG_DIR}/data' temporarely away or just disable the 'pg-hier' USE-flag won't work."
-			die "Can't update this database."
-		fi
-	fi
-	if cluster_exists ; then
-		local cluster_version=$(cat "${PG_DIR}/data/PG_VERSION")
-		if [[ ${cluster_version} != $(get_version_component_range 1-2) ]] ; then
-			eerror "There is a database in '${PG_DIR}/data' from PostgreSQL version ${cluster_version}."
-			eerror "PostgreSQL doesn't support upgrades between major versions, you have to use pg_dump"
-			eerror "to dump your existing database. Then move your '${PG_DIR}/data' directory away and"
-			eerror "restart the merge. After that create a new database cluster and use pg_restore to"
-			eerror "re-import the previously dumped data."
-			die "Can't update this database."
-		fi
-	fi
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-sh.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# Fix sandbox violation
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, well, we
-		# don't support that in this version of PostgreSQL ... :)
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-
-	newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum init.d-file failed"
-	newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die "Inserting pg_autovacuum conf.d-file failed"
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if hasq userpriv ${FEATURES} ; then
-		if ! emake -j1 check ; then
-			hasq test ${FEATURES} && die "Make check failed. See above for details."
-			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-		fi
-	else
-		eerror "Tests won't be run if FEATURES=userpriv is disabled!"
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-8.1.5-r1.ebuild b/dev-db/postgresql/postgresql-8.1.5-r1.ebuild
deleted file mode 100644
index 1e63bb8efcc2..000000000000
--- a/dev-db/postgresql/postgresql-8.1.5-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.5-r1.ebuild,v 1.1 2006/12/13 07:59:07 dev-zero Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-pkg_setup() {
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			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."
-			eerror "(database directory = ${PG_DIR})."
-			die "Remove your database directory to continue"
-		fi
-	fi
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-sh.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# Fix sandbox violation
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-
-		# Fix broken tests
-		epatch "${FILESDIR}/${PN}-${PV}-regress_fix.patch"
-
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, we need to
-		# su - to a valid user, portage again, so we patch the test-scripts to do that.
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-		if ! hasq userpriv ${FEATURES} ; then
-			mkdir -p "${S}/src/test/regress/results"
-			chown portage "${S}/src/test/regress/results"
-			epatch "${FILESDIR}/${PN}-${PV}-regress_su.patch"
-			sed -e "s|PORTAGETEMPDIRPG|${S}/src/test/regress|g" -i src/test/regress/pg_regress.sh
-		fi
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	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/postgresql.conf."
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if ! emake -j1 check ; then
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-8.1.8.ebuild b/dev-db/postgresql/postgresql-8.1.8.ebuild
deleted file mode 100644
index 9224d0b53b08..000000000000
--- a/dev-db/postgresql/postgresql-8.1.8.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.8.ebuild,v 1.1 2007/02/12 03:34:18 mjolnir Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
-		mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
-		doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-pkg_setup() {
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			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."
-			eerror "(database directory = ${PG_DIR})."
-			die "Remove your database directory to continue"
-		fi
-	fi
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-${PV}-sh.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# Fix sandbox violation
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-
-		# Fix broken tests
-		epatch "${FILESDIR}/${PN}-${PV}-regress_fix.patch"
-
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, we need to
-		# su - to a valid user, portage again, so we patch the test-scripts to do that.
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-		if ! hasq userpriv ${FEATURES} ; then
-			mkdir -p "${S}/src/test/regress/results"
-			chown portage "${S}/src/test/regress/results"
-			epatch "${FILESDIR}/${PN}-${PV}-regress_su.patch"
-			sed -e "s|PORTAGETEMPDIRPG|${S}/src/test/regress|g" -i src/test/regress/pg_regress.sh
-		fi
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	cd "${S}/doc"
-	dodoc FAQ* README.* TODO bug.template
-
-	if use doc ; then
-		cd "${S}/doc"
-		docinto FAQ_html
-		dodoc src/FAQ/*
-		docinto sgml
-		dodoc src/sgml/*.{sgml,dsl}
-		docinto sgml/ref
-		dodoc src/sgml/ref/*.sgml
-		docinto TODO.detail
-		dodoc TODO.detail/*
-	fi
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	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/postgresql.conf."
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
-
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if ! emake -j1 check ; then
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}