dev-db/postgresql-{libs,client,server}-7.3*: get rid of gnuconfig_update as per bug #160178

svn path=/experimental/; revision=268

13 files changed, 135 insertions, 56 deletions

diff --git a/dev-db/postgresql-client/Manifest b/dev-db/postgresql-client/Manifest
index cb7df5a..f438ed1 100644
--- a/dev-db/postgresql-client/Manifest
+++ b/dev-db/postgresql-client/Manifest
@@ -14,14 +14,18 @@ AUX pg_autovacuum.init-8.0 1409 RMD160 47fd6ce37fe067e21660034194625cd7ae3eddfe
 MD5 0247f6ce4f15fc609330fe3eaba888f8 files/pg_autovacuum.init-8.0 1409
 RMD160 47fd6ce37fe067e21660034194625cd7ae3eddfe files/pg_autovacuum.init-8.0 1409
 SHA256 e5691194b84a22f5720d16fb00a74f4bacd7c716715530851e22908059d53d58 files/pg_autovacuum.init-8.0 1409
-AUX postgresql-7.3-client.patch 5100 RMD160 43b2d385720562c7533638581e8de6027446e29f SHA1 08326750f011543a024c8ca06131ba4e1bd8b54c SHA256 7ed19d12251d6caa7ea8649fdc6cced07662abbbd512591ce7eec0626701035a
-MD5 04a1230071d569986350b498a5a88347 files/postgresql-7.3-client.patch 5100
-RMD160 43b2d385720562c7533638581e8de6027446e29f files/postgresql-7.3-client.patch 5100
-SHA256 7ed19d12251d6caa7ea8649fdc6cced07662abbbd512591ce7eec0626701035a files/postgresql-7.3-client.patch 5100
+AUX postgresql-7.3-client.patch 5177 RMD160 19563ae70a5c6e00ac7aa293d2c23835ac7b433f SHA1 f1bb4b20ed2d8c6826f4557e3a6176b486188e12 SHA256 5590bbd2488c4e67cf1196a28af4edddd2801e08bf62870acd3ad2f216a41428
+MD5 4808e7c25ac60be8b9c16c3e52c37fd9 files/postgresql-7.3-client.patch 5177
+RMD160 19563ae70a5c6e00ac7aa293d2c23835ac7b433f files/postgresql-7.3-client.patch 5177
+SHA256 5590bbd2488c4e67cf1196a28af4edddd2801e08bf62870acd3ad2f216a41428 files/postgresql-7.3-client.patch 5177
 AUX postgresql-7.3-nls.patch 903 RMD160 13819ef0b92c29114cf67ecc84b9ac6d9dbd5b66 SHA1 00f04235b4f5f126c3446b7108f2c81c21118507 SHA256 b2bf11ca9d3a0e315d3c7ca5ae27b57ff7177e54bc580136e22dbd61428fcc44
 MD5 738855088ca899a3c51c731a2bf4a4d4 files/postgresql-7.3-nls.patch 903
 RMD160 13819ef0b92c29114cf67ecc84b9ac6d9dbd5b66 files/postgresql-7.3-nls.patch 903
 SHA256 b2bf11ca9d3a0e315d3c7ca5ae27b57ff7177e54bc580136e22dbd61428fcc44 files/postgresql-7.3-nls.patch 903
+AUX postgresql-7.3.19-autoconf.patch 1772 RMD160 99fd33fcd10e6fa588ec7533ed0a5b491a7c9c14 SHA1 2cb76454285c571d25db1db83e8e2c6731686526 SHA256 a965ea9599d8fdc0b85560b78f43be82246b164766ed398c39bafcd5816abd67
+MD5 b074f84a4df28e3ece20df2de94ef3d7 files/postgresql-7.3.19-autoconf.patch 1772
+RMD160 99fd33fcd10e6fa588ec7533ed0a5b491a7c9c14 files/postgresql-7.3.19-autoconf.patch 1772
+SHA256 a965ea9599d8fdc0b85560b78f43be82246b164766ed398c39bafcd5816abd67 files/postgresql-7.3.19-autoconf.patch 1772
 AUX postgresql-7.4-client.patch 4289 RMD160 73ba52aa608bef2922e67fa305e3207c6c45c371 SHA1 bade646b90fae0a6be5cd1e1b4837b247a047f99 SHA256 ca8bcf409da1c99d775637105af4c068e5f7df6f90380edccd125553993f2a33
 MD5 cbad55f8a6e3d9642076d09c9c488a67 files/postgresql-7.4-client.patch 4289
 RMD160 73ba52aa608bef2922e67fa305e3207c6c45c371 files/postgresql-7.4-client.patch 4289
