Fix building with gcc-4.3

(Portage version: 2.1.5_rc6)

3 files changed, 79 insertions, 7 deletions

diff --git a/games-kids/gmult/ChangeLog b/games-kids/gmult/ChangeLog
index 52709a061265..d6243bcccfe4 100644
--- a/games-kids/gmult/ChangeLog
+++ b/games-kids/gmult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/gmult
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/ChangeLog,v 1.9 2007/02/07 14:50:15 nyhm Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/ChangeLog,v 1.10 2008/05/02 19:35:34 nyhm Exp $
+
+  02 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/gmult-5.3-gcc43.patch, gmult-5.3.ebuild:
+  Fix building with gcc-4.3
 
 *gmult-5.3 (07 Feb 2007)
 
diff --git a/games-kids/gmult/files/gmult-5.3-gcc43.patch b/games-kids/gmult/files/gmult-5.3-gcc43.patch
new file mode 100644
index 000000000000..74b2f2041cc4
--- /dev/null
+++ b/games-kids/gmult/files/gmult-5.3-gcc43.patch
@@ -0,0 +1,32 @@
+--- gmult/DigitChooser.cpp
++++ gmult/DigitChooser.cpp
+@@ -19,6 +19,7 @@
+ #include "DigitChooser.h"
+ #include "config.h"
+ #include "gettext.h"
++#include <cstring>
+ 
+ DigitChooser::DigitChooser (Gtk::Window &parent, MultPuzzle &puzzle, char letter)
+ 	: Gtk::Dialog ("", parent, true, false)
+--- gmult/GtkMult.cpp
++++ gmult/GtkMult.cpp
+@@ -3,6 +3,7 @@
+ #include "config.h"

+ #include "gettext.h"

+ 
++#include <cstring>
+ #include <gtkmm/icontheme.h>

+ 

+ GtkMult::GtkMult (void)

+--- gmult/GtkMultTable.cpp
++++ gmult/GtkMultTable.cpp
+@@ -22,7 +22,8 @@
+ #include "DigitChooser.h"
+ #include "config.h"
+ #include "gettext.h"
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+ 
+ GtkMultTable::GtkMultTable (MultPuzzle *p)
+ 	: Gtk::Table (1, 1, TRUE), puzzle (p)
diff --git a/games-kids/gmult/gmult-5.3.ebuild b/games-kids/gmult/gmult-5.3.ebuild
index 2ef7e7a63351..f2654af52b70 100644
--- a/games-kids/gmult/gmult-5.3.ebuild
+++ b/games-kids/gmult/gmult-5.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-5.3.ebuild,v 1.1 2007/02/07 14:50:15 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gmult/gmult-5.3.ebuild,v 1.2 2008/05/02 19:35:34 nyhm Exp $
 
-inherit gnome2
+inherit eutils gnome2-utils games
 
-DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs."
+DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs"
 HOMEPAGE="http://www.mterry.name/gmult/"
 SRC_URI="http://www.mterry.name/gmult/${P}.tar.bz2"
 
@@ -13,4 +13,40 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=dev-cpp/gtkmm-2.6"
+RDEPEND=">=dev-cpp/gtkmm-2.6
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	egamesconf \
+		--datadir=/usr/share \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README THANKS
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}