Version bump. But this is hard masked because of beta version.

7 files changed, 362 insertions, 1 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index b1f0417dbd1f..af42e5f55cc5 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # 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.114 2004/07/27 17:16:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.115 2004/08/10 16:01:30 nakano Exp $
+
+*postgresql-8.0.0_beta1 (10 Aug 2004)
+
+  10 Aug 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.0_beta1-gentoo.patch, +files/postgresql.conf-8.0.0,
+  +files/postgresql.init-8.0.0, +postgresql-8.0.0_beta1.ebuild:
+  Version bump. But this is hard masked because of beta version.
 
   27 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> postgresql-7.4.3-r1.ebuild:
   Fixed SHMMAX_MIN to calculate from MAX_CONNECTIONS.
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ba3ff19cd73c..d3b5f3fe0c59 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,7 +1,10 @@
 MD5 52a786d752a82349212155903662c276 postgresql-7.3.6-r1.ebuild 7488
+MD5 949cfcbd387ecb277628b924a20b072e postgresql-8.0.0_beta1.ebuild 7633
 MD5 aaf8cd9061874576d883c099899b9eee postgresql-7.4.3-r1.ebuild 10031
+MD5 6c8c663290db490f6b6290180e0c9e61 .postgresql-8.0.0_beta.ebuild.swp 4096
 MD5 0cfe4ea1b66826088bff446a34518c0c postgresql-7.4.3.ebuild 9736
 MD5 af789ce84297f7afdd7c028c8f384537 postgresql-7.3.6-r2.ebuild 7870
