Fix compile with GCC 4.4 and keyword ~amd64.

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

5 files changed, 32 insertions, 91 deletions

diff --git a/media-sound/chuck/ChangeLog b/media-sound/chuck/ChangeLog
index 4dc2af125dd5..b61ceae8da68 100644
--- a/media-sound/chuck/ChangeLog
+++ b/media-sound/chuck/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for media-sound/chuck
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/ChangeLog,v 1.12 2008/07/25 06:41:43 cedk Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/ChangeLog,v 1.13 2009/06/01 18:35:47 ssuominen Exp $
 
-  25 Jul 2008; Cédric Krier <cedk@gentoo.org> chuck-1.2.1.2.ebuild:
-  Fix typo
+  01 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> chuck-1.2.1.2.ebuild,
+  +files/chuck-1.2.1.2-gcc44.patch:
+  Fix compile with GCC 4.4 and keyword ~amd64.
 
   20 Jul 2008; Cédric Krier <cedk@gentoo.org> chuck-1.2.1.2.ebuild:
   Add call to eselect update
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index db0c3f867136..98362bfbf6d5 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,11 +1,10 @@
 AUX chuck-1.2.1.1-gcc43.patch 1356 RMD160 cc76abfff110a21126f069f3fbbd87529c1077e3 SHA1 c5cdf7f353f06e0d2923e7988210a1b61583e7be SHA256 6cbefd42959cc60a569307efaecac6d5098a125017fe64d24b2ea862b98aef56
 AUX chuck-1.2.1.1-hid-smc.patch 3066 RMD160 d14ed663309cf1d1d959def210f911445232aa16 SHA1 0597db202b8e2696f02ea22c27f01920c13d19bf SHA256 5b07a22881c36bede4d041993cc4b6b26faf13f3e3c549ff9f31cc127fda1554
+AUX chuck-1.2.1.2-gcc44.patch 384 RMD160 17d8f91074357182840ee2ad4ab29386eb551d48 SHA1 cf86d52fc6444f0e0399d76799f0daece75a0499 SHA256 8d08d89370458d0bc2c4754bbcaecae7714fb4e40efe5f0cdee15e84ffbb92f1
 AUX chuck.eselect-0.1 3763 RMD160 8ed04d75f4fc8201638ae1e6fbee4527aff11ca1 SHA1 f2c8147cf36bbeefe3c02f5204d17f96d32f78a1 SHA256 5cdaad3fef2acfb1df4052bf9c25a380edc121e93be5b435a0f544659d9a6da9
-DIST chuck-1.2.0.8.tgz 1488649 RMD160 f497373a5e10adb47b33c618141693ac3f439079 SHA1 5c41dfd982ce606658bab1498e64ac110523db99 SHA256 68e1fcce0cf0ff39c7dc009f4893a0c98c4b5368d2748b2fe3c33f2f6d619358
 DIST chuck-1.2.1.1.tgz 1490434 RMD160 2b4d5734931b892634b4f2bbce8aafcad077bc5c SHA1 5a1219d8f4b55f6a311fe0c040c28c9230e016dc SHA256 2bd38ad3d55e4cd0f9f789b17eded8d6ad340f3bf169c099f271ff8a883b5e06
 DIST chuck-1.2.1.2.tgz 1546875 RMD160 6ce645bb135beb6d1c63b925c09a7d571bc65708 SHA1 2a5486eac43a093f1c49ad4f2e09b979176fa7a4 SHA256 9cb9c246a2fb7ac886c0a3d5f23a5d60eb18aa7717f6ee57f031e42140cf0d2a
-EBUILD chuck-1.2.0.8.ebuild 1949 RMD160 f33eaeeb47c55f8098c0b30d7832ac04969697a7 SHA1 cb862a0ee927177442fde590ebc059cd57945708 SHA256 874d39bf7323db4e4392e5c7213141eefdb03e839730101636f7ba1df4bb2793
 EBUILD chuck-1.2.1.1.ebuild 2079 RMD160 3de3c65822f5cbdcd4ae4d8e9130267583c8d245 SHA1 4f88938333dbbb423948d53ebb2c863db79accf8 SHA256 17b1d4c58f19fc7eb3d4517c97d7e9c37f36b131aeaaca76ef04b7bc95c7d0fc
-EBUILD chuck-1.2.1.2.ebuild 2610 RMD160 9cf4301e906a32971c2aea9596bb48bba213bb04 SHA1 1921dd2ade78770c41dd3cfef596c4cc16818254 SHA256 10c86f1c3751351ec14073a188062635edf873bc5571f3c4be1e33ccacb848f0
-MISC ChangeLog 1617 RMD160 39278a05d6190789cb5d9b160e6e9bf764800ff6 SHA1 8a88827323b55de5539d8c40d9c3ecf711a0bd88 SHA256 0a67df1f00f25f6faa801276673b7d74d535abec06d12baa869ea4d7a1026c21
+EBUILD chuck-1.2.1.2.ebuild 2663 RMD160 e18c4a590c3bbd7737d515f48441cb4f4e07f2a8 SHA1 bd88fd178389817e620b02112e0820b50dcb169d SHA256 e8647c864a2c5bb6affa27f1cd83413d1f54e79cd161923f44f1ca7c8e5322b4
+MISC ChangeLog 1701 RMD160 4921ee2471c6e41a4b1c20bd310a4d29150a0e94 SHA1 de5ae9357130cac2f69595935598915d3cccd716 SHA256 f075ee6b5e5ffa6b5a648c1de57c2dcf3d62a7e804cf4008cf17b7738f692588
 MISC metadata.xml 368 RMD160 1bdbac2a814e0ac3680a3fbdbbb426c4b42aa1f0 SHA1 e0f26be139138f200081a60985b3a13d75b6c359 SHA256 27805233ee7ce2aaa17abecafbc40d5b5f2664636e1849f314f3e1dc56241030
