Version bump and fixed dependency in 7.3.4-r1 on mips.

6 files changed, 331 insertions, 16 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 65c5de1e2774..76ec80319b48 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2004/02/27 17:44:59 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.88 2004/03/05 16:11:10 nakano Exp $
+
+*postgresql-7.3.6 (05 Mar 2004)
+
+  05 Mar 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.6.ebuild,
+  postgresql-7.4.1-r4.ebuild, files/postgresql.init-7.3.6:
+  Version bump and fixed dependency in 7.3.4-r1 on mips.
+
+*postgresql-7.3.6 (05 Mar 2004)
 
   27 Feb 2004; Joshua Kinard <kumba@gentoo.org> :
   Added ~mips to KEYWORDS to satisfy repoman deps, and added gnuconfig to fix up
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d990cfff47e6..65dddf9aa589 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,18 +1,20 @@
-MD5 a0fae3fd31b886c48cc5f6f3fa6a58b5 ChangeLog 15372
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 7242b7bebfa1e8d11384bfb997ecda5b postgresql-7.3.4-r1.ebuild 8090
+MD5 595456a9d68f751ee63ce180bb9b4960 postgresql-7.3.6.ebuild 7899
 MD5 595456a9d68f751ee63ce180bb9b4960 postgresql-7.3.5.ebuild 7899
 MD5 53319d9e55f16958f26e114e2c7c61f0 postgresql-7.4.1-r4.ebuild 8605
-MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
-MD5 6aa51ffe3edcbada285a86d4cab456de files/digest-postgresql-7.3.5 223
-MD5 90d60bb0f7ce4dd379d1b3dc4c75a339 files/digest-postgresql-7.4.1-r4 290
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.1 302
-MD5 9034af61e538ae850c2b3103158d492d files/pg_autovacuum.init-7.4.1 1090
-MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
+MD5 7242b7bebfa1e8d11384bfb997ecda5b postgresql-7.3.4-r1.ebuild 8090
+MD5 a0fae3fd31b886c48cc5f6f3fa6a58b5 ChangeLog 15372
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.1-vacuum-delay.patch 8918
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
+MD5 5a0b8275ed1af0691ba041b5074d5590 files/postgresql-7.4.1-gentoo.patch 631
 MD5 03f05cf1f4a1c7be863a2aa664ce7638 files/postgresql.init-7.3.4 1288
 MD5 b25cbbcf131706a94c9b77e8c6c58f16 files/postgresql.init-7.3.5 1288
 MD5 28061ecf68e40d99b5dadf0a0f3abea6 files/postgresql.init-7.4.1 1288
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.1 390
+MD5 6aa51ffe3edcbada285a86d4cab456de files/digest-postgresql-7.3.5 223
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6 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 90d60bb0f7ce4dd379d1b3dc4c75a339 files/digest-postgresql-7.4.1-r4 290
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.6 b/dev-db/postgresql/files/digest-postgresql-7.3.6
new file mode 100644
index 000000000000..2e476ab072c6
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.3.6
@@ -0,0 +1,3 @@
+MD5 80b1649458ed7b0e765fb19bcb81c7aa postgresql-base-7.3.6.tar.bz2 5647447
+MD5 49b6faa1698c6d9f357e13236f7ca777 postgresql-opt-7.3.6.tar.bz2 341096
+MD5 ec0cf85996049eb0180a2163c482c02c postgresql-docs-7.3.6.tar.bz2 2337333
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.6 b/dev-db/postgresql/files/postgresql.init-7.3.6
new file mode 100644
index 000000000000..c977c0b1c7cf
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-7.3.6
@@ -0,0 +1,63 @@
+#!/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-7.3.6,v 1.1 2004/03/05 16:11:14 nakano Exp $
+
+opts="${opts} reload"
+
+depend() {
+	use net
+}
+
+checkconfig() {
+	if [ ! -d $PGDATA ]; then
+		eerror "directory not found: $PGDATA"
+		eerror "You should create PGDATA directory first."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting PostgreSQL"
+	if [ -f $PGDATA/postmaster.pid ]; then
+		rm $PGDATA/postmaster.pid
+	fi
+	su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
+
+	while :
+	do
+		cnt=$(($cnt + 1))
+		if [ -f "$PGDATA/postmaster.pid" ]; then
+			ret=0
+			break
+		fi
+
+		if [ $cnt -eq 30 ]; then
+			eerror "Please see log file: $PGLOG"
+			ret=1
+			break
+		fi
+		sleep 1
+	done
+	eend $ret
+}
+
+stop() {
+	ebegin "Stopping PostgreSQL"
+	su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
+	eend $?
+}
+
+svc_restart() {
+	ebegin "Restarting PostgreSQL"
+	su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading PostgreSQL configuration"
+	su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
+	eend $?
+}
diff --git a/dev-db/postgresql/postgresql-7.3.6.ebuild b/dev-db/postgresql/postgresql-7.3.6.ebuild
new file mode 100644
index 000000000000..e25228364396
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.3.6.ebuild
@@ -0,0 +1,239 @@
+# 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.6.ebuild,v 1.1 2004/03/05 16:11:10 nakano Exp $
+
+DESCRIPTION="sophisticated Object-Relational DBMS"
+
+RESTRICT="nomirror"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
+	mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
+	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib"
+
+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
+	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}
+	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
+
+	keepdir /var/lib/postgresql
+}
+
+pkg_postinst() {
+	einfo "Execute the following command"
+	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo "to setup the initial database environment."
+	einfo ""
+	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell, 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})."
+			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.4.1-r4.ebuild b/dev-db/postgresql/postgresql-7.4.1-r4.ebuild
index 130170ef55fe..6cb62150a64e 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.3 2004/02/27 17:43:32 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.1-r4.ebuild,v 1.4 2004/03/05 16:11:10 nakano Exp $
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 
@@ -28,7 +28,7 @@ DEPEND="virtual/glibc
 	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 )
+	python? ( !mips? ( >=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 )
@@ -94,7 +94,7 @@ src_compile() {
 
 	local myconf
 	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
+	use python && use mips || myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
 	if [ "`use java`" -a ! "`use amd64`" ]; then
 		myconf="$myconf --with-java"