5 files changed, 5 insertions, 526 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index b3ef3594dfeb..f3beb87033b6 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.367 2008/01/15 20:58:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.368 2008/01/16 05:52:04 mjolnir Exp $
+
+  16 Jan 2008; Martin Jackson <mjolnir@gentoo.org> -postgresql-8.1.9.ebuild,
+  -postgresql-8.2.4-r1.ebuild:
+  Remove vulnerable non-stable targets for #204760
 
   15 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   postgresql-7.3.21.ebuild, postgresql-7.4.19.ebuild,
diff --git a/dev-db/postgresql/files/digest-postgresql-8.1.9 b/dev-db/postgresql/files/digest-postgresql-8.1.9
deleted file mode 100644
index a20386c29703..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 44582cd7184badf63d9c558f91cdd128 postgresql-base-8.1.9.tar.bz2 8108212
-RMD160 e10c91f95e16cfcdf10235d533855676f8e03ceb postgresql-base-8.1.9.tar.bz2 8108212
-SHA256 4d11584d545d5f18566bc1bf65409794adceef1825dc4850514238f6b5d3f5fd postgresql-base-8.1.9.tar.bz2 8108212
-MD5 a13ad4fbe78aa2ab4f86381cfcec8eb7 postgresql-docs-8.1.9.tar.bz2 2503673
-RMD160 68df3beb8c8f2ccdcf0f3875d4d1bacf1ad3017d postgresql-docs-8.1.9.tar.bz2 2503673
-SHA256 9b1f5d47345067baf9ecc71941707199d055d2f147a206b1b70245a9d5c45b30 postgresql-docs-8.1.9.tar.bz2 2503673
-MD5 26fed39417431ff56e213caf11dc7215 postgresql-opt-8.1.9.tar.bz2 144737
-RMD160 3541c7c2d86e7a9d129d521c3a7bac189758d1a5 postgresql-opt-8.1.9.tar.bz2 144737
-SHA256 b8c5c3098c53e8c8b722ba8928787eb7478beeb3c6b42adbaad1d8ca24d2e49f postgresql-opt-8.1.9.tar.bz2 144737
-MD5 abd4d19d536f846eb37f63d50bbfc02f postgresql-test-8.1.9.tar.bz2 948085
-RMD160 80f20a3353ee437efc78390d8d2d0d12c5cb519f postgresql-test-8.1.9.tar.bz2 948085
-SHA256 2dd60f661df70d43b261af0722e768f6ec4dc856c765c3dd9cd24042089323ba postgresql-test-8.1.9.tar.bz2 948085
diff --git a/dev-db/postgresql/files/digest-postgresql-8.2.4-r1 b/dev-db/postgresql/files/digest-postgresql-8.2.4-r1
deleted file mode 100644
index 6035a30b4e46..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-8.2.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 5c0576627c9969a3cedb6b014fb6ae05 postgresql-base-8.2.4.tar.bz2 8549159
-RMD160 876105c3cc9d36b66cf9dc9b687d4b6f6b2c3d9c postgresql-base-8.2.4.tar.bz2 8549159
-SHA256 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca postgresql-base-8.2.4.tar.bz2 8549159
-MD5 7d520a0fc88c8b59338c25cf18331f6a postgresql-docs-8.2.4.tar.bz2 2769630
-RMD160 bcdb176f509f69141524ababa0f6c9b1a1dd5c3f postgresql-docs-8.2.4.tar.bz2 2769630
-SHA256 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c postgresql-docs-8.2.4.tar.bz2 2769630
-MD5 b71b0526e7c8af22d82fbc7b6f81a750 postgresql-opt-8.2.4.tar.bz2 167612
-RMD160 aaacb743be86afbfe0f885b7994c15c94fef2413 postgresql-opt-8.2.4.tar.bz2 167612
-SHA256 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35 postgresql-opt-8.2.4.tar.bz2 167612
-MD5 0fefe28b8c9d16ebdf6f05c366477a9d postgresql-test-8.2.4.tar.bz2 985819
-RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae postgresql-test-8.2.4.tar.bz2 985819
-SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504 postgresql-test-8.2.4.tar.bz2 985819
diff --git a/dev-db/postgresql/postgresql-8.1.9.ebuild b/dev-db/postgresql/postgresql-8.1.9.ebuild
deleted file mode 100644
index 44e2c6086c35..000000000000
--- a/dev-db/postgresql/postgresql-8.1.9.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.9.ebuild,v 1.2 2007/10/28 12:56:33 phreak Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-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 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )
-		virtual/logger"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
-
-pkg_setup() {
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			eerror "PostgreSQL ${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 "Remove your database directory to continue"
-		fi
-	fi
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# libpq is provided separately as dev-db/libpq
-	sed -i -e 's/^DIRS := libpq ecpg/DIRS := ecpg/' src/interfaces/Makefile
-	sed -i -e '/\W\+\$.MAKE. -C include \$/d' src/Makefile
-	sed -i -e '/^\W\+psql scripts pg_config pg_controldata/ s/pg_config //' src/bin/Makefile
-
-	epatch "${FILESDIR}/${P}-sh.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# Fix sandbox violation
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-
-		# Fix broken tests
-		#epatch "${FILESDIR}/${P}-regress_fix.patch"
-
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, we need to
-		# su - to a valid user, portage again, so we patch the test-scripts to do that.
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-		if ! hasq userpriv ${FEATURES} ; then
-			mkdir -p "${S}/src/test/regress/results"
-			chown portage "${S}/src/test/regress/results"
-			epatch "${FILESDIR}/${P}-regress_su.patch"
-			sed -e "s|PORTAGETEMPDIRPG|${S}/src/test/regress|g" -i src/test/regress/pg_regress.sh
-		fi
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-	dodoc contrib/adddepend/*
-
-	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
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1."
-	elog "You can enable it in ${ROOT%/}/etc/postgresql/postgresql.conf."
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT%/}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_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
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT%/}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if ! emake -j1 check ; then
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}
diff --git a/dev-db/postgresql/postgresql-8.2.4-r1.ebuild b/dev-db/postgresql/postgresql-8.2.4-r1.ebuild
deleted file mode 100644
index ac9b1459c2bb..000000000000
--- a/dev-db/postgresql/postgresql-8.2.4-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.2.4-r1.ebuild,v 1.3 2007/10/28 12:56:33 phreak Exp $
-
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-DESCRIPTION="Sophisticated and powerful Object-Relational DBMS."
-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 )
-		test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )"
-LICENSE="POSTGRESQL"
-SLOT="0"
-IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib"
-
-RDEPEND="~dev-db/libpq-${PV}
-		>=sys-libs/ncurses-5.2
-		kerberos? ( virtual/krb5 )
-		pam? ( virtual/pam )
-		perl? ( >=dev-lang/perl-5.6.1-r2 )
-		python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-		readline? ( >=sys-libs/readline-4.1 )
-		selinux? ( sec-policy/selinux-postgresql )
-		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-		tcl? ( >=dev-lang/tcl-8 )
-		xml? ( dev-libs/libxml2 dev-libs/libxslt )
-		zlib? ( >=sys-libs/zlib-1.1.3 )
-		virtual/logger"
-DEPEND="${RDEPEND}
-		sys-devel/autoconf
-		>=sys-devel/bison-1.875
-		nls? ( sys-devel/gettext )
-		xml? ( dev-util/pkgconfig )"
-
-PG_DIR="/var/lib/postgresql"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="40"
-
-pkg_setup() {
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			eerror "PostgreSQL ${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 "Remove your database directory to continue"
-		fi
-	fi
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/bash /var/lib postgres
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-sh.patch"
-
-	# Gentoo/FreeBSD's python is works fine with threading - unlike FreeBSD's
-	epatch "${FILESDIR}/${P}-python-threads.patch"
-
-	# Prepare package for future tests
-	if use test ; then
-		# Fix sandbox violation
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
-
-		# Fix broken tests
-		epatch "${FILESDIR}/${P}-regress_fix.patch"
-
-		# We need to run the tests as a non-root user, portage seems the most fitting here,
-		# so if userpriv is enabled, we use it directly. If userpriv is disabled, we need to
-		# su - to a valid user, portage again, so we patch the test-scripts to do that.
-		mkdir -p "${S}/src/test/regress/tmp_check"
-		chown portage "${S}/src/test/regress/tmp_check"
-		einfo "Tests will be run as user portage."
-		if ! hasq userpriv ${FEATURES} ; then
-			mkdir -p "${S}/src/test/regress/results"
-			chown portage "${S}/src/test/regress/results"
-			epatch "${FILESDIR}/${P}-regress_su.patch"
-		fi
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math -feliminate-dwarf2-dups
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
-		--includedir=/usr/include/postgresql/pgsql \
-		--sysconfdir=/etc/postgresql \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-depend \
-		$(use_with kerberos krb5) \
-		$(use_enable nls ) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_enable pg-intdatetime integer-datetimes ) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with zlib) \
-		|| die "configure failed"
-
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed"
-
-	cd "${S}/contrib"
-	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed"
-	fi
-}
-
-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
-
-	cd "${S}"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed"
-
-	cd "${S}/contrib"
-	emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed"
-
-	if use xml ; then
-		cd "${S}/contrib/xml2"
-		emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed"
-	fi
-
-	cd "${S}"
-	dodoc README HISTORY
-
-	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
-
-	newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed"
-	newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed"
-}
-
-pkg_postinst() {
-	elog "Execute the following command to setup the initial database environment:"
-	elog
-	elog "emerge --config =${PF}"
-	elog
-	elog "The autovacuum function, which was in contrib, has been moved to the main"
-	elog "PostgreSQL functions starting with 8.1."
-	elog "You can enable it in ${ROOT}/etc/postgresql/postgresql.conf."
-	elog
-	elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'."
-}
-
-pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PG_DIR}/data"
-	chown -Rf postgres:postgres "${PG_DIR}"
-	chmod 0700 "${PG_DIR}/data"
-
-	einfo "Initializing the database ..."
-	if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then
-		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${PG_DIR})."
-		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_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
-		else
-			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-		fi
-
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
-	fi
-}
-
-src_test() {
-	cd "${S}"
-
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	if ! emake -j1 check ; then
-		hasq test ${FEATURES} && die "Make check failed. See above for details."
-		hasq test ${FEATURES} || eerror "Make check failed. See above for details."
-	fi
-
-	einfo "Yes, there are other tests which could be run."
-	einfo "... and no, we don't plan to add/support them."
-	einfo "For now, the main regressions tests will suffice."
-	einfo "If you think other tests are necessary, please submit a"
-	einfo "bug including a patch for this ebuild to enable them."
-}