Fix autoconf weirdness (Patch thanks to David Leverton), bump to r2.

(Portage version: 2.1.2.1)

4 files changed, 53 insertions, 3 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 0771613dbcb9..f73ea2b3b3b1 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/povray
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.53 2007/02/22 01:38:51 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.54 2007/03/04 18:00:33 anant Exp $
+
+*povray-3.6.1-r2 (04 Mar 2007)
+
+  04 Mar 2007; <anant@gentoo.org> +files/povray-3.6.1-find-egrep.patch,
+  -povray-3.6.1-r1.ebuild, +povray-3.6.1-r2.ebuild:
+  Fix autoconf weirdness (patch thanks to David Leverton),
+  bump to r2; this closes bug #142498
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-gfx/povray/files/digest-povray-3.6.1-r1 b/media-gfx/povray/files/digest-povray-3.6.1-r2
index 4de2b2aa24e4..4de2b2aa24e4 100644
--- a/media-gfx/povray/files/digest-povray-3.6.1-r1
+++ b/media-gfx/povray/files/digest-povray-3.6.1-r2
diff --git a/media-gfx/povray/files/povray-3.6.1-find-egrep.patch b/media-gfx/povray/files/povray-3.6.1-find-egrep.patch
new file mode 100644
index 000000000000..290beb6d965e
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.6.1-find-egrep.patch
@@ -0,0 +1,41 @@
+--- acinclude.m4	2006-11-15 15:44:46.000000000 +0000
++++ acinclude.m4	2006-11-15 16:01:14.000000000 +0000
+@@ -95,12 +95,12 @@
+ 
+   # check for -dumpversion
+   AC_TRY_COMMAND([$CXX -dumpversion < /dev/null 2> /dev/null > conftest.out])
+-  pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep '[[0-9]]'`
++  pov_prog_cxx_version=`cat conftest.out | $EGREP '[[0-9]]'`
+ 
+   # check for -v
+   if test -z "$pov_prog_cxx_version"; then
+     AC_TRY_COMMAND([$CXX -v < /dev/null 2>&1 | tr A-Z a-z > conftest.out])
+-    pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,'`
++    pov_prog_cxx_version=`cat conftest.out | $EGREP "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,'`
+   fi
+ 
+   # final compiler version string
+@@ -155,10 +155,10 @@
+       AC_TRY_COMMAND([$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0])
+       AC_TRY_COMMAND([$CXX -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
+       AC_TRY_COMMAND([cat conftest.err >&5])
+-      AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
++      AC_TRY_COMMAND([$EGREP \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
+       # the command above seems to not always return the correct status, so
+       # for safety I rerun it here; I keep the other one for logging purpose.
+-      pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
++      pov_prog_cxx_flags_err=`$EGREP "$pov_prog_cxx_flags_regexp" conftest.err`
+       AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
+       if test -z "$pov_prog_cxx_flags_err" \
+       || test -z "`diff conftest.err0 conftest.err`"; then
+@@ -204,8 +204,8 @@
+       AC_TRY_COMMAND([$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0])
+       AC_TRY_COMMAND([$CC -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
+       AC_TRY_COMMAND([cat conftest.err >&5])
+-      AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
+-      pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
++      AC_TRY_COMMAND([$EGREP \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
++      pov_prog_cc_flags_err=`$EGREP "$pov_prog_cc_flags_regexp" conftest.err`
+       AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
+       if test -z "$pov_prog_cc_flags_err" \
+       || test -z "`diff conftest.err0 conftest.err`"; then
diff --git a/media-gfx/povray/povray-3.6.1-r1.ebuild b/media-gfx/povray/povray-3.6.1-r2.ebuild
index 1ea3b1d9ea85..9bc8fbdbe5ff 100644
--- a/media-gfx/povray/povray-3.6.1-r1.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r1.ebuild,v 1.17 2006/07/22 20:22:59 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r2.ebuild,v 1.1 2007/03/04 18:00:33 anant Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -25,6 +25,8 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-find-egrep.patch
+	eaclocal
 	eautoconf
 }