Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 92 insertions, 9 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/Manifest b/games-kids/gmult/Manifest
index dd22c30f91b9..687c54f65e8e 100644
--- a/games-kids/gmult/Manifest
+++ b/games-kids/gmult/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gmult-5.3-gcc43.patch 763 RMD160 34130ab704ec58fefb24a0492401a40a08d34e43 SHA1 f245aa0ce6554d1d9c6d55047026f1df6839fbbf SHA256 8d1db7bbb51ef63809c111e69dab04e13e719fd5fb9f070323088c98132c1059
 DIST gmult-4.2.tar.bz2 154052 RMD160 bda7436dc0524dc800f30ff60d0dc004e5137deb SHA1 53584effad58b5e43a34b7c37e8524dea2d83a7f SHA256 8d29e958229d8770b49c5176a49681b81bfc01d699fc2a6b2263711149aeb1ed
 DIST gmult-5.3.tar.bz2 142440 RMD160 bb2523698c4b07ae98caf659a853bd151df570d8 SHA1 c3d109fd9fe891f736c47cc938a85e5f8af42a53 SHA256 dc983113c27ebf29fccec8330f15d6d3d9786eb5f4d68706fc94832ca5331f5a
 EBUILD gmult-4.2.ebuild 522 RMD160 8e9707b7806b0cf0a48edc9d5aa9f4e7a5b467e3 SHA1 366f1a9e33d063efc976f48935ee567a076db2d2 SHA256 695c60f43f3e043f952add2e49761200ac797508c62a11251a0dac36cd41d8b1
-EBUILD gmult-5.3.ebuild 529 RMD160 8912de0f2e0514042c4eb779fa6c93f3d2eb9dd4 SHA1 72f895f98d21f4f5d559f10e317200a0ee4ddc59 SHA256 705c095d3cf8bb854ddcec52e51bc2f06b88152bcf3427e7111b925790ad7f3f
-MISC ChangeLog 1201 RMD160 be0eb1059f07eb4b5c653e0f390ef9c8eb6e55be SHA1 0c73c728c0907afa6b5866f1f7788ddd6d7df911 SHA256 59fafe521abe74c631d7f4f0f4fb38cf8def4b2f8d1ab45b13129c1acc2da9f5
+EBUILD gmult-5.3.ebuild 1079 RMD160 252b767aa0ebdf5b928ea3c39f7b674f262e0adc SHA1 8101133286be2697ef25709e91c87607ec8c67b6 SHA256 208a1170c096a24a3b5cfbffc3c7a040ace3c25db869db3f6dc2b8c18eb4a1b2
+MISC ChangeLog 1329 RMD160 02ab8202bb0c586ff5cc2d3716881174b1b58a21 SHA1 f6f0dc626f5ac1f1bca0be3a6670268660ddee3b SHA256 7f5d68749ee1d2efada7badabeafd800871f6ee65f9f5b6355ff69fa5e080b2c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgbbQwACgkQdz7hIScOURFn0QCgrhHC9tLqGP23WAWEWsiNUwMX
+BJIAn1PBdLMwRrzvnykBUKBb5eVSKWFZ
+=ZbO5
+-----END PGP SIGNATURE-----
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
+}