Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

4 files changed, 41 insertions, 12 deletions

diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog
index d46009137dc8..b116ef757479 100644
--- a/games-puzzle/picpuz/ChangeLog
+++ b/games-puzzle/picpuz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/picpuz
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.1 2007/02/21 18:36:38 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.2 2008/05/01 11:01:43 nyhm Exp $
+
+  01 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/picpuz-06-gcc43.patch, picpuz-06.ebuild:
+  Fix building with gcc-4.3
 
 *picpuz-06 (21 Feb 2007)
 
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 10d1ee4af0e7..8af2c947085c 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX picpuz-06-gcc43.patch 865 RMD160 1bead2838d71bd0cd81e6fe4472d9e98288cbf6c SHA1 1b6e6b858780f3400027a9e7f15ae619a21a4c33 SHA256 8b35f6e5d32ae7be13d95b831a2992c0b2b3343a5ed189ccb99708036d637a89
 DIST picpuz.06.tar.gz 382528 RMD160 15ac077548d3a1a6816ca361fcbfa6e6a83d1ea2 SHA1 a9bceea5cdd326088fec1afc0da1a409ef4a498f SHA256 ddee4f9e892db6db9a091c5dc8bea2767c151cb8f7e28517f24d7eedc179ca73
-EBUILD picpuz-06.ebuild 1018 RMD160 0a98d6e0589a6f111c34af10ec4f2057618a0e41 SHA1 36baa2f71e08d2c53f9c0a5941973ffd4dd01c3f SHA256 7a72a486eaebceb03a7eca4b218c5fe3329253adf2d46b12522760f3306914ca
-MISC ChangeLog 402 RMD160 a99603391cfbb50a6f050dae914a745d2c084f18 SHA1 7f960d6845b50e531efb55e0575a87b00aba84ec SHA256 c29c98c4952fa8616682e210de1256d8ff71cccf2cf2eaa114973f5ccddcb76c
+EBUILD picpuz-06.ebuild 1065 RMD160 77d277110a2594061fb25fa0f6202067929bcf3d SHA1 6d7f9e3bd874dfe6e3a0194b50db07ee2391fbf0 SHA256 fbefef43fac7cca37f73ae7a8bba9bf116d3800c514f12913966bc59e7dc5411
+MISC ChangeLog 524 RMD160 39c173253344211265f94ac181643aba14cccb98 SHA1 fc901fa1203f01677217fc3d4376983b64c2ef6c SHA256 4f51105b15a2e5fde35417390847c5cd9073a89e66db8b5acc902f93e47eed7c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZoxwACgkQdz7hIScOURHlgwCg4IzOKOaFw3X/Em9Lpc/vCW45
+kdkAoJjauNcC7IUT4tIchptpYD3Gp3GP
+=F202
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/picpuz/files/picpuz-06-gcc43.patch b/games-puzzle/picpuz/files/picpuz-06-gcc43.patch
new file mode 100644
index 000000000000..4876120540bd
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-06-gcc43.patch
@@ -0,0 +1,13 @@
+--- zlib.h
++++ zlib.h
+@@ -374,8 +374,8 @@
+ 
+ typedef int zdialog_event(zdialog *zd, int widget);                        //  widget event callback function
+ typedef int zdialog_compl(zdialog *zd, int stat);                          //  dialog completion callback function
+-int zdialog_run(zdialog *zd, zdialog_event func = null,                    //  run dialog with optional callbacks
+-                             zdialog_compl func = null);                   //  (completion func >> non-modal dialog)
++int zdialog_run(zdialog *zd, zdialog_event evfunc = null,                    //  run dialog with optional callbacks
++                             zdialog_compl compfunc = null);                   //  (completion func >> non-modal dialog)
+ 
+ int zdialog_destroy(zdialog *zd);                                          //  destroy dialog (zdialog caller resp.)
+ 
diff --git a/games-puzzle/picpuz/picpuz-06.ebuild b/games-puzzle/picpuz/picpuz-06.ebuild
index 8790ef229cd4..5dcb9f9421eb 100644
--- a/games-puzzle/picpuz/picpuz-06.ebuild
+++ b/games-puzzle/picpuz/picpuz-06.ebuild
@@ -1,6 +1,6 @@
-# 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-puzzle/picpuz/picpuz-06.ebuild,v 1.1 2007/02/21 18:36:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-06.ebuild,v 1.2 2008/05/01 11:01:43 nyhm Exp $
 
 inherit eutils games
 
@@ -10,7 +10,7 @@ SRC_URI="http://kornelix.squarespace.com/storage/picpuz/${PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2.8"
@@ -20,8 +20,9 @@ S=${WORKDIR}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	sed -i \
-		-e 's:-O3 -Wall:${CXXFLAGS}:' \
+		-e 's:-O3:${CXXFLAGS} ${LDFLAGS}:' \
 		picpuz-build.sh \
 		|| die "sed failed"
 	sed -i \
@@ -35,10 +36,10 @@ src_compile() {
 }
 
 src_install() {
-	newgamesbin ${PN}.x	${PN} || die "doexe failed"
+	newgamesbin ${PN}.x ${PN} || die "newgamesbin failed"
 	newicon ${PN}-icon.png ${PN}.png
-	dodoc ${PN}-guide.pdf
-	gunzip "${D}"/usr/share/doc/${PF}/picpuz-guide.pdf.gz
-	make_desktop_entry ${PN} "Picpuz"
+	make_desktop_entry ${PN} Picpuz
+	insinto /usr/share/doc/${PF}
+	doins ${PN}-guide.pdf || die "doins failed"
 	prepgamesdirs
 }