Added ebuilds separated libpq version, which are still in package.mask.

Package-Manager: portage-2.0.51.21-r1

8 files changed, 558 insertions, 42 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 1f0c3df25c40..7253cb07564a 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,15 @@
 # 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.212 2005/05/07 20:29:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.213 2005/05/08 20:39:27 nakano Exp $
+
+*postgresql-8.0.2-r2 (08 May 2005)
+*postgresql-8.0.1-r4 (08 May 2005)
+
+  08 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.1-gentoo-libpq.patch,
+  +files/postgresql-8.0.2-gentoo-libpq.patch, +postgresql-8.0.1-r4.ebuild,
+  +postgresql-8.0.2-r2.ebuild:
+  Added ebuilds separated libpq version, which are still in package.mask.
 
   07 May 2005; Bryan Østergaard <kloeri@gentoo.org>
   postgresql-8.0.1-r3.ebuild:
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 644c6d0b1845..de2c9020d531 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,55 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078
-MD5 0b70c546fd4986361ee6a065538c189a postgresql-8.0.1-r3.ebuild 7784
-MD5 17a0224a6605fa4ea98509b509191385 ChangeLog 39700
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 3ccd9f609f0cdc19cb5d5472d05e832d postgresql-8.0.2-r1.ebuild 7870
-MD5 b97f1ff215bab634316e5cf9cee6598e postgresql-7.3.6-r2.ebuild 7869
 MD5 7c4985fe29bbff02173bccc94a3fafcb postgresql-8.0.2.ebuild 7718
+MD5 0b70c546fd4986361ee6a065538c189a postgresql-8.0.1-r3.ebuild 7784
 MD5 7df0eb9c1b199df87cf6a16309fdba7c postgresql-7.4.7-r1.ebuild 10750
+MD5 bd15f7a4d1815ff8cef137d222d4abfb postgresql-8.0.2-r2.ebuild 8025
+MD5 1bf725f1e46685699f62d97f7ca0e821 postgresql-7.3.9-r1.ebuild 8078
 MD5 461bda3ff314acce4f6a587a61864385 postgresql-8.0.1-r2.ebuild 7633
+MD5 3ccd9f609f0cdc19cb5d5472d05e832d postgresql-8.0.2-r1.ebuild 7870
+MD5 abeae77f27d0a2bb20950d3593927b8a postgresql-8.0.1-r4.ebuild 7946
 MD5 019be9f5f95384b8ba2f79fce882a3e1 postgresql-7.4.7-r2.ebuild 10901
-MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
+MD5 b97f1ff215bab634316e5cf9cee6598e postgresql-7.3.6-r2.ebuild 7869
+MD5 1000e19a432b68bfeb67ccae90d57e77 ChangeLog 40049
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698
-MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.2 390
-MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
 MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
-MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
-MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
-MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
-MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
+MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843
+MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r2 293
+MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293
+MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r4 293
 MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2-r1 223
+MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2-r2 223
+MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279
+MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
+MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
+MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
 MD5 707bbfd80773f0874ff6ea36822166ec files/postgresql.init-8.0.2 1279
-MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 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 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2 223
+MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 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.7 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 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
+MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
 MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
-MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r2 293
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
-MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
 MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
-MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
-MD5 9ba8eab19589a7ab8044a83fca22e928 files/digest-postgresql-8.0.2 223
-MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279
-MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfSUmKf2g/qXtneoRAmKzAKCbafU9Zo+b5hCa84OnrUJ96o3PAwCgkKMu
-YKNIA/VGzDUdNyRY+ooyUPA=
-=X2GY
------END PGP SIGNATURE-----
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
+MD5 ce87d1ddcbede115933804b0e0b93a50 files/postgresql-8.0.1-gentoo-libpq.patch 411
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
+MD5 4a1ecc271a25ae471af1159e702e258c files/postgresql-8.0.2-gentoo-libpq.patch 411
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.1-r4 b/dev-db/postgresql/files/digest-postgresql-8.0.1-r4
new file mode 100644
index 000000000000..ac51ef3dcc05
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.1-r4
@@ -0,0 +1,4 @@
+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
+MD5 1d410cfb38253675fee36c8f9ee655e2 hier-Pg8.0.1-0.5.4.diff.gz 30662
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.2-r2 b/dev-db/postgresql/files/digest-postgresql-8.0.2-r2
new file mode 100644
index 000000000000..462e8d577622
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.2-r2
@@ -0,0 +1,3 @@
+MD5 39ef5bfca3d573b356c755b5429aea8b postgresql-base-8.0.2.tar.bz2 7806083
+MD5 ed57846ed0b4a0044fe545437fcf6f6f postgresql-opt-8.0.2.tar.bz2 133708
+MD5 9840cc8892ac52e7ae0ac5a357b5b610 postgresql-docs-8.0.2.tar.bz2 2202096
diff --git a/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch b/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
new file mode 100644
index 000000000000..238dfb04f4f5
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
@@ -0,0 +1,12 @@
+diff -Naru postgresql-8.0.1.org/src/interfaces/Makefile postgresql-8.0.1/src/interfaces/Makefile
+--- postgresql-8.0.1.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
++++ postgresql-8.0.1/src/interfaces/Makefile	2005-05-04 11:45:56.000000000 +0100
+@@ -12,7 +12,7 @@
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-DIRS := libpq ecpg 
++DIRS := ecpg 
+ 
+ ALLDIRS := $(DIRS) 
+ 
diff --git a/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch b/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch
new file mode 100644
index 000000000000..88adf371e9df
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.0.2-gentoo-libpq.patch
@@ -0,0 +1,12 @@
+diff -Naru postgresql-8.0.2.org/src/interfaces/Makefile postgresql-8.0.2/src/interfaces/Makefile
+--- postgresql-8.0.2.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
++++ postgresql-8.0.2/src/interfaces/Makefile	2005-05-04 11:45:56.000000000 +0100
+@@ -12,7 +12,7 @@
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-DIRS := libpq ecpg 
++DIRS := ecpg 
+ 
+ ALLDIRS := $(DIRS) 
+ 
diff --git a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
new file mode 100644
index 000000000000..040ec471d693
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
@@ -0,0 +1,239 @@
+# 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-r4.ebuild,v 1.1 2005/05/08 20:39:27 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+HOMEPAGE="http://www.postgresql.org/"
+P_HIERPG="hier-Pg8.0.1-0.5.4"
+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.moonbone.ru/${P_HIERPG}.diff.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 kerberos pg-intdatetime pg-hier"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	=dev-db/libpq-3.2
+	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 )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	=dev-db/libpq-3.2
+	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 )
+	kerberos? ( virtual/krb5 )"
+
+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 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
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo-libpq.patch
+	epatch ${FILESDIR}/${P}-securityfix.patch
+	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
+
+	# Bug 91231
+	epatch ${FILESDIR}/CAN-2005-1409.patch
+	epatch ${FILESDIR}/CAN-2005-1410.patch
+	use doc && epatch ${FILESDIR}/CAN-2005-1409-doc.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	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 kerberos && myconf="$myconf --with-krb5"
+	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 \
+		$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}
+	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-${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
+		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=`expr 250000 + 8200 \* 1000 + 14200 \* 100`
+
+		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 ""
+		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
+		einfo ""
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-8.0.2-r2.ebuild b/dev-db/postgresql/postgresql-8.0.2-r2.ebuild
new file mode 100644
index 000000000000..6fbde0d1d095
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.0.2-r2.ebuild
@@ -0,0 +1,241 @@
+# 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-r2.ebuild,v 1.1 2005/05/08 20:39:27 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+HOMEPAGE="http://www.postgresql.org/"
+P_HIERPG="hier-Pg8.0.1-0.5.4"
+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.moonbone.ru/${P_HIERPG}.diff.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 kerberos pg-intdatetime"
+#pg-hier"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	=dev-db/libpq-4.0
+	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 )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	=dev-db/libpq-4.0
+	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 )
+	kerberos? ( virtual/krb5 )"
+
+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 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
+	cd ${S}
+#	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
+	epatch ${FILESDIR}/${P}-gentoo-libpq.patch
+
+	# Bug 91231
+	epatch ${FILESDIR}/CAN-2005-1409.patch
+	epatch ${FILESDIR}/CAN-2005-1410.patch
+	use doc && epatch ${FILESDIR}/CAN-2005-1409-doc.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	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 kerberos && myconf="$myconf --with-krb5"
+	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 \
+		$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}
+	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-${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
+		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 "The PostgreSQL library libpq has changed major number."
+	einfo "You will need to rebuild applications that use it."
+	einfo "You might want to use revdep-rebuild for this upgrade."
+	einfo "e.g.) # revdep-rebuild --soname 'libpq.so.3'"
+	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=`expr 250000 + 8200 \* 1000 + 14200 \* 100`
+
+		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 ""
+		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
+		einfo ""
+	fi
+}