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

also
- moved vacuum-delay patch to -server
- added nls to -server IUSE

svn path=/experimental/; revision=270

14 files changed, 113 insertions, 70 deletions

diff --git a/dev-db/postgresql-client/Manifest b/dev-db/postgresql-client/Manifest
index f438ed1..ce6f828 100644
--- a/dev-db/postgresql-client/Manifest
+++ b/dev-db/postgresql-client/Manifest
@@ -18,22 +18,18 @@ AUX postgresql-7.3-client.patch 5177 RMD160 19563ae70a5c6e00ac7aa293d2c23835ac7b
 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
-SHA256 ca8bcf409da1c99d775637105af4c068e5f7df6f90380edccd125553993f2a33 files/postgresql-7.4-client.patch 4289
-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
-SHA256 55f015b1f7a73b0c8ef957cfe9d52c782f9eaf8abff38a59840b86edc3731025 files/postgresql-7.4-nls.patch 903
+AUX postgresql-7.4-client.patch 4359 RMD160 0c72d031a49513e91975ae113526a0e444debf67 SHA1 66db3077f39e027e60c35fe7fb3c0dd22bcfe165 SHA256 712b7a1a0b8f1949cf2039ec839b31e1951b05805b4dd87f2d7361de1fdcf46d
+MD5 5e9ef25dc96f9253502e2b4687d77d6a files/postgresql-7.4-client.patch 4359
+RMD160 0c72d031a49513e91975ae113526a0e444debf67 files/postgresql-7.4-client.patch 4359
+SHA256 712b7a1a0b8f1949cf2039ec839b31e1951b05805b4dd87f2d7361de1fdcf46d files/postgresql-7.4-client.patch 4359
+AUX postgresql-7.4.17-autoconf.patch 1501 RMD160 a2174cdfc120bdeb1a175afb2431c4294d2dabd5 SHA1 82005b48dd2a2cebebe37c0a0056eaabdd675de0 SHA256 6f78d727cff369b22fba7661c9b39a732d5f107535c664eac3de0a90442fec0a
+MD5 8929de413275bafa364fd12eaa26424c files/postgresql-7.4.17-autoconf.patch 1501
+RMD160 a2174cdfc120bdeb1a175afb2431c4294d2dabd5 files/postgresql-7.4.17-autoconf.patch 1501
+SHA256 6f78d727cff369b22fba7661c9b39a732d5f107535c664eac3de0a90442fec0a files/postgresql-7.4.17-autoconf.patch 1501
 AUX postgresql-8.0-client.patch 2822 RMD160 1b2b5ada1a3bb314dba57016016661298a137d6c SHA1 3076bda9547f2e2b162af37954bb4e339dec5849 SHA256 d5a4696b86f1b7486dc50a5d371d2cb6e542f4a3e5b6b639e0fb4a8ca749afbe
 MD5 dce4b2df4ec40940ff5061b2c09dba42 files/postgresql-8.0-client.patch 2822
 RMD160 1b2b5ada1a3bb314dba57016016661298a137d6c files/postgresql-8.0-client.patch 2822
@@ -84,10 +80,10 @@ EBUILD postgresql-client-7.3.19.ebuild 2726 RMD160 bad8ae08588f9f7b75d4b46c82386
 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
-SHA256 101e9738ff126a30e2af76dff321dd94dda10bfd75b4f9f0f1753314d747b749 postgresql-client-7.4.17.ebuild 3093
+EBUILD postgresql-client-7.4.17.ebuild 3072 RMD160 0d7f0417a44338a724cc0aa0b6f0db94393d7183 SHA1 62a42d11a4b5715355e62284857faef038ee9e5c SHA256 f1708893ab1857be1d8009b3e8e87b44ba78c0e6d7d010b0179dc6e2a5a85351
+MD5 b9479a17136c762f8042dd4fcafe1e14 postgresql-client-7.4.17.ebuild 3072
+RMD160 0d7f0417a44338a724cc0aa0b6f0db94393d7183 postgresql-client-7.4.17.ebuild 3072
+SHA256 f1708893ab1857be1d8009b3e8e87b44ba78c0e6d7d010b0179dc6e2a5a85351 postgresql-client-7.4.17.ebuild 3072
 EBUILD postgresql-client-8.0.13.ebuild 3443 RMD160 501e3093563036c0483b9378a872a4fe04b4278a SHA1 6184fa717b4258b17aa5f9204ee8556d3c988546 SHA256 ac0ab7f554f053f3a365eb8efbc256181a9a1029be0c06c86a8cdbd112a3c74b
 MD5 e2f61057398d122b3406f1976cf1f92b postgresql-client-8.0.13.ebuild 3443
 RMD160 501e3093563036c0483b9378a872a4fe04b4278a postgresql-client-8.0.13.ebuild 3443
