4 files changed, 250 insertions, 14 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 8b605e20c53b..996bf80eff6e 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.264 2006/03/09 22:32:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.265 2006/04/10 14:49:58 chrb Exp $
+
+*postgresql-8.1.3-r1 (10 Apr 2006)
+
+  10 Apr 2006; <chrb@gentoo.org> +postgresql-8.1.3-r1.ebuild:
+  Re-add threads support
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> postgresql-8.0.7.ebuild:
   Mark 8.0.7 stable on ia64
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index a45da934d27f..03dde12ec1c6 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d1518a47a4176a25e715923578781ddc ChangeLog 53616
-RMD160 48caa4e543599cfef7bebf903fcababf0a783a5a ChangeLog 53616
-SHA256 a3df2655644bd2698d23c186b4c5eb8def8c8d6ce59d93969f947daac77a9085 ChangeLog 53616
+MD5 c20b87fa7ff098d4416fd6bab4369252 ChangeLog 53736
+RMD160 262407487afd401ceb86a886ee158ef42f8b1680 ChangeLog 53736
+SHA256 3806a15e6673ace1dedc77304058fc92d6e448951f574ea093eb62cd0d135eb2 ChangeLog 53736
 MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
 RMD160 a01fb02931799230c9797dacba6f5d28b0b53ab9 files/CAN-2005-1409-doc.patch 1749
 SHA256 6f5e52a18b6fafd50c36659eb8c9980b7987ad262c88bb621640f352208f938b files/CAN-2005-1409-doc.patch 1749
@@ -64,6 +61,9 @@ SHA256 df967e9869b87217adaedeac7a16c254d82421473056439ae31db36f0bc6007c files/di
 MD5 4c03a8c23190af3a632a6ca9789ab6d5 files/digest-postgresql-8.1.3 223
 RMD160 66ffef4258ea870bc72b703684db31f183de0ab8 files/digest-postgresql-8.1.3 223
 SHA256 96c2ea0de8afd27b1ec1d2dc0bd0a69ff7994bfa6794539f8761b860c03b8528 files/digest-postgresql-8.1.3 223
+MD5 712aa7c7262db68b90baea25f83f3c1a files/digest-postgresql-8.1.3-r1 807
+RMD160 b1b32de704e2616a123976625c76c0b9e8d9186e files/digest-postgresql-8.1.3-r1 807
+SHA256 3aa2506ab4a0b41b0f4f9b3a8451eaae207e24c3811b8c32edbfa11ecedb9265 files/digest-postgresql-8.1.3-r1 807
 MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.11 302
 RMD160 8bdeef1a914659e7c55ce8d802b57cbeca6020bc files/pg_autovacuum.conf-7.4.11 302
 SHA256 9a8b0813bc67318f2df9e662fc067fa85ecd9bca2d19709715a94d5ab32bf721 files/pg_autovacuum.conf-7.4.11 302
@@ -352,13 +352,9 @@ SHA256 bfffba9660012202be02087a3b19eb3d931fbdc7037a898c335f0e33c00876b0 postgres
 MD5 80a1a1d30549701a852fab63217c0c4f postgresql-8.1.2.ebuild 7570
 RMD160 ab17d698f35014c86b826f869ebb51a5054a220a postgresql-8.1.2.ebuild 7570
 SHA256 93e9655115ab5d87b9f3f99574bd8fba900510be7bdc6af15bd941c5654a53dc postgresql-8.1.2.ebuild 7570
+MD5 7ea3543768bfdaf066c15ea6f4fa34c9 postgresql-8.1.3-r1.ebuild 7635
+RMD160 171581b9fd732939ada418232880e881ad46a665 postgresql-8.1.3-r1.ebuild 7635
+SHA256 891e8518b8105528e832a561bf90c4737249333aa5076dfa4d2fa80b4fc932aa postgresql-8.1.3-r1.ebuild 7635
 MD5 adbf7d75f449d28959ef3fe8d09870ff postgresql-8.1.3.ebuild 7569
 RMD160 2b7dc463fa94c08983449563589582c44e0db5df postgresql-8.1.3.ebuild 7569
 SHA256 6cd7d1f69ece18814cd38965f98f9d9ecc7b07e5287702e0aeb9082aa229011e postgresql-8.1.3.ebuild 7569
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEEK0TJrHF4yAQTrARAo2VAJ9hy74erQzqW/CZHSFMm0DhBSkypQCfTPby
-LTHgXt8TJc3E0m/efABMB7I=
-=ytHy
------END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/files/digest-postgresql-8.1.3-r1 b/dev-db/postgresql/files/digest-postgresql-8.1.3-r1
new file mode 100644
index 000000000000..040a253b9f0e
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.1.3-r1
@@ -0,0 +1,9 @@
+MD5 4b9466e42b7951d7ec7be4455f64b13f postgresql-base-8.1.3.tar.bz2 8044411
+RMD160 539ec857517d01310225fff2e738ccd6698891ab postgresql-base-8.1.3.tar.bz2 8044411
+SHA256 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619 postgresql-base-8.1.3.tar.bz2 8044411
+MD5 9ca0b7f6b4c2edcd51b9995d4e3a8a42 postgresql-docs-8.1.3.tar.bz2 2467558
+RMD160 b11f2405b4401f7342a7dabd5321f248bf27a2c0 postgresql-docs-8.1.3.tar.bz2 2467558
+SHA256 3aecc34a12e9f611ff83d109884bae90c28f0491cc11a372ae24f4b11a31e020 postgresql-docs-8.1.3.tar.bz2 2467558
+MD5 ad1dd1d66c9c608180418375e36aafcb postgresql-opt-8.1.3.tar.bz2 144608
+RMD160 0427f3b851c3bbaff53699baa0ebdf0c610303cf postgresql-opt-8.1.3.tar.bz2 144608
+SHA256 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525 postgresql-opt-8.1.3.tar.bz2 144608
diff --git a/dev-db/postgresql/postgresql-8.1.3-r1.ebuild b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
new file mode 100644
index 000000000000..04b07ddcfaeb
--- /dev/null
+++ b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.1 2006/04/10 14:49:58 chrb 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"
+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 )"
+#	pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime threads"
+
+DEPEND="virtual/libc
+	=dev-db/libpq-8.1.3*
+	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-8.1.3*
+	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 1 ] ; 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
+	enewgroup postgres 70 \
+		|| die "problem adding group postgres"
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
+		|| die "problem adding user postgres"
+}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+#	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-sh.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"
+	use threads && myconf="$myconf --enable-thread-safety"
+
+	# 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 \
+		$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
+
+	cd ${S}/doc
+	dodoc FAQ* README.* TODO bug.template
+	if use doc; then
+		cd ${S}/doc
+		docinto FAQ_html
+		dodoc src/FAQ/*
+		docinto sgml
+		dodoc src/sgml/*.{sgml,dsl}
+		docinto sgml/ref
+		dodoc src/sgml/ref/*.sgml
+		docinto TODO.detail
+		dodoc TODO.detail/*
+	fi
+
+	cd ${S}
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
+
+	insinto /etc/conf.d/
+	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
+
+	rm ${D}/usr/include/postgres_ext.h
+}
+
+pkg_postinst() {
+	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
+
+	einfo ""
+	einfo "Execute the following command when you want to setup the initial database environment."
+	einfo "emerge --config =${PF}"
+	einfo ""
+	einfo "autovacuum function, which  was in contrib, has moved to main PostgreSQL function from 8.1."
+	einfo "You can enable it in postgresql.conf."
+	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 ${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
+		su postgres -c "/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
+}