EAPI=5; add patch from Martin Väth to fix compile with gcc49 (bug #537338)

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

diff --git a/games-puzzle/brainparty/ChangeLog b/games-puzzle/brainparty/ChangeLog
index 2598d3be1d8a5503ab72c331a5df1b9c547df96e..ad36a8ca51e14baa3d1e41ff88288ab051bb68cf 100644 (file)
--- a/games-puzzle/brainparty/ChangeLog
+++ b/games-puzzle/brainparty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/brainparty
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/brainparty/ChangeLog,v 1.9 2014/05/15 16:49:00 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/brainparty/ChangeLog,v 1.10 2015/01/23 21:44:21 mr_bones_ Exp $
+
+  23 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/brainparty-0.61-gcc49.patch, brainparty-0.61.ebuild,
+  files/brainparty-0.61-savegame.patch:
+  EAPI=5; add patch from Martin Väth to fix compile with gcc49 (bug #537338)
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> brainparty-0.61.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
@@ -37,4 +42,3 @@
   02 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
   +brainparty-0.5.ebuild, +metadata.xml:
   initial commit - ebuild submitted by Chris Coleman via bug #312473
-

diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
index a1dd9a92b70a6383a24f32739510b85a65c21d00..a1d1a232c9b863fda11b106b1bcf75d082069608 100644 (file)
--- a/games-puzzle/brainparty/Manifest
+++ b/games-puzzle/brainparty/Manifest
@@ -1,22 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX brainparty-0.61-savegame.patch 746 SHA256 1a46a01aed9caa1c64921d104327b1325e0549c596dfa71894fcf53fcc526ad3 SHA512 a1b295fa488696c4889d55c00c9a33535fc27b46d1c5daa48b8260f3fb291e34acb7a2d23d7f6dd37c27a3d8ede308b6ad52493506370678a05962765867e9a4 WHIRLPOOL ee1b1d21fc6c5a03ba5e9fd76a7b52bbac64b52002ead17c2b61f1e69c18697156e5e462221d646a68cf8ec025cd29afa9b769455ba972a8c6a53511fa2571ff
+AUX brainparty-0.61-gcc49.patch 489 SHA256 4c3422cfc4fdfb5f223f60e701d40afeba2700ce593becedab41c16e86dbd525 SHA512 9859614d97c9fe8efd8cefedd8ef935cbdf4344154f2e272e0624268e48533b620a55654c9d0097e3726579ce1a7028ad44eb705c2e86bbc983cb490faec6295 WHIRLPOOL 9a6a5494c8425d01d8599420b4d4f55025e9c082b1dd2108fe483909caf1fd607690c8cb949a42f75814dd1cc3becbfa228e236f34d9a61f5cdafe21f0563686
+AUX brainparty-0.61-savegame.patch 674 SHA256 2089b4008aa43715d2c80f6edc1c444b71a4ebd8d92563f7566f8735197cc9c2 SHA512 9e158b97ff15cfb4b6b8e4f6eb8006335841c48ff94b5da8bbb0cba03868b8ead92d2520bc8adae887d4baabac93c8104e44b46d87b6c4258792ab64376ce34a WHIRLPOOL 77ca0f82e5c31a6ab89a8acdd596e6799f1df9ccdd47d23d9f85315f549cc50c22a23355feb6323cb95cf01a680dcb75ab564bcb4a17a3800f72d906492ab285
 DIST brainparty0.61.tar.gz 40676905 SHA256 6930b563b45f935451b28fa3ed5d33619e766885f82656a3eb48c6d30671a625 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9 WHIRLPOOL b8c9065af334a7f404faab934922841adf860fbc36734ae44ba582e7c30f218236c2f266347f1de596e0036f5139e16c5e4702899b83025e5f60fcc1fc36d258
-EBUILD brainparty-0.61.ebuild 1311 SHA256 d99022e81fa7ce3b7664048c95f1719b2a0c7d2a85d47040609cf8d8b386e8cc SHA512 1b9b7c5f6c07e7aee56a866bd49e66d09801eebf19531e900efa5aa33488c49c2479668f4c5d1e0e972fd92baf8a0400362eb03b32178f16af48260c2bee404b WHIRLPOOL fc46cd0454881e8a44c48456ee3036cce30365ea81c741bbd646de31be1c48b8b931d9bb9da4136ad6c34f605449ad57478f2b3acee030d93378a60bb9c06aad
-MISC ChangeLog 1520 SHA256 87a77e40499d1557f525cb1a62c5806e3cfa48b4d3fee4f808492969895992d0 SHA512 7e196e4a034abf77febf6842e9868f4c8c39212351df2d783a66bd97b36ed05d66728e9627a750ebbb8edb02d95b32cd257ae4094ab5583b04635a55223dfbed WHIRLPOOL 1669f9b896f30be704fcd35b7e490374953abf01fe120e58296438e6e41473a1ba0220cac1b4147bba03bbbbf5ec1f755d259b1d8459d52f89b50fe0eb1cb667
+EBUILD brainparty-0.61.ebuild 1326 SHA256 c9e329bcefd651ed146a30e875de1e87b82410abbd6106dd27b1c86a1b309484 SHA512 bebc0d727b6c50a7fbeb9a1ae89810957ba0b107bfca35709ef13105fd497bcae0e56039865ece0f32039f95dae77456bb09827bb6898f64c812762910693383 WHIRLPOOL 064b560001bcf129334e20a6d1663ec88cc2c5931dd0bf562785c0ae5728c1c3806a832570b1554c61c5e284480589bde7e75e4bf8158d654399778515a5c3f4
+MISC ChangeLog 1762 SHA256 d2f0d2a4d4f7d4c6c0c548b91cdccd045237e6bda2aa430bc6247a47299fc1fa SHA512 335b136afc6ce2050dabf5d6b5acefbb7c2ce5445d74b25302bf5bcc75e3689fc5abbfa8569c34b200bd034d944e92ff64b36abffcb0ce1e463d39669b36423e WHIRLPOOL 73bdccd8339697968a9b926179f8c753fb88b443bcd9ff0232120ea5b799f49c997798ea3e2033e63b967c2e7eba91c43a1aef85dc3f498ed96efe4509102d98
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdPAKAAoJEJQzkH1pP7W4e20L/1cHk6GcJ1YBHFPhNYQ7PvsE
-NYkH2LpWn0JYbrcHuoGoiR/opyzNflbodX8RV4nHMyk964bDvs0TrFj27RVcOVIp
-+qzSfIHJ/aLBgOYqnkVcSVaFQhKazUJCQmEGxuArZrBLfkCcvEb/Cq7rn1C2LZcP
-CnPvGE42McNceqDR790LTntmwprrI/1CH+p3x2d9BVURWYYIsDNuQjhdMkigWlR4
-K5nGq2wtPx+mmMkYDuL4kH0DJ665ikwhKDTOivRc9ZvU0TRWN6XdPiR8wVq57p8q
-jZwLeGV0BE/QGYve4EsZ7jgU0JnJ/gs/x48eBhwaKj/k2RmntWoInT80Uf8SKcLr
-e3hrW7+pVlBz48tmHrodZpwncPfC3NcouodC1ThHqGCc9W5sFBcyKu9vurE5EMLv
-ipJ5hlXilLYXesu6MoGYa/p0KIyVhOMTFk0gG/IPXddmiAIImS3AMkCkiPWaXIk/
-zx2/TY+EWqU4qhJPqTBujtiLbiZVG+8wm2gLqvyHLg==
-=+Xce
------END PGP SIGNATURE-----

diff --git a/games-puzzle/brainparty/brainparty-0.61.ebuild b/games-puzzle/brainparty/brainparty-0.61.ebuild
index 33804826b2873a61dded7735564e18a6bdc5159f..29be7e481ed5a9fabd091da482405adac70e411e 100644 (file)
--- a/games-puzzle/brainparty/brainparty-0.61.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/brainparty/brainparty-0.61.ebuild,v 1.5 2014/05/15 16:49:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/brainparty/brainparty-0.61.ebuild,v 1.6 2015/01/23 21:44:21 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
@@ -19,6 +19,7 @@ DEPEND="media-libs/libsdl[sound,opengl,video]
        media-libs/sdl-ttf
        media-libs/sdl-image[png]
        media-libs/sdl-gfx"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${PN}
 
@@ -28,20 +29,20 @@ src_prepare() {
                -e 's/CXXFLAGS = .*/CXXFLAGS+=-c/' \
                -e '/^CXX =/d' \
                -e '/-o brainparty/s/INCLUDES) /&$(LDFLAGS) /' \
-               Makefile \
-               || die "sed failed"
+               Makefile || die
        sed -i \
                "/^int main(/ a\\\\tchdir(\"${GAMES_DATADIR}/${PN}\");\n" \
-               main.cpp \
-               || die "sed failed"
-       epatch "${FILESDIR}"/${P}-savegame.patch
+               main.cpp || die
+       epatch \
+               "${FILESDIR}"/${P}-savegame.patch \
+               "${FILESDIR}"/${P}-gcc49.patch
 
 }
 
 src_install() {
-       dogamesbin brainparty || die
+       dogamesbin brainparty
        insinto "${GAMES_DATADIR}/${PN}/Content"
-       doins Content/* || die
+       doins Content/*
        newicon Content/icon.bmp ${PN}.bmp
        make_desktop_entry brainparty "Brain Party" /usr/share/pixmaps/${PN}.bmp
        prepgamesdirs

diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch b/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch
new file mode 100644 (file)
index 0000000..7147cd4
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch
@@ -0,0 +1,20 @@
+--- a/BPList.h
++++ a/BPList.h
+@@ -138,7 +138,7 @@
+       ~BPPList();
+       void Add(T item);
+       bool Contains(T item);
+-      void Clear(bool safe_delete);
++      void Clear(bool safe_delete = true);
+       int IndexOf(T item);
+       void Insert(int pos, T item);
+       void Remove(T item);
+@@ -171,7 +171,7 @@
+ }
+ 
+ template <class T>
+-void BPPList<T>::Clear(bool safe_delete = true) {
++void BPPList<T>::Clear(bool safe_delete) {
+       if (safe_delete) {
+               for (int i = data.size() - 1; i >= 0; --i) {
+                       T item = data[i];

diff --git a/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch b/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
index 1b7b437ab4465b02ee439db49a0177b129502dd9..08526d3451009879fba5fcc89530f9aa3aac4e05 100644 (file)
--- a/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
+++ b/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
@@ -1,5 +1,5 @@
---- a/BPGame.cpp       2010-03-11 00:15:34.000000000 +0000
-+++ b/BPGame.cpp       2010-04-02 04:17:02.640735675 +0100
+--- a/BPGame.cpp
++++ b/BPGame.cpp
 @@ -1294,8 +1294,10 @@ void BPGame::LoadSettings() {
        Secret1 = Secret2 = Secret3 = Secret4 = false;
        NumUnlockedGames = 0;