Fixed bug #39589 and cleanup old files.

21 files changed, 23 insertions, 1655 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 80601361e027..2c3013543ee5 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.84 2004/02/17 17:12:46 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.85 2004/02/23 19:43:06 nakano Exp $
+
+  23 Feb 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5-r1.ebuild,
+  postgresql-7.3.5-r2.ebuild, postgresql-7.3.5.ebuild,
+  postgresql-7.4.1-r1.ebuild, postgresql-7.4.1-r2.ebuild,
+  postgresql-7.4.1-r3.ebuild, postgresql-7.4.1-r4.ebuild,
+  postgresql-7.4.1.ebuild, files/postgresql-7.4-gentoo.patch,
+  files/postgresql.env-7.3.5, files/postgresql.env-7.4.1,
+  files/postgresql.init:
+  Fixed pg-hier bug for 7.4.1. Removed pg-hier patch from 7.3.5 because 
+  the patch doesn't apply against it. And cleanup unnecessary files.
+  This should fix #39589.
 
 *postgresql-7.4.1-r4 (17 Feb 2004)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9398f67b75d5..ad6a4c6616a6 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,17 +1,8 @@
-MD5 5dced1760ca8ba305cb6e37408e3f26a postgresql-7.3.5-r2.ebuild 8517
-MD5 ec5c3866f1c807df3d5a001f5fed2ab9 postgresql-7.4.1-r2.ebuild 8652
-MD5 105fabcd8accf9c0f533da136c767aa9 postgresql-7.4.1.ebuild 8276
-MD5 b9dfc557b3fc43a1afaef124b996b51d postgresql-7.3.5-r1.ebuild 8589
-MD5 e1188a1c01977a25f5c3f7e2f415129c postgresql-7.3.5.ebuild 8508
-MD5 03e948a526084a24e056486fd4624bd4 postgresql-7.4.1-r4.ebuild 8585
+MD5 595456a9d68f751ee63ce180bb9b4960 postgresql-7.3.5.ebuild 7899
+MD5 53317ccaa54a9c570fb6d0d525737eaa postgresql-7.4.1-r4.ebuild 8512
 MD5 7242b7bebfa1e8d11384bfb997ecda5b postgresql-7.3.4-r1.ebuild 8090
-MD5 418db21605309d5c0322b65bac9cf8c7 postgresql-7.4.1-r1.ebuild 8531
-MD5 9f6ee8c3259177c1542e363beacbd668 ChangeLog 14435
-MD5 840055700d7fd5c990c95344d785b034 postgresql-7.4.1-r3.ebuild 8581
+MD5 65d4b743933adb8a5e107d061b1f2468 ChangeLog 14997
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
-MD5 acdb60da191b0dc633560407ca7e172b files/postgresql.env-7.3.5 29
-MD5 acdb60da191b0dc633560407ca7e172b files/postgresql.env-7.4.1 29
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.1-vacuum-delay.patch 8918
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
 MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
@@ -19,16 +10,9 @@ MD5 05ffc90f9c6ccecdb66c97bfa6d57688 files/postgresql.init-7.3.4 1134
 MD5 836d8c4298884ecb970eae770a552833 files/postgresql.init-7.3.5 1134
 MD5 e27b4a15beaaa4e9ea42bc59972e60c9 files/postgresql.init-7.4.1 1133
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
-MD5 7b4771ec5dd5bcb3f47495cca2fb3482 files/digest-postgresql-7.3.5 288
-MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1 288
+MD5 6aa51ffe3edcbada285a86d4cab456de files/digest-postgresql-7.3.5 223
 MD5 9034af61e538ae850c2b3103158d492d files/pg_autovacuum.init-7.4.1 1090
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.1 302
 MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