diff --git a/dev-db/postgresql-client/files/postgresql-7.4-client.patch b/dev-db/postgresql-client/files/postgresql-7.4-client.patch
index bb909c3..59008c6 100644
--- a/dev-db/postgresql-client/files/postgresql-7.4-client.patch
+++ b/dev-db/postgresql-client/files/postgresql-7.4-client.patch
@@ -69,7 +69,7 @@ diff --git a/src/Makefile.global.in b/src/Makefile.global.in
 index 19c49d1..af4af77 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -287,14 +287,16 @@ #
+@@ -287,14 +287,16 @@ endif
  # Some variables needed to find some client interfaces
  
  libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
@@ -123,7 +123,7 @@ diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
 index 5594593..927d367 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
  
@@ -144,7 +144,7 @@ diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
 index e8afcf6..e70a8bf 100644
 --- a/src/bin/psql/Makefile
 +++ b/src/bin/psql/Makefile
-@@ -23,7 +23,7 @@ OBJS=	command.o common.o help.o input.o 
+@@ -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.4-nls.patch b/dev-db/postgresql-client/files/postgresql-7.4.17-autoconf.patch
index bf634c7..6c292ab 100644
--- a/dev-db/postgresql-client/files/postgresql-7.4-nls.patch
+++ b/dev-db/postgresql-client/files/postgresql-7.4.17-autoconf.patch
@@ -23,3 +23,20 @@ index ae3b91a..6af24d2 100644
  
    AC_SUBST(localedir)
    AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index 97a9701..0270800 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.4.17], [pgsql-bugs@postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
diff --git a/dev-db/postgresql-client/postgresql-client-7.4.17.ebuild b/dev-db/postgresql-client/postgresql-client-7.4.17.ebuild
index 7444edf..a554513 100644
--- a/dev-db/postgresql-client/postgresql-client-7.4.17.ebuild
+++ b/dev-db/postgresql-client/postgresql-client-7.4.17.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 6f79bdd..17e0b85 100644
--- a/dev-db/postgresql-libs/Manifest
+++ b/dev-db/postgresql-libs/Manifest
@@ -10,18 +10,14 @@ AUX postgresql-7.4-hppa.patch 1433 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f5
 MD5 d098cc4f48bf9153e17260fdde299327 files/postgresql-7.4-hppa.patch 1433
 RMD160 4c4021ab6654d4c131704d6def2b2d689df7f527 files/postgresql-7.4-hppa.patch 1433
 SHA256 4424694fecd4f16655cd5ff9603489fa644175ab344498040f2c88cb0962aa6b files/postgresql-7.4-hppa.patch 1433
-AUX postgresql-7.4-libs.patch 3060 RMD160 a8c32ed25b2df1b8b09caba941832307a4654b2f SHA1 3f9ddb74bd474ccb5333d39dfcf0919475c1d959 SHA256 6045d04cf0fd8dcc1bbdc9c13472ba415b6fc912d3a1469b6aa98325bf0106f9
-MD5 fa75be0d9058da8c8b13c4b5c9b4c7ab files/postgresql-7.4-libs.patch 3060
-RMD160 a8c32ed25b2df1b8b09caba941832307a4654b2f files/postgresql-7.4-libs.patch 3060
-SHA256 6045d04cf0fd8dcc1bbdc9c13472ba415b6fc912d3a1469b6aa98325bf0106f9 files/postgresql-7.4-libs.patch 3060
-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
-SHA256 55f015b1f7a73b0c8ef957cfe9d52c782f9eaf8abff38a59840b86edc3731025 files/postgresql-7.4-nls.patch 903
-AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4-vacuum-delay.patch 8918
-RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 files/postgresql-7.4-vacuum-delay.patch 8918
-SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123 files/postgresql-7.4-vacuum-delay.patch 8918
+AUX postgresql-7.4-libs.patch 3068 RMD160 9fb11c3a7ec425df657870e24145d87a273240cc SHA1 93a2f026e08fe2e96bba844d2f2dc93bf2f39268 SHA256 a819dfef215ff14c4cfc949302e9625403e9d33eaf4e68c82e7fc7c6ed780cb1
+MD5 4c1ef062224e28526431aab8e820ca68 files/postgresql-7.4-libs.patch 3068
+RMD160 9fb11c3a7ec425df657870e24145d87a273240cc files/postgresql-7.4-libs.patch 3068
+SHA256 a819dfef215ff14c4cfc949302e9625403e9d33eaf4e68c82e7fc7c6ed780cb1 files/postgresql-7.4-libs.patch 3068
+AUX postgresql-7.4.17-autoconf.patch 1501 RMD160 a2174cdfc120bdeb1a175afb2431c4294d2dabd5 SHA1 82005b48dd2a2cebebe37c0a0056eaabdd675de0 SHA256 6f78d727cff369b22fba7661c9b39a732d5f107535c664eac3de0a90442fec0a
+MD5 8929de413275bafa364fd12eaa26424c files/postgresql-7.4.17-autoconf.patch 1501
+RMD160 a2174cdfc120bdeb1a175afb2431c4294d2dabd5 files/postgresql-7.4.17-autoconf.patch 1501
+SHA256 6f78d727cff369b22fba7661c9b39a732d5f107535c664eac3de0a90442fec0a files/postgresql-7.4.17-autoconf.patch 1501
 AUX postgresql-8.0-libs.patch 3348 RMD160 2d8e6cd59e1174fb836696716071f93376fcb97e SHA1 895c36387acf091259ea64a2ac87b6489a322d62 SHA256 39140f92033e79a06852ce1fda7de7ccb1a33e80381d85c4d8bdab5101b6a3b3
 MD5 6f7ca0db4664977908d54717440290da files/postgresql-8.0-libs.patch 3348
 RMD160 2d8e6cd59e1174fb836696716071f93376fcb97e files/postgresql-8.0-libs.patch 3348
@@ -74,10 +70,10 @@ EBUILD postgresql-libs-7.3.19.ebuild 3731 RMD160 eaf52ab21d35a318185eea8cbbc6078
 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
-SHA256 4e6d8ae4e9a15bea0caeea062dedce6af1a8bb462fe85d3e39a80cd0bdead603 postgresql-libs-7.4.17.ebuild 3983
+EBUILD postgresql-libs-7.4.17.ebuild 3902 RMD160 7ccbe77a57091f5aed86ec56a883dc7521f67128 SHA1 7265ed42a970bb6f4bbf16e3f43cbf479daa2c44 SHA256 424fd5889e9eb3604b33ed2b2265dd573cc824f14f2e75ab25b3128e8ef7b83f
+MD5 49d6f0a9758de764d21b12c99bfbc34b postgresql-libs-7.4.17.ebuild 3902
+RMD160 7ccbe77a57091f5aed86ec56a883dc7521f67128 postgresql-libs-7.4.17.ebuild 3902
+SHA256 424fd5889e9eb3604b33ed2b2265dd573cc824f14f2e75ab25b3128e8ef7b83f postgresql-libs-7.4.17.ebuild 3902
 EBUILD postgresql-libs-8.0.13.ebuild 4032 RMD160 1df28ef7388dd8418453342589978276ab77359e SHA1 6ee9c627bf887b28d48a471a8e125702a3ad4541 SHA256 252dd2a3b447f10cd85eb6549876db977ec3da3444f2dc351b26af77742eb1b7
 MD5 49e5afadab14764b0cee1ecdf21169f7 postgresql-libs-8.0.13.ebuild 4032
 RMD160 1df28ef7388dd8418453342589978276ab77359e postgresql-libs-8.0.13.ebuild 4032
diff --git a/dev-db/postgresql-libs/files/postgresql-7.4-libs.patch b/dev-db/postgresql-libs/files/postgresql-7.4-libs.patch
index b2e53f2..a619303 100644
--- a/dev-db/postgresql-libs/files/postgresql-7.4-libs.patch
+++ b/dev-db/postgresql-libs/files/postgresql-7.4-libs.patch
@@ -49,7 +49,7 @@ index 82cdd0f..88d302a 100644
  
  ifneq ($(PORTNAME), cygwin)
  
-@@ -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.4-nls.patch b/dev-db/postgresql-libs/files/postgresql-7.4.17-autoconf.patch
index bf634c7..6c292ab 100644
--- a/dev-db/postgresql-libs/files/postgresql-7.4-nls.patch
+++ b/dev-db/postgresql-libs/files/postgresql-7.4.17-autoconf.patch
@@ -23,3 +23,20 @@ index ae3b91a..6af24d2 100644
  
    AC_SUBST(localedir)
    AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index 97a9701..0270800 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.4.17], [pgsql-bugs@postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
diff --git a/dev-db/postgresql-libs/postgresql-libs-7.4.17.ebuild b/dev-db/postgresql-libs/postgresql-libs-7.4.17.ebuild
index 167ccb3..471ddfb 100644
--- a/dev-db/postgresql-libs/postgresql-libs-7.4.17.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-7.4.17.ebuild
@@ -44,22 +44,20 @@ 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}-hppa.patch"
-	epatch "${FILESDIR}/postgresql-${SLOT}-vacuum-delay.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-libs.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
 
 	eautoreconf
