tidy up

Package-Manager: portage-2.0.51.19
author: Masatomo Nakano <nakano@gentoo.org> 2005-04-12 15:47:39 +0000
committer: Masatomo Nakano <nakano@gentoo.org> 2005-04-12 15:47:39 +0000
commit: f0bbcd4eed2e5ef4102dacdd644cbeba33755144 (patch)
tree: 9cff24ac3a8d44772b58976350c5ce15cf0f27a1 /dev-db/postgresql
parent: preventive sylpheed-claws-gtk2 mask (diff)
download: historical-f0bbcd4eed2e5ef4102dacdd644cbeba33755144.tar.gz
historical-f0bbcd4eed2e5ef4102dacdd644cbeba33755144.tar.bz2
historical-f0bbcd4eed2e5ef4102dacdd644cbeba33755144.zip
66 files changed, 44 insertions, 5794 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index add8d2487bf4..6ad11e9c49b0 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.197 2005/04/12 11:32:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.198 2005/04/12 15:47:39 nakano Exp $
+
+  12 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/postgresql.init-7.3.6, -files/postgresql.init-7.3.7,
+  -files/postgresql-7.3.7-gentoo.patch,
+  -files/postgresql-7.3.7-tempfile.patch, -files/postgresql.init-7.3.8,
+  -files/postgresql-7.3.8-gentoo.patch, -files/pg_autovacuum.conf-7.4.3,
+  -files/pg_autovacuum.init-7.4.3, -files/postgresql.conf-7.4.3,
+  -files/postgresql.init-7.4.3, -files/postgresql-7.4.3-gentoo.patch,
+  -files/postgresql-7.4.3-hppa-testandset.patch,
+  -files/postgresql-7.4.3-vacuum-delay.patch,
+  -files/pg_autovacuum.conf-7.4.5, -files/pg_autovacuum.init-7.4.5,
+  -files/postgresql.conf-7.4.5, -files/postgresql.init-7.4.5,
+  -files/postgresql-7.4.5-gentoo.patch,
+  -files/postgresql-7.4.5-hppa-testandset.patch,
+  -files/postgresql-7.4.5-r1-gentoo.patch,
+  -files/postgresql-7.4.5-tempfile.patch,
+  -files/postgresql-7.4.5-vacuum-delay.patch,
+  -files/pg_autovacuum.conf-7.4.6, -files/pg_autovacuum.init-7.4.6,
+  -files/postgresql.conf-7.4.6, -files/postgresql.init-7.4.6,
+  -files/postgresql-7.4.6-gentoo.patch,
+  -files/postgresql-7.4.6-hppa-testandset.patch,
+  -files/postgresql-7.4.6-vacuum-delay.patch,
+  -files/pg_autovacuum.conf-8.0.0, -files/pg_autovacuum.init-8.0.0,
+  -files/postgresql.conf-8.0.0, -files/postgresql.init-8.0.0,
+  -files/postgresql-8.0.0-gentoo.patch, -postgresql-7.3.6-r1.ebuild,
+  -postgresql-7.3.7-r2.ebuild, -postgresql-7.3.8.ebuild,
+  -postgresql-7.3.9.ebuild, -postgresql-7.4.3.ebuild,
+  -postgresql-7.4.3-r1.ebuild, -postgresql-7.4.5.ebuild,
+  -postgresql-7.4.5-r1.ebuild, -postgresql-7.4.5-r2.ebuild,
+  -postgresql-7.4.6.ebuild, -postgresql-7.4.7.ebuild,
+  -postgresql-8.0.0.ebuild, -postgresql-8.0.1.ebuild,
+  -postgresql-8.0.1-r1.ebuild, postgresql-8.0.1-r2.ebuild,
+  postgresql-8.0.2.ebuild:
+  Tidy up.
 
 *postgresql-8.0.2 (12 Apr 2005)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 28d9dbcfa88b..5fc6032a96ce 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,95 +1,33 @@
-MD5 3d47b5db7583fb37926b044bd7ac011e postgresql-8.0.2.ebuild 7717
+MD5 f02a4e9934609d2a1cffe2c697e4d460 postgresql-8.0.2.ebuild 7717
 MD5 adbd082118d1d8fe6bdf95636dd9e2e7 postgresql-7.4.7-r1.ebuild 10754
-MD5 d193fb4efd1f7af60c275813eb732035 postgresql-7.3.6-r1.ebuild 7558
-MD5 20e3e37c02b6d8ea6de9f2ac0261aeb9 postgresql-7.4.3-r1.ebuild 10108
-MD5 a73b94b56ed3cf01372c2738d1dea021 postgresql-7.4.5-r2.ebuild 10168
-MD5 ce29d9a5d68214c3295637e44ee5583f postgresql-7.3.8.ebuild 8030
-MD5 471cdf4debd31c9ea84e4bdc30994411 postgresql-7.4.6.ebuild 10578
 MD5 e8801f803d71c5547413a8fb6874a6a7 postgresql-7.3.9-r1.ebuild 8078
-MD5 74252610db00139ea781984fb3d5f489 postgresql-8.0.1.ebuild 7367
-MD5 770e3a582b8b128457136c427718f768 postgresql-8.0.1-r2.ebuild 7639
-MD5 62378567412e5a30aaf0587efe5c4297 postgresql-7.3.7-r2.ebuild 8004
-MD5 ff6f083a649f8f56baa98d386bf4fc67 postgresql-7.4.3.ebuild 9816
-MD5 98cc1f2ce8a28b6d1d14b65a4a6ffab3 postgresql-7.4.5-r1.ebuild 10138
-MD5 a7ddb837a8e5f4185f80084d12cb26db postgresql-7.4.5.ebuild 10126
-MD5 b7f7e9c1140834bb073859ef3d72bc1d postgresql-8.0.0.ebuild 7367
-MD5 f50385e6369ab23d971e54556c3bd79c postgresql-7.3.9.ebuild 8029
-MD5 c503d14ceb1ade17a1a3678c3043b9a9 postgresql-8.0.1-r1.ebuild 7549
-MD5 e8c1e7ac0f9e713a6e712c980b938dd1 ChangeLog 35810
+MD5 c5fe53f56d74a95863f58ddacb9848f6 postgresql-8.0.1-r2.ebuild 7637
+MD5 c53e4eee1c903c01aeb739281ace51dc ChangeLog 37586
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 304fd4d70f4af99b5d71b2e2a8dd091b postgresql-7.4.7.ebuild 10571
-MD5 8c15706d957604bad595fc940f933ef3 files/postgresql-8.0.0-gentoo.patch 808
-MD5 cd9e32f5a21def1a4e2d1ac0e042aa47 files/postgresql-7.3.7-gentoo.patch 529
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
-MD5 e9a2e5278a70bebace44f1ecf38129e6 files/postgresql-7.4.6-gentoo.patch 1160
 MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
