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

svn path=/testing/; revision=277

6 files changed, 59 insertions, 20 deletions

diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 2f1cb33..c422892 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -2,6 +2,10 @@ AUX libpq-7.3.19-gentoo.patch 2145 RMD160 697f39977f0400c4ee2fdba9508d9c64d74466
 MD5 12b0d7b6fb93d3c6272210a95ae41e39 files/libpq-7.3.19-gentoo.patch 2145
 RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c files/libpq-7.3.19-gentoo.patch 2145
 SHA256 db52e0d1345977ff8cd58ee9a74d321356032cb344f080a93409f9922fefed14 files/libpq-7.3.19-gentoo.patch 2145
+AUX libpq-7.4.17-autoconf.patch 598 RMD160 ba60a76ee8c92c3ccc8d5f04d868f703d901645d SHA1 59a710165036313b637be89b10dd49246f24d163 SHA256 9963a7b8c380f1d13bd54c0d0a689a45ee02a96c01ab7a37c61c7d517a085da4
+MD5 4fba6bc05b157a3d058cacb97b74cb6e files/libpq-7.4.17-autoconf.patch 598
+RMD160 ba60a76ee8c92c3ccc8d5f04d868f703d901645d files/libpq-7.4.17-autoconf.patch 598
+SHA256 9963a7b8c380f1d13bd54c0d0a689a45ee02a96c01ab7a37c61c7d517a085da4 files/libpq-7.4.17-autoconf.patch 598
 AUX libpq-7.4.17-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 SHA1 02709ec494dbd51b0122510b483ea188ca3ea85f SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d
 MD5 8e845c6bb301c666f6db969f762a1ce8 files/libpq-7.4.17-gentoo.patch 2846
 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 files/libpq-7.4.17-gentoo.patch 2846
@@ -32,10 +36,10 @@ EBUILD libpq-7.3.19.ebuild 3280 RMD160 d220e0f496d0108a3ebbc35a67846a91553368dd
 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.4.17.ebuild 3074 RMD160 7e82a6289f3d936d9e22f694aa159aae543c4e9d SHA1 65d55ff007ecf69e5417e326c095879dbb2faa4d SHA256 5a4187a9d1e714d0dadde37b67137fb4131c9d9e1d6e186a761e437ecfb27a25
-MD5 e83a6b15c291954b3ff3d43e308e45b7 libpq-7.4.17.ebuild 3074
-RMD160 7e82a6289f3d936d9e22f694aa159aae543c4e9d libpq-7.4.17.ebuild 3074
-SHA256 5a4187a9d1e714d0dadde37b67137fb4131c9d9e1d6e186a761e437ecfb27a25 libpq-7.4.17.ebuild 3074
+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
+SHA256 08ba705432369fab2a0d848c72834fd9359cceb3d3b55f1c15969b405cacf0ab libpq-7.4.17.ebuild 3080
 EBUILD libpq-8.0.13.ebuild 3231 RMD160 96b0f68f763cb28f5637ab87896e4bb72bf7de04 SHA1 129812047395e1e88a8326502a1098b67af4bb52 SHA256 1f2474b62f8545f7594de11ae732edee024e2f334749473e62b9c0e30c35bbb2
 MD5 528fa6548641bb22cc8533a491719e08 libpq-8.0.13.ebuild 3231
 RMD160 96b0f68f763cb28f5637ab87896e4bb72bf7de04 libpq-8.0.13.ebuild 3231
diff --git a/dev-db/libpq/files/libpq-7.4.17-autoconf.patch b/dev-db/libpq/files/libpq-7.4.17-autoconf.patch
new file mode 100644
index 0000000..ac01049
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.4.17-autoconf.patch
@@ -0,0 +1,17 @@
+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/libpq/libpq-7.4.17.ebuild b/dev-db/libpq/libpq-7.4.17.ebuild
index 7d2f229..9a259c1 100644
--- a/dev-db/libpq/libpq-7.4.17.ebuild
+++ b/dev-db/libpq/libpq-7.4.17.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.4.17.ebuild,v 1.9 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
 
 DESCRIPTION="Libraries of postgresql"
 HOMEPAGE="http://www.postgresql.org/"
