# HG changeset patch
# User holger
# Date 1252515880 -7200
# Node ID 7ce3014adf4ba2a6686c54736e07a3fb0e77546d
# Parent  9014d136897e7ca41cce7f158fe8e7dd0ff49b6a
sync postgres ebuilds with Gentoo bug#276125, fixes misc. bugs

diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-base/Manifest
--- a/dev-db/postgresql-base/Manifest	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-base/Manifest	Wed Sep 09 19:04:40 2009 +0200
@@ -1,5 +1,5 @@
 AUX postgresql-8.4-base.patch 4673 RMD160 414aa67067a9e7f39a0d674d1bb97d592022cce2 SHA1 7b03968e1301c124d73fe38d7a411efe8ed7b50f SHA256 c1647545a7c2af3164df839f6aa967e8f5a8eb7bf6f1a31d1a16a74c6b2f2f05
 AUX postgresql-8.4-common.patch 2058 RMD160 14e61a791fb1deaa327f90d207526fabfa35c4de SHA1 315543042274e3802f429fefe83568e8801078f3 SHA256 03b613fcb816b455eb92708e8095b8a0685f4c6992f90288295e1c6193af70b4
 DIST postgresql-8.4.1.tar.bz2 13579302 RMD160 ad03c250afd71091294a2a3e67d96b661883db87 SHA1 e6903f0029402ef8fb12645a177204499ea5b2b7 SHA256 85f5a5053aea196a2c997785cb5f61368aa46407527de820006d04b594fd9d7c
-EBUILD postgresql-base-8.4.1.ebuild 4617 RMD160 7fd7c93d52332ebd1ab69537388b5f5971040cf4 SHA1 7d05af356f57b91f09b068aad1f616477d6514f9 SHA256 38d1897cdbf7a9fc9c780546ed7b0494d195e087947455ef99cd2c29ff028caf
+EBUILD postgresql-base-8.4.1.ebuild 4636 RMD160 ae6a6ba18baa96c880dfb1eb10d037e6ae1b19da SHA1 d5171540df8812e4890197135ff7a3e561bfdd95 SHA256 3af80f231ffe50b7d7384f35c3731dbb15de06e14afefc8bdfdcf3e6c612d196
 MISC metadata.xml 329 RMD160 3b8f9c5e1c05696380c649d2f4f6eb3f1d3b688b SHA1 d7d9e8fbd6a509c5016fc764ccc4239af8feb5b8 SHA256 d9eed0f3b1f204ace8472c343d526d6c949124b5fe5ab8174b2e555712b3e831
diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-base/postgresql-base-8.4.1.ebuild
--- a/dev-db/postgresql-base/postgresql-base-8.4.1.ebuild	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-base/postgresql-base-8.4.1.ebuild	Wed Sep 09 19:04:40 2009 +0200
@@ -68,11 +68,10 @@
 src_compile() {
 	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
 		--datadir=/usr/share/postgresql-${SLOT} \
+		--docdir=/usr/share/doc/postgresql-${SLOT} \
 		--sysconfdir=/etc/postgresql-${SLOT} \
 		--includedir=/usr/include/postgresql-${SLOT} \
-		--with-locale-dir=/usr/share/postgresql-${SLOT}/locale \
 		--mandir=/usr/share/postgresql-${SLOT}/man \
-		--without-docdir \
 		--enable-depend \
 		--without-tcl \
 		--without-perl \
@@ -104,6 +103,7 @@
 	dodir /usr/share/postgresql-${SLOT}/man/man1
 	tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1
 
+	rm -r "${D}/usr/share/doc/postgresql-${SLOT}/html"
 	rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-docs/Manifest
--- a/dev-db/postgresql-docs/Manifest	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-docs/Manifest	Wed Sep 09 19:04:40 2009 +0200
@@ -1,3 +1,3 @@
 DIST postgresql-8.4.1.tar.bz2 13579302 RMD160 ad03c250afd71091294a2a3e67d96b661883db87 SHA1 e6903f0029402ef8fb12645a177204499ea5b2b7 SHA256 85f5a5053aea196a2c997785cb5f61368aa46407527de820006d04b594fd9d7c
-EBUILD postgresql-docs-8.4.1.ebuild 1067 RMD160 5688050adb542b08497f7a47ca1bf97ca23885c1 SHA1 3a5da084a13b8d72c885c3fad59405b56b58bbde SHA256 17466fbb6ee210220504d39f5446bb35847d84b1e780e79f9f692c7dbb6d909d
+EBUILD postgresql-docs-8.4.1.ebuild 1129 RMD160 7817a577fde92d90812b398a6f79a58161dbb8e6 SHA1 5cd42809cb4728705ee803bed6da51b6a09e52f2 SHA256 185d4b4cebd986b9c33d53cb3e5f00e825202fa940d84eaf08047c5c9bd3e281
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-docs/postgresql-docs-8.4.1.ebuild
--- a/dev-db/postgresql-docs/postgresql-docs-8.4.1.ebuild	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-docs/postgresql-docs-8.4.1.ebuild	Wed Sep 09 19:04:40 2009 +0200
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.3.7.ebuild,v 1.4 2009/06/05 22:49:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.3.5.ebuild,v 1.1 2008/12/03 19:20:23 caleb Exp $
 
 inherit versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 # Nothing to test here per 232157
 RESTRICT="test"
@@ -17,8 +17,6 @@
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
-RESTRICT="test"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -30,9 +28,14 @@
 	dodir /usr/share/doc/${PF}/html
 	tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
 	cd "${S}/doc"
-	dodoc TODO
 	docinto FAQ_html
 	dodoc src/FAQ/*
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+	docinto
+	dodoc TODO
 
 	dodir /etc/eselect/postgresql/slots/${SLOT}
 	{
diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-server/Manifest
--- a/dev-db/postgresql-server/Manifest	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-server/Manifest	Wed Sep 09 19:04:40 2009 +0200
@@ -1,6 +1,6 @@
 AUX postgresql-8.4-common.patch 2058 RMD160 14e61a791fb1deaa327f90d207526fabfa35c4de SHA1 315543042274e3802f429fefe83568e8801078f3 SHA256 03b613fcb816b455eb92708e8095b8a0685f4c6992f90288295e1c6193af70b4
-AUX postgresql-8.4-server.patch 7991 RMD160 a4358bd536e6f22a6ac4d395f397320b42951340 SHA1 a119d690b7ef349885c7a402a0bb2c72ffd7c2c9 SHA256 5b848fd214bf6cfa77946d4f73c5a03b1da684b626a538eaf8eeeb8d5e33a89d
+AUX postgresql-8.4-server.patch 7806 RMD160 99ab77e553987869e3243a895b4b6c4afdf39268 SHA1 ccb552141347e4545db78e73012509c6ecc7a1e4 SHA256 48b63ec1f6b61e7c167a7cb754fc6c278d56654e57f3b10678323f35984077ae
 AUX postgresql.conf-8.4 1725 RMD160 31336d319b654ccaada3eae51ce09f2cafb37fc5 SHA1 c05de3c88e44ec9f71774c2c129f31013ca723d7 SHA256 0e1e9ffaf563f6d9f653575ec5938329644fc68aeb414d926d3b465872b40162
 AUX postgresql.init-8.4 3036 RMD160 dac1f3a59b80c05f0f80057d758a70a1dc6f4232 SHA1 6779f74194185005c0249b2079e3aca698748091 SHA256 2c47b023a6d1a17a3be9bfc6cb4c0453c91aac26d55becb563813280efc5a148
 DIST postgresql-8.4.1.tar.bz2 13579302 RMD160 ad03c250afd71091294a2a3e67d96b661883db87 SHA1 e6903f0029402ef8fb12645a177204499ea5b2b7 SHA256 85f5a5053aea196a2c997785cb5f61368aa46407527de820006d04b594fd9d7c
-EBUILD postgresql-server-8.4.1.ebuild 9662 RMD160 11262aaf1d4dc4bc7084afcab606c3fd44ae7cc7 SHA1 f1853ea002bd4b1880c27536129c2e64d3e8ff79 SHA256 19b23fd9086d4965861cc408b78e982889cf9750a03a60a6ae356f1e9e29c11a
+EBUILD postgresql-server-8.4.1.ebuild 9174 RMD160 6b955622cca4beff3a340ee5e7cd538ae5d43585 SHA1 3c0703cc21bf6ab2a37a2cbc927f717e8e0d5d53 SHA256 5870812684fc6d1e3c457942a3dbfbdcf4838281805a788030257e5cba8a4d65
diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-server/files/postgresql-8.4-server.patch
--- a/dev-db/postgresql-server/files/postgresql-8.4-server.patch	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-server/files/postgresql-8.4-server.patch	Wed Sep 09 19:04:40 2009 +0200
@@ -164,17 +164,6 @@
 diff -Naur postgresql-8.4.0.orig/src/Makefile.global.in postgresql-8.4.0/src/Makefile.global.in
 --- postgresql-8.4.0.orig/src/Makefile.global.in	2009-06-23 05:46:00.000000000 +0200
 +++ postgresql-8.4.0/src/Makefile.global.in	2009-07-09 19:39:46.000000000 +0200
-@@ -397,10 +397,8 @@
- 
- 
- submake-libpq:
--	$(MAKE) -C $(libpq_builddir) all
- 
- submake-libpgport:
--	$(MAKE) -C $(top_builddir)/src/port all
- 
- .PHONY: submake-libpq submake-libpgport
- 
 @@ -443,6 +441,8 @@
     LDFLAGS += $(PROFILE)
  endif
diff -r 9014d136897e -r 7ce3014adf4b dev-db/postgresql-server/postgresql-server-8.4.1.ebuild
--- a/dev-db/postgresql-server/postgresql-server-8.4.1.ebuild	Wed Sep 09 17:22:48 2009 +0200
+++ b/dev-db/postgresql-server/postgresql-server-8.4.1.ebuild	Wed Sep 09 19:04:40 2009 +0200
@@ -81,12 +81,9 @@
 		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		|| die "configure failed"
 
-	for bd in . contrib $(use xml && echo contrib/xml2); do
+	for bd in .  contrib $(use xml && echo contrib/xml2); do
 		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake in $bd failed"
+			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake in $bd failed"
 	done
 }
 
@@ -99,13 +96,10 @@
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
 		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-			emake install -C $bd -j1 DESTDIR="${D}" \
-				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
-				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake install in $bd failed"
+			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
 	done
 
-	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/${PF}/html"
+	rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html"
 	rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
@@ -237,9 +231,7 @@
 src_test() {
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
-		emake -j1 check \
-			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
-			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
+		emake -j1 check  || die "Make check failed. See above for details."
 
 	einfo "Yes, there are other tests which could be run."
 	einfo "... and no, we don't plan to add/support them."