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

Package-Manager: portage-2.1.2.1

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 0771613dbcb95efc49d5ae17a8b0b13f79c85b0a..f73ea2b3b3b196559f9bf3ef3ac97d701458c849 100644 (file)
--- 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/Manifest b/media-gfx/povray/Manifest
index 513e5d2356bdbf17c0d68a15e61c297114c5ce47..6d2358d39327e49b4a559bc2fb7dcb36c85537c1 100644 (file)
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -2,19 +2,23 @@ AUX povray-3.6.1-configure.patch 1081 RMD160 92dd3995691d567f6ae24b38bea1f31b980
 MD5 1704c587f882e616eb4b80dc64a07be5 files/povray-3.6.1-configure.patch 1081
 RMD160 92dd3995691d567f6ae24b38bea1f31b9803b5b3 files/povray-3.6.1-configure.patch 1081
 SHA256 a3278c6e43c30daa5a2edb7de3726e57f732f9c387b2d838cb41f3c7f14f773b files/povray-3.6.1-configure.patch 1081
+AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4af2dbe2 SHA1 19537ff628130a4d2b048529e5a4f9bbfe79840c SHA256 1f56d1223954c1d0ed160b034badcf0878813b0bf984221c8eadce5d7666a46e
+MD5 9d37b4a9034005f305d276f3819e2228 files/povray-3.6.1-find-egrep.patch 2463
+RMD160 6af6c01daec1a0eb5ae27f65ede5411c4af2dbe2 files/povray-3.6.1-find-egrep.patch 2463
+SHA256 1f56d1223954c1d0ed160b034badcf0878813b0bf984221c8eadce5d7666a46e files/povray-3.6.1-find-egrep.patch 2463
 DIST povray-3.6.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
-EBUILD povray-3.6.1-r1.ebuild 1416 RMD160 d710507e018c53a7bbe88cde789b6b34b6992d34 SHA1 1fb5639ff98dc2231e1d5e4fae449074b34c59c6 SHA256 ad1af2051796f05277fddd5d540468a2c41ce3a6288c84c721a9d0999f6f7bab
-MD5 ccf5adc96fe3af43a5c33e0e62f0239c povray-3.6.1-r1.ebuild 1416
-RMD160 d710507e018c53a7bbe88cde789b6b34b6992d34 povray-3.6.1-r1.ebuild 1416
-SHA256 ad1af2051796f05277fddd5d540468a2c41ce3a6288c84c721a9d0999f6f7bab povray-3.6.1-r1.ebuild 1416
-MISC ChangeLog 8348 RMD160 7919ad270046df3d0e1d31bc8d3b6bb7ad079db4 SHA1 15594a179c60f6fb9a513dc78a294df514b31ef2 SHA256 b3fff516b78aaff54d01cc6b28976d65072b5add7eee587a7c4483cbfd9d16b3
-MD5 c0fe3c18b2997d080c35e011254cd6e3 ChangeLog 8348
-RMD160 7919ad270046df3d0e1d31bc8d3b6bb7ad079db4 ChangeLog 8348
-SHA256 b3fff516b78aaff54d01cc6b28976d65072b5add7eee587a7c4483cbfd9d16b3 ChangeLog 8348
+EBUILD povray-3.6.1-r2.ebuild 1468 RMD160 d3a915595e5a9aa1a89c4ec3371a89e9db03d225 SHA1 afdcaff192c069361619471ac4d0c665ba19e2eb SHA256 9bdfc200ec19cc59296d2825dd0e9e6d9f07a400e040e3279a94033d747a1d94
+MD5 403f1999b175c833b31bf02153a27515 povray-3.6.1-r2.ebuild 1468
+RMD160 d3a915595e5a9aa1a89c4ec3371a89e9db03d225 povray-3.6.1-r2.ebuild 1468
+SHA256 9bdfc200ec19cc59296d2825dd0e9e6d9f07a400e040e3279a94033d747a1d94 povray-3.6.1-r2.ebuild 1468
+MISC ChangeLog 8602 RMD160 b6ee8aa4b9ac1362864ceeb9b1c6dc46b1a87af8 SHA1 55dfee662cdb6e10e0c047e55a72c6aa24c0d12f SHA256 69f9c6cf12e3bbb0968ce61c76dbd9c101fad4481f60a3bc4795b52795decf1c
+MD5 6dade4950a4fa05911e9dd062c283262 ChangeLog 8602
+RMD160 b6ee8aa4b9ac1362864ceeb9b1c6dc46b1a87af8 ChangeLog 8602
+SHA256 69f9c6cf12e3bbb0968ce61c76dbd9c101fad4481f60a3bc4795b52795decf1c ChangeLog 8602
 MISC metadata.xml 273 RMD160 89613f560c9c600c61e80cf0375368b94c2b06f0 SHA1 e31a56089174fd76ca5c9288b1f97f7456e75526 SHA256 b7a63942bf008010ae02c47db6502d240dd9ac7ab09c6f406f8273b5a10bd028
 MD5 0618d14aafde92de542be650a81d6d5b metadata.xml 273
 RMD160 89613f560c9c600c61e80cf0375368b94c2b06f0 metadata.xml 273
 SHA256 b7a63942bf008010ae02c47db6502d240dd9ac7ab09c6f406f8273b5a10bd028 metadata.xml 273
-MD5 85ad661d807da8c30df39147db087bc2 files/digest-povray-3.6.1-r1 238
-RMD160 e37c9cef8c5ef846109eef6ee0422b623a7548c1 files/digest-povray-3.6.1-r1 238
-SHA256 4a00114e5d9f684a16e16c2b2ece52952c3dd72cb716255f1f9289b95a03a13e files/digest-povray-3.6.1-r1 238
+MD5 85ad661d807da8c30df39147db087bc2 files/digest-povray-3.6.1-r2 238
+RMD160 e37c9cef8c5ef846109eef6ee0422b623a7548c1 files/digest-povray-3.6.1-r2 238
+SHA256 4a00114e5d9f684a16e16c2b2ece52952c3dd72cb716255f1f9289b95a03a13e files/digest-povray-3.6.1-r2 238

diff --git a/media-gfx/povray/files/digest-povray-3.6.1-r1 b/media-gfx/povray/files/digest-povray-3.6.1-r2
similarity index 100%
rename from media-gfx/povray/files/digest-povray-3.6.1-r1
rename to 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 (file)
index 0000000..290beb6
--- /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
similarity index 90%
rename from media-gfx/povray/povray-3.6.1-r1.ebuild
rename to media-gfx/povray/povray-3.6.1-r2.ebuild
index 1ea3b1d9ea85bd884551d3c3c0776e19f0e3d536..9bc8fbdbe5ffeefb14c9c1e590c502fb9b3c0b5e 100644 (file)
--- 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
 }