fix tellhow.h to work with gcc 3.3 (bug #41440)

3 files changed, 20 insertions, 6 deletions

diff --git a/games-kids/lletters/ChangeLog b/games-kids/lletters/ChangeLog
index 87b4ad2cad12..e8c36740a39c 100644
--- a/games-kids/lletters/ChangeLog
+++ b/games-kids/lletters/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/lletters
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.4 2003/10/29 10:49:25 mr_bones_ Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.5 2004/02/13 04:10:17 mr_bones_ Exp $
+
+  12 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  lletters-0.1.95-r1.ebuild, files/tellhow.h.gentoo:
+  fix tellhow.h to work with gcc 3.3 (bug #41440)
 
   29 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> lletters-0.1.95.ebuild:
   clean old ebuild
diff --git a/games-kids/lletters/files/tellhow.h.gentoo b/games-kids/lletters/files/tellhow.h.gentoo
new file mode 100644
index 000000000000..7ceba9bfc3bc
--- /dev/null
+++ b/games-kids/lletters/files/tellhow.h.gentoo
@@ -0,0 +1,9 @@
+#define BRAG "WavTools %d.%d Written by Colin Ligertwood.\nThis software is provided as is. No waranty is offered, implied or included.\n"
+
+#define WAVR "USE: %s <options> \n	-c #		Number of channels. 1, 2. (default 1)\n	-d #		Sample depth in bits. 8, 16. (default 8)\n	-f <name.wav>	Filename of wav. (default \"untitled.wav\")	-l #		Length of recording in seconds. (Optional)\n	-r #		Sample rate.  44100 22050 11025 8000. (default 8000)\n	-s <c|l|m>	Recording source. (default mic)\n	c = cd; l = line; m = mic\n"
+			
+#define WAVP "USE: %s <file.wav>\n"
+
+#define PLAYING "Playing [FILE: %s] [LENGTH: %u]\n[RATE: %u] [BPS: %u] [DEPTH: %u] [CHANNELS: %u]\n"
+
+#define RECORDING "Recording [FILE: %s] [LENGTH: %u]\n[RATE: %u] [BPS: %u] [DEPTH: %u] [CHANNELS: %u]\n"
diff --git a/games-kids/lletters/lletters-0.1.95-r1.ebuild b/games-kids/lletters/lletters-0.1.95-r1.ebuild
index 25d15851af95..1c45e483cb45 100644
--- a/games-kids/lletters/lletters-0.1.95-r1.ebuild
+++ b/games-kids/lletters/lletters-0.1.95-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r1.ebuild,v 1.2 2003/10/29 10:48:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r1.ebuild,v 1.3 2004/02/13 04:10:17 mr_bones_ Exp $
 
 inherit games
 
 DESCRIPTION="Game that helps young kids learn their letters and numbers"
+HOMEPAGE="http://lln.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lln/${PN}-media-0.1.9a.tar.gz
 	mirror://sourceforge/lln/${P}.tar.gz"
-HOMEPAGE="http://lln.sourceforge.net/"
 
 KEYWORDS="x86"
 LICENSE="GPL-2"
@@ -24,6 +24,7 @@ IUSE="nls"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
+	cp -f "${FILESDIR}/tellhow.h.gentoo" tellhow.h || die "cp failed"
 	unpack lletters-media-0.1.9a.tar.gz
 }
 
@@ -34,7 +35,7 @@ src_compile() {
 }
 
 src_install () {
-	egamesinstall || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS CREDITS ChangeLog README* TODO || die "dodoc failed"
 	prepgamesdirs
 }