@@ -76,10 +80,10 @@ DIST postgresql-opt-7.4.17.tar.bz2 333513 RMD160 55b7d1c9900f590d778c915d586d8ca
 DIST postgresql-opt-8.0.13.tar.bz2 134769 RMD160 f3fb741c5dcff23045a58baf57f4386099e3c563 SHA1 ccdc23eb12b19c6d88633125b9e0c2feeda5f93e SHA256 9f63fc12ede1a605934cdc462ff45c0e924288284f411ae38dec1c5b6e87ce25
 DIST postgresql-opt-8.1.9.tar.bz2 144737 RMD160 3541c7c2d86e7a9d129d521c3a7bac189758d1a5 SHA1 d3b011edaa9b05295b15692bfe0932b1e37572d2 SHA256 b8c5c3098c53e8c8b722ba8928787eb7478beeb3c6b42adbaad1d8ca24d2e49f
 DIST postgresql-opt-8.2.4.tar.bz2 167612 RMD160 aaacb743be86afbfe0f885b7994c15c94fef2413 SHA1 892112c6f348bccce534f87336ea073a0b8ca249 SHA256 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35
-EBUILD postgresql-client-7.3.19.ebuild 2747 RMD160 30ee7336e02aca44d8928db0ed7cbf85244a07b4 SHA1 d454f0c50248a836930a84dcd0dc6ebe87d16fbe SHA256 7c1b6c40474ef0abbe613ed5d567f5bdf6989faba41fb039db8c05a78ee18ff3
-MD5 2f6ee70384512e5b97f5d9e49992d41a postgresql-client-7.3.19.ebuild 2747
-RMD160 30ee7336e02aca44d8928db0ed7cbf85244a07b4 postgresql-client-7.3.19.ebuild 2747
-SHA256 7c1b6c40474ef0abbe613ed5d567f5bdf6989faba41fb039db8c05a78ee18ff3 postgresql-client-7.3.19.ebuild 2747
+EBUILD postgresql-client-7.3.19.ebuild 2726 RMD160 bad8ae08588f9f7b75d4b46c8238609bec444482 SHA1 0a802af113e228cb76aa9776985ccf4fd411ff15 SHA256 1780d5eed0f8e2dba9b9d6b768d89c0ee2a75a02f868a9c1ad1ea64555ee7e63
+MD5 6455355ec93b352370b1bb6860a7cbbd postgresql-client-7.3.19.ebuild 2726
+RMD160 bad8ae08588f9f7b75d4b46c8238609bec444482 postgresql-client-7.3.19.ebuild 2726
+SHA256 1780d5eed0f8e2dba9b9d6b768d89c0ee2a75a02f868a9c1ad1ea64555ee7e63 postgresql-client-7.3.19.ebuild 2726
 EBUILD postgresql-client-7.4.17.ebuild 3093 RMD160 cf89f65742bc7f682189261f0e87364ca1db64c6 SHA1 0328d0f0e041df581813c051ac34c560a2b45787 SHA256 101e9738ff126a30e2af76dff321dd94dda10bfd75b4f9f0f1753314d747b749
 MD5 f4f185b2a82c07399a9ac75af2560e8b postgresql-client-7.4.17.ebuild 3093
 RMD160 cf89f65742bc7f682189261f0e87364ca1db64c6 postgresql-client-7.4.17.ebuild 3093
diff --git a/dev-db/postgresql-client/files/postgresql-7.3-client.patch b/dev-db/postgresql-client/files/postgresql-7.3-client.patch
index b8e42e9..a8ca94f 100644
--- a/dev-db/postgresql-client/files/postgresql-7.3-client.patch
+++ b/dev-db/postgresql-client/files/postgresql-7.3-client.patch
@@ -66,7 +66,7 @@ diff --git a/src/Makefile.global.in b/src/Makefile.global.in
 index e0fd91d..88b8f46 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -282,11 +282,11 @@ #
+@@ -282,11 +282,11 @@ endif
  # Some variables needed to find some client interfaces
  
  libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
@@ -94,7 +94,7 @@ index 5cdfeca..651b6d8 100644
  
  ifneq ($(PORTNAME), win)
  
