testing/dev-db/{libp,postgresql}-7.3*: eliminate gnuconfig_update as per bug #160178

svn path=/testing/; revision=278

6 files changed, 76 insertions, 23 deletions

diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index c422892..e95ffc9 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -1,3 +1,7 @@
+AUX libpq-7.3.19-autoconf.patch 869 RMD160 d39a2beb9e4d549975fee7a59df5a23046a6ceeb SHA1 657a96eddfe4d578c196f621eb3e57f9290d5ab8 SHA256 e79d05901282531fc85e3703f394a3c5655f047973c776a2874f3d360c96ced7
+MD5 b4bb6bb605eb2808daf9ab42404906d4 files/libpq-7.3.19-autoconf.patch 869
+RMD160 d39a2beb9e4d549975fee7a59df5a23046a6ceeb files/libpq-7.3.19-autoconf.patch 869
+SHA256 e79d05901282531fc85e3703f394a3c5655f047973c776a2874f3d360c96ced7 files/libpq-7.3.19-autoconf.patch 869
 AUX libpq-7.3.19-gentoo.patch 2145 RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c SHA1 ac84864269c6e377d24f6c5e11bebfe2c3eb89d3 SHA256 db52e0d1345977ff8cd58ee9a74d321356032cb344f080a93409f9922fefed14
 MD5 12b0d7b6fb93d3c6272210a95ae41e39 files/libpq-7.3.19-gentoo.patch 2145
 RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c files/libpq-7.3.19-gentoo.patch 2145
@@ -32,10 +36,10 @@ DIST postgresql-opt-8.0.13.tar.bz2 134769 RMD160 f3fb741c5dcff23045a58baf57f4386
 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
 DIST postgresql-test-8.2.4.tar.bz2 985819 RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae SHA1 60be22d85c37d1ea461401b8e7c10472a3458913 SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504
-EBUILD libpq-7.3.19.ebuild 3280 RMD160 d220e0f496d0108a3ebbc35a67846a91553368dd SHA1 9434fa307b92929c172f299c72d4b02cda19cb0e SHA256 4931c0b0123592e9ab54f94f78f2aa7d603cac593b676526d8c66b46115cc7bf
-MD5 1abacf536db3adfd993be5048a054895 libpq-7.3.19.ebuild 3280
-RMD160 d220e0f496d0108a3ebbc35a67846a91553368dd libpq-7.3.19.ebuild 3280
-SHA256 4931c0b0123592e9ab54f94f78f2aa7d603cac593b676526d8c66b46115cc7bf libpq-7.3.19.ebuild 3280
+EBUILD libpq-7.3.19.ebuild 3274 RMD160 0283c38be17c7849aa5ffa4504e2e732f6f16bb2 SHA1 d779e0c422ac916bd7aa31016fdd405ddc2e0cf4 SHA256 69894fa0ac09bbb1281485ee294d46d8c4c4903b24a21d5fb0075db0cfd5cc02
+MD5 aed6cfc2149921505675c61fd9746b8f libpq-7.3.19.ebuild 3274
+RMD160 0283c38be17c7849aa5ffa4504e2e732f6f16bb2 libpq-7.3.19.ebuild 3274
+SHA256 69894fa0ac09bbb1281485ee294d46d8c4c4903b24a21d5fb0075db0cfd5cc02 libpq-7.3.19.ebuild 3274
 EBUILD libpq-7.4.17.ebuild 3080 RMD160 2333f2170e74aeea83b887fb579afb7c3c8b2377 SHA1 b945cd9a44120449339f3d6176cea03d1b8223c5 SHA256 08ba705432369fab2a0d848c72834fd9359cceb3d3b55f1c15969b405cacf0ab
 MD5 74f83d221e20e8e7343ae640684bfb06 libpq-7.4.17.ebuild 3080
 RMD160 2333f2170e74aeea83b887fb579afb7c3c8b2377 libpq-7.4.17.ebuild 3080
diff --git a/dev-db/libpq/files/libpq-7.3.19-autoconf.patch b/dev-db/libpq/files/libpq-7.3.19-autoconf.patch
new file mode 100644
index 0000000..9e83884
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.3.19-autoconf.patch
@@ -0,0 +1,26 @@
+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/libpq/libpq-7.3.19.ebuild b/dev-db/libpq/libpq-7.3.19.ebuild
index 0346a2f..9da43d0 100644
--- a/dev-db/libpq/libpq-7.3.19.ebuild
+++ b/dev-db/libpq/libpq-7.3.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.19.ebuild,v 1.8 2007/06/24 21:20:43 vapier Exp $
 
-inherit eutils gnuconfig flag-o-matic toolchain-funcs
+inherit eutils gnuconfig flag-o-matic toolchain-funcs autotools
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
 
