Add patch to fix compilation with gcc-4 on ppc64; bug #118156

(Portage version: 2.1_pre4-r1)

5 files changed, 55 insertions, 7 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 29387d31d2bd..a8f5bddfc1ca 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/povray
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.49 2005/12/13 05:55:40 spyderous Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.50 2006/02/09 01:29:40 halcy0n Exp $
+
+  09 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/povray-3.6.1-configure.patch, povray-3.6.1-r1.ebuild:
+  Add patch to fix compilation with gcc-4 on ppc64; bug #118156
 
   13 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   povray-3.6.1-r1.ebuild:
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 8662a5c3bc46..b70d9eb681f1 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,4 +1,15 @@
 MD5 4f0fde2d53607571bf443d38657affa8 ChangeLog 7897
-MD5 c46bc643339b324f376236e2a9df237b files/digest-povray-3.6.1-r1 64
+RMD160 e94a930e64c2ad54d49cefa2e2abab6fc72981a5 ChangeLog 7897
+SHA256 8cc05539cf4eeef3b39cd1cb6883922985fbfb2b51c8871f975d5897e976f37f ChangeLog 7897
+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 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
 MD5 48eaa040015831c1b8e6bc2e0e6ce522 metadata.xml 262
-MD5 d89dbcb79584d36b77981f4699464b8e povray-3.6.1-r1.ebuild 1307
+RMD160 0d47ccab9704d8ee2b579ba8169aa443ae1f6718 metadata.xml 262
+SHA256 5b1f7fb42c2e8f9ed8f9203d6ef075805ac088542ffb14953780c8e208660e14 metadata.xml 262
+MD5 d2e372aa85afcc4852cae5bcea392786 povray-3.6.1-r1.ebuild 1420
+RMD160 e0ef6d23f83b660a33134a47eeb5ea64d344a42d povray-3.6.1-r1.ebuild 1420
+SHA256 9a6dbea591195ba0dc871d6b0736bc5d9a8deb6c824c6cf1046cd961e1d50681 povray-3.6.1-r1.ebuild 1420
diff --git a/media-gfx/povray/files/digest-povray-3.6.1-r1 b/media-gfx/povray/files/digest-povray-3.6.1-r1
index ea0c793199a3..4de2b2aa24e4 100644
--- a/media-gfx/povray/files/digest-povray-3.6.1-r1
+++ b/media-gfx/povray/files/digest-povray-3.6.1-r1
@@ -1 +1,3 @@
 MD5 b5789bb7eeaed0809c5c82d0efda571d povray-3.6.tar.bz2 8200160
+RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 povray-3.6.tar.bz2 8200160
+SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73 povray-3.6.tar.bz2 8200160
diff --git a/media-gfx/povray/files/povray-3.6.1-configure.patch b/media-gfx/povray/files/povray-3.6.1-configure.patch
new file mode 100644
index 000000000000..6cc0afa28902
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.6.1-configure.patch
@@ -0,0 +1,24 @@
+--- povray-3.6.1/configure.ac	2006-01-15 20:11:41.000000000 +0000
++++ povray-3.6.1/configure.ac	2006-01-15 20:11:19.000000000 +0000
+@@ -1051,11 +1051,19 @@
+       # PPC 7400 (aka G4).  To be precise, the vector instructions are new
+       # in the four digit model number PowerPC processors (aka G4), but gcc
+       # cannot (as of February 2003) use them automatically anyway! [trf]
+-      for pov_flags in "-mpowerpc" "-mcpu=750 -mtune=7450" "-mmultiple" "-mstring" "-mfused-madd"; do
++      if "$host" != powerpc64* ; then
++          for pov_flags in "-mpowerpc" "-mcpu=750 -mtune=7450"; do
++            POV_PROG_CXX_FLAGS([$pov_flags],
++              [if test "$subdirs"; then { POV_PROG_CC_FLAGS([$pov_flags]) }; fi]
++            )
++          done
++      fi
++      for pov_flags in "-mmultiple" "-mstring" "-mfused-madd"; do
+         POV_PROG_CXX_FLAGS([$pov_flags],
+-          [if test "$subdirs"; then { POV_PROG_CC_FLAGS([$pov_flags]) }; fi]
++            [if test "$subdirs"; then { POV_PROG_CC_FLAGS([$pov_flags]) }; fi]
+         )
+       done
++
+       ;;
+ 
+     sparc-*)
diff --git a/media-gfx/povray/povray-3.6.1-r1.ebuild b/media-gfx/povray/povray-3.6.1-r1.ebuild
index 42f070da93db..a0bda04c5f21 100644
--- a/media-gfx/povray/povray-3.6.1-r1.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.15 2005/12/13 05:55:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r1.ebuild,v 1.16 2006/02/09 01:29:40 halcy0n Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils autotools
 
 DESCRIPTION="The Persistence Of Vision Ray Tracer"
 SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/povray-3.6.tar.bz2"
@@ -20,6 +20,13 @@ DEPEND="media-libs/libpng
 	X? ( || ( x11-libs/libXaw virtual/x11 ) )
 	svga? ( media-libs/svgalib )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoconf
+}
 
 src_compile() {
 	local myconf