-MD5 7b4771ec5dd5bcb3f47495cca2fb3482 files/digest-postgresql-7.3.5-r1 288
-MD5 7b4771ec5dd5bcb3f47495cca2fb3482 files/digest-postgresql-7.3.5-r2 288
-MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1-r1 288
-MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1-r2 288
-MD5 3f7fdc0edd471b911d75caf118d6b7e2 files/digest-postgresql-7.4.1-r3 288
 MD5 90d60bb0f7ce4dd379d1b3dc4c75a339 files/digest-postgresql-7.4.1-r4 290
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 73f424e9871dfda4943a980555cd66ee files/postgresql.init 919
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.5 b/dev-db/postgresql/files/digest-postgresql-7.3.5
index df4394a2c3a1..bf408c28c14d 100644
--- a/dev-db/postgresql/files/digest-postgresql-7.3.5
+++ b/dev-db/postgresql/files/digest-postgresql-7.3.5
@@ -1,4 +1,3 @@
 MD5 071efb8cee72a62b4f0da478df39f08d postgresql-base-7.3.5.tar.bz2 5645560
 MD5 d106ee6a4b0fb1d63eb51525ee8faed6 postgresql-opt-7.3.5.tar.bz2 340898
 MD5 7354a7c9cc5f1203586131e454df270e postgresql-docs-7.3.5.tar.bz2 2336586
