fix bug 428316

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 134 insertions, 16 deletions

diff --git a/games-rpg/mana/ChangeLog b/games-rpg/mana/ChangeLog
index 7ef0bbcf1896..dfe0c5470d0a 100644
--- a/games-rpg/mana/ChangeLog
+++ b/games-rpg/mana/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/mana
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/ChangeLog,v 1.14 2012/08/05 11:55:24 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/ChangeLog,v 1.15 2013/07/29 21:25:23 hasufell Exp $
+
+  29 Jul 2013; Julian Ospald <hasufell@gentoo.org> mana-0.6.1.ebuild,
+  +files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch,
+  +files/mana-0.6.1-Import-cstdint-for-int64_t.patch,
+  +files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch:
+  fix bug 428316
 
   05 Aug 2012; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   add myself as maintainer
diff --git a/games-rpg/mana/Manifest b/games-rpg/mana/Manifest
index 5aaff70228ad..3f340cc95d7a 100644
--- a/games-rpg/mana/Manifest
+++ b/games-rpg/mana/Manifest
@@ -3,23 +3,26 @@ Hash: SHA256
 
 AUX mana-0.5.3-gentoo.patch 1006 SHA256 acc8b2cc8f0d3134edf89aba4c9e8695cd13ce803aea0f9c9eaf06827fbca014 SHA512 0338028e7809c4c792faaa3817654faa6b24b7931fd85e946a992b38e8fb9ce17773b6103604dc0441c9bbafb5883fac4c25d44e922215a2b29bb39ce7eea1a8 WHIRLPOOL f8a0ca9e31f335177ea9994ba0daf9168eb84c88e73f0e9696cb70ecec5e0a83fe1f3716ca5ffa338e222762eae50efa4c7168fc683462afab97f033968671fd
 AUX mana-0.6.0-gentoo.patch 1006 SHA256 acc8b2cc8f0d3134edf89aba4c9e8695cd13ce803aea0f9c9eaf06827fbca014 SHA512 0338028e7809c4c792faaa3817654faa6b24b7931fd85e946a992b38e8fb9ce17773b6103604dc0441c9bbafb5883fac4c25d44e922215a2b29bb39ce7eea1a8 WHIRLPOOL f8a0ca9e31f335177ea9994ba0daf9168eb84c88e73f0e9696cb70ecec5e0a83fe1f3716ca5ffa338e222762eae50efa4c7168fc683462afab97f033968671fd