-	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 419aea1..672fc3b 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -14,18 +14,22 @@ AUX postgresql-7.3.19-autoconf.patch 1772 RMD160 99fd33fcd10e6fa588ec7533ed0a5b4
 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
-SHA256 55f015b1f7a73b0c8ef957cfe9d52c782f9eaf8abff38a59840b86edc3731025 files/postgresql-7.4-nls.patch 903
-AUX postgresql-7.4-regress.patch 3486 RMD160 d901903a23f8bfc9d30fee35f1b9fc74c20cffc9 SHA1 81b8f84048be3a0a6e315c5aeabf36d7534651d8 SHA256 4f16fb6f0a6492bf83c47b3be93c01fcc62e37afd5c269f7fa90658ffca1eb78
-MD5 8239e08f43222b969461066207914c31 files/postgresql-7.4-regress.patch 3486
-RMD160 d901903a23f8bfc9d30fee35f1b9fc74c20cffc9 files/postgresql-7.4-regress.patch 3486
-SHA256 4f16fb6f0a6492bf83c47b3be93c01fcc62e37afd5c269f7fa90658ffca1eb78 files/postgresql-7.4-regress.patch 3486
-AUX postgresql-7.4-server.patch 2469 RMD160 faaaa56d510bea9673cd99eaf464410bc905753e SHA1 bfa34f6b35b73f2c5e193bbe833775e1def6ed3c SHA256 934138b61ac4fd1c2dfa8395d32e27d5fcc8b54b3f65cb0139c4803caf926d9e
-MD5 c22dcb9042c6a8a7cc92f0b477c14e44 files/postgresql-7.4-server.patch 2469
-RMD160 faaaa56d510bea9673cd99eaf464410bc905753e files/postgresql-7.4-server.patch 2469
-SHA256 934138b61ac4fd1c2dfa8395d32e27d5fcc8b54b3f65cb0139c4803caf926d9e files/postgresql-7.4-server.patch 2469
+AUX postgresql-7.4-regress.patch 3397 RMD160 59c5c292eab17cb358a498d4a9b408a118dedabc SHA1 27f2d2d07f8acb70b754a09efede17e9e69cf4ec SHA256 62ebfe599b75cadf6c967727da70cea1eca4b50fa0ba840cb57214270b02db1f
+MD5 ba333c32a7f335bd82762ae640a87850 files/postgresql-7.4-regress.patch 3397
+RMD160 59c5c292eab17cb358a498d4a9b408a118dedabc files/postgresql-7.4-regress.patch 3397
+SHA256 62ebfe599b75cadf6c967727da70cea1eca4b50fa0ba840cb57214270b02db1f files/postgresql-7.4-regress.patch 3397
+AUX postgresql-7.4-server.patch 2482 RMD160 8f5f4c5e07b8c2b9616a82dd97992f7e5da372b1 SHA1 24f1b2cd0b831766b2f9cb423707e16d1f75d2e7 SHA256 dafa7ecb1dbf033c484c0f8d0a77ec1bac10f1088c17086e344da4793814fee0
+MD5 b2acf4d0948f999b183a26561223df3b files/postgresql-7.4-server.patch 2482
+RMD160 8f5f4c5e07b8c2b9616a82dd97992f7e5da372b1 files/postgresql-7.4-server.patch 2482
+SHA256 dafa7ecb1dbf033c484c0f8d0a77ec1bac10f1088c17086e344da4793814fee0 files/postgresql-7.4-server.patch 2482
+AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4-vacuum-delay.patch 8918
+RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 files/postgresql-7.4-vacuum-delay.patch 8918
+SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123 files/postgresql-7.4-vacuum-delay.patch 8918
+AUX postgresql-7.4.17-autoconf.patch 1501 RMD160 a2174cdfc120bdeb1a175afb2431c4294d2dabd5 SHA1 82005b48dd2a2cebebe37c0a0056eaabdd675de0 SHA256 6f78d727cff369b22fba7661c9b39a732d5f107535c664eac3de0a90442fec0a
+MD5 8929de413275bafa364fd12eaa26424c files/postgresql-7.4.17-autoconf.patch 1501
+RMD160 a2174cdfc120bdeb1a175afb2431c4294d2dabd5 files/postgresql-7.4.17-autoconf.patch 1501
+SHA256 6f78d727cff369b22fba7661c9b39a732d5f107535c664eac3de0a90442fec0a files/postgresql-7.4.17-autoconf.patch 1501
 AUX postgresql-8.0-nls.patch 903 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af SHA1 f49df137be68a34b7f30e0c054df9f0e39721c22 SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98
 MD5 adfce07a45d624bc1903905090ffe431 files/postgresql-8.0-nls.patch 903
 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af files/postgresql-8.0-nls.patch 903