-MD5 48e0a30256ff63828820519640b44833 files/postgresql-7.4.5-tempfile.patch 1453
-MD5 b953b7e3784ac0d01467f1e740a96a8a files/postgresql-7.4.5-gentoo.patch 631
-MD5 cdb90ea55ba57a76d898f14e63b921fa files/digest-postgresql-8.0.1-r1 223
 MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r2 293
-MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
-MD5 fb7c6cd99264f1a121d07cf812e9f99b files/postgresql.init-7.3.7 1279
-MD5 f2a242fa36b13934a9011de1bb1d9825 files/postgresql.init-7.3.8 1279
 MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
-MD5 b54624cb385431b9b3d4b167c2a9aca4 files/postgresql.init-7.4.3 1281
-MD5 eb2eba5dfa7b1f85b4323b219368044b files/postgresql.init-7.4.5 1279
-MD5 db140f8202f740ac22fa8185927999e0 files/postgresql.init-7.4.6 1279
 MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
-MD5 2d09c23680cd7d8f706a2fe8cc41b8fa files/postgresql.init-8.0.0 1279
 MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
 MD5 707bbfd80773f0874ff6ea36822166ec files/postgresql.init-8.0.2 1279
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.3 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.5 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.6 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.0 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.2 390
 MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
-MD5 a12e2f4ae7117b664e78b9966db14096 files/postgresql-7.3.7-tempfile.patch 1453
-MD5 2bf145f0cc937ec4b3146b2ac9fc255c files/digest-postgresql-7.3.8 223
-MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9 223
-MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3 290
-MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5 290
-MD5 0fd21b9794e41d1f8b0ac360acf743d8 files/digest-postgresql-7.4.6 290
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7 290
-MD5 443d8f3814093d85bcc736cf86a2cac0 files/digest-postgresql-8.0.0 223
-MD5 cdb90ea55ba57a76d898f14e63b921fa files/digest-postgresql-8.0.1 223
 MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2 223
-MD5 683d803768f3060ffc4bd5a6f5c91918 files/pg_autovacuum.init-7.4.3 1064
-MD5 8fa377b0390f126d8ef3ee0909f7f813 files/pg_autovacuum.init-7.4.5 1414
-MD5 52434d5b7d919db061399aed45ad4c08 files/pg_autovacuum.init-7.4.6 1414
 MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
-MD5 bdd82428192638b7dd7c21ee2dd04089 files/pg_autovacuum.init-8.0.0 1414
 MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
 MD5 52db3da1b290758687e1df279ea7ccfe files/pg_autovacuum.init-8.0.2 1414
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.3 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.5 302
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.6 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.3-hppa-testandset.patch 1596
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.0 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.2 302
 MD5 94081f9cc2dbcb9e1bd47cfa45d9eb6d files/postgresql-8.0.2-gentoo.patch 808
 MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.3-vacuum-delay.patch 8918
 MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.5-hppa-testandset.patch 1596
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.6-hppa-testandset.patch 1596
 MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
-MD5 b22b4de6c3cc06beed0ed3e1f8df257f files/digest-postgresql-7.3.7-r2 223
 MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
-MD5 8825eddcfe252e724f9e23dd9d8eb4fa files/postgresql-7.3.8-gentoo.patch 529
-MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3-r1 290
-MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r1 290
-MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r2 290
 MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.5-vacuum-delay.patch 8918
 MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 7b8bf110e22829c7040aa1e87afa371c files/postgresql-7.4.3-gentoo.patch 631