-MD5 0081cb994e22f6af83f1984fdaeed16e hier-Pg7.3-0.4.tar.gz 33264
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.5-r1 b/dev-db/postgresql/files/digest-postgresql-7.3.5-r1
deleted file mode 100644
index df4394a2c3a1..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.5-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 071efb8cee72a62b4f0da478df39f08d postgresql-base-7.3.5.tar.bz2 5645560
-MD5 d106ee6a4b0fb1d63eb51525ee8faed6 postgresql-opt-7.3.5.tar.bz2 340898
-MD5 7354a7c9cc5f1203586131e454df270e postgresql-docs-7.3.5.tar.bz2 2336586
-MD5 0081cb994e22f6af83f1984fdaeed16e hier-Pg7.3-0.4.tar.gz 33264
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.5-r2 b/dev-db/postgresql/files/digest-postgresql-7.3.5-r2
deleted file mode 100644
index df4394a2c3a1..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.3.5-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 071efb8cee72a62b4f0da478df39f08d postgresql-base-7.3.5.tar.bz2 5645560
-MD5 d106ee6a4b0fb1d63eb51525ee8faed6 postgresql-opt-7.3.5.tar.bz2 340898
-MD5 7354a7c9cc5f1203586131e454df270e postgresql-docs-7.3.5.tar.bz2 2336586
-MD5 0081cb994e22f6af83f1984fdaeed16e hier-Pg7.3-0.4.tar.gz 33264
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.1 b/dev-db/postgresql/files/digest-postgresql-7.4.1
deleted file mode 100644
index a972fa33ab5e..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6a608caae10fb1d90bf3c7bdcc56b876 postgresql-base-7.4.1.tar.bz2 6407883
-MD5 5c2c63741d9c7a4168b29e4b4439b0c7 postgresql-opt-7.4.1.tar.bz2 329268
-MD5 c1ed614b482df37fa0b174b3f3839752 postgresql-docs-7.4.1.tar.bz2 2381553
-MD5 d9f4cf61cd53ca84e9163f986bfbf2a9 hier-Pg7.4-0.3.tar.gz 28392
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.1-r1 b/dev-db/postgresql/files/digest-postgresql-7.4.1-r1
deleted file mode 100644
index a972fa33ab5e..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6a608caae10fb1d90bf3c7bdcc56b876 postgresql-base-7.4.1.tar.bz2 6407883
-MD5 5c2c63741d9c7a4168b29e4b4439b0c7 postgresql-opt-7.4.1.tar.bz2 329268
-MD5 c1ed614b482df37fa0b174b3f3839752 postgresql-docs-7.4.1.tar.bz2 2381553
-MD5 d9f4cf61cd53ca84e9163f986bfbf2a9 hier-Pg7.4-0.3.tar.gz 28392
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.1-r2 b/dev-db/postgresql/files/digest-postgresql-7.4.1-r2
deleted file mode 100644
index a972fa33ab5e..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.1-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6a608caae10fb1d90bf3c7bdcc56b876 postgresql-base-7.4.1.tar.bz2 6407883
-MD5 5c2c63741d9c7a4168b29e4b4439b0c7 postgresql-opt-7.4.1.tar.bz2 329268
-MD5 c1ed614b482df37fa0b174b3f3839752 postgresql-docs-7.4.1.tar.bz2 2381553
-MD5 d9f4cf61cd53ca84e9163f986bfbf2a9 hier-Pg7.4-0.3.tar.gz 28392
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.1-r3 b/dev-db/postgresql/files/digest-postgresql-7.4.1-r3
deleted file mode 100644
index a972fa33ab5e..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.1-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 6a608caae10fb1d90bf3c7bdcc56b876 postgresql-base-7.4.1.tar.bz2 6407883
-MD5 5c2c63741d9c7a4168b29e4b4439b0c7 postgresql-opt-7.4.1.tar.bz2 329268
-MD5 c1ed614b482df37fa0b174b3f3839752 postgresql-docs-7.4.1.tar.bz2 2381553
-MD5 d9f4cf61cd53ca84e9163f986bfbf2a9 hier-Pg7.4-0.3.tar.gz 28392
diff --git a/dev-db/postgresql/files/postgresql-7.4-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4-gentoo.patch
deleted file mode 100644
index 575238564c77..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naru postgresql-7.4.org/src/bin/initdb/initdb.sh postgresql-7.4/src/bin/initdb/initdb.sh
---- postgresql-7.4.org/src/bin/initdb/initdb.sh	2003-10-13 22:06:44.000000000 +0100
-+++ postgresql-7.4/src/bin/initdb/initdb.sh	2003-11-20 14:50:18.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.env-7.3.5 b/dev-db/postgresql/files/postgresql.env-7.3.5
deleted file mode 100644
index 58f1aecd97f3..000000000000
--- a/dev-db/postgresql/files/postgresql.env-7.3.5
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/lib/postgresql"
diff --git a/dev-db/postgresql/files/postgresql.env-7.4.1 b/dev-db/postgresql/files/postgresql.env-7.4.1
deleted file mode 100644
index 58f1aecd97f3..000000000000
--- a/dev-db/postgresql/files/postgresql.env-7.4.1
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/lib/postgresql"
diff --git a/dev-db/postgresql/files/postgresql.init b/dev-db/postgresql/files/postgresql.init
deleted file mode 100644
index 3e47fc650dab..000000000000
--- a/dev-db/postgresql/files/postgresql.init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init,v 1.2 2004/02/13 19:26:31 vapier Exp $
-
-depend() {
-	need 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 postgres"
-	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'"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping postgres"
-	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
-	eend $?
-}
-
-svc_restart() {
-	ebegin "Restarting postgres"
-	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
-	eend $?
-}
diff --git a/dev-db/postgresql/postgresql-7.3.5-r1.ebuild b/dev-db/postgresql/postgresql-7.3.5-r1.ebuild
deleted file mode 100644
index 68b70040256f..000000000000
--- a/dev-db/postgresql/postgresql-7.3.5-r1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.5-r1.ebuild,v 1.1 2004/01/16 16:45:55 nakano Exp $
-
-DESCRIPTION="sophisticated Object-Relational DBMS"
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.3-0.4"
-HOMEPAGE="http://www.postgresql.org/ http://gppl.terminal.ru/index.eng.html"
-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 ~alpha ~amd64 ~hppa ~ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib pg-hier"
-
-DEPEND="virtual/glibc
-	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? ( !ppc? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
-	java? ( !amd64? ( >=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/glibc
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !ppc? ( >=dev-lang/python-2.2 ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	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
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		if [ "`use amd64`" ]; then
-			ewarn "Ignore USE=\"java\" in amd64"
-		fi
-	fi
-
-	if [ "`use python`" ]; then
-		if [ "`use ppc`" ]; then
-			ewarn "Ignore USE=\"python\" in ppc"
-		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
-	if [ "`use pg-hier`" ]; then
-		cd ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff || die
-	fi
-	cd ${S} || die
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && use ppc || myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	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} \
-		--includedir=/usr/include/postgresql \
-		--libdir=/usr/lib/postgresql \
-		--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/postgresql/:" \
-			${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/postgresql install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib/postgresql install || die
-	cd ${S}
-	if [ "`use pg-hier`" ]; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html
-	fi
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	dodoc contrib/adddepend/*
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	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
-
-	insinto /etc/env.d/
-	newins ${FILESDIR}/postgresql.env-${PV} 50postgresql || die
-}
-
-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, or /bin/true"
-	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
-}
-
-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.5-r2.ebuild b/dev-db/postgresql/postgresql-7.3.5-r2.ebuild
deleted file mode 100644
index faccf543c9a5..000000000000
--- a/dev-db/postgresql/postgresql-7.3.5-r2.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.5-r2.ebuild,v 1.1 2004/01/18 00:10:32 nakano Exp $
-
-DESCRIPTION="sophisticated Object-Relational DBMS"
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.3-0.4"
-HOMEPAGE="http://www.postgresql.org/ http://gppl.terminal.ru/index.eng.html"
-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 ~alpha ~amd64 ~hppa ~ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib pg-hier"
-
-DEPEND="virtual/glibc
-	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? ( !ppc? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
-	java? ( !amd64? ( >=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/glibc
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	tcltk? ( >=dev-lang/tcl-8 )
-	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !ppc? ( >=dev-lang/python-2.2 ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	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
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		if [ "`use amd64`" ]; then
-			ewarn "Ignore USE=\"java\" in amd64"
-		fi
-	fi
-
-	if [ "`use python`" ]; then
-		if [ "`use ppc`" ]; then
-			ewarn "Ignore USE=\"python\" in ppc"
-		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
-	if [ "`use pg-hier`" ]; then
-		cd ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff || die
-	fi
-	cd ${S} || die
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && use ppc || myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	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}
-	if [ "`use pg-hier`" ]; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html
-	fi
-	dodoc COPYRIGHT HISTORY INSTALL README register.txt
-	dodoc contrib/adddepend/*
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		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
-}
-
-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, or /bin/true"
-	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
-}
-
-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.5.ebuild b/dev-db/postgresql/postgresql-7.3.5.ebuild
index 8dac1833661f..26df2abce27c 100644
--- a/dev-db/postgresql/postgresql-7.3.5.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.5.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.5.ebuild,v 1.5 2004/01/07 00:01:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.5.ebuild,v 1.6 2004/02/23 19:43:06 nakano Exp $
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
 RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.3-0.4"
-HOMEPAGE="http://www.postgresql.org/ http://gppl.terminal.ru/index.eng.html"
+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 )
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
+	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib pg-hier"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib"
 
 DEPEND="virtual/glibc
 	sys-devel/autoconf
@@ -80,12 +78,6 @@ check_java_config() {
 
 src_unpack() {
 	unpack ${A} || die
-	if [ "`use pg-hier`" ]; then
-		cd ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff || die
-	fi
 	cd ${S} || die
 }
 
@@ -148,9 +140,6 @@ src_install() {
 	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
-	fi
 	dodoc COPYRIGHT HISTORY INSTALL README register.txt
 	dodoc contrib/adddepend/*
 
@@ -182,6 +171,8 @@ src_install() {
 
 	insinto /etc/conf.d/
 	newins ${FILESDIR}/postgresql.conf postgresql || die
+
+	keepdir /var/lib/postgresql
 }
 
 pkg_postinst() {
@@ -190,14 +181,6 @@ pkg_postinst() {
 	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, or /bin/true"
-	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
 }
 
 pkg_config() {
diff --git a/dev-db/postgresql/postgresql-7.4.1-r1.ebuild b/dev-db/postgresql/postgresql-7.4.1-r1.ebuild
deleted file mode 100644
index 191ea5b8f291..000000000000
--- a/dev-db/postgresql/postgresql-7.4.1-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r1.ebuild,v 1.4 2004/01/15 14:25:50 gmsoft Exp $
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.4-0.3"
-SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-HOMEPAGE="http://www.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=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? ( !amd64? ( >=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/glibc
-	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? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	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 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 ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	[ "${ARCH}" = "hppa" ] && epatch ${FILESDIR}/${P}-hppa-testandset.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	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"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--includedir=/usr/include/postgresql/pgsql \
-		--libdir=/usr/lib \
-		--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} 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
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	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
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
-}
-
-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, or /bin/true"
-	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
-}
-
-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
-		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.4.1-r2.ebuild b/dev-db/postgresql/postgresql-7.4.1-r2.ebuild
deleted file mode 100644
index c2aeaaedf590..000000000000
--- a/dev-db/postgresql/postgresql-7.4.1-r2.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r2.ebuild,v 1.1 2004/01/16 16:45:55 nakano Exp $
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.4-0.3"
-SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-HOMEPAGE="http://www.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=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? ( !amd64? ( >=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/glibc
-	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? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	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 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 ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	[ "${ARCH}" = "hppa" ] && epatch ${FILESDIR}/${P}-hppa-testandset.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	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"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--includedir=/usr/include/postgresql \
-		--libdir=/usr/lib/postgresql \
-		--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/postgresql:" \
-			${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/postgresql install || die
-	make DESTDIR=${D} install-all-headers || die
-	cd ${S}/contrib
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib/postgresql install || die
-	cd ${S}
-	if use pg-hier; then
-		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
-	fi
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-	fi
-
-	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
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
-
-	insinto /etc/env.d/
-	newins ${FILESDIR}/postgresql.env-${PV} 50postgresql || die
-}
-
-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, or /bin/true"
-	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
-}
-
-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
-		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.4.1-r3.ebuild b/dev-db/postgresql/postgresql-7.4.1-r3.ebuild
deleted file mode 100644
index 18b59b5c73d6..000000000000
--- a/dev-db/postgresql/postgresql-7.4.1-r3.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r3.ebuild,v 1.1 2004/01/18 00:10:32 nakano Exp $
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.4-0.3"
-SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-HOMEPAGE="http://www.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=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? ( !amd64? ( >=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/glibc
-	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? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	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 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 ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if use pg-vacuumdelay; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-
-	[ "${ARCH}" = "hppa" ] && epatch ${FILESDIR}/${P}-hppa-testandset.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	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"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/lib \
-		--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} 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
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		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
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
-}
-
-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, or /bin/true"
-	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
-}
-
-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
-		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.4.1-r4.ebuild b/dev-db/postgresql/postgresql-7.4.1-r4.ebuild
index 665a8ee12484..7b2470482919 100644
--- a/dev-db/postgresql/postgresql-7.4.1-r4.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r4.ebuild,v 1.1 2004/02/17 17:12:46 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r4.ebuild,v 1.2 2004/02/23 19:43:06 nakano Exp $
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 
@@ -72,8 +72,6 @@ src_unpack() {
 	unpack ${A} || die
 	epatch ${FILESDIR}/${P}-gentoo.patch
 	if use pg-hier; then
-		cd ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
 		cd ${S} || die
 		epatch ${WORKDIR}/${P_HIERPG}.diff
 	fi
diff --git a/dev-db/postgresql/postgresql-7.4.1.ebuild b/dev-db/postgresql/postgresql-7.4.1.ebuild
deleted file mode 100644
index 8eee086c9000..000000000000
--- a/dev-db/postgresql/postgresql-7.4.1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1.ebuild,v 1.3 2004/01/05 10:43:21 robbat2 Exp $
-
-DESCRIPTION="sophisticated Object-Relational DBMS."
-
-RESTRICT="nomirror"
-P_HIERPG="hier-Pg7.4-0.3"
-SRC_URI="mirror://postgresql/v${PV}/${PN}-base-${PV}.tar.bz2
-	mirror://postgresql/v${PV}/${PN}-opt-${PV}.tar.bz2
-	doc? ( mirror://postgresql/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
-
-HOMEPAGE="http://www.postgresql.org/"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime"
-
-DEPEND="virtual/glibc
-	sys-devel/autoconf
-	app-admin/sudo
-	>=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? ( !amd64? ( >=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/glibc
-	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? ( !amd64? ( >=virtual/jdk-1.3* ) )
-	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 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 ${WORKDIR} || die
-		mv readme.html README-${P_HIERPG}.html || die
-		cd ${S} || die
-		epatch ${WORKDIR}/${P_HIERPG}.diff
-	fi
-
-	if [ "`use pg-vacuumdelay`" ]; then
-		cd ${S} || die
-		epatch ${FILESDIR}/${P}-vacuum-delay.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		check_java_config
-	fi
-
-	local myconf
-	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
-	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
-	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"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/lib \
-		--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} 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
-	dodoc contrib/adddepend/*
-
-	exeinto /usr/bin
-
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		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
-	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
-
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
-	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
-}
-
-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, or /bin/true"
-}
-
-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
-		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
-}