Version bump

Package-Manager: portage-2.1.9.42/cvs/Linux i686

3 files changed, 335 insertions, 7 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 6e64b0ec6525..e236e0111d26 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.122 2011/04/24 09:36:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.123 2011/05/03 02:51:40 titanofold Exp $
+
+*postgresql-server-9.1_beta1 (03 May 2011)
+
+  03 May 2011; Aaron W. Swenson <titanofold@gentoo.org>
+  +postgresql-server-9.1_beta1.ebuild:
+  Version bump
 
   24 Apr 2011; Fabian Groffen <grobian@gentoo.org>
   postgresql-server-9.0.3-r4.ebuild, postgresql-server-9.0.4.ebuild,
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 27a7733c7ed9..0c4c31d09bea 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-8.2-server.patch 5319 RMD160 9aae5832defd2e43879246e773fd1aada0680716 SHA1 ea726704fc85118c27f511bfd9324b136ced3eb1 SHA256 2687fa5159a34da59e36af4c894f43b2136e8e88c965a682607cb48acb61d8ee
@@ -50,6 +50,7 @@ DIST postgresql-9.0.4.tar.bz2 14040871 RMD160 0f11efb7634b9acb2080d07771c0355a3b
 DIST postgresql-9.1alpha4-patches.tbz2 4326 RMD160 d30f1e3ea673eddba0821c07b3335723d9331769 SHA1 8ac563990d6b0ad5845f68d0eb6f22e7a01acde9 SHA256 5a8297ffb61e9f93ec1b828caddf15d89a9fcc5d1d839501caf47f8a199c1399
 DIST postgresql-9.1alpha4.tar.bz2 14296555 RMD160 71962c5e0833bd42bbea3e7494c24aedbdab6f76 SHA1 9f7d5a663e14caebecb22dbedd07f7d28223ee9a SHA256 5d09764d05dca68cbafc133fd079d312751b0b22722c3ee9e2f33b1f26f78dc6
 DIST postgresql-9.1alpha5.tar.bz2 14350905 RMD160 358edd6ec7303030c90bac0e24284d2daf0682bd SHA1 164d19c410f6152fefabcebee8a1f77e412cbb80 SHA256 44a2f92f6b085f52ff20429f98599e725f83cde6e70fc4b1bae9da50b3526124
+DIST postgresql-9.1beta1.tar.bz2 14384089 RMD160 ab0f0b12e45ac291b03ed9a4a82d72ad3e88343a SHA1 165d1cad5629c51bcc0a876d8c43b5a016a07448 SHA256 1b7dcabe7826b9e5111754aa92c0ad68015047bf26f0dc8e98f7a77af2913adb
 DIST postgresql-initscript-1.0.1.tbz2 2635 RMD160 989b89364ff367569c5129dec70c369496a69af1 SHA1 24cfbab756bf2c08e783ecae31c26ca45984de87 SHA256 a85276c431047e0123c988b296869cfa8afbbb6a4721d74fff4b419f608f0293
 DIST postgresql-initscript-1.0.tbz2 2534 RMD160 f0570096f61ec9fe4c28d274cc8a7c5cc9180b2f SHA1 227b026b9a60aac15b48de2813da25fedb181be3 SHA256 cb8fd1d07fedbd18696ab77fa778b4393aca9bbaa770a2a9b123edcd633f3556
 DIST postgresql-initscript-1.1.tbz2 2642 RMD160 c9d1a112c72b86845e7e402ca8e9a2cc9d4ee12f SHA1 b79d4dc3ced647b0718f0053d218385e5f647039 SHA256 b25d65e0c3278ccface7dd969023f81aa6f871c9089e111e5785f725b0b4b56a
@@ -59,6 +60,7 @@ DIST postgresql-patches-8.3.tbz2 5274 RMD160 b12f362a9f6795ef2180d2e9f09b049fffb
 DIST postgresql-patches-8.4.tbz2 4615 RMD160 ce13939969e19125099afcf8629b5f0955d83788 SHA1 381913b49dd2c9a5c6b105b6f45cc7b2784bb55b SHA256 6173fbc38d7eef912b51501f155f1c35a2dd891c4d4f31dd9758243e5becade8
 DIST postgresql-patches-9.0-r1.tbz2 4305 RMD160 858525038e409bc351efd178cfa9886aa98e0944 SHA1 d1e8cdf56900ad1426f9b17fe0d45ec2beb39c49 SHA256 0f6684fec778208a8527f9bdd7eb498e0b25af6f3e01439c9774311fc541e107
 DIST postgresql-patches-9.1alpha5.tbz2 4348 RMD160 5ee1ea68009d1590af583156e6dab196c1263beb SHA1 bb6e7f829bfd846a71b978fce21be2f21178bdc9 SHA256 d8fba4571996baeeedf48d60f31b4b842bfcdb3916a4b7d51302943339a73763