@@ -137,10 +141,10 @@ EBUILD postgresql-server-7.3.19.ebuild 8130 RMD160 d6acbda69286c274a4c81a89afca0
 MD5 337a95f846c24ce9faf280878c23f133 postgresql-server-7.3.19.ebuild 8130
 RMD160 d6acbda69286c274a4c81a89afca07bf58551108 postgresql-server-7.3.19.ebuild 8130
 SHA256 744837911b3b5e737cca3a8930402e625ebbfce00359d35ffdf888db4ed8c7d3 postgresql-server-7.3.19.ebuild 8130
-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
-SHA256 eb977472f053c4c8c0575372b92677e2918abc117f046e0dab4f38cbdaa4de7a postgresql-server-7.4.17.ebuild 8129
+EBUILD postgresql-server-7.4.17.ebuild 8037 RMD160 a37d074cc7dd9582f9bb0494bad07cc58526df55 SHA1 74e49b5ed8789c2048ba8152ddfa867c4f29e41b SHA256 9883ac831c1205fa59e79e7585afa7a8497cee377fb4bc3325f4e8e147f73448
+MD5 cd449e6536f341bbdf9181675c48bf90 postgresql-server-7.4.17.ebuild 8037
+RMD160 a37d074cc7dd9582f9bb0494bad07cc58526df55 postgresql-server-7.4.17.ebuild 8037
+SHA256 9883ac831c1205fa59e79e7585afa7a8497cee377fb4bc3325f4e8e147f73448 postgresql-server-7.4.17.ebuild 8037
 EBUILD postgresql-server-8.0.13.ebuild 8151 RMD160 4b8859c59fc7d04f99f2c399a5c12611b0770d9f SHA1 ef596c5d5dcea072ce12c4575ff0f1c87fa440fc SHA256 095021b5e121ff168acb566ffaa673cb5d96a8cd0b4aead7a86a42902b360983
 MD5 25e9d967b0cb2dd5a483fdd5597afdb9 postgresql-server-8.0.13.ebuild 8151
 RMD160 4b8859c59fc7d04f99f2c399a5c12611b0770d9f postgresql-server-8.0.13.ebuild 8151
