Version bump.

5 files changed, 269 insertions, 27 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 969b956c229d..fd3216363aaa 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.129 2004/09/17 19:11:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.130 2004/09/28 01:13:38 nakano Exp $
+
+*postgresql-8.0.0_beta3 (28 Sep 2004)
+
+  28 Sep 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.0_beta3-gentoo.patch, +postgresql-8.0.0_beta3.ebuild:
+  Version bump.
 
   17 Sep 2004; Jason Wever <weeve@gentoo.org> postgresql-7.4.5.ebuild:
   Stable on sparc.
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 420c09e70e3b..256a5c240243 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,38 +1,41 @@
-MD5 7a73a90e01d4c48732e539e96e983b52 ChangeLog 23269
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 e6e8b4f6da29c0318a0e475adc4bcba5 postgresql-7.4.3-r1.ebuild 10027
-MD5 eb10c55efd876cd1f1d6f770e904656a postgresql-7.4.5-r1.ebuild 10058
 MD5 52a786d752a82349212155903662c276 postgresql-7.3.6-r1.ebuild 7488
+MD5 e6e8b4f6da29c0318a0e475adc4bcba5 postgresql-7.4.3-r1.ebuild 10027
+MD5 c8cfe91570d04c81d48fa47b3eb3106f postgresql-8.0.0_beta3.ebuild 6845
 MD5 0cfe4ea1b66826088bff446a34518c0c postgresql-7.4.3.ebuild 9736
+MD5 eb10c55efd876cd1f1d6f770e904656a postgresql-7.4.5-r1.ebuild 10058
 MD5 8d7710ea217e4a80d1c323558a9e2656 postgresql-7.3.7.ebuild 7866
 MD5 86284c90596a6d3de1a79d0e88a79d86 postgresql-7.4.5.ebuild 10045
 MD5 5940bcebbeaa05b6ce84a18d67f33356 postgresql-8.0.0_beta2.ebuild 6783
-MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3-r1 290
-MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3 290
-MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r1 290
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.0 390
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
-MD5 9d9574a1f687c1fd28ddac5ce56bc0c7 files/postgresql-8.0.0_beta1-gentoo.patch 1112
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.3 302
+MD5 7f2ddf8fe451825b6233cb28dd3d735d ChangeLog 23455
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 2b95b50fc69a8003c493789f15020ee5 files/postgresql-8.0.0_beta3-gentoo.patch 730
+MD5 b953b7e3784ac0d01467f1e740a96a8a files/postgresql-7.4.5-gentoo.patch 631
+MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
+MD5 fb7c6cd99264f1a121d07cf812e9f99b files/postgresql.init-7.3.7 1279
+MD5 b54624cb385431b9b3d4b167c2a9aca4 files/postgresql.init-7.4.3 1281
+MD5 eb2eba5dfa7b1f85b4323b219368044b files/postgresql.init-7.4.5 1279
 MD5 2d09c23680cd7d8f706a2fe8cc41b8fa files/postgresql.init-8.0.0 1279
-MD5 683d803768f3060ffc4bd5a6f5c91918 files/pg_autovacuum.init-7.4.3 1064
-MD5 7b8bf110e22829c7040aa1e87afa371c files/postgresql-7.4.3-gentoo.patch 631
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.3-hppa-testandset.patch 1596
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.3 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.5 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.0 390
 MD5 b22b4de6c3cc06beed0ed3e1f8df257f files/digest-postgresql-7.3.7 223
+MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3 290
 MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5 290
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.5 302
+MD5 683d803768f3060ffc4bd5a6f5c91918 files/pg_autovacuum.init-7.4.3 1064
 MD5 0e381121f20d189a1fdeb4652822114c files/pg_autovacuum.init-7.4.5 1062
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.3 390
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.5 390
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.3 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.5 302
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.3-hppa-testandset.patch 1596
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.3-vacuum-delay.patch 8918
-MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
-MD5 b54624cb385431b9b3d4b167c2a9aca4 files/postgresql.init-7.4.3 1281
-MD5 b953b7e3784ac0d01467f1e740a96a8a files/postgresql-7.4.5-gentoo.patch 631
-MD5 18249476d920987d48972156c34bec75 files/postgresql-7.4.5-r1-gentoo.patch 1160
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.5-hppa-testandset.patch 1596
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.5-vacuum-delay.patch 8918
-MD5 fb7c6cd99264f1a121d07cf812e9f99b files/postgresql.init-7.3.7 1279
-MD5 eb2eba5dfa7b1f85b4323b219368044b files/postgresql.init-7.4.5 1279
 MD5 aec9d4d7fecf1e06538c9719f9e8b9e6 files/digest-postgresql-8.0.0_beta2 238