+DIST postgresql-patches-9.1beta1.tbz2 4343 RMD160 a5e714733131afa3361c57cac5595482a9cc0778 SHA1 1c694f50db382c90a3fdd8548322ddf31b1b355d SHA256 216448c1810ef5de4ced5e52277fde2a8edc7979bda74bd8cd78b436dd83c509
 EBUILD postgresql-server-8.2.18.ebuild 10146 RMD160 866f7f61fb2980b7a8f19de51857b8a16e3d2b4b SHA1 fd053ee16ba8be74f06e6a541e9b2f2cbddf0f5e SHA256 428cf6122e463c65209f47f519b5ee6718ab027484ba53df3bcf01e5bc7fdba7
 EBUILD postgresql-server-8.2.19.ebuild 10156 RMD160 3b6c3ec4ff02999ca6d2e59f4966efe8120e4f3e SHA1 eda937fbafcf0772740e448051478249092635d1 SHA256 6f6032f54bca4dc1dc942ea89d1ff3d0f9f4487b09722fb734b80730a00eae87
 EBUILD postgresql-server-8.2.20-r1.ebuild 10659 RMD160 1781c0a8eadef9aab618530fd43ea563aafdf4f9 SHA1 2a5f0515dfd5d9c6b1e3da048d61535e1c59e934 SHA256 6991151d46f5106385a1eaa8eb4b87d5fd22131ac96832346e065f85e3c670f6
@@ -91,12 +93,13 @@ EBUILD postgresql-server-9.1_alpha4-r1.ebuild 10312 RMD160 8bd10acf58d0c370156d6
 EBUILD postgresql-server-9.1_alpha4.ebuild 10337 RMD160 bd2fdab0f859120ca077594ebbda4c3c428f9509 SHA1 f18528e8a27f21004f464b0139c05c71d9767cdb SHA256 230a1f29d8965a32e5557ef235ea2fd53c085ef383d935a50195f575f8d08f4a
 EBUILD postgresql-server-9.1_alpha5-r1.ebuild 11078 RMD160 aedfa686737daeceafcf73fd207fe28aad48ddec SHA1 d9cc53536e6b602624cdf0a8b0f9d1fb446a697c SHA256 1be1c517606b9ade4008fe174e2681042e697983323ee4a1b3aab40ec597da0a
 EBUILD postgresql-server-9.1_alpha5.ebuild 10852 RMD160 0f8d03a524ea30389137fb1e31436484476e5058 SHA1 9ed72b70b8b26e51767ff3984e483ebd8c190b50 SHA256 06b24f6f64b950ac4811cbc42836ffe84d8ef7488319a76f7a421e4c0684d4cc
-MISC ChangeLog 39129 RMD160 328359e27aa86056a7338eab29738945e1cbce6b SHA1 008c71503a4d2ca1e25bc88d61192c659d64fcd0 SHA256 651d458c46ceeef37a112f749c6a1cc286546758b311a5d50216d04cda6caf7c
+EBUILD postgresql-server-9.1_beta1.ebuild 10847 RMD160 a05affff4c133e3a303c33ff64723515cbd370ef SHA1 0e0b58306d49a18577958a5cf0116cd1aa8852e8 SHA256 4c5f328efaf0fd154763fc8ede474a6c4d86172583e45454ff17266689fca8a4
+MISC ChangeLog 39287 RMD160 e02a2f295d030fa8a27a511a6decf038da6ed803 SHA1 30f87587654b4fccb41ef3bed734661b2867bcd5 SHA256 34c705e953c615d57f27466f350cfac4766623c7dfef0c2c541f0e1954c8b506
 MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2z7y0ACgkQX3X2B8XHTonZwwCfXTlo4e75nCdNwows3jELbU2S
-G7wAoJHfQ4ToMaWelMDjTWeNg3aIftIC
-=JFIg
+iF4EAREIAAYFAk2/bc8ACgkQCOhwUhu5AEmjfwEAuaBtVAzdD+Y6vR/g1dTuIop6
+7UFXGmhlhL9KsObBN6oBAK0ZLHl8KB2YmJvtA+HnZQgdb6rWhWrVaUEyasPDAvr4
+=APtg
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql-server/postgresql-server-9.1_beta1.ebuild b/dev-db/postgresql-server/postgresql-server-9.1_beta1.ebuild
new file mode 100644
index 000000000000..734b4731db12
--- /dev/null
+++ b/dev-db/postgresql-server/postgresql-server-9.1_beta1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1_beta1.ebuild,v 1.1 2011/05/03 02:51:40 titanofold Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils flag-o-matic multilib pam prefix python versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+# Upstream doesn't have an underscore in the file name
+MY_PV=${PV/_/}
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${MY_PV}.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-1.2.tbz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${MY_PV}
+SLOT="$(get_version_component_range 1-2)"
+
+LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+	perl? ( >=dev-lang/perl-5.8 )
+	python? ( dev-python/egenix-mx-base )
+	selinux? ( sec-policy/selinux-postgresql )
+	tcl? ( >=dev-lang/tcl-8 )
+	uuid? ( dev-libs/ossp-uuid )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	xml? ( dev-util/pkgconfig )"
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash "${EROOT%/}/var/lib/postgresql" postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/server.patch"
+	epatch "${FILESDIR}"/${PN}-9.0.4-bool.patch
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${EROOT%/}/usr/share/zoneinfo" \
+		--with-includes="${EROOT%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${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
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/service"
+
+	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.confd
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || die "Inserting conf failed"
+	sed -e "s/@SLOT@/${SLOT}/g" -i "${WORKDIR}"/postgresql.init
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || die "Inserting conf failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	use prefix || fowners postgres:postgres /var/run/postgresql
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "The Unix-domain socket is located in:"
+	elog "    ${EROOT%/}/var/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the socket,"
+	elog "you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that"
+	elog "it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake -j1 check  || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}