Added patch to fix configure issues with autoconf-2.64 and later (fixes #294376).

Package-Manager: portage-2.1.7.14/cvs/Linux x86_64

4 files changed, 53 insertions, 4 deletions

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index 48eacc5cd184..cab61eaf0a45 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/hippodraw
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.13 2009/11/13 03:45:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.14 2009/12/15 23:26:12 markusle Exp $
+
+  15 Dec 2009; Markus Dittrich <markusle@gentoo.org>
+  hippodraw-1.21.3-r1.ebuild, +files/hippodraw-1.21.3-autoconf-2.64.patch:
+  Added patch to fix configure issues with autoconf-2.64 and later (fixes
+  #294376).
 
   13 Nov 2009; Markus Dittrich <markusle@gentoo.org>
   hippodraw-1.21.3-r1.ebuild, +files/hippodraw-1.21.3-gcc4.4.patch:
diff --git a/sci-visualization/hippodraw/Manifest b/sci-visualization/hippodraw/Manifest
index d1247201f480..6cc94013a1bf 100644
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -1,3 +1,4 @@
+AUX hippodraw-1.21.3-autoconf-2.64.patch 1729 RMD160 2c0ebb3c3a3387049672e351cea0aa1fe485acf9 SHA1 fd7bcaf5ecc24939c5617759555bd45f14668266 SHA256 e60f8da1021c522e3b6d9e87f2d333fac6787c27baa649482142b78e2a1c7675
 AUX hippodraw-1.21.3-gcc4.3.patch 7310 RMD160 7fd794311627f762e476ba0e3cb0190600038e87 SHA1 35abf03f3d704891fa6d4bbf8bd9725045396eb3 SHA256 4945521437e9e8c211b743bcc4f5078629d35c1b56989734ecfbcd21c142d225
 AUX hippodraw-1.21.3-gcc4.4.patch 364 RMD160 e4bed68dde832ca010114049026272e047fca603 SHA1 b3a4f0fe5f20c0ec5fbfb3971116d00108c4119b SHA256 6e884d769ac1bf8d2c50370b4abd3f234c43d1fd590a47d91990fe518bb7bfd7
 AUX hippodraw-1.21.3-minuit2.patch 1922 RMD160 32c91e6648ba12292fa6e1d621e99a6e00d0b614 SHA1 dae13bc08a2990d27bcd1e8e0918c1de898e86ac SHA256 cf2d9d064e67a861b59c0f67fe2cfd57d660d481b9e5279eaad6624cc0f89366
@@ -6,6 +7,6 @@ AUX hippodraw-1.21.3-qt4.patch 922 RMD160 e209a6f84b7f4f6801e84ff7fd2be9280e5d38
 AUX hippodraw-1.21.3-test-fix.patch 539 RMD160 3658745e4f8e449e845031ff561c5753a9fc9cda SHA1 774a47f7a1085940c63de8e652eefdd06652ae22 SHA256 f523f9298ec5887973831d42fa1881d9f6ac3bbd7656ffdb448eb197bc093bc9
 AUX hippodraw-1.21.3-wcslib.patch 879 RMD160 d339517136249a0a5c56edeb69abe652c82a9b06 SHA1 b7dde32740a1395ea2400be999e3b03edfb628c6 SHA256 49444a17b22b4448944c9b3e419c1fecb5ab551790705a1ac75bf5cd2957b670
 DIST HippoDraw-1.21.3.tar.gz 9087353 RMD160 33ab867739feda0caef29da9160c3e410de5fc35 SHA1 6959c564c0c366260b5b7ad81cce6efd2d30846b SHA256 a649dd51b4316ba54fad03cb7b39035ecd2d0efeea0cbff1a17d4790f7df0e28
-EBUILD hippodraw-1.21.3-r1.ebuild 4139 RMD160 f0917c0075269a15cb2b585b95baec5d71380972 SHA1 e34d6f2fb64c6248ca4d96e4ceee89160762fdb0 SHA256 2045f334ab109fd760c62aed746ddea412591d76107c11957d2e66b682ddad32
-MISC ChangeLog 2830 RMD160 d615156c967796af6e92e1d4c22bd7832912c015 SHA1 828e61871810a8b485b35d03f81aa7e7ee1a0418 SHA256 fae1afcf03eccece37435b5c8f1cac9a72346ec0333b56f0263cdd03a0106ff8
+EBUILD hippodraw-1.21.3-r1.ebuild 4186 RMD160 e99364d4a500a5fb5680ab1cb04287c16ab42765 SHA1 667e1da1ba329af612b317c9629f2c3b5d972d55 SHA256 9d7214907f167c51174ef77e423ad5cf159507700ab1e22e69b8f3e51f4a746a
+MISC ChangeLog 3045 RMD160 84daa264532a3a24a81ca2cadc926506262dc7b0 SHA1 8a6d69212a2b087ce65f9fa0be2b46387c61b1d4 SHA256 cef240cb7317a5b1df5277456fcc68dbb1238a8230e46977133b8fe6c4748e4e
 MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch
new file mode 100644
index 000000000000..211e61033b71
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-autoconf-2.64.patch
@@ -0,0 +1,42 @@
+diff -Naur HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4 HippoDraw-1.21.3/config/m4/bnv_have_qt.m4
+--- HippoDraw-1.21.3.old/config/m4/bnv_have_qt.m4	2006-12-08 14:15:35.000000000 -0500
++++ HippoDraw-1.21.3/config/m4/bnv_have_qt.m4	2009-12-15 18:15:24.000000000 -0500
+@@ -438,8 +438,8 @@
+       bnv_save_CXXFLAGS="$CXXFLAGS"
+       echo "Saved cxxflgs"
+       CXXFLAGS="-I$bnv_qt_include_dir"
+-      AC_TRY_LINK([#include <$qt_direct_test_header>],
+-        $qt_direct_test_main,
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
++        [[$qt_direct_test_main]])],
+       [
+         # Success.
+         # We can link with no special library directory.
+@@ -460,8 +460,8 @@
+           echo "Non-critical error, please neglect the above." >&AC_FD_CC
+           bnv_qt_lib=qt-gl
+           LIBS="-l$bnv_qt_lib"
+-          AC_TRY_LINK([#include <$qt_direct_test_header>],
+-            $qt_direct_test_main,
++          AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
++            [[$qt_direct_test_main]])],
+           [
+             # Success.
+             # We can link with no special library directory.
+@@ -496,14 +496,12 @@
+             done
+             # Try with that one
+             LIBS="-l$bnv_qt_libS"
+-            AC_TRY_LINK([#include <$qt_direct_test_header>],
+-              $qt_direct_test_main,
++            AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <$qt_direct_test_header>]],
++              [[$qt_direct_test_main]])],
+             [
+               # Success.
+               # We can link with no special library directory.
+               bnv_qt_lib_dir=
+-            ], [
+-              # Leave bnv_qt_lib_dir defined
+             ])
+           ])
+         ])
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
index 8fb31d238ad1..5bf36d031b5b 100644
--- a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.8 2009/11/13 03:45:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.9 2009/12/15 23:26:12 markusle Exp $
 
 EAPI=2
 
@@ -53,6 +53,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-minuit2.patch
 	epatch "${FILESDIR}"/${P}-wcslib.patch
 	epatch "${FILESDIR}"/${P}-qt4.patch
+	epatch "${FILESDIR}"/${P}-autoconf-2.64.patch
 
 	# fix the install doc directory to gentoo's one
 	local docdir=/usr/share/doc/${PF}