+AUX mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch 1634 SHA256 eb4d99d3376f9630efaf7befe0b9493b1438cca623e0a4a368be2452e27a53e9 SHA512 ee3daf739f9b24bb48efb53e3fc78b893347f9318173b391a09f9340333c3c0ae8b6d38b0d608c795fa71bff51f74447355bef9d6a106a32efe86b1532d4c496 WHIRLPOOL 106ef3946ad6d6eb9173b74c6f7587fe09c7e420ceb4a90d1b10a4a0e793921d6c69f43e03fa47b22cad6b4eb3a43735745c10c0f0bf9603de0ce886176e8889
+AUX mana-0.6.1-Import-cstdint-for-int64_t.patch 592 SHA256 1d6cc62486e9d3d9fbd8c751d483976700535e88d2db9d28d8dbdd231dc4577e SHA512 796168725f4b468f3a1471d9568d4757e9af7e3f1090d4687db2cef1f90402b24fc3cad9c42d5404338974c851c409b85a33b33812852a4d00fa7eb56c36343b WHIRLPOOL 74ac26d009d33551ec84a1ff9b1547229ddf0374b83e1c1bec709657089827087eb27570011485bd1635009590dc3d8a4a8d7f2758b3bea3ec10069298d340b9
+AUX mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch 653 SHA256 44a241bc9243e2ec49ec75cf23f60859ac1aaff0379f4d8b9c8e6a8c469dc564 SHA512 e0ec6c02b0236cc39222a3c8e6cbe12fda48a9462bde1ac2d8acf3de6b85de38383b6bf9617cdec96d4e2f096c7cd233889a875f4a634c215cbf9ebbe4e5da97 WHIRLPOOL a995665fb0eb070507ba10fdd2a908a3ae2f2bcf0f56d6c7efa46787c2f036511b0557e5fb81d70932361cbfc166c7586d5746f839c68fd96ba230bcad340192
 AUX mana-0.6.1-gentoo.patch 2247 SHA256 6b57b1e9028ea3846c1d9c588127337e486498d422666292129eb9e8cb7dd99c SHA512 9e63a211f508a0f6e94eaa9092da585a8d573a786c9134695497736695b29f977726854013e7f805381f6052e8f69624c861f0a1ee7f15e875e69ac493d88785 WHIRLPOOL 17bd43a0fb2761a96bb16eda811f4fb759856d85f97ced4542072e12ed2dc4b35e7c06191f545bde4c9106bfa98fbdd375a0b3d8a53f5db663eb6b02bb835f37
 DIST mana-0.5.3.tar.gz 2473239 SHA256 3b9781cc2aa89fb0723d76df7407f4b89d1305e42166b2f4c850f3acd61022d5
 DIST mana-0.6.0.tar.gz 4621532 SHA256 d83d6c3ee7f527175a5db3ed25c95b8417006c3fef273c68d13352ec57d93474 SHA512 7418f018ef53e9487f1c3d14cdcfe6fe5fcb925d162f2011651f651634f6f12107d8b5023e3e37f8b0792b7e1c32c45b8dda0bb61140cb66767c278064df8eb0 WHIRLPOOL 590a7595e9980a65290d8753f6e6fde385f0a5ca5200f2bf6a08e0bb5f140b3c88c7d6ae51e4b79d1ef684ba70138647fce85684069306adef23fa60821de7a4
 DIST mana-0.6.1.tar.gz 4651447 SHA256 b945cd3e32489dfa5b8e82d571cc11e0e5308576307fca4d8dd7cf3cf6ed8c55 SHA512 d3cd66409f6eca274ee24c9d6f6355d2406b3f29fb6efdce82ef99dcc9a6945ff6dca39d3f4cbe031b8684d8e46c8d5c89937ed2e9eebfb2831f2ed8d02a6919 WHIRLPOOL 5b812dc7a2ff63ab3ace820f13fdea0df44685e9bfa0ed4a6aaefaea8c3889cda8b79678369a70e1f1fe855f0de973455cb37b1bbea7fc589a8741f3ae19d2bc
 EBUILD mana-0.5.3.ebuild 1639 SHA256 b1c1d4ecd090152e706422aad32f76b3dd5706318a536f06c73e0c6913d1356e SHA512 f4ecf5f4aeb0c182ae6a54be9cdd4082e82bccaa646442084a84a0ae9a8d2a4760f9a628b671650b351efdb1b7532f8ea9e09808072bc7f4af4a1a63b35823fa WHIRLPOOL fc49707f0333e7446a9f1de2b24c28ac702d1b9bd1bb3cf5d220bf760be1e682dd4f6357a8250efa5ed22be2038ea0b1b1a834f3031163184aca41cbf859f11a
 EBUILD mana-0.6.0.ebuild 1899 SHA256 c1aa07f9e738cb8ac4921f633c69177b4b41e9ac34b392f959b67421d700fb24 SHA512 4a0d2fc57de7745f2be736448790e692e29394b74594cda76bcb1c9784081b225b419940ab419e5de276dcc92c19aa0dd896c79925e46dc43632f3558a2c6547 WHIRLPOOL 6a49789af2a15f3936f447b7ba583d9d2919f2159f677b5e0056d3daf37270d1774809a206b6b35e087bbd4b0f05bc9ccbc5280be78e267dc26b2912169bed99