diff --git a/dev-db/postgresql-server/files/postgresql-7.4-regress.patch b/dev-db/postgresql-server/files/postgresql-7.4-regress.patch
index 56e4fef..a8107d8 100644
--- a/dev-db/postgresql-server/files/postgresql-7.4-regress.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.4-regress.patch
@@ -2,7 +2,7 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index 3d6a939..865351a 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -122,7 +122,8 @@ ## Run tests
+@@ -122,7 +122,8 @@ all-spi:
  ##
  
  check: all
@@ -43,7 +43,7 @@ index 47f2cb9..130c671 100644
      # errors can be ignored
  fi
  
-@@ -466,7 +468,7 @@ # ----------
+@@ -466,7 +468,7 @@ fi
  # Set up SQL shell for the test.
  # ----------
  
@@ -52,7 +52,7 @@ index 47f2cb9..130c671 100644
  
  
  # ----------
-@@ -497,13 +499,13 @@ # will not mess up the tests.
+@@ -497,13 +499,13 @@ fi
  # ----------
  
  message "creating database \"$dbname\""
@@ -68,7 +68,7 @@ index 47f2cb9..130c671 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';
-@@ -519,7 +521,7 @@ # Remove regressuser* and regressgroup* 
+@@ -519,7 +521,7 @@ fi
  # ----------
  
  message "dropping regression test user accounts"
