Fix building with GCC 4.4 and keyword ~amd64 wrt #272377.

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

4 files changed, 31 insertions, 15 deletions

diff --git a/media-sound/sndpeek/ChangeLog b/media-sound/sndpeek/ChangeLog
index d9966907e689..a4d7609ae0ee 100644
--- a/media-sound/sndpeek/ChangeLog
+++ b/media-sound/sndpeek/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sndpeek
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/ChangeLog,v 1.3 2008/06/28 10:45:42 cedk Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/ChangeLog,v 1.4 2009/06/06 07:57:49 ssuominen Exp $
+
+  06 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> sndpeek-1.3-r1.ebuild,
+  +files/sndpeek-1.3-gcc-4.4.patch:
+  Fix building with GCC 4.4 and keyword ~amd64 wrt #272377.
 
 *sndpeek-1.3-r1 (28 Jun 2008)
 
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index 2a76bf249473..6d65d74f8e17 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -1,6 +1,7 @@
 AUX sndpeek-1.3-gcc-4.3.patch 831 RMD160 0f77883203a18c88a206fc32f94f0e778f3bdaab SHA1 f2e75b0381181c36f9aabe84c106aecfb8eb0fa1 SHA256 07ca504403485e4d9f03ab62ada02e17d3e48af42f7c5b24fa3bfa3539232e36
+AUX sndpeek-1.3-gcc-4.4.patch 402 RMD160 8924fa1ab9ab44424a07e824e4c865d9ad48b648 SHA1 b013a0740fa6d8c344a0134d4d60772b01b0f8df SHA256 b309c9e8117e0d1665362cc7d7fa20a4753cd336d33fe7f9c8877f6603202259
 AUX sndpeek-1.3-makefile.patch 7578 RMD160 3cb1ccd318fc11710ab34dcaf2dc621f888ed53b SHA1 e82eae70cbe7d677857dab5868446405fa934c6a SHA256 fc7fcb83c2d8063b161dd73f0ba5255e2822250818ca9c3d11a78652ca6958e5
 DIST sndpeek-1.3.tgz 298983 RMD160 cec1696a6b5e26551748fc7e6230baa2bd77edc2 SHA1 16291c1cc595068150d4c2a9075982d9bed5416e SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08
-EBUILD sndpeek-1.3-r1.ebuild 1583 RMD160 ebf20c9cd2efe8c40e78eea6b1926c6079ed1f5e SHA1 88cd099d8d1e164aea3374521e4a0b422031a46d SHA256 5b3fe676ed7e14ceb7905e25c249dedda2eda4746c337b4511423a26661e3656
-MISC ChangeLog 677 RMD160 81e26a46420e1a12ef514a583bd68e133299892c SHA1 d428f37dd094fb995a5788adcc312b33d6af2da4 SHA256 82334432959641a66c75afa4af29bee5e335d8994754532ad9a8b24b400a65fc
+EBUILD sndpeek-1.3-r1.ebuild 1637 RMD160 23d220695cd191000fae4ef09b9008307f84a569 SHA1 a948966951b9c674714294eb3ba4c81f8333d84d SHA256 015aee3b42bd60c89b218d1c52ade6e5521cd2077a4e227d1feab826a5bf403c
+MISC ChangeLog 856 RMD160 6abd8d765b61f863e38d264f0181900f6073ea1f SHA1 0aac2b10bb8b20736f3fba58fb4fb3fcc4d40241 SHA256 f52b1b7f7176abdda8ac8401fb2684785a48f40a840ab1ec8b9eb18e0ecde9fc
 MISC metadata.xml 334 RMD160 0d5ac0f00b7f4fbdaab75bf8702a37276d53f1f0 SHA1 a66c874258738edb7dfa0050fa5233b1cd1b2c61 SHA256 ab94c9c3418d1cc5778593b4c3a3c703c7ee4ce652985bdc3c681ff8a3fcc9f1
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch
new file mode 100644
index 000000000000..d92bcdddf3b2
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch
@@ -0,0 +1,11 @@
+diff -ur sndpeek-1.3.orig/src/sndpeek/RtAudio.cpp sndpeek-1.3/src/sndpeek/RtAudio.cpp
+--- sndpeek-1.3.orig/src/sndpeek/RtAudio.cpp	2006-01-14 01:38:54.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/RtAudio.cpp	2009-06-06 10:58:48.000000000 +0300
+@@ -40,6 +40,7 @@
+ // RtAudio: Version 3.0.1, 22 March 2004
+ 
+ #include "RtAudio.h"
++#include <cstdio>
+ #include <iostream>
+ 
+ // Static variable definitions.
diff --git a/media-sound/sndpeek/sndpeek-1.3-r1.ebuild b/media-sound/sndpeek/sndpeek-1.3-r1.ebuild
index b6ca0e73b1f1..46e8d03e80d0 100644
--- a/media-sound/sndpeek/sndpeek-1.3-r1.ebuild
+++ b/media-sound/sndpeek/sndpeek-1.3-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/sndpeek-1.3-r1.ebuild,v 1.1 2008/06/28 10:45:42 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sndpeek/sndpeek-1.3-r1.ebuild,v 1.2 2009/06/06 07:57:49 ssuominen Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="real-time audio visualization"
@@ -10,7 +11,7 @@ SRC_URI="http://soundlab.cs.princeton.edu/software/${PN}/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="oss jack alsa"
 
 DEPEND="virtual/glut
@@ -23,11 +24,10 @@ DEPEND="virtual/glut
 	alsa? ( media-libs/alsa-lib )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.4.patch
 }
 
 pkg_setup() {
@@ -55,11 +55,11 @@ src_compile() {
 		backend="oss"
 	fi
 	einfo "Compiling against ${backend}"
-	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) || die "emake failed"
 }
 
 src_install() {
-	dobin src/sndpeek/sndpeek
-
+	dobin src/sndpeek/sndpeek || die "dobin failed"
 	dodoc AUTHORS README THANKS TODO VERSIONS
 }