-EBUILD mana-0.6.1.ebuild 1905 SHA256 a0d2ed768060f60457807e6f47a732423474e0cb9697815657eb721e06fb1853 SHA512 0094c92c307378d665aa24a70db6180e8beae71b3254d7a84b0b6a38d5eb6611c1795a7bb96130335c6aa0c110e8ea79cb89df125cf934a57ce667ac1ad074f4 WHIRLPOOL 9740782a04b22cf6fe9577ade57a69d0beab9aa0648dcccb6fbb3a9fa84ca5d9dcac115a6379e67d62f48a92535ab84cba9224c4953d497d4da6acc6e7fb3b2d
-MISC ChangeLog 1984 SHA256 d3d3457a7b63e57e9905539e78f555ce9f729c31a0edb5d3e773b029616909d8 SHA512 0ccfc58fbdb9ed3856c9c3ff2610b28236c2eebf18a4507e4cde229200d27680278d6c88c284468ac75794700f55895d453d1f9608a88299b6b8b627d21fdeb0 WHIRLPOOL e86abd5c2bbb60e5e25760e7768278d394afd7110ac706dbcabcf9e8286b3154cfd08aaa0f88524d27eecd7144e588a9c61cb0606626fe109267ae922102ccee
+EBUILD mana-0.6.1.ebuild 2134 SHA256 87dffbd519441f1a33a497c93e9327d41f419327b17c1ef7ef75f03890f5ccf6 SHA512 14a853b6fdbad1bc992489d6000588f67f8d91b96eafc12456ccf543067f304b50b3147ab0198c87246794ed93815c4ca95ef7c5dfce4d5c8139c8a72da45432 WHIRLPOOL 81e768e2a266da85543f9da903ea49cce1e58be0491e9e5c90e66e21ffb00bccc96554cbaa6a58246cb28c459eba8a1d91f239abe2e4a74278a1d43ea378ce86
+MISC ChangeLog 2281 SHA256 5c2b55a0fd0e0632285244c1bf81f95a9bc01e7745ec6904d1177d4948658cee SHA512 ee2ac5203406d398928265a450b07107cb87bc30fd932aaf9c6abd0e50e5b259045b269f4c9e7508152d0b24b699c476c4b3c246fba24f0aa3bbc73d0444741e WHIRLPOOL b5cf0f158c0910b457b752581467132a5408a1a44a389029932339dc41ba2c091de91db4fb3bfc6ddfcda40ec58d28369504701386d64ead6915724880de3f4e
 MISC metadata.xml 532 SHA256 df5ba9842ecdac965eebfc18d3be6679dfbdb7433becb94623414748fed4952a SHA512 ed5c904bcda2c31466b9c747eb17a0f2e13d67da012345be4100bfeccf04c63d45f739dcbc532f439ec857584307738c6083fecd34d2a5c19afd4a441143c05c WHIRLPOOL c23c6feb5ae84bad9a40d1897bee3e8ad8eb7e8966a0137745f00c667993f9e86edf53c9e3b59b31bed3e90b1745d75b2e96fbd2e85e307db5a4c88f44e560eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQHl4kAAoJEFpvPKfnPDWzVmkH/Rq/ietsFqSjlVMbLU95Qeqf
