version bump.

7 files changed, 310 insertions, 11 deletions

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 91b3182e11dd..24ec29ecb9dc 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,11 +1,11 @@
-MD5 618063e049e54a99ab026b9f2a19a1bc postgresql-7.3.ebuild 5535
-MD5 1eb1f3eeb7599f68d1a37366691498b2 postgresql-7.3.3.ebuild 5952
-MD5 e7affd7cd01f1b801109d2c122dec84e postgresql-7.3.2.ebuild 5944
+MD5 8209316daf7e08531d3fe495d9a9a8f3 postgresql-7.3.ebuild 5550
+MD5 d14e09bbf946bcb9084a6dfa89a3bf07 postgresql-7.3.3.ebuild 5967
+MD5 e2f91a5762f1e303c2a28a75792f2763 postgresql-7.3.2.ebuild 5959
 MD5 63367fc8150c677e6ff6f77f916fd50b ChangeLog 10508
-MD5 8fc6cb3477cac9abb545f6785d2ec2ee postgresql-7.4.ebuild 8508
+MD5 a3d656b9c7ac5d2ef9b1c99d0ceae9f8 postgresql-7.4.ebuild 7259
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 833657cc768d7a3d374311d37274fb46 postgresql-7.3.4-r1.ebuild 7590
-MD5 9b63e936a9ba4003fdfad931238031da postgresql-7.3.4.ebuild 7244
+MD5 cd19ab56b3c8e79135cb5dd43689d470 postgresql-7.3.4-r1.ebuild 7605
+MD5 001672389391266544b0972fd0a7553c postgresql-7.3.4.ebuild 7262
 MD5 bc6938c5fbc47a864dddb0c885f0a6dd files/pgsql 613
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
 MD5 26e2c8e4978d59f58bf13e94bbdc446b files/postgres 851
@@ -19,10 +19,9 @@ MD5 4e148f930c09bddec23d157f9c446020 files/postgresql.init 937
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql 375
 MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
 MD5 973b357ee4548f1e275f02e2515c3577 files/digest-postgresql-7.4 68
-MD5 be8e548a3338b2db8204b40a57ceac41 files/postgresql-7.4.init 1255
-MD5 cc24ba2380911aa4266e0cdbd8b2faee files/postgresql.env 35
-MD5 4da8e951e563201537e001f08a3342e9 files/postgresql-7.4.env 39
-MD5 65b6f6a1cb4961d06b6e1853c9b3ff4e files/postgresql-7.4.conf 412
-MD5 c7601793268af7dba665f94d938993b9 files/postgresql-7.4-gentoo.patch 35047
+MD5 cc24ba2380911aa4266e0cdbd8b2faee files/postgresql.env-7.4 35
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4 390
+MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.4 1138
+MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
 MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3/postgresql 678
 MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3.2/postgresql 678
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4 b/dev-db/postgresql/files/digest-postgresql-7.4
new file mode 100644
index 000000000000..6f667843e9b6
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.4
@@ -0,0 +1 @@
+MD5 fc79f5b0074b32671dac7342a2318950 postgresql-7.4.tar.gz 12311256
diff --git a/dev-db/postgresql/files/postgresql-7.4-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4-gentoo.patch
new file mode 100644
index 000000000000..575238564c77
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4-gentoo.patch
@@ -0,0 +1,16 @@
+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.conf-7.4 b/dev-db/postgresql/files/postgresql.conf-7.4
new file mode 100644
index 000000000000..e8dab3e4c827
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.conf-7.4
@@ -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.env-7.4 b/dev-db/postgresql/files/postgresql.env-7.4
new file mode 100644
index 000000000000..5a4867fbab25
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.env-7.4
@@ -0,0 +1 @@
+CONFIG_PROTECT=/var/lib/postgresql
diff --git a/dev-db/postgresql/files/postgresql.init-7.4 b/dev-db/postgresql/files/postgresql.init-7.4
new file mode 100644
index 000000000000..9ea516e3e0bb
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql.init-7.4
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# /space/gentoo/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.rc6,v 1.1 2002/01/06 00:53:24 woodchip 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'"
+
+	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 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.4.ebuild b/dev-db/postgresql/postgresql-7.4.ebuild
new file mode 100644
index 000000000000..55114e6fd3ae
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.4.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2003 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.ebuild,v 1.1 2003/11/20 15:24:13 nakano Exp $
+
+DESCRIPTION="sophisticated Object-Relational DBMS."
+
+SRC_URI="mirror://postgresql/v${PV}/${P}.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"
+
+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? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 )
+	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? ( >=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
+	cd ${S} || die
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	use java && check_java_config
+
+	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"
+
+	# 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() {
+	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
+	dodoc contrib/adddepend/*
+	cd ${S}/doc
+	dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README*
+	dodoc TODO bug.template
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+	rm -rf ${D}/usr/doc ${D}/mnt
+	exeinto /usr/bin
+
+	if [ `use java` ]; 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
+
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
+
+	insinto /etc/conf.d/
+	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
+
+	insinto /etc/env.d/
+	newins ${FILESDIR}/postgresql.env-${PV} 70postgresql || 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
+}