-@@ -78,8 +78,7 @@ # Parallel make trickery
+@@ -78,8 +78,7 @@ $(OBJS): $(DIRS:%=%-recursive) ;
  
  .PHONY: $(DIRS:%=%-recursive)
  # Update the commonly used headers before building the subdirectories
@@ -142,7 +142,7 @@ diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
 index f18280b..839296f 100644
 --- a/src/bin/pg_dump/Makefile
 +++ b/src/bin/pg_dump/Makefile
-@@ -24,13 +24,13 @@ override CPPFLAGS := -I$(libpq_srcdir) $
+@@ -24,13 +24,13 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DBINDIR=\"$(bindir)\"
  
  all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall
  
@@ -163,7 +163,7 @@ diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
 index dbaa583..3726aa4 100644
 --- a/src/bin/psql/Makefile
 +++ b/src/bin/psql/Makefile
-@@ -23,7 +23,7 @@ OBJS=command.o common.o help.o input.o s
+@@ -23,7 +23,7 @@ OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
  
  all: submake-libpq submake-libpgport psql
  
diff --git a/dev-db/postgresql-client/files/postgresql-7.3-nls.patch b/dev-db/postgresql-client/files/postgresql-7.3.19-autoconf.patch
index e1a09f7..5111907 100644
--- a/dev-db/postgresql-client/files/postgresql-7.3-nls.patch
+++ b/dev-db/postgresql-client/files/postgresql-7.3.19-autoconf.patch
@@ -23,3 +23,29 @@ index 35d9e2b..c681983 100644
  
    AC_SUBST(localedir)
    AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index 2dd90d6..6fffa79 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,12 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ dnl
+ dnl The GNU folks apparently haven't heard that some people don't use
+ dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
+-m4_define([info], [doc])
+-m4_define([infodir], [docdir])
+ AC_INIT([PostgreSQL], [7.3.19], [pgsql-bugs@postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group])
+@@ -623,7 +618,7 @@ AC_CHECK_LIB(PW,       main)
+ AC_CHECK_LIB(resolv,   main)
+ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
+ # QNX:
+-AC_CHECK_LIB([[unix]], main)
++AC_CHECK_LIB([unix], main)
+ AC_SEARCH_LIBS(crypt,  crypt)
+ # BeOS:
+ AC_CHECK_LIB(bind,     __inet_ntoa)
diff --git a/dev-db/postgresql-client/postgresql-client-7.3.19.ebuild b/dev-db/postgresql-client/postgresql-client-7.3.19.ebuild
index 74bd777..a19330e 100644
--- a/dev-db/postgresql-client/postgresql-client-7.3.19.ebuild
+++ b/dev-db/postgresql-client/postgresql-client-7.3.19.ebuild
@@ -38,14 +38,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
+	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-client.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
 
 	eautoconf