-SIhGGXyPSVDqft/xFpPPqaAVG+c88imzNeNzyjt+XaqmQ6/Zehz7BRYXN9+3Fhpk
-Go+27ynjtyunJSAk9ARORjDAsA2jiuNRaGz9jOk3oi5XQ+8ypu5aogQCgKQeNFCB
-hobPj01LQB8eHjrMvUE9Yb9HH5a3mD7s1tsKShgWYgNsY9y3xNurxASDTP5AS72E
-FdOPNgG8hZB8/KSNDqPTmrpG0omZ83We8pfuxsV/VkBiQM7HB1l+ziRZruM9e7JT
-9ZYhD/hgBx0pIr/xNrAlVbhO0gqAMIg+lZUCsjRGOIbMnVlz9t5DGQN6HcNpNNA=
-=gh9s
+iQEcBAEBCAAGBQJR9t3MAAoJEFpvPKfnPDWzgQkH/ilU1UBTrturbkczIpaXhgbF
+oY5qMXe/SX2GwzCtggf508R7WoKM7hEVCeBVmRpC7Q5GD/ndnEFmkblPESK6UM65
+WmKPjkGJNO3vkMZOclqw8f9Dc3NgxHXR1s4xkA9dqbypSX0Bu+MXQ1BAcXCJS8q4
+K0EmSUWnWMwwZ6w0kWkJzHPEFtPIwdTAgl13KmS0KH+pyCKuf74ujEx5TUxZezKd
+5Z9ttdHwXJxRiVDfBvDKIY/k32220pS0DFSp7ShfvlaCtuOTYy9OdlyGSPsVKbJG
+/lpkktcdBaM0VcHR0ncCJkv+3Z0QpB6063WjlH2cb8zC5f5iO4siOO5BWJYzRKw=
+=1ZYy
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch b/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch
new file mode 100644
index 000000000000..6cd99bf4262c
--- /dev/null
+++ b/games-rpg/mana/files/mana-0.6.1-Fix-missing-virtual-destructors-and-guichan-use.patch
@@ -0,0 +1,53 @@
+From b5dc2de418d6d06cce31d786862c5f548171a097 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 28 Jul 2012 15:52:35 +0200
+Subject: [PATCH 1/3] Fix missing virtual destructors and guichan use.
+
+---
+ src/gui/widgets/tabbedarea.h | 3 ++-
+ src/gui/widgets/textfield.h  | 1 +
+ src/resources/itemdb.h       | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
+index 45b092a..b43078a 100644
+--- a/src/gui/widgets/tabbedarea.h
++++ b/src/gui/widgets/tabbedarea.h
+@@ -98,7 +98,8 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener
+         int getContainerHeight() const
+         { return mWidgetContainer->getHeight(); }
+ 
+-        using gcn::TabbedArea::setSelectedTab;
++        void setSelectedTab(unsigned int index)
++        { gcn::TabbedArea::setSelectedTab(index); }
+ 
+         void setSelectedTab(gcn::Tab *tab);
+ 
+diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
+index 2865403..94cada4 100644
+--- a/src/gui/widgets/textfield.h
++++ b/src/gui/widgets/textfield.h
+@@ -63,6 +63,7 @@ struct TextHistory {
+ 
+ class AutoCompleteLister {
+ public:
++    virtual ~AutoCompleteLister() {}
+     virtual void getAutoCompleteList(std::vector<std::string>&) const {}
+ };
+ 
+diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
+index 1531108..d7859ad 100644
+--- a/src/resources/itemdb.h
++++ b/src/resources/itemdb.h
+@@ -78,7 +78,7 @@ class ItemDB
+           mLoaded(false)
+         {}
+ 
+-        ~ItemDB()
++        virtual ~ItemDB()
+         {}
+ 
+         /**
+-- 
+1.7.11.1
+
diff --git a/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch b/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch
new file mode 100644
index 000000000000..b7ab39d05cdc
--- /dev/null
+++ b/games-rpg/mana/files/mana-0.6.1-Import-cstdint-for-int64_t.patch
@@ -0,0 +1,24 @@
+From dfd304e93bb9010ef8226ee4d026d45c9bf9d2f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 28 Jul 2012 15:54:57 +0200
+Subject: [PATCH 3/3] Import cstdint for int64_t.
+
+---
+ src/net/download.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/net/download.h b/src/net/download.h
+index c0bdf20..b9ad17e 100644
+--- a/src/net/download.h
++++ b/src/net/download.h
+@@ -18,6 +18,7 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <cstdint>
+ #include <cstdio>
+ #include <string>
+ 
+-- 
+1.7.11.1
+
diff --git a/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch b/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
new file mode 100644
index 000000000000..fa752383c38a
--- /dev/null
+++ b/games-rpg/mana/files/mana-0.6.1-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
@@ -0,0 +1,26 @@
+From bb92108fed0242f1a3509384faeb2234d007c05e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 28 Jul 2012 15:54:10 +0200
+Subject: [PATCH 2/3] Trick gcc into importing C99 stdint.h when C++11 is not
+ used.
+
+---
+ src/cpp0x_compat/cstdint | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/cpp0x_compat/cstdint b/src/cpp0x_compat/cstdint
+index d8d71d9..d430649 100644
+--- a/src/cpp0x_compat/cstdint
++++ b/src/cpp0x_compat/cstdint
+@@ -5,3 +5,8 @@
+  * compiles Mana fine so it apparently understands types like uint16_t by
+  * default.
+  */
++
++extern "C"
++{
++#include <stdint.h>
++};
+-- 
+1.7.11.1
+
diff --git a/games-rpg/mana/mana-0.6.1.ebuild b/games-rpg/mana/mana-0.6.1.ebuild
index 299ad0fcf6aa..ea69913831cf 100644
--- a/games-rpg/mana/mana-0.6.1.ebuild
+++ b/games-rpg/mana/mana-0.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/mana-0.6.1.ebuild,v 1.3 2012/07/13 13:58:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/mana-0.6.1.ebuild,v 1.4 2013/07/29 21:25:23 hasufell Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils cmake-utils games
 
 DESCRIPTION="A fully free and open source MMORPG game client"
@@ -36,7 +36,12 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-Fix-missing-virtual-destructors-and-guichan-use.patch
+	"${FILESDIR}"/${P}-Trick-gcc-into-importing-C99-stdint.h-when-C-11-is-n.patch
+	"${FILESDIR}"/${P}-Import-cstdint-for-int64_t.patch
+	)
 
 src_prepare() {
 	base_src_prepare
@@ -59,6 +64,7 @@ src_configure() {
 		-DPKG_DATADIR="${GAMES_DATADIR}/${PN}"
 		-DPKG_BINDIR="${GAMES_BINDIR}"
 		-DWITH_BUNDLEDHEADERS=OFF
+		-DENABLE_CPP0X=OFF
 	)
 	cmake-utils_src_configure
 }