diff --git a/media-sound/chuck/chuck-1.2.0.8.ebuild b/media-sound/chuck/chuck-1.2.0.8.ebuild
deleted file mode 100644
index d73340939768..000000000000
--- a/media-sound/chuck/chuck-1.2.0.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/chuck-1.2.0.8.ebuild,v 1.2 2007/07/22 15:20:12 opfer Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Strongly-timed, Concurrent, and On-the-fly
-Audio Programming Language"
-HOMEPAGE="http://chuck.cs.princeton.edu/release/"
-SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="oss jack alsa examples"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	local cnt=0
-	use jack && cnt="$((${cnt} + 1))"
-	use alsa && cnt="$((${cnt} + 1))"
-	use oss && cnt="$((${cnt} + 1))"
-	if [[ "${cnt}" -eq 0 ]] ; then
-		eerror "One of the following USE flags is needed: jack, alsa or oss"
-		die "Please set one audio engine type"
-	elif [[ "${cnt}" -ne 1 ]] ; then
-		ewarn "You have set ${P} to use multiple audio engine."
-	fi
-}
-
-src_compile() {
-	local backend
-	if use jack ; then
-		backend="jack"
-	elif use alsa ; then
-		backend="alsa"
-	elif use oss ; then
-		backend="oss"
-	fi
-	einfo "Compiling against ${backend}"
-
-	# when compile with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	cd "${S}/src"
-	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
-	dobin src/chuck
-
-	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	docinto doc
-	dodoc doc/*
-	if use examples; then
-		insinto /usr/share/doc/${P}/examples
-		doins `find examples -type f`
-		for dir in `find examples/* -type d`; do
-			insinto /usr/share/doc/${P}/$dir
-			doins $dir/*
-		done
-	fi
-}
diff --git a/media-sound/chuck/chuck-1.2.1.2.ebuild b/media-sound/chuck/chuck-1.2.1.2.ebuild
index ef5d32611104..86477b2a8aa1 100644
--- a/media-sound/chuck/chuck-1.2.1.2.ebuild
+++ b/media-sound/chuck/chuck-1.2.1.2.ebuild
@@ -1,6 +1,6 @@
-# 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/chuck/chuck-1.2.1.2.ebuild,v 1.3 2008/07/25 06:41:43 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/chuck/chuck-1.2.1.2.ebuild,v 1.4 2009/06/01 18:35:47 ssuominen Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -11,11 +11,11 @@ SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="oss jack alsa examples"
 
 RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
+	alsa? ( media-libs/alsa-lib )
 	media-libs/libsndfile
 	app-admin/eselect"
 DEPEND="${RDEPEND}
@@ -38,7 +38,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.2.1.1-hid-smc.patch"
+	epatch "${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_compile() {
@@ -71,17 +72,17 @@ src_install() {
 	docinto doc
 	dodoc doc/*
 	if use examples; then
-		insinto /usr/share/doc/${P}/examples
-		doins `find examples -type f`
-		for dir in `find examples/* -type d`; do
-			insinto /usr/share/doc/${P}/$dir
-			doins $dir/*
+		insinto /usr/share/doc/${PF}/examples
+		doins $(find examples -type f)
+		for dir in $(find examples/* -type d); do
+			insinto /usr/share/doc/${PF}/"${dir}"
+			doins "${dir}"/*
 		done
 	fi
 
 	dodir /usr/share/eselect/modules
 	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}/chuck.eselect-0.1" chuck.eselect
+	newins "${FILESDIR}"/chuck.eselect-0.1 chuck.eselect
 }
 
 pkg_postinst() {
diff --git a/media-sound/chuck/files/chuck-1.2.1.2-gcc44.patch b/media-sound/chuck/files/chuck-1.2.1.2-gcc44.patch
new file mode 100644
index 000000000000..8059c97592f7
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.2.1.2-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur chuck-1.2.1.2.orig/src/util_string.h chuck-1.2.1.2/src/util_string.h
+--- chuck-1.2.1.2.orig/src/util_string.h	2008-07-16 12:55:17.000000000 +0300
++++ chuck-1.2.1.2/src/util_string.h	2009-06-01 21:33:59.000000000 +0300
+@@ -33,6 +33,8 @@
+ #ifndef __UTIL_STRING_H__
+ #define __UTIL_STRING_H__
+ 
++#include <cstdio>
++
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>