-MD5 18249476d920987d48972156c34bec75 files/postgresql-7.4.5-r1-gentoo.patch 1160
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.6-vacuum-delay.patch 8918
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.6-r1 b/dev-db/postgresql/files/digest-postgresql-7.3.6-r1
deleted file mode 100644
index 2e476ab072c6..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80b1649458ed7b0e765fb19bcb81c7aa postgresql-base-7.3.6.tar.bz2 5647447
-MD5 49b6faa1698c6d9f357e13236f7ca777 postgresql-opt-7.3.6.tar.bz2 341096
-MD5 ec0cf85996049eb0180a2163c482c02c postgresql-docs-7.3.6.tar.bz2 2337333
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.7-r2 b/dev-db/postgresql/files/digest-postgresql-7.3.7-r2
deleted file mode 100644
index f7f8f6801db1..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d64e0eca8025caa2e35e5d8226a1afbf postgresql-base-7.3.7.tar.bz2 5651364
-MD5 d3a8a078e786abc5b6c52fac2663a125 postgresql-opt-7.3.7.tar.bz2 340879
-MD5 53bb62e0d7a302b0e626436001f9b242 postgresql-docs-7.3.7.tar.bz2 2340178
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.8 b/dev-db/postgresql/files/digest-postgresql-7.3.8
deleted file mode 100644
index 808cde808f68..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed60b739218cb55f642e0e28bc741a9c postgresql-base-7.3.8.tar.bz2 5648343
-MD5 ff3f04c3f0e118e1cb33654aa459c063 postgresql-opt-7.3.8.tar.bz2 340652
-MD5 52376e982ffccd748dd7a8247bc8fc7f postgresql-docs-7.3.8.tar.bz2 2342068
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.9 b/dev-db/postgresql/files/digest-postgresql-7.3.9
deleted file mode 100644
index 22f82fbd1b80..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 acf807dfbc7389556dd8b9745588d04c postgresql-base-7.3.9.tar.bz2 5644088
-MD5 cc5df63bb78d6b021477fb8c4596037c postgresql-opt-7.3.9.tar.bz2 340736
-MD5 0e19d3bad8b8bb9c56a0c466e5765449 postgresql-docs-7.3.9.tar.bz2 2343410
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.3 b/dev-db/postgresql/files/digest-postgresql-7.4.3
deleted file mode 100644
index cf2422827237..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 647b7d76f93acf12c0a7c11d302a1663 postgresql-base-7.4.3.tar.bz2 6486437
-MD5 f3446bdfc33f6d26d637aa15f6fd1084 postgresql-opt-7.4.3.tar.bz2 331745
-MD5 5f7d235553ae47946439d4b24f8d1ab2 postgresql-docs-7.4.3.tar.bz2 2407307
-MD5 438721e9c5d6ef4df9b4023f0e579ff4 hier-Pg7.4-0.5.2.tar.gz 34747
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.3-r1 b/dev-db/postgresql/files/digest-postgresql-7.4.3-r1
deleted file mode 100644
index cf2422827237..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 647b7d76f93acf12c0a7c11d302a1663 postgresql-base-7.4.3.tar.bz2 6486437
-MD5 f3446bdfc33f6d26d637aa15f6fd1084 postgresql-opt-7.4.3.tar.bz2 331745
-MD5 5f7d235553ae47946439d4b24f8d1ab2 postgresql-docs-7.4.3.tar.bz2 2407307
-MD5 438721e9c5d6ef4df9b4023f0e579ff4 hier-Pg7.4-0.5.2.tar.gz 34747
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.5 b/dev-db/postgresql/files/digest-postgresql-7.4.5
deleted file mode 100644
index d41123b52cb6..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bffc3fe775c885489f9071e97f43ab9b postgresql-base-7.4.5.tar.bz2 6530104
-MD5 8be416baeeb32518f2b17a91c4caafba postgresql-opt-7.4.5.tar.bz2 332174
-MD5 548a73c898e65f901dbc06d622a2bc63 postgresql-docs-7.4.5.tar.bz2 2409931
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.5-r1 b/dev-db/postgresql/files/digest-postgresql-7.4.5-r1
deleted file mode 100644
index d41123b52cb6..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.5-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bffc3fe775c885489f9071e97f43ab9b postgresql-base-7.4.5.tar.bz2 6530104
-MD5 8be416baeeb32518f2b17a91c4caafba postgresql-opt-7.4.5.tar.bz2 332174
-MD5 548a73c898e65f901dbc06d622a2bc63 postgresql-docs-7.4.5.tar.bz2 2409931
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.5-r2 b/dev-db/postgresql/files/digest-postgresql-7.4.5-r2
deleted file mode 100644
index d41123b52cb6..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.5-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 bffc3fe775c885489f9071e97f43ab9b postgresql-base-7.4.5.tar.bz2 6530104
-MD5 8be416baeeb32518f2b17a91c4caafba postgresql-opt-7.4.5.tar.bz2 332174
-MD5 548a73c898e65f901dbc06d622a2bc63 postgresql-docs-7.4.5.tar.bz2 2409931
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.6 b/dev-db/postgresql/files/digest-postgresql-7.4.6
deleted file mode 100644
index 13b3c07076d5..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.6
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 650757097b7cff36ea6052ddb3a78987 postgresql-base-7.4.6.tar.bz2 6534961
-MD5 f70f0c3f4b07fff02273a1ed9f8f55d6 postgresql-opt-7.4.6.tar.bz2 331832
-MD5 1a0567a4ac34dd1f02d5ba3e70e611c1 postgresql-docs-7.4.6.tar.bz2 2412858
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.7 b/dev-db/postgresql/files/digest-postgresql-7.4.7
deleted file mode 100644
index 1b1c931e6d98..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.7
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 70c07688c89f5fc7dbd9b8caee123582 postgresql-base-7.4.7.tar.bz2 6582981
-MD5 b72409a2d57c73bf6347e0d19b2cfb6e postgresql-opt-7.4.7.tar.bz2 332158
-MD5 4fed2346dd0ec798554c055afaa84a89 postgresql-docs-7.4.7.tar.bz2 2417733
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.0 b/dev-db/postgresql/files/digest-postgresql-8.0.0
deleted file mode 100644
index 08c4dbf84572..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 57984b8b016501ee920e95af6edc7145 postgresql-base-8.0.0.tar.bz2 7795453
-MD5 11f91f2bf1697d7c8f340151208e0c3e postgresql-opt-8.0.0.tar.bz2 133317
-MD5 9deb6ac959e367cabe882d77287a6b31 postgresql-docs-8.0.0.tar.bz2 2195941
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.1 b/dev-db/postgresql/files/digest-postgresql-8.0.1
deleted file mode 100644
index f473b6015573..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b8f8edce5b29bcf785251693c6225885 postgresql-base-8.0.1.tar.bz2 7798118
-MD5 130474770b88fd059c2dff457fb06b0a postgresql-opt-8.0.1.tar.bz2 133466
-MD5 f51624e70b9fca4ebd6bb56ba8587b97 postgresql-docs-8.0.1.tar.bz2 2198650
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.1-r1 b/dev-db/postgresql/files/digest-postgresql-8.0.1-r1
deleted file mode 100644
index f473b6015573..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b8f8edce5b29bcf785251693c6225885 postgresql-base-8.0.1.tar.bz2 7798118
-MD5 130474770b88fd059c2dff457fb06b0a postgresql-opt-8.0.1.tar.bz2 133466
-MD5 f51624e70b9fca4ebd6bb56ba8587b97 postgresql-docs-8.0.1.tar.bz2 2198650
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.3 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.3
deleted file mode 100644
index f342ebfd2a47..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-# The PostgreSQL user is:
-PGUSER=postgres
-
-# LOG file is:
-PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
-
-# See the pg_autovacuum documentation for the details of how these
-# parameters affect pg_autovacuum's aggressiveness.
-
-VACUUM_BASE=1000
-VACUUM_SCALE=2
-
-SLEEP_BASE=300
-SLEEP_SCALE=2
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.5 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.5
deleted file mode 100644
index f342ebfd2a47..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-# The PostgreSQL user is:
-PGUSER=postgres
-
-# LOG file is:
-PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
-
-# See the pg_autovacuum documentation for the details of how these
-# parameters affect pg_autovacuum's aggressiveness.
-
-VACUUM_BASE=1000
-VACUUM_SCALE=2
-
-SLEEP_BASE=300
-SLEEP_SCALE=2
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.6 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.6
deleted file mode 100644
index f342ebfd2a47..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-# The PostgreSQL user is:
-PGUSER=postgres
-
-# LOG file is:
-PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
-
-# See the pg_autovacuum documentation for the details of how these
-# parameters affect pg_autovacuum's aggressiveness.
-
-VACUUM_BASE=1000
-VACUUM_SCALE=2
-
-SLEEP_BASE=300
-SLEEP_SCALE=2
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-8.0.0 b/dev-db/postgresql/files/pg_autovacuum.conf-8.0.0
deleted file mode 100644
index f342ebfd2a47..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.conf-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-# The PostgreSQL user is:
-PGUSER=postgres
-
-# LOG file is:
-PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
-
-# See the pg_autovacuum documentation for the details of how these
-# parameters affect pg_autovacuum's aggressiveness.
-
-VACUUM_BASE=1000
-VACUUM_SCALE=2
-
-SLEEP_BASE=300
-SLEEP_SCALE=2
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.3 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.3
deleted file mode 100644
index 1d584833fb5d..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.3
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.3,v 1.2 2004/07/14 21:42:29 agriffis Exp $
-
-depend() {
-	need postgresql logger
-}
-
-start() {
-	ebegin "Starting pg_autovacuum"
-	start-stop-daemon --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
-	sleep 1
-	pidof /usr/bin/pg_autovacuum > /dev/null
-	if [ $? -eq 0 ]; then
-		eend 0
-	else
-		eerror "Please see log file: $PG_AUTOVACUUM_LOG"
-		eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
-		eerror " stats_start_collector = true"
-		eerror " stats_row_level = true"
-
-		eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping pg_autovacuum"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
-	result=$?
-	eend $result
-}
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.5 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.5
deleted file mode 100644
index 74c38c832cb0..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.5
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.5,v 1.2 2004/10/02 23:57:49 nakano Exp $
-
-depend() {
-	need postgresql logger
-}
-
-start() {
-	ebegin "Starting pg_autovacuum"
-	echo ""
-	echo -n "Waiting max. 10 sec. for postgresql to start "
-	CONTINUE=0
-	TOO_LONG=0
-	while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ]
-	do
-		psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null
-		if [ "$?" -eq 0 ]
-		then
-			CONTINUE=1
-		else
-			echo -n "."
-			TOO_LONG=`expr $TOO_LONG + 1`
-			sleep 1
-		fi
-	done
-	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
-
-	sleep 1
-	pidof /usr/bin/pg_autovacuum > /dev/null
-	if [ $? -eq 0 ]; then
-		eend 0
-	else
-		eerror ""
-		eerror "Please see log file: $PG_AUTOVACUUM_LOG"
-		eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
-		eerror " stats_start_collector = true"
-		eerror " stats_row_level = true"
-
-		eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping pg_autovacuum"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
-	result=$?
-	eend $result
-}
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.6 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.6
deleted file mode 100644
index 6d48f6cc8c7c..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.6
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.6,v 1.1 2004/10/24 17:15:22 nakano Exp $
-
-depend() {
-	need postgresql logger
-}
-
-start() {
-	ebegin "Starting pg_autovacuum"
-	echo ""
-	echo -n "Waiting max. 10 sec. for postgresql to start "
-	CONTINUE=0
-	TOO_LONG=0
-	while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ]
-	do
-		psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null
-		if [ "$?" -eq 0 ]
-		then
-			CONTINUE=1
-		else
-			echo -n "."
-			TOO_LONG=`expr $TOO_LONG + 1`
-			sleep 1
-		fi
-	done
-	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
-
-	sleep 1
-	pidof /usr/bin/pg_autovacuum > /dev/null
-	if [ $? -eq 0 ]; then
-		eend 0
-	else
-		eerror ""
-		eerror "Please see log file: $PG_AUTOVACUUM_LOG"
-		eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
-		eerror " stats_start_collector = true"
-		eerror " stats_row_level = true"
-
-		eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping pg_autovacuum"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
-	result=$?
-	eend $result
-}
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0.0 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.0
deleted file mode 100644
index ed8a329a64d2..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.init-8.0.0
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.0,v 1.1 2005/01/19 13:47:14 nakano Exp $
-
-depend() {
-	need postgresql logger
-}
-
-start() {
-	ebegin "Starting pg_autovacuum"
-	echo ""
-	echo -n "Waiting max. 10 sec. for postgresql to start "
-	CONTINUE=0
-	TOO_LONG=0
-	while [ "$CONTINUE" -eq 0 ] && [ $TOO_LONG -lt 10 ]
-	do
-		psql -U $PGUSER -d template1 -c "SELECT 1" 1> /dev/null 2> /dev/null
-		if [ "$?" -eq 0 ]
-		then
-			CONTINUE=1
-		else
-			echo -n "."
-			TOO_LONG=`expr $TOO_LONG + 1`
-			sleep 1
-		fi
-	done
-	start-stop-daemon -o --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
-
-	sleep 1
-	pidof /usr/bin/pg_autovacuum > /dev/null
-	if [ $? -eq 0 ]; then
-		eend 0
-	else
-		eerror ""
-		eerror "Please see log file: $PG_AUTOVACUUM_LOG"
-		eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
-		eerror " stats_start_collector = true"
-		eerror " stats_row_level = true"
-
-		eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
-		eend 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping pg_autovacuum"
-	start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
-	result=$?
-	eend $result
-}
diff --git a/dev-db/postgresql/files/postgresql-7.3.7-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3.7-gentoo.patch
deleted file mode 100644
index 0b54f6d33b41..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.7-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru postgresql-7.3.7.org/configure postgresql-7.3.7/configure
---- postgresql-7.3.7.org/configure	2004-08-15 01:51:58.000000000 +0100
-+++ postgresql-7.3.7/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.7-tempfile.patch b/dev-db/postgresql/files/postgresql-7.3.7-tempfile.patch
deleted file mode 100644
index 0dad790220b7..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.7-tempfile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur postgresql-7.3.7.orig/contrib/findoidjoins/make_oidjoins_check postgresql-7.3.7/contrib/findoidjoins/make_oidjoins_check
---- postgresql-7.3.7.orig/contrib/findoidjoins/make_oidjoins_check	2002-09-05 21:57:32.000000000 +0200
-+++ postgresql-7.3.7/contrib/findoidjoins/make_oidjoins_check	2004-09-20 11:51:39.000000000 +0200
-@@ -10,27 +10,35 @@
- # Caution: you may need to use GNU awk.
- AWK=${AWK:-awk}
- 
--trap "rm -f /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
-+TMP=
-+TMPA=
-+TMPB=
-+trap 'rm -f -- "$TMP" "$TMPA" "$TMPB"' EXIT
-+trap 'trap - EXIT; rm -f -- "$TMP" "$TMPA" "$TMPB"; exit 1' HUP INT QUIT TERM
-+
-+TMP=`mktemp -t oidjoins.XXXXXX` || exit 1
-+TMPA=`mktemp -t oidjoins.a.XXXXXX` || exit 1
-+TMPB=`mktemp -t oidjoins.b.XXXXXX` || exit 1
- 
- # Read input
--cat "$@" >/tmp/$$
-+cat "$@" > $TMP
- 
- # Look for fields with multiple references.
--cat /tmp/$$ | cut -d' ' -f2 | sort | uniq -d >/tmp/$$a
--if [ -s /tmp/$$a ] ; then
-+cat $TMP | cut -d' ' -f2 | sort | uniq -d > $TMPA
-+if [ -s $TMPA ] ; then
- 	echo "Ignoring these fields that link to multiple tables:" 1>&2
--	cat /tmp/$$a 1>&2
-+	cat $TMPA 1>&2
- fi
- 
- # Get the non-multiply-referenced fields.
--cat /tmp/$$ | while read LINE
-+cat $TMP | while read LINE
- do
- 	set -- $LINE
--	grep "^$2\$" /tmp/$$a >/dev/null 2>&1 || echo $LINE
--done >/tmp/$$b
-+	grep "^$2\$" $TMPA >/dev/null 2>&1 || echo $LINE
-+done > $TMPB
- 
- # Generate the output.
--cat /tmp/$$b |
-+cat $TMPB |
- $AWK -F'[ \.]' '\
- 	BEGIN \
- 	{
diff --git a/dev-db/postgresql/files/postgresql-7.3.8-gentoo.patch b/dev-db/postgresql/files/postgresql-7.3.8-gentoo.patch
deleted file mode 100644
index db5083f945a7..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.8-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naru postgresql-7.3.8.org/configure postgresql-7.3.8/configure
---- postgresql-7.3.8.org/configure	2004-08-15 01:51:58.000000000 +0100
-+++ postgresql-7.3.8/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.4.3-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.3-gentoo.patch
deleted file mode 100644
index 584100e72b4d..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.3-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naru postgresql-7.4.3/src/bin/initdb/initdb.sh postgresql-7.4.3.new/src/bin/initdb/initdb.sh
---- postgresql-7.4.3/src/bin/initdb/initdb.sh	2003-10-13 22:06:44.000000000 +0100
-+++ postgresql-7.4.3.new/src/bin/initdb/initdb.sh	2003-12-25 01:08:12.000000000 +0000
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo "    $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--#  process writing to the terminal.)
--echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo "    /etc/init.d/postgresql start"
- echo
- 
- exit 0
diff --git a/dev-db/postgresql/files/postgresql-7.4.3-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.3-hppa-testandset.patch
deleted file mode 100644
index 010a42a4088e..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.3-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
---- postgresql-7.4.1.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.1/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.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
---- postgresql-7.4.1.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.1/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.3-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.3-vacuum-delay.patch
deleted file mode 100644
index e0f499859009..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.3-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.5-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.5-gentoo.patch
deleted file mode 100644
index 5cea3a0c5ecb..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.5-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naru postgresql-7.4.5/src/bin/initdb/initdb.sh postgresql-7.4.5.new/src/bin/initdb/initdb.sh
---- postgresql-7.4.5/src/bin/initdb/initdb.sh	2003-10-13 22:06:44.000000000 +0100
-+++ postgresql-7.4.5.new/src/bin/initdb/initdb.sh	2003-12-25 01:08:12.000000000 +0000
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo "    $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--#  process writing to the terminal.)
--echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo "    /etc/init.d/postgresql start"
- echo
- 
- exit 0
diff --git a/dev-db/postgresql/files/postgresql-7.4.5-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.5-hppa-testandset.patch
deleted file mode 100644
index 010a42a4088e..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.5-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
---- postgresql-7.4.1.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.1/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.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
---- postgresql-7.4.1.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.1/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.5-r1-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.5-r1-gentoo.patch
deleted file mode 100644
index f07124e905c3..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.5-r1-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naru postgresql-7.4.5.org/configure postgresql-7.4.5/configure
---- postgresql-7.4.5.org/configure	2004-08-18 04:11:24.000000000 +0100
-+++ postgresql-7.4.5/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.5.org/src/bin/initdb/initdb.sh postgresql-7.4.5/src/bin/initdb/initdb.sh
---- postgresql-7.4.5.org/src/bin/initdb/initdb.sh	2004-05-05 17:09:56.000000000 +0100
-+++ postgresql-7.4.5/src/bin/initdb/initdb.sh	2004-09-15 20:28:35.507026977 +0100
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo "    $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--#  process writing to the terminal.)
--echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo "    /etc/init.d/postgresql start"
- echo
- 
- exit 0
diff --git a/dev-db/postgresql/files/postgresql-7.4.5-tempfile.patch b/dev-db/postgresql/files/postgresql-7.4.5-tempfile.patch
deleted file mode 100644
index e541efd0c270..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.5-tempfile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur postgresql-7.4.5.orig/contrib/findoidjoins/make_oidjoins_check postgresql-7.4.5/contrib/findoidjoins/make_oidjoins_check
---- postgresql-7.4.5.orig/contrib/findoidjoins/make_oidjoins_check	2002-09-05 21:57:32.000000000 +0200
-+++ postgresql-7.4.5/contrib/findoidjoins/make_oidjoins_check	2004-09-20 11:51:39.000000000 +0200
-@@ -10,27 +10,35 @@
- # Caution: you may need to use GNU awk.
- AWK=${AWK:-awk}
- 
--trap "rm -f /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
-+TMP=
-+TMPA=
-+TMPB=
-+trap 'rm -f -- "$TMP" "$TMPA" "$TMPB"' EXIT
-+trap 'trap - EXIT; rm -f -- "$TMP" "$TMPA" "$TMPB"; exit 1' HUP INT QUIT TERM
-+
-+TMP=`mktemp -t oidjoins.XXXXXX` || exit 1
-+TMPA=`mktemp -t oidjoins.a.XXXXXX` || exit 1
-+TMPB=`mktemp -t oidjoins.b.XXXXXX` || exit 1
- 
- # Read input
--cat "$@" >/tmp/$$
-+cat "$@" > $TMP
- 
- # Look for fields with multiple references.
--cat /tmp/$$ | cut -d' ' -f2 | sort | uniq -d >/tmp/$$a
--if [ -s /tmp/$$a ] ; then
-+cat $TMP | cut -d' ' -f2 | sort | uniq -d > $TMPA
-+if [ -s $TMPA ] ; then
- 	echo "Ignoring these fields that link to multiple tables:" 1>&2
--	cat /tmp/$$a 1>&2
-+	cat $TMPA 1>&2
- fi
- 
- # Get the non-multiply-referenced fields.
--cat /tmp/$$ | while read LINE
-+cat $TMP | while read LINE
- do
- 	set -- $LINE
--	grep "^$2\$" /tmp/$$a >/dev/null 2>&1 || echo $LINE
--done >/tmp/$$b
-+	grep "^$2\$" $TMPA >/dev/null 2>&1 || echo $LINE
-+done > $TMPB
- 
- # Generate the output.
--cat /tmp/$$b |
-+cat $TMPB |
- $AWK -F'[ \.]' '\
- 	BEGIN \
- 	{
diff --git a/dev-db/postgresql/files/postgresql-7.4.5-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.5-vacuum-delay.patch
deleted file mode 100644
index e0f499859009..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.5-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.6-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.6-gentoo.patch
deleted file mode 100644
index e9b2ae48d5fa..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.6-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naru postgresql-7.4.6.org/configure postgresql-7.4.6/configure
---- postgresql-7.4.6.org/configure	2004-08-18 04:11:24.000000000 +0100
-+++ postgresql-7.4.6/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.6.org/src/bin/initdb/initdb.sh postgresql-7.4.6/src/bin/initdb/initdb.sh
---- postgresql-7.4.6.org/src/bin/initdb/initdb.sh	2004-05-05 17:09:56.000000000 +0100
-+++ postgresql-7.4.6/src/bin/initdb/initdb.sh	2004-09-15 20:28:35.507026977 +0100
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo "    $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--#  process writing to the terminal.)
--echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo "    /etc/init.d/postgresql start"
- echo
- 
- exit 0
diff --git a/dev-db/postgresql/files/postgresql-7.4.6-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.6-hppa-testandset.patch
deleted file mode 100644
index 010a42a4088e..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.6-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
---- postgresql-7.4.1.orig/src/include/port/linux.h	2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.1/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.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
---- postgresql-7.4.1.orig/src/include/storage/s_lock.h	2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.1/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.6-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.6-vacuum-delay.patch
deleted file mode 100644
index e0f499859009..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.6-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-8.0.0-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.0-gentoo.patch
deleted file mode 100644
index ea2ae4d5fef2..000000000000
--- a/dev-db/postgresql/files/postgresql-8.0.0-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naru postgresql-8.0.0.org/src/bin/initdb/initdb.c postgresql-8.0.0/src/bin/initdb/initdb.c
---- postgresql-8.0.0.org/src/bin/initdb/initdb.c	2004-11-29 03:05:03.000000000 +0000
-+++ postgresql-8.0.0/src/bin/initdb/initdb.c	2004-12-04 18:02:43.757485824 +0000
-@@ -2617,13 +2617,7 @@
- 	get_parent_directory(bin_dir);
- 	
- 	printf(_("\nSuccess. You can now start the database server using:\n\n"
--			 "    %s%s%s%spostmaster -D %s%s%s\n"
--			 "or\n"
--			 "    %s%s%s%spg_ctl -D %s%s%s -l logfile start\n\n"),
--	  QUOTE_PATH, bin_dir, QUOTE_PATH, (strlen(bin_dir) > 0) ? DIR_SEP : "",
--	  QUOTE_PATH, pg_data_native, QUOTE_PATH,
--	  QUOTE_PATH, bin_dir, QUOTE_PATH, (strlen(bin_dir) > 0) ? DIR_SEP : "",
--	  QUOTE_PATH, pg_data_native, QUOTE_PATH);
-+		   "/etc/init.d/postgresql start\n\n"));
- 
- 	return 0;
- }
diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.3 b/dev-db/postgresql/files/postgresql.conf-7.4.3
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-7.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.5 b/dev-db/postgresql/files/postgresql.conf-7.4.5
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-7.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.6 b/dev-db/postgresql/files/postgresql.conf-7.4.6
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-7.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.conf-8.0.0 b/dev-db/postgresql/files/postgresql.conf-8.0.0
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.6 b/dev-db/postgresql/files/postgresql.init-7.3.6
deleted file mode 100644
index 28abd14ed647..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.3.6
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.6,v 1.2 2004/07/14 21:42:29 agriffis Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.7 b/dev-db/postgresql/files/postgresql.init-7.3.7
deleted file mode 100644
index 18058fa3287f..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.3.7
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.7,v 1.1 2004/08/21 16:12:27 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.8 b/dev-db/postgresql/files/postgresql.init-7.3.8
deleted file mode 100644
index c69a0d13cacb..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.3.8
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.8,v 1.1 2004/10/24 17:15:22 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.3 b/dev-db/postgresql/files/postgresql.init-7.4.3
deleted file mode 100644
index e953918f59d8..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.4.3
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.3,v 1.2 2004/07/14 21:42:29 agriffis Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.5 b/dev-db/postgresql/files/postgresql.init-7.4.5
deleted file mode 100644
index ecaa6a7c3258..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.4.5
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.5,v 1.1 2004/08/21 16:12:27 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.6 b/dev-db/postgresql/files/postgresql.init-7.4.6
deleted file mode 100644
index 117d28356f52..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.4.6
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.6,v 1.1 2004/10/24 17:15:22 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/files/postgresql.init-8.0.0 b/dev-db/postgresql/files/postgresql.init-8.0.0
deleted file mode 100644
index fb1f14117ac6..000000000000
--- a/dev-db/postgresql/files/postgresql.init-8.0.0
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.0,v 1.1 2004/08/10 16:01:30 nakano Exp $
-
-opts="${opts} reload"
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [ ! -d $PGDATA ]; then
-		eerror "directory not found: $PGDATA"
-		eerror "You should create PGDATA directory first."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-	if [ -f $PGDATA/postmaster.pid ]; then
-		rm $PGDATA/postmaster.pid
-	fi
-	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
-	while :
-	do
-		cnt=$(($cnt + 1))
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			ret=0
-			break
-		fi
-
-		if [ $cnt -eq 30 ]; then
-			eerror "Please see log file: $PGLOG"
-			ret=1
-			break
-		fi
-		sleep 1
-	done
-	eend $ret
-}
-
-stop() {
-	ebegin "Stopping PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting PostgreSQL"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
-	eend $?
-}
diff --git a/dev-db/postgresql/postgresql-7.3.6-r1.ebuild b/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
deleted file mode 100644
index a8333c94ed1d..000000000000
--- a/dev-db/postgresql/postgresql-7.3.6-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6-r1.ebuild,v 1.9 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit flag-o-matic java-pkg
-
-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="x86 ppc sparc alpha amd64 hppa ia64 mips"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib selinux"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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})."
-			die
-		fi
-	fi
-}
-
-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} || die
-	cd ${S} || die
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${P} \
-		--libdir=/usr/lib \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=1024 \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-}
-
-src_install() {
-	addwrite "/usr/share/man/man3/Pg.3pm"
-
-	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} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	cd ${S}
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	dodoc contrib/adddepend/*
-
-	if use java; then
-		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf postgresql || die
-
-	keepdir /var/lib/postgresql
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	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})."
-			die
-		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
-		sudo -u postgres /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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.3.7-r2.ebuild b/dev-db/postgresql/postgresql-7.3.7-r2.ebuild
deleted file mode 100644
index d7e8ca258c4b..000000000000
--- a/dev-db/postgresql/postgresql-7.3.7-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.7-r2.ebuild,v 1.10 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="x86 ppc sparc alpha amd64 hppa ia64 ~mips"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib selinux"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-tempfile.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--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/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
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf postgresql || die
-
-	keepdir /var/lib/postgresql
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.3.8.ebuild b/dev-db/postgresql/postgresql-7.3.8.ebuild
deleted file mode 100644
index ce76da53e22c..000000000000
--- a/dev-db/postgresql/postgresql-7.3.8.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.8.ebuild,v 1.5 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--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/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
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf postgresql || die
-
-	keepdir /var/lib/postgresql
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.3.9.ebuild b/dev-db/postgresql/postgresql-7.3.9.ebuild
deleted file mode 100644
index a9a53b97eb31..000000000000
--- a/dev-db/postgresql/postgresql-7.3.9.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.9.ebuild,v 1.3 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="x86 ~ppc sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
-
-DEPEND="virtual/libc
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	readline? ( >=sys-libs/readline-4.1 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--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/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
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf postgresql || die
-
-	keepdir /var/lib/postgresql
-}
-
-pkg_postinst() {
-	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-	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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.3-r1.ebuild b/dev-db/postgresql/postgresql-7.4.3-r1.ebuild
deleted file mode 100644
index ad785720e3e5..000000000000
--- a/dev-db/postgresql/postgresql-7.4.3-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.3-r1.ebuild,v 1.12 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-P_HIERPG="hier-Pg7.4-0.5.2"
-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? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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"
-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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$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/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
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.3.ebuild b/dev-db/postgresql/postgresql-7.4.3.ebuild
deleted file mode 100644
index 3fd358010e9b..000000000000
--- a/dev-db/postgresql/postgresql-7.4.3.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.3.ebuild,v 1.10 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-P_HIERPG="hier-Pg7.4-0.5.2"
-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? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	app-admin/sudo
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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"
-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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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/lib \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$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/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} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	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
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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=134217728 # 128M
-
-		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
-		sudo -u postgres /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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.5-r1.ebuild b/dev-db/postgresql/postgresql-7.4.5-r1.ebuild
deleted file mode 100644
index f8b8ffe7510b..000000000000
--- a/dev-db/postgresql/postgresql-7.4.5-r1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5-r1.ebuild,v 1.6 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="~x86 ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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"
-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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-${PR}-gentoo.patch
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$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/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
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.5-r2.ebuild b/dev-db/postgresql/postgresql-7.4.5-r2.ebuild
deleted file mode 100644
index 91eeea7bdffc..000000000000
--- a/dev-db/postgresql/postgresql-7.4.5-r2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5-r2.ebuild,v 1.14 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="x86 ppc sparc ~mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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"
-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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-r1-gentoo.patch
-	epatch ${FILESDIR}/${P}-tempfile.patch
-
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$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/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
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.5.ebuild b/dev-db/postgresql/postgresql-7.4.5.ebuild
deleted file mode 100644
index 6e914683b678..000000000000
--- a/dev-db/postgresql/postgresql-7.4.5.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.5.ebuild,v 1.11 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-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="x86 ppc sparc ~mips alpha ~arm hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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"
-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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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"
-
-	# 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/lib \
-		--includedir=/usr/include/postgresql/pgsql \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$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/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
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.6.ebuild b/dev-db/postgresql/postgresql-7.4.6.ebuild
deleted file mode 100644
index f0e433dbe9aa..000000000000
--- a/dev-db/postgresql/postgresql-7.4.6.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.6.ebuild,v 1.12 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-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="x86 ~ppc sparc ~mips alpha ~arm hppa amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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 )
-	xml2? ( 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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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 )
-	xml2? ( 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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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 xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && 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-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-	if use xml2; then
-		make -C xml || 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 xml2; 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 || die
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-7.4.7.ebuild b/dev-db/postgresql/postgresql-7.4.7.ebuild
deleted file mode 100644
index 83eb6b13a346..000000000000
--- a/dev-db/postgresql/postgresql-7.4.7.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7.ebuild,v 1.6 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
-
-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="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
-
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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 )
-	xml2? ( 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
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=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 )
-	xml2? ( 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
-}
-
-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} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-
-	if use pg-hier; then
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-hppa-testandset.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if use java; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && 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 xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && 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-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-	if use xml2; then
-		make -C xml || 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 xml2; 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 || die
-	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 || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${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 "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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 "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."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-8.0.0.ebuild b/dev-db/postgresql/postgresql-8.0.0.ebuild
deleted file mode 100644
index a5394361f01b..000000000000
--- a/dev-db/postgresql/postgresql-8.0.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.0.ebuild,v 1.3 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-#P_HIERPG="hier-Pg7.4-0.5.2"
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-SRC_URI="mirror://postgresql/source/v8.0.0/${PN}-base-${MY_PV}.tar.bz2
-	mirror://postgresql/source/v8.0.0/${PN}-opt-${MY_PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v8.0.0/${PN}-docs-${MY_PV}.tar.bz2 )"
-#	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux"
-
-S=${WORKDIR}/${MY_P}
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/libc
-	app-admin/sudo
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 )
-	selinux? ( sec-policy/selinux-postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( 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 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
-			eerror "Postgres ${MY_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
-}
-
-src_unpack() {
-	unpack ${A} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	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"
-
-	# 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} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-	if use xml2; then
-		cd xml2
-		make || 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} LIBDIR=${D}/usr/lib install || die
-#	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
-		cd ${S}/contrib/xml2
-		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	fi
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	fi
-	dodoc README HISTORY COPYRIGHT INSTALL
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || die
-	newins ${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
-		einfo ""
-		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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
-		eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		exit 1
-	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=134217728 # 128M
-
-		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
-		sudo -u postgres /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
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-8.0.1-r1.ebuild b/dev-db/postgresql/postgresql-8.0.1-r1.ebuild
deleted file mode 100644
index f7fed0462d6c..000000000000
--- a/dev-db/postgresql/postgresql-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r1.ebuild,v 1.3 2005/03/09 08:15:33 eradicator Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-#P_HIERPG="hier-Pg7.4-0.5.2"
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
-	mirror://postgresql/source/v${PV}/${PN}-opt-${MY_PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${MY_PV}.tar.bz2 )"
-#	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux"
-
-S=${WORKDIR}/${MY_P}
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/libc
-	app-admin/sudo
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 )
-	selinux? ( sec-policy/selinux-postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( 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 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
-			eerror "Postgres ${MY_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
-}
-
-src_unpack() {
-	unpack ${A} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	cd ${S}
-	epatch ${FILESDIR}/${P}-securityfix.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	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"
-
-	# 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} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		--with-gnu-ld \
-		--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 xml2; then
-		cd xml2
-		make 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} LIBDIR=${D}/usr/lib install || die
-#	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
-		cd ${S}/contrib/xml2
-		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	fi
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	fi
-	dodoc README HISTORY COPYRIGHT INSTALL
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || die
-	newins ${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
-		einfo ""
-		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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
-		eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		exit 1
-	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=134217728 # 128M
-
-		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
-		sudo -u postgres /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
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-8.0.1-r2.ebuild b/dev-db/postgresql/postgresql-8.0.1-r2.ebuild
index 8c32ee0e70cd..f92a077bcf6a 100644
--- a/dev-db/postgresql/postgresql-8.0.1-r2.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r2.ebuild,v 1.8 2005/04/12 01:01:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r2.ebuild,v 1.9 2005/04/12 15:47:39 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -154,12 +154,12 @@ src_install() {
 
 	cd ${S}
 	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
+	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
 	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
 	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
 
 	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || die
+	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
 	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
 }
 
diff --git a/dev-db/postgresql/postgresql-8.0.1.ebuild b/dev-db/postgresql/postgresql-8.0.1.ebuild
deleted file mode 100644
index 8ac0d2b0ef48..000000000000
--- a/dev-db/postgresql/postgresql-8.0.1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1.ebuild,v 1.2 2005/02/24 20:59:32 kaiowas Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-HOMEPAGE="http://www.postgresql.org/"
-#P_HIERPG="hier-Pg7.4-0.5.2"
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
-	mirror://postgresql/source/v${PV}/${PN}-opt-${MY_PV}.tar.bz2
-	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${MY_PV}.tar.bz2 )"
-#	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux"
-
-S=${WORKDIR}/${MY_P}
-DEPEND="virtual/libc
-	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 )
-	tcltk? ( >=dev-lang/tcl-8 >=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 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/libc
-	app-admin/sudo
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( >=dev-lang/python-2.2 )
-	selinux? ( sec-policy/selinux-postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( 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 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
-			eerror "Postgres ${MY_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
-}
-
-src_unpack() {
-	unpack ${A} || die
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	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"
-
-	# 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} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		--with-gnu-ld \
-		--with-maxbackends=${MAX_CONNECTIONS} \
-		$myconf || die
-
-	make || die
-	cd contrib
-	make || die
-	if use xml2; then
-		cd xml2
-		make || 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} LIBDIR=${D}/usr/lib install || die
-#	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
-		cd ${S}/contrib/xml2
-		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	fi
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	fi
-	dodoc README HISTORY COPYRIGHT INSTALL
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
-	cd ${S}/doc
-	dodoc FAQ* README.* TODO bug.template
-	if use doc; then
-		cd ${S}/doc
-		docinto FAQ_html || die
-		dodoc src/FAQ/* || die
-		docinto sgml || die
-		dodoc src/sgml/*.{sgml,dsl} || die
-		docinto sgml/ref || die
-		dodoc src/sgml/ref/*.sgml || die
-		docinto TODO.detail || die
-		dodoc TODO.detail/* || die
-	fi
-
-	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || die
-	newins ${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
-		einfo ""
-		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
-		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
-		eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		exit 1
-	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=134217728 # 128M
-
-		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
-		sudo -u postgres /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
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-8.0.2.ebuild b/dev-db/postgresql/postgresql-8.0.2.ebuild
index 74fdf47c4b97..b977a894f903 100644
--- a/dev-db/postgresql/postgresql-8.0.2.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.2.ebuild,v 1.1 2005/04/12 11:32:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.2.ebuild,v 1.2 2005/04/12 15:47:39 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -154,12 +154,12 @@ src_install() {
 
 	cd ${S}
 	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
+	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
 	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
 	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
 
 	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || die
+	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
 	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
 }
author	Masatomo Nakano <nakano@gentoo.org>	2005-04-12 15:47:39 +0000
committer	Masatomo Nakano <nakano@gentoo.org>	2005-04-12 15:47:39 +0000
commit	f0bbcd4eed2e5ef4102dacdd644cbeba33755144 (patch)
tree	9cff24ac3a8d44772b58976350c5ce15cf0f27a1 /dev-db/postgresql
parent	preventive sylpheed-claws-gtk2 mask (diff)
download	historical-f0bbcd4eed2e5ef4102dacdd644cbeba33755144.tar.gz historical-f0bbcd4eed2e5ef4102dacdd644cbeba33755144.tar.bz2 historical-f0bbcd4eed2e5ef4102dacdd644cbeba33755144.zip