@@ -77,7 +77,7 @@ index 47f2cb9..130c671 100644
  if [ $? -eq 2 ]; then
      echo "$me: could not drop user accounts"
      (exit 2); exit
-@@ -532,7 +534,7 @@ # ----------
+@@ -532,7 +534,7 @@ fi
  
  if [ "$enable_shared" = yes ]; then
          message "installing PL/pgSQL"
diff --git a/dev-db/postgresql-server/files/postgresql-7.4-server.patch b/dev-db/postgresql-server/files/postgresql-7.4-server.patch
index 2435eca..3661c6d 100644
--- a/dev-db/postgresql-server/files/postgresql-7.4-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.4-server.patch
@@ -64,7 +64,7 @@ diff --git a/src/Makefile.global.in b/src/Makefile.global.in
 index 19c49d1..c968a2e 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -291,10 +291,10 @@ libpq_builddir = $(top_builddir)/src/int
+@@ -291,10 +291,10 @@ libpq_builddir = $(top_builddir)/src/interfaces/libpq
  libpq = -L$(libpq_builddir) -lpq
  
  submake-libpq:
diff --git a/dev-db/postgresql-libs/files/postgresql-7.4-vacuum-delay.patch b/dev-db/postgresql-server/files/postgresql-7.4-vacuum-delay.patch
index e0f4998..e0f4998 100644
--- a/dev-db/postgresql-libs/files/postgresql-7.4-vacuum-delay.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.4-vacuum-delay.patch
diff --git a/dev-db/postgresql-server/files/postgresql-7.4-nls.patch b/dev-db/postgresql-server/files/postgresql-7.4.17-autoconf.patch
index bf634c7..6c292ab 100644
--- a/dev-db/postgresql-server/files/postgresql-7.4-nls.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.4.17-autoconf.patch
@@ -23,3 +23,20 @@ index ae3b91a..6af24d2 100644
  
    AC_SUBST(localedir)
    AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index 97a9701..0270800 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.4.17], [pgsql-bugs@postgresql.org])
+-m4_undefine([infodir])
+-m4_undefine([info])
+-AC_SUBST(docdir)
+ 
+ AC_PREREQ(2.53)
+ AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
diff --git a/dev-db/postgresql-server/postgresql-server-7.4.17.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.17.ebuild
index 86bb2d1..8461016 100644
--- a/dev-db/postgresql-server/postgresql-server-7.4.17.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.4.17.ebuild
@@ -20,7 +20,7 @@ IUSE_LINGUAS="
 	linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu
 	linguas_it linguas_nb linguas_pt_BR linguas_ru linguas_sl linguas_sv
 	linguas_tr linguas_zh_CN linguas_zh_TW"
-IUSE="doc perl python selinux tcl test xml eselect ${IUSE_LINGUAS}"
+IUSE="doc perl python selinux tcl test xml eselect nls ${IUSE_LINGUAS}"
 
 wanted_languages() {
 	for u in ${IUSE_LINGUAS} ; do
@@ -64,16 +64,15 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
+	epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch"
+	epatch "${FILESDIR}/postgresql-${SLOT}-vacuum-delay.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-server.patch"
 
 	if use test ; then
 		epatch "${FILESDIR}/postgresql-${SLOT}-regress.patch"
-		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
 	fi
 
 	eautoreconf
-	gnuconfig_update
 }
 
 src_compile() {
@@ -81,7 +80,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)" \
 		$(use_with perl) \
 		$(use_with python) \
 		$(use_with tcl) \