@@ -39,17 +39,14 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-autoconf.patch"
+	eautoconf
 }
 
 src_compile() {
 	filter-flags -ffast-math -feliminate-dwarf2-dups
 
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
+	econf --prefix=/usr \
 		--includedir=/usr/include/postgresql/libpq-${SLOT} \
 		--sysconfdir=/etc/postgresql \
 		--mandir=/usr/share/man \
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9971029..1f9b78f 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -14,6 +14,10 @@ AUX pg_autovacuum.init-8.0 1457 RMD160 620731601a73267e52d0cf459dac4c13a1dc94f4
 MD5 92ae9f4fbbe0221fcd8d6dc357bd12c0 files/pg_autovacuum.init-8.0 1457
 RMD160 620731601a73267e52d0cf459dac4c13a1dc94f4 files/pg_autovacuum.init-8.0 1457
 SHA256 f0f8c1f85fdad5fc0c75a1299ddf904f9b1165eece2e67de7a3a99f82c97fa42 files/pg_autovacuum.init-8.0 1457
+AUX postgresql-7.3.19-autoconf.patch 869 RMD160 d39a2beb9e4d549975fee7a59df5a23046a6ceeb SHA1 657a96eddfe4d578c196f621eb3e57f9290d5ab8 SHA256 e79d05901282531fc85e3703f394a3c5655f047973c776a2874f3d360c96ced7
+MD5 b4bb6bb605eb2808daf9ab42404906d4 files/postgresql-7.3.19-autoconf.patch 869
+RMD160 d39a2beb9e4d549975fee7a59df5a23046a6ceeb files/postgresql-7.3.19-autoconf.patch 869
+SHA256 e79d05901282531fc85e3703f394a3c5655f047973c776a2874f3d360c96ced7 files/postgresql-7.3.19-autoconf.patch 869
 AUX postgresql-7.3.19-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
 MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3.19-cubeparse.patch 1296
 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3.19-cubeparse.patch 1296
@@ -118,10 +122,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-7.3.19.ebuild 8314 RMD160 c4fd4cdef56848e71a5fd7f3bcb2791aee766a9e SHA1 a40b4d27554c2dda022f301d30341bad63c6248b SHA256 e66a1e46609fc6bf715acaf0576274dbacd8bcfc966ccbb463e93b11f58afe1e
-MD5 945891ac61caffed3cc2bbfdc6910c25 postgresql-7.3.19.ebuild 8314
-RMD160 c4fd4cdef56848e71a5fd7f3bcb2791aee766a9e postgresql-7.3.19.ebuild 8314
-SHA256 e66a1e46609fc6bf715acaf0576274dbacd8bcfc966ccbb463e93b11f58afe1e postgresql-7.3.19.ebuild 8314
+EBUILD postgresql-7.3.19.ebuild 8307 RMD160 413428f746696df37fd490626936a4bafb02a45e SHA1 37f3f4b302b90222594dc60ee0e0ae1c7eaa8b10 SHA256 fe13db7898155cb0ee8527274683526807025f8ce62197bfc67c4ca84303c118
+MD5 c0c41f225eac5036d67645c07e7e01e3 postgresql-7.3.19.ebuild 8307
+RMD160 413428f746696df37fd490626936a4bafb02a45e postgresql-7.3.19.ebuild 8307
+SHA256 fe13db7898155cb0ee8527274683526807025f8ce62197bfc67c4ca84303c118 postgresql-7.3.19.ebuild 8307
 EBUILD postgresql-7.4.17.ebuild 9830 RMD160 37760540e1a2830d98efb608bd157deee7b73896 SHA1 5f12cc54bb5893f77cbc91f6f29ef88e7c20cb05 SHA256 838f87ab728c2737c5c9dd46568781b3dcca285109a8b8144209a7d45e7f54b2
 MD5 f6340902d6568afc75111eb43924b052 postgresql-7.4.17.ebuild 9830
 RMD160 37760540e1a2830d98efb608bd157deee7b73896 postgresql-7.4.17.ebuild 9830
diff --git a/dev-db/postgresql/files/postgresql-7.3.19-autoconf.patch b/dev-db/postgresql/files/postgresql-7.3.19-autoconf.patch
new file mode 100644
index 0000000..9e83884
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.3.19-autoconf.patch
@@ -0,0 +1,26 @@
+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/postgresql-7.3.19.ebuild b/dev-db/postgresql/postgresql-7.3.19.ebuild
index 68b8d69..7e46c54 100644
--- a/dev-db/postgresql/postgresql-7.3.19.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.19.ebuild,v 1.8 2007/06/24 21:20:59 vapier Exp $
 
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator
+inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator autotools
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
 
@@ -64,6 +64,7 @@ src_unpack() {
 	sed -i -e '/^\W\+psql scripts pg_config pg_controldata/ s/pg_config //' src/bin/Makefile
 
 	epatch "${FILESDIR}/${P}-cubeparse.patch"
+	epatch "${FILESDIR}/${P}-autoconf.patch"
 
 	# Prepare package for future tests
 	if use test ; then
@@ -74,6 +75,7 @@ src_unpack() {
 		chown portage "${S}/src/test/regress/tmp_check"
 		einfo "Tests will be run as user portage."
 	fi
+	eautoconf
 }
 
 src_compile() {
@@ -84,13 +86,7 @@ src_compile() {
 		CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
 		LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 	fi
-
-	# Detect mips systems properly
-	gnuconfig_update
-
-	cd "${S}"
-
-	./configure --prefix=/usr \
+	econf --prefix=/usr \
 		--includedir=/usr/include/postgresql/pgsql \
 		--sysconfdir=/etc/postgresql \
 		--mandir=/usr/share/man \