+MD5 f866bf017df6501dfe4918e0d4744f61 files/digest-postgresql-8.0.0_beta3 238
 MD5 d8c786a06fa94da4bd1f3b69eaa45101 files/postgresql-8.0.0_beta2-gentoo.patch 730
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.5-hppa-testandset.patch 1596
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
+MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3-r1 290
+MD5 edd1ce8d03bdce473718f1c3036e68cd files/digest-postgresql-7.4.5-r1 290
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.5-vacuum-delay.patch 8918
+MD5 9d9574a1f687c1fd28ddac5ce56bc0c7 files/postgresql-8.0.0_beta1-gentoo.patch 1112
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
+MD5 7b8bf110e22829c7040aa1e87afa371c files/postgresql-7.4.3-gentoo.patch 631
+MD5 18249476d920987d48972156c34bec75 files/postgresql-7.4.5-r1-gentoo.patch 1160
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.0_beta3 b/dev-db/postgresql/files/digest-postgresql-8.0.0_beta3
new file mode 100644
index 000000000000..7b139a36320b
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.0_beta3
@@ -0,0 +1,3 @@
+MD5 b15dc95b107dafeaddf9b24b12e23e62 postgresql-base-8.0.0beta3.tar.bz2 7393067
+MD5 53ab8c1ca946ac60ffc1b6c469ecbf3c postgresql-opt-8.0.0beta3.tar.bz2 131078
+MD5 10b2b8b1e58ee0bd757ab2291a955e9e postgresql-docs-8.0.0beta3.tar.bz2 2260393
diff --git a/dev-db/postgresql/files/postgresql-8.0.0_beta3-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.0_beta3-gentoo.patch
new file mode 100644
index 000000000000..84e45a92bb47
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.0.0_beta3-gentoo.patch
@@ -0,0 +1,16 @@
+diff -Naru postgresql-8.0.0beta3.org/src/bin/initdb/initdb.c postgresql-8.0.0beta3/src/bin/initdb/initdb.c
+--- postgresql-8.0.0beta3.org/src/bin/initdb/initdb.c	2004-08-29 06:06:52.000000000 +0100
++++ postgresql-8.0.0beta3/src/bin/initdb/initdb.c	2004-09-02 09:18:00.634625577 +0100
+@@ -2499,11 +2499,7 @@
+ 		fprintf(stderr, authwarning);
+ 
+ 	printf(_("\nSuccess. You can now start the database server using:\n\n"
+-			 "    %s%s%s/postmaster -D %s%s%s\n"
+-			 "or\n"
+-			 "    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n\n"),
+-	   QUOTE_PATH, bin_path, QUOTE_PATH, QUOTE_PATH, pg_data, QUOTE_PATH,
+-	  QUOTE_PATH, bin_path, QUOTE_PATH, QUOTE_PATH, pg_data, QUOTE_PATH);
++		   "/etc/init.d/postgresql start\n\n"));
+ 
+ 	return 0;
+ }
diff --git a/dev-db/postgresql/postgresql-8.0.0_beta3.ebuild b/dev-db/postgresql/postgresql-8.0.0_beta3.ebuild
new file mode 100644
index 000000000000..74bcef5c360e
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.0.0_beta3.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.0_beta3.ebuild,v 1.1 2004/09/28 01:13:38 nakano Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+HOMEPAGE="http://www.postgresql.org/"
+#P_HIERPG="hier-Pg7.4-0.5.2"
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+SRC_URI="mirror://postgresql/source/v8.0.0beta/${PN}-base-${MY_PV}.tar.bz2
+	mirror://postgresql/source/v8.0.0beta/${PN}-opt-${MY_PV}.tar.bz2
+	doc? ( mirror://postgresql/source/v8.0.0beta/${PN}-docs-${MY_PV}.tar.bz2 )"
+#	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+IUSE="ssl nls python tcltk perl libg++ pam readline zlib doc"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
+	perl? ( >=dev-lang/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/libc
+	app-admin/sudo
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=dev-lang/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
+
+PG_DIR="/var/lib/postgresql"
+MAX_CONNECTIONS=1024
+
+pkg_setup() {
+	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+		PG_MAJOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f1 -d.`
+		PG_MINOR=`cat ${PG_DIR}/data/PG_VERSION | cut -f2 -d.`
+		if [ ${PG_MAJOR} -lt 8 ] || [ ${PG_MAJOR} -eq 8 -a ${PG_MINOR} -lt 0 ] ; then
+			eerror "Postgres ${MY_PV} cannot upgrade your existing databases, you must"
+			eerror "use pg_dump to export your existing databases to a file, and then"
+			eerror "pg_restore to import them when you have upgraded completely."
+			eerror "You must remove your entire database directory to continue."
+			eerror "(database directory = ${PG_DIR})."
+			exit 1
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A} || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	local myconf
+	use tcltk && myconf="--with-tcl"
+	use python && myconf="$myconf --with-python"
+	use perl && myconf="$myconf --with-perl"
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use libg++ && myconf="$myconf --with-CXX"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use pg-intdatetime && myconf="$myconf --enable-integer-datetimes"
+
+	# these are the only working CFLAGS I could get on ppc, so locking them
+	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/lib \
+		--enable-depend \
+		--with-gnu-ld \
+		--with-maxbackends=${MAX_CONNECTIONS} \
+		$myconf || die
+
+	make || die
+	cd contrib
+	make || die
+}
+
+src_install() {
+	if use perl; then
+		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
+		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
+			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
+		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
+	fi
+
+	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} install-all-headers || die
+	cd ${S}/contrib
+	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	cd ${S}
+	if use pg-hier; then
+		dodoc ${WORKDIR}/README-${P_HIERPG}.html || die
+	fi
+	dodoc README HISTORY COPYRIGHT INSTALL
+	dodoc contrib/adddepend/*
+
+	exeinto /usr/bin
+
+	dodir /usr/include/postgresql/pgsql
+	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
+
+	cd ${S}/doc
+	dodoc FAQ* README.* TODO bug.template
+	if use doc; then
+		cd ${S}/doc
+		docinto FAQ_html || die
+		dodoc src/FAQ/* || die
+		docinto sgml || die
+		dodoc src/sgml/*.{sgml,dsl} || die
+		docinto sgml/ref || die
+		dodoc src/sgml/ref/*.sgml || die
+		docinto TODO.detail || die
+		dodoc TODO.detail/* || die
+	fi
+
+	cd ${S}
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/postgresql.init-8.0.0 postgresql || die
+
+	insinto /etc/conf.d/
+	newins ${FILESDIR}/postgresql.conf-8.0.0 postgresql || 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/pygresq\"."
+	einfo ""
+}
+
+pkg_config() {
+	einfo "Creating the data directory ..."
+	mkdir -p ${PG_DIR}/data
+	chown -Rf postgres:postgres ${PG_DIR}
+	chmod 700 ${PG_DIR}/data
+
+	einfo "Initializing the database ..."
+	if [ -f ${PG_DIR}/data/PG_VERSION ] ; then
+		eerror "Postgres ${MY_PV} cannot upgrade your existing databases."
+		eerror "You must remove your entire database directory to continue."
+		eerror "(database directory = ${PG_DIR})."
+		exit 1
+	else
+		local SEM=`sysctl -n kernel.sem | cut -f-3`
+		local SEMMNI=`sysctl -n kernel.sem | cut -f4`
+		local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
+		local SHMMAX=`sysctl -n kernel.shmmax`
+		local SHMMAX_MIN=134217728 # 128M
+
+		if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
+			eerror "The current value of SEMMNI is too low"
+			eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
+			eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
+			echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
+		fi
+		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
+
+		if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
+			echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
+			ewarn "Restoring the SEMMNI value to the previous value"
+			ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
+			ewarn "and set it to at least ${SEMMNI_MIN}"
+			ewarn ""
+			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
+			ewarn ""
+		fi
+
+		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
+			eerror "The current value of SHMMAX is too low for postgresql to run."
+			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
+			eerror ""
+			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
+			eerror ""
+
+		fi
+	fi
+}