-	gnuconfig_update
 }
 
 src_compile() {
@@ -53,7 +52,7 @@ src_compile() {
 	# use ppc && CFLAGS="-pipe -fsigned-char"
 
 	# eval is needed to get along with pg_config quotation of space-rich entities.
-	eval ./configure "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+	eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
 		"$(built_with_use ~dev-db/postgresql-libs-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		|| die "configure failed"
 
diff --git a/dev-db/postgresql-libs/Manifest b/dev-db/postgresql-libs/Manifest
index 78e06f3..6f79bdd 100644
--- a/dev-db/postgresql-libs/Manifest
+++ b/dev-db/postgresql-libs/Manifest
@@ -1,11 +1,11 @@
-AUX postgresql-7.3-libs.patch 3053 RMD160 b1c8b6a58f4f7eb863511e11873dbecbe24797ae SHA1 720b233247f1beb2ae970d752bc6436b598f6f58 SHA256 85924a5e448f8806e1daca024d7b97c41cc7a42181b9773ad75f6be75184a3a4
-MD5 8802c962391284c8f9adf68f913eaa1c files/postgresql-7.3-libs.patch 3053
-RMD160 b1c8b6a58f4f7eb863511e11873dbecbe24797ae files/postgresql-7.3-libs.patch 3053
-SHA256 85924a5e448f8806e1daca024d7b97c41cc7a42181b9773ad75f6be75184a3a4 files/postgresql-7.3-libs.patch 3053
-AUX postgresql-7.3-nls.patch 903 RMD160 13819ef0b92c29114cf67ecc84b9ac6d9dbd5b66 SHA1 00f04235b4f5f126c3446b7108f2c81c21118507 SHA256 b2bf11ca9d3a0e315d3c7ca5ae27b57ff7177e54bc580136e22dbd61428fcc44
-MD5 738855088ca899a3c51c731a2bf4a4d4 files/postgresql-7.3-nls.patch 903
-RMD160 13819ef0b92c29114cf67ecc84b9ac6d9dbd5b66 files/postgresql-7.3-nls.patch 903
-SHA256 b2bf11ca9d3a0e315d3c7ca5ae27b57ff7177e54bc580136e22dbd61428fcc44 files/postgresql-7.3-nls.patch 903
+AUX postgresql-7.3-libs.patch 3061 RMD160 7d846335bea21ac9e166f87e102e8311f0e0de52 SHA1 0fa0a444cd5c435ad1272164c4c806717fc79904 SHA256 297f44ae666b62e6cd61e5b345b9639abf16fe00f97fe3357e5a48704361adef
+MD5 a5ba3f757febabcf541197cccb63bd45 files/postgresql-7.3-libs.patch 3061
+RMD160 7d846335bea21ac9e166f87e102e8311f0e0de52 files/postgresql-7.3-libs.patch 3061
+SHA256 297f44ae666b62e6cd61e5b345b9639abf16fe00f97fe3357e5a48704361adef files/postgresql-7.3-libs.patch 3061
+AUX postgresql-7.3.19-autoconf.patch 1772 RMD160 99fd33fcd10e6fa588ec7533ed0a5b491a7c9c14 SHA1 2cb76454285c571d25db1db83e8e2c6731686526 SHA256 a965ea9599d8fdc0b85560b78f43be82246b164766ed398c39bafcd5816abd67
+MD5 b074f84a4df28e3ece20df2de94ef3d7 files/postgresql-7.3.19-autoconf.patch 1772
+RMD160 99fd33fcd10e6fa588ec7533ed0a5b491a7c9c14 files/postgresql-7.3.19-autoconf.patch 1772
+SHA256 a965ea9599d8fdc0b85560b78f43be82246b164766ed398c39bafcd5816abd67 files/postgresql-7.3.19-autoconf.patch 1772
 AUX postgresql-7.4-hppa.patch 1433 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f527 SHA1 2234eff32e0ae4bdecd4b21eb9f6c7be33023652 SHA256 4424694fecd4f16655cd5ff9603489fa644175ab344498040f2c88cb0962aa6b
 MD5 d098cc4f48bf9153e17260fdde299327 files/postgresql-7.4-hppa.patch 1433
 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f527 files/postgresql-7.4-hppa.patch 1433
@@ -70,10 +70,10 @@ DIST postgresql-base-8.2.4.tar.bz2 8549159 RMD160 876105c3cc9d36b66cf9dc9b687d4b
 DIST postgresql-opt-8.0.13.tar.bz2 134769 RMD160 f3fb741c5dcff23045a58baf57f4386099e3c563 SHA1 ccdc23eb12b19c6d88633125b9e0c2feeda5f93e SHA256 9f63fc12ede1a605934cdc462ff45c0e924288284f411ae38dec1c5b6e87ce25
 DIST postgresql-opt-8.1.9.tar.bz2 144737 RMD160 3541c7c2d86e7a9d129d521c3a7bac189758d1a5 SHA1 d3b011edaa9b05295b15692bfe0932b1e37572d2 SHA256 b8c5c3098c53e8c8b722ba8928787eb7478beeb3c6b42adbaad1d8ca24d2e49f
 DIST postgresql-test-8.2.4.tar.bz2 985819 RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae SHA1 60be22d85c37d1ea461401b8e7c10472a3458913 SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-EBUILD postgresql-libs-7.3.19.ebuild 3752 RMD160 1f909d4731a6a22dd8834499073969c7c40895d0 SHA1 3d9a4a05168d33014eb15da05866e7013f21ccc8 SHA256 c9a27216dc828164099cde833a69f665e5ccc4fc20b79a908dc1dd060d15a85b
-MD5 bfcfaa37ed8300fe2bf200e8f6b8f75b postgresql-libs-7.3.19.ebuild 3752
-RMD160 1f909d4731a6a22dd8834499073969c7c40895d0 postgresql-libs-7.3.19.ebuild 3752
-SHA256 c9a27216dc828164099cde833a69f665e5ccc4fc20b79a908dc1dd060d15a85b postgresql-libs-7.3.19.ebuild 3752
+EBUILD postgresql-libs-7.3.19.ebuild 3731 RMD160 eaf52ab21d35a318185eea8cbbc60789d1fe2bcc SHA1 be7555ef5474ab3fe81b98c0c282a97ee4a3d690 SHA256 414066f4f705c3ceb615e762c4479f33fc9e2990e44b9c5a06f84b241f45bded
+MD5 59d78824d1cc8852856bce7f1b4e3b48 postgresql-libs-7.3.19.ebuild 3731
+RMD160 eaf52ab21d35a318185eea8cbbc60789d1fe2bcc postgresql-libs-7.3.19.ebuild 3731
+SHA256 414066f4f705c3ceb615e762c4479f33fc9e2990e44b9c5a06f84b241f45bded postgresql-libs-7.3.19.ebuild 3731
 EBUILD postgresql-libs-7.4.17.ebuild 3983 RMD160 9815dfa12ef33d0ba3c74625953f5273e438ffe7 SHA1 5933d4328fa6a68038a47da6ae30e468a35b5194 SHA256 4e6d8ae4e9a15bea0caeea062dedce6af1a8bb462fe85d3e39a80cd0bdead603
 MD5 ac67074fc0b6cc0efe065e897f5dac79 postgresql-libs-7.4.17.ebuild 3983
 RMD160 9815dfa12ef33d0ba3c74625953f5273e438ffe7 postgresql-libs-7.4.17.ebuild 3983
diff --git a/dev-db/postgresql-libs/files/postgresql-7.3-libs.patch b/dev-db/postgresql-libs/files/postgresql-7.3-libs.patch
index 3236cda..b4d7d78 100644
--- a/dev-db/postgresql-libs/files/postgresql-7.3-libs.patch
+++ b/dev-db/postgresql-libs/files/postgresql-7.3-libs.patch
@@ -49,7 +49,7 @@ index 5cdfeca..651b6d8 100644
  
  ifneq ($(PORTNAME), win)
  
-@@ -78,8 +78,7 @@ # Parallel make trickery
+@@ -78,8 +78,7 @@ $(OBJS): $(DIRS:%=%-recursive) ;
  
  .PHONY: $(DIRS:%=%-recursive)
  # Update the commonly used headers before building the subdirectories
diff --git a/dev-db/postgresql-libs/files/postgresql-7.3-nls.patch b/dev-db/postgresql-libs/files/postgresql-7.3.19-autoconf.patch
index e1a09f7..5111907 100644
--- a/dev-db/postgresql-libs/files/postgresql-7.3-nls.patch
+++ b/dev-db/postgresql-libs/files/postgresql-7.3.19-autoconf.patch
@@ -23,3 +23,29 @@ index 35d9e2b..c681983 100644
  
    AC_SUBST(localedir)
    AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index 2dd90d6..6fffa79 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,12 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ dnl
+ dnl The GNU folks apparently haven't heard that some people don't use
+ dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
+-m4_define([info], [doc])
+-m4_define([infodir], [docdir])
+ AC_INIT([PostgreSQL], [7.3.19], [pgsql-bugs@postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group])
+@@ -623,7 +618,7 @@ AC_CHECK_LIB(PW,       main)
+ AC_CHECK_LIB(resolv,   main)
+ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
+ # QNX:
+-AC_CHECK_LIB([[unix]], main)
++AC_CHECK_LIB([unix], main)
+ AC_SEARCH_LIBS(crypt,  crypt)
+ # BeOS:
+ AC_CHECK_LIB(bind,     __inet_ntoa)
diff --git a/dev-db/postgresql-libs/postgresql-libs-7.3.19.ebuild b/dev-db/postgresql-libs/postgresql-libs-7.3.19.ebuild
index c295174..978ff4c 100644
--- a/dev-db/postgresql-libs/postgresql-libs-7.3.19.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-7.3.19.ebuild
@@ -44,20 +44,19 @@ S="${WORKDIR}/postgresql-${PV}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
+	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-libs.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
 
 	eautoconf
-	gnuconfig_update
 }
 
 src_compile() {
 	# TODO: test if PPC really cannot work with other CFLAGS settings
 	# use ppc && CFLAGS="-pipe -fsigned-char"
-	./configure --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
+	econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \
 		--datadir=/usr/share/postgresql-${SLOT} \
 		--sysconfdir=/etc/postgresql-${SLOT} \
 		--includedir=/usr/include/postgresql-${SLOT} \
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index f1fd0fa..661dd82 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -2,18 +2,18 @@ AUX postgresql-7.3-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b18
 MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3-cubeparse.patch 1296
 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3-cubeparse.patch 1296
 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada files/postgresql-7.3-cubeparse.patch 1296
-AUX postgresql-7.3-nls.patch 903 RMD160 13819ef0b92c29114cf67ecc84b9ac6d9dbd5b66 SHA1 00f04235b4f5f126c3446b7108f2c81c21118507 SHA256 b2bf11ca9d3a0e315d3c7ca5ae27b57ff7177e54bc580136e22dbd61428fcc44
-MD5 738855088ca899a3c51c731a2bf4a4d4 files/postgresql-7.3-nls.patch 903
-RMD160 13819ef0b92c29114cf67ecc84b9ac6d9dbd5b66 files/postgresql-7.3-nls.patch 903
-SHA256 b2bf11ca9d3a0e315d3c7ca5ae27b57ff7177e54bc580136e22dbd61428fcc44 files/postgresql-7.3-nls.patch 903
-AUX postgresql-7.3-regress.patch 3443 RMD160 64e285d961e75a0a46adfa8e325fd271b8b39497 SHA1 411f394e20dabac54f1991c8438124663798b442 SHA256 c5dbb92298a24f14a5fcfe0c7151d4e4d23d23da5d4bb47ad40eaa898e1a5e66
-MD5 4a58832abaa6e51d3bf027a786fa6aac files/postgresql-7.3-regress.patch 3443
-RMD160 64e285d961e75a0a46adfa8e325fd271b8b39497 files/postgresql-7.3-regress.patch 3443
-SHA256 c5dbb92298a24f14a5fcfe0c7151d4e4d23d23da5d4bb47ad40eaa898e1a5e66 files/postgresql-7.3-regress.patch 3443
-AUX postgresql-7.3-server.patch 2365 RMD160 46a28438add0293f30de008bc5431f0d2be37a06 SHA1 967b025205d4c9319dfcec519a20c660b0db65c4 SHA256 b833b2ddeee90341a1094cd57b8a7f9669c2c40820da531ca4b3895de86fc243
-MD5 4535e5bc31a3cec7cdf490f787009c4f files/postgresql-7.3-server.patch 2365
-RMD160 46a28438add0293f30de008bc5431f0d2be37a06 files/postgresql-7.3-server.patch 2365
-SHA256 b833b2ddeee90341a1094cd57b8a7f9669c2c40820da531ca4b3895de86fc243 files/postgresql-7.3-server.patch 2365
+AUX postgresql-7.3-regress.patch 3354 RMD160 9283301c6782048a5350c03194cf966318ff4399 SHA1 59d0997e2529a8416a72a71ff4005f31b780ceac SHA256 724e75da0aaf06f7ae51dd8c38601897ffcd3aca8d0755e07e91c2a71984271d
+MD5 8262c9f959228f2951272db219aa4312 files/postgresql-7.3-regress.patch 3354
+RMD160 9283301c6782048a5350c03194cf966318ff4399 files/postgresql-7.3-regress.patch 3354
+SHA256 724e75da0aaf06f7ae51dd8c38601897ffcd3aca8d0755e07e91c2a71984271d files/postgresql-7.3-regress.patch 3354
+AUX postgresql-7.3-server.patch 2392 RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 SHA1 878478c8eac3949a217cce448eec418d93cda5ad SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821
+MD5 8563ce00d25ffb102fbe8ee54b0b0526 files/postgresql-7.3-server.patch 2392
+RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 files/postgresql-7.3-server.patch 2392
+SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821 files/postgresql-7.3-server.patch 2392
+AUX postgresql-7.3.19-autoconf.patch 1772 RMD160 99fd33fcd10e6fa588ec7533ed0a5b491a7c9c14 SHA1 2cb76454285c571d25db1db83e8e2c6731686526 SHA256 a965ea9599d8fdc0b85560b78f43be82246b164766ed398c39bafcd5816abd67
+MD5 b074f84a4df28e3ece20df2de94ef3d7 files/postgresql-7.3.19-autoconf.patch 1772
+RMD160 99fd33fcd10e6fa588ec7533ed0a5b491a7c9c14 files/postgresql-7.3.19-autoconf.patch 1772
+SHA256 a965ea9599d8fdc0b85560b78f43be82246b164766ed398c39bafcd5816abd67 files/postgresql-7.3.19-autoconf.patch 1772
 AUX postgresql-7.4-nls.patch 903 RMD160 67bd39108c62c1a223dde749965e6981824030b0 SHA1 45bac2039e2a487d03488a3ef70f23ce116a4684 SHA256 55f015b1f7a73b0c8ef957cfe9d52c782f9eaf8abff38a59840b86edc3731025
 MD5 64897f6edf14f53bdfa0921be5fffbb0 files/postgresql-7.4-nls.patch 903
 RMD160 67bd39108c62c1a223dde749965e6981824030b0 files/postgresql-7.4-nls.patch 903
@@ -133,10 +133,10 @@ DIST postgresql-test-7.4.17.tar.bz2 902524 RMD160 5d2580ac74e01a65d9c00bc7a29006
 DIST postgresql-test-8.0.13.tar.bz2 932945 RMD160 d1a1c5e05337d82fb1fc2a7249e98ce8df375978 SHA1 07924ea198ce2654b65ecce6cd05025f24b62b86 SHA256 ea7e45aa8d9d8f127704e659575a0e860fd53abdaefa7c0f256f246c283ff1cf
 DIST postgresql-test-8.1.9.tar.bz2 948085 RMD160 80f20a3353ee437efc78390d8d2d0d12c5cb519f SHA1 5a37496ab4bcb1a991674ae1b7ecdcc52f988abc SHA256 2dd60f661df70d43b261af0722e768f6ec4dc856c765c3dd9cd24042089323ba
 DIST postgresql-test-8.2.4.tar.bz2 985819 RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae SHA1 60be22d85c37d1ea461401b8e7c10472a3458913 SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-EBUILD postgresql-server-7.3.19.ebuild 8151 RMD160 4510a2b99b1d440b5132f171c2a789db735bf9f4 SHA1 8f914d8d8eed9a791fe90e299853894ae9d6956b SHA256 259b88f37582b7f4e663d70ab344f557f8f5a8e0ac9ff386a2dec5e800d198e4
-MD5 b2090d0e8e58d02971776df5c5b8e341 postgresql-server-7.3.19.ebuild 8151
-RMD160 4510a2b99b1d440b5132f171c2a789db735bf9f4 postgresql-server-7.3.19.ebuild 8151
-SHA256 259b88f37582b7f4e663d70ab344f557f8f5a8e0ac9ff386a2dec5e800d198e4 postgresql-server-7.3.19.ebuild 8151
+EBUILD postgresql-server-7.3.19.ebuild 8136 RMD160 9b395382812ec10789e123aa4aaa396219fb901e SHA1 c3464017afc24cb2b9c5884df2e6ead1ec271e3f SHA256 afe79513c948c042671b2d24c44a05a875599870dfc672c17f85f4f2947da04f
+MD5 4ef454d119c69f98aa57e6675acf79f0 postgresql-server-7.3.19.ebuild 8136
+RMD160 9b395382812ec10789e123aa4aaa396219fb901e postgresql-server-7.3.19.ebuild 8136
+SHA256 afe79513c948c042671b2d24c44a05a875599870dfc672c17f85f4f2947da04f postgresql-server-7.3.19.ebuild 8136
 EBUILD postgresql-server-7.4.17.ebuild 8129 RMD160 62053f62622f5a0c6a54798e01d5ea51ed36ff35 SHA1 245c8fc5368297775e65474a9682ae2107997c75 SHA256 eb977472f053c4c8c0575372b92677e2918abc117f046e0dab4f38cbdaa4de7a
 MD5 7583addc0e15eaa09a85144ce8ae5528 postgresql-server-7.4.17.ebuild 8129
 RMD160 62053f62622f5a0c6a54798e01d5ea51ed36ff35 postgresql-server-7.4.17.ebuild 8129
diff --git a/dev-db/postgresql-server/files/postgresql-7.3-regress.patch b/dev-db/postgresql-server/files/postgresql-7.3-regress.patch
index eeab500..992d09c 100644
--- a/dev-db/postgresql-server/files/postgresql-7.3-regress.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.3-regress.patch
@@ -2,7 +2,7 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index ebf14e5..bb07726 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -113,7 +113,8 @@ ## Run tests
+@@ -113,7 +113,8 @@ all-spi:
  ##
  
  check: all
@@ -43,7 +43,7 @@ index 9657ed3..b1b1a7f 100644
      # errors can be ignored
  fi
  
-@@ -420,7 +422,7 @@ # ----------
+@@ -420,7 +422,7 @@ fi
  # Set up SQL shell for the test.
  # ----------
  
@@ -52,7 +52,7 @@ index 9657ed3..b1b1a7f 100644
  
  
  # ----------
-@@ -451,13 +453,13 @@ # will not mess up the tests.
+@@ -451,13 +453,13 @@ fi
  # ----------
  
  message "creating database \"$dbname\""
@@ -68,7 +68,7 @@ index 9657ed3..b1b1a7f 100644
  alter database \"$dbname\" set lc_messages to 'C';
  alter database \"$dbname\" set lc_monetary to 'C';
  alter database \"$dbname\" set lc_numeric to 'C';
-@@ -473,7 +475,7 @@ # Remove regressuser* and regressgroup* 
+@@ -473,7 +475,7 @@ fi
  # ----------
  
  message "dropping regression test user accounts"
@@ -77,7 +77,7 @@ index 9657ed3..b1b1a7f 100644
  if [ $? -eq 2 ]; then
      echo "$me: could not drop user accounts"
      (exit 2); exit
-@@ -486,7 +488,7 @@ # ----------
+@@ -486,7 +488,7 @@ fi
  
  if [ "$enable_shared" = yes ]; then
          message "installing PL/pgSQL"
diff --git a/dev-db/postgresql-server/files/postgresql-7.3-server.patch b/dev-db/postgresql-server/files/postgresql-7.3-server.patch
index 1ccaa3a..6650ec6 100644
--- a/dev-db/postgresql-server/files/postgresql-7.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.3-server.patch
@@ -47,7 +47,7 @@ diff --git a/src/Makefile b/src/Makefile
 index cd6e5e6..49672db 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -17,13 +17,10 @@ all install installdirs uninstall dep de
+@@ -17,13 +17,10 @@ all install installdirs uninstall dep depend distprep:
  	$(MAKE) -C port $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -65,7 +65,7 @@ diff --git a/src/Makefile.global.in b/src/Makefile.global.in
 index e0fd91d..f8a3430 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -286,10 +286,10 @@ libpq_builddir = $(top_builddir)/src/int
+@@ -286,10 +286,10 @@ libpq_builddir = $(top_builddir)/src/interfaces/libpq
  libpq = -L$(libpq_builddir) -lpq
  
  submake-libpq:
diff --git a/dev-db/postgresql-server/files/postgresql-7.3-nls.patch b/dev-db/postgresql-server/files/postgresql-7.3.19-autoconf.patch
index e1a09f7..5111907 100644
--- a/dev-db/postgresql-server/files/postgresql-7.3-nls.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.3.19-autoconf.patch
@@ -23,3 +23,29 @@ index 35d9e2b..c681983 100644
  
    AC_SUBST(localedir)
    AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index 2dd90d6..6fffa79 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,12 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ dnl
+ dnl The GNU folks apparently haven't heard that some people don't use
+ dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
+-m4_define([info], [doc])
+-m4_define([infodir], [docdir])
+ AC_INIT([PostgreSQL], [7.3.19], [pgsql-bugs@postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group])
+@@ -623,7 +618,7 @@ AC_CHECK_LIB(PW,       main)
+ AC_CHECK_LIB(resolv,   main)
+ AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
+ # QNX:
+-AC_CHECK_LIB([[unix]], main)
++AC_CHECK_LIB([unix], main)
+ AC_SEARCH_LIBS(crypt,  crypt)
+ # BeOS:
+ AC_CHECK_LIB(bind,     __inet_ntoa)
diff --git a/dev-db/postgresql-server/postgresql-server-7.3.19.ebuild b/dev-db/postgresql-server/postgresql-server-7.3.19.ebuild
index 9f10251..d883ff9 100644
--- a/dev-db/postgresql-server/postgresql-server-7.3.19.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.3.19.ebuild
@@ -64,7 +64,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
+	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-server.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-cubeparse.patch"
 
@@ -74,7 +74,6 @@ src_unpack() {
 	fi
 
 	eautoconf
-	gnuconfig_update
 }
 
 src_compile() {