@@ -42,6 +42,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-autoconf.patch"
+	eautoconf
 }
 
 src_compile() {
@@ -60,10 +62,7 @@ src_compile() {
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
 
-	# Detect mips systems properly
-	gnuconfig_update
-
-	./configure --prefix=/usr \
+	econf --prefix=/usr \
 		--include=/usr/include/postgresql/libpq-${SLOT} \
 		--mandir=/usr/share/man \
 		--host=${CHOST} \
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 3337cd5..9971029 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -18,6 +18,10 @@ AUX postgresql-7.3.19-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588
 MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3.19-cubeparse.patch 1296
 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3.19-cubeparse.patch 1296
 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada files/postgresql-7.3.19-cubeparse.patch 1296
+AUX postgresql-7.4.17-autoconf.patch 598 RMD160 ba60a76ee8c92c3ccc8d5f04d868f703d901645d SHA1 59a710165036313b637be89b10dd49246f24d163 SHA256 9963a7b8c380f1d13bd54c0d0a689a45ee02a96c01ab7a37c61c7d517a085da4
+MD5 4fba6bc05b157a3d058cacb97b74cb6e files/postgresql-7.4.17-autoconf.patch 598
+RMD160 ba60a76ee8c92c3ccc8d5f04d868f703d901645d files/postgresql-7.4.17-autoconf.patch 598
+SHA256 9963a7b8c380f1d13bd54c0d0a689a45ee02a96c01ab7a37c61c7d517a085da4 files/postgresql-7.4.17-autoconf.patch 598
 AUX postgresql-7.4.17-hppa-testandset.patch 1394 RMD160 8f65f37b7e6cf251c4ab134227570ee9974915a8 SHA1 359a4b598aa419d5ae92d746d13abd4a6e05a0cf SHA256 226f17c6064f53be2908325153b64e5f3b7d3e2275b7bd0f1abac27404b4678e
 MD5 2bf25091efb109eaf759b63e39b08716 files/postgresql-7.4.17-hppa-testandset.patch 1394
 RMD160 8f65f37b7e6cf251c4ab134227570ee9974915a8 files/postgresql-7.4.17-hppa-testandset.patch 1394
@@ -118,10 +122,10 @@ EBUILD postgresql-7.3.19.ebuild 8314 RMD160 c4fd4cdef56848e71a5fd7f3bcb2791aee76
 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.4.17.ebuild 9835 RMD160 8d9ccc6f90ea8db4da9e6d8762d2cb4f35308e4e SHA1 5e8ae79386a64f0327841d0f210cc1040ef6b97d SHA256 359a3cf27c6e0fec3c1807fff973e6f3b27eb09b8531f00ea7c49f75d3d5a82c
-MD5 548d3dc1bb04705e97fba94a8077660c postgresql-7.4.17.ebuild 9835
-RMD160 8d9ccc6f90ea8db4da9e6d8762d2cb4f35308e4e postgresql-7.4.17.ebuild 9835
-SHA256 359a3cf27c6e0fec3c1807fff973e6f3b27eb09b8531f00ea7c49f75d3d5a82c postgresql-7.4.17.ebuild 9835
+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
+SHA256 838f87ab728c2737c5c9dd46568781b3dcca285109a8b8144209a7d45e7f54b2 postgresql-7.4.17.ebuild 9830
 EBUILD postgresql-8.0.13.ebuild 9740 RMD160 6f7f3b984984ea5e1c52a44c757023af7bf1e4f7 SHA1 53189152517a9b13bf4cdfb700360678d045d6fd SHA256 f80373392faabc8cd49808b11f09aa89ecfeabc7bc232ce82166ad2e15eb14c7
 MD5 0455d9e5f70aa82ba187b0f816ebc095 postgresql-8.0.13.ebuild 9740
 RMD160 6f7f3b984984ea5e1c52a44c757023af7bf1e4f7 postgresql-8.0.13.ebuild 9740
diff --git a/dev-db/postgresql/files/postgresql-7.4.17-autoconf.patch b/dev-db/postgresql/files/postgresql-7.4.17-autoconf.patch
new file mode 100644
index 0000000..ac01049
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-7.4.17-autoconf.patch
@@ -0,0 +1,17 @@
+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/postgresql-7.4.17.ebuild b/dev-db/postgresql/postgresql-7.4.17.ebuild
index 34e0480..9b77362 100644
--- a/dev-db/postgresql/postgresql-7.4.17.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.17.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.4.17.ebuild,v 1.9 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"
 
@@ -87,6 +87,7 @@ src_unpack() {
 	sed -i -e '/^\W\+psql scripts pg_config pg_controldata/ s/pg_config //' src/bin/Makefile
 
 	epatch "${FILESDIR}/${P}-hppa-testandset.patch"
+	epatch "${FILESDIR}/${P}-autoconf.patch"
 
 	# Prepare package for future tests
 	if use test ; then
@@ -97,6 +98,8 @@ src_unpack() {
 		chown portage "${S}/src/test/regress/tmp_check"
 		einfo "Tests will be run as user portage."
 	fi
+
+	eautoconf
 }
 
 src_compile() {
@@ -108,12 +111,7 @@ src_compile() {
 		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 \