+MD5 49bdd16c1726a1717cbad932ad0baaad postgresql-8.0.0_beta1.ebuild~ 9754
 MD5 f1647fb18b6a37b0397b70cc2e3a7b20 ChangeLog 20814
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
@@ -12,6 +15,7 @@ MD5 683d803768f3060ffc4bd5a6f5c91918 files/pg_autovacuum.init-7.4.3 1064
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.3 302
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.3-hppa-testandset.patch 1596
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.3-vacuum-delay.patch 8918
+MD5 34d5846d604abf6f9c314884b19ccb26 files/digest-postgresql-8.0.0_beta1 238
 MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r1 223
 MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
 MD5 a0c1913ae5fcdc67eccdc1ed2e8360f2 files/digest-postgresql-7.4.3-r1 290
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.0_beta1 b/dev-db/postgresql/files/digest-postgresql-8.0.0_beta1
new file mode 100644
index 000000000000..15b38bc03fd5
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.0_beta1
@@ -0,0 +1,3 @@
+MD5 e8fe985e6333b45dbb328cab815796f4 postgresql-base-8.0.0beta1.tar.bz2 7205993
+MD5 20b45631a3bd9567b166632f0a65e7ca postgresql-opt-8.0.0beta1.tar.bz2 131046
+MD5 21303676d964c72e868d01c49d1e04fe postgresql-docs-8.0.0beta1.tar.bz2 2249514
diff --git a/dev-db/postgresql/files/postgresql-8.0.0_beta1-gentoo.patch b/dev-db/postgresql/files/postgresql-8.0.0_beta1-gentoo.patch
new file mode 100644
index 000000000000..b88ccbf570a8
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.0.0_beta1-gentoo.patch
@@ -0,0 +1,27 @@
+diff -Naru postgresql-8.0.0beta1.org/contrib/Makefile postgresql-8.0.0beta1/contrib/Makefile
+--- postgresql-8.0.0beta1.org/contrib/Makefile	2004-06-01 06:15:47.000000000 +0100
++++ postgresql-8.0.0beta1/contrib/Makefile	2004-08-10 15:42:47.197198133 +0100
+@@ -11,7 +11,6 @@
+ 		dbase		\
+ 		dblink		\
+ 		dbmirror	\
+-		dbsize		\
+ 		earthdistance	\
+ 		findoidjoins	\
+ 		fulltextindex	\
+diff -Naru postgresql-8.0.0beta1.org/src/bin/initdb/initdb.c postgresql-8.0.0beta1/src/bin/initdb/initdb.c
+--- postgresql-8.0.0beta1.org/src/bin/initdb/initdb.c	2004-08-01 07:19:23.000000000 +0100
++++ postgresql-8.0.0beta1/src/bin/initdb/initdb.c	2004-08-10 15:45:05.678447838 +0100
+@@ -2490,11 +2490,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/files/postgresql.conf-8.0.0 b/dev-db/postgresql/files/postgresql.conf-8.0.0
new file mode 100644
index 000000000000..e8dab3e4c827
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.conf-8.0.0
@@ -0,0 +1,14 @@
+# PostgreSQL's Database Directory
+PGDATA=/var/lib/postgresql/data
+
+# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
+PGLOG=/var/lib/postgresql/data/postgresql.log
+
+# Run the PostgreSQL user as:
+PGUSER=postgres
+
+# Extra options to run postmaster with.
+# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
+# PGOPTS="-N 1024 -B 2048 -i"
+PGOPTS=""
+
diff --git a/dev-db/postgresql/files/postgresql.init-8.0.0 b/dev-db/postgresql/files/postgresql.init-8.0.0
new file mode 100644
index 000000000000..fb1f14117ac6
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-8.0.0
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.0,v 1.1 2004/08/10 16:01:30 nakano Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use net
+}
+
+checkconfig() {
+	if [ ! -d $PGDATA ]; then
+		eerror "directory not found: $PGDATA"
+		eerror "You should create PGDATA directory first."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting PostgreSQL"
+	if [ -f $PGDATA/postmaster.pid ]; then
+		rm $PGDATA/postmaster.pid
+	fi
+	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
+
+	while :
+	do
+		cnt=$(($cnt + 1))
+		if [ -f "$PGDATA/postmaster.pid" ]; then
+			ret=0
+			break
+		fi
+
+		if [ $cnt -eq 30 ]; then
+			eerror "Please see log file: $PGLOG"
+			ret=1
+			break
+		fi
+		sleep 1
+	done
+	eend $ret
+}
+
+stop() {
+	ebegin "Stopping PostgreSQL"
+	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
+	eend $?
+}
+
+svc_restart() {
+	ebegin "Restarting PostgreSQL"
+	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading PostgreSQL configuration"
+	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
+	eend $?
+}
diff --git a/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild b/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild
new file mode 100644
index 000000000000..c8d0af747f8f
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild
@@ -0,0 +1,243 @@
+# 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_beta1.ebuild,v 1.1 2004/08/10 16:01:30 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"
+IUSE="ssl nls java 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 )
+	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
+		dev-java/java-config )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )"
+# java dep workaround for portage bug
+# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
+RDEPEND="virtual/libc
+	app-admin/sudo
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	tcltk? ( >=dev-lang/tcl-8 )
+	perl? ( >=dev-lang/perl-5.6.1-r2 )
+	python? ( >=dev-lang/python-2.2 )
+	java? ( >=virtual/jdk-1.3* )
+	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
+}
+
+check_java_config() {
+	JDKHOME="`java-config --jdk-home`"
+	if [[ -z ${JDKHOME} && ! -d ${JDKHOME} ]]; then
+		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
+		eerror "${NOJDKERROR}"
+		die "${NOJDKERROR}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	if use java; then
+		check_java_config
+	fi
+
+	local myconf
+	use tcltk && myconf="--with-tcl"
+	use python && myconf="$myconf --with-python"
+	use perl && myconf="$myconf --with-perl"
+	use java && myconf="$myconf --with-java"
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use libg++ && myconf="$myconf --with-CXX"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use 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
+
+	if use java; then
+		# we need to remove jar file after dojar; otherwise two same jar
+		# file are installed.
+		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
+		rm ${D}/usr/share/postgresql/java/postgresql.jar
+		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
+	fi
+
+	dodir /usr/include/postgresql/pgsql
+	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
+
+	cd ${S}/doc
+	dodoc FAQ* README.* TODO bug.template
+	if use doc; then
+		cd ${S}/doc
+		docinto FAQ_html || die
+		dodoc src/FAQ/* || die
+		docinto sgml || die
+		dodoc src/sgml/*.{sgml,dsl} || die
+		docinto sgml/ref || die
+		dodoc src/sgml/ref/*.sgml || die
+		docinto TODO.detail || die
+		dodoc TODO.detail/* || die
+	fi
+
+	cd ${S}
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/postgresql.init-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
+}