Add patch for gcc-4.1, bug #131296

Package-Manager: portage-2.1.2_pre2-r2

5 files changed, 71 insertions, 20 deletions

diff --git a/games-strategy/netpanzer/ChangeLog b/games-strategy/netpanzer/ChangeLog
index 1bee638a61fc..cdc52ef32590 100644
--- a/games-strategy/netpanzer/ChangeLog
+++ b/games-strategy/netpanzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/netpanzer
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.20 2005/12/22 19:18:32 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.21 2006/10/04 00:05:46 nyhm Exp $
+
+  04 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/netpanzer-0.8-gcc41.patch, netpanzer-0.8-r1.ebuild:
+  Add patch for gcc-4.1, bug #131296
 
   22 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   netpanzer-0.8-r1.ebuild:
diff --git a/games-strategy/netpanzer/Manifest b/games-strategy/netpanzer/Manifest
index 84e470a4991a..ebb444b38495 100644
--- a/games-strategy/netpanzer/Manifest
+++ b/games-strategy/netpanzer/Manifest
@@ -1,3 +1,7 @@
+AUX netpanzer-0.8-gcc41.patch 1055 RMD160 980f6d989cb792162912a04d5f758795c76bfe5e SHA1 14cb3ebd47972a5e211c592d1c2169fa7e8031c0 SHA256 9de127700051dcd1ea0b40ff3939fd1ade52b4eb5769418f2efc6472b0fb0fc2
+MD5 02b54887b0c2d34d6c4e8ec046a9db18 files/netpanzer-0.8-gcc41.patch 1055
+RMD160 980f6d989cb792162912a04d5f758795c76bfe5e files/netpanzer-0.8-gcc41.patch 1055
+SHA256 9de127700051dcd1ea0b40ff3939fd1ade52b4eb5769418f2efc6472b0fb0fc2 files/netpanzer-0.8-gcc41.patch 1055
 AUX netpanzer-0.8-min-size-check.patch 1385 RMD160 236c57478879366dc446831dedeeb01683eac7b0 SHA1 3bb10d7c4f00667042e583f34db09501d011d45e SHA256 1c30f7c6ada47a7a8c10a2c9408215e2b272f07c09c283465aaaea9362068d06
 MD5 616b3d065523e34fd3e0d5d8ada5d053 files/netpanzer-0.8-min-size-check.patch 1385
 RMD160 236c57478879366dc446831dedeeb01683eac7b0 files/netpanzer-0.8-min-size-check.patch 1385
@@ -22,20 +26,20 @@ AUX physfs.patch 553 RMD160 48ea3f3f4b56c906de336e4a3d3253f25e55153e SHA1 8781be
 MD5 52b3f20dca70a177cc63da9903b5f5fb files/physfs.patch 553
 RMD160 48ea3f3f4b56c906de336e4a3d3253f25e55153e files/physfs.patch 553
 SHA256 91ba9459153246b447647de8717f306a102244811866f97de9845a93b98dfe0d files/physfs.patch 553
-DIST netpanzer-0.8.tar.bz2 382007
-DIST netpanzer-data-0.8.tar.bz2 10123751
-EBUILD netpanzer-0.8-r1.ebuild 2021 RMD160 2d86cdc39e08747c89fba72eb7e738fa518bf956 SHA1 f189c9ddd3f86f6d81c35d3736d84ef768113629 SHA256 4de81ec1ddb64c38c0ddcd515a2848f9802a89928879b8af7565892e27c232b6
-MD5 686e4ab69bae8884b584ac77555156c9 netpanzer-0.8-r1.ebuild 2021
-RMD160 2d86cdc39e08747c89fba72eb7e738fa518bf956 netpanzer-0.8-r1.ebuild 2021
-SHA256 4de81ec1ddb64c38c0ddcd515a2848f9802a89928879b8af7565892e27c232b6 netpanzer-0.8-r1.ebuild 2021
-MISC ChangeLog 3526 RMD160 fb159fb365d5f57d0422eafc08513f2bb8d854be SHA1 08a9f2b29c1e394e083e2e336be3212bb3544e86 SHA256 99d6c8db04859fc9775c8a4f37242004c57870c8f079446b64a4809150b4f4c7
-MD5 c2a2744f63d0ddbaa6a873ad4c062593 ChangeLog 3526
-RMD160 fb159fb365d5f57d0422eafc08513f2bb8d854be ChangeLog 3526
-SHA256 99d6c8db04859fc9775c8a4f37242004c57870c8f079446b64a4809150b4f4c7 ChangeLog 3526
+DIST netpanzer-0.8.tar.bz2 382007 RMD160 1be9730ae1ac56765eda87251207b0cf35affbdb SHA1 9d2c3938732db12496dca7e91f75e86c8ba3f4d6 SHA256 468e0d7a6d16aeeb9f7f68214a26db7ceb90fc4876a3da2de63b711b83d71233
+DIST netpanzer-data-0.8.tar.bz2 10123751 RMD160 a2746ba759b61a1ddc31847144e407674dc46900 SHA1 4fec331aab570a2d76895c5799fadcfe1ad933eb SHA256 0ed4398f5e0a796422474fcc518934d74ceb056ca7ab624d8d239b749535277b
+EBUILD netpanzer-0.8-r1.ebuild 2087 RMD160 22f99cf0183f19aaabc066f2048d37f85011f5b1 SHA1 2687d9c674663421f8b9a4355805ef5bad334921 SHA256 49a77bb4c2bda868e1326aaf156be9aacadf8d3d335cfb5581baadf55ef40a88
+MD5 d67542cc6dfabab5d200271fa20171d7 netpanzer-0.8-r1.ebuild 2087
+RMD160 22f99cf0183f19aaabc066f2048d37f85011f5b1 netpanzer-0.8-r1.ebuild 2087
+SHA256 49a77bb4c2bda868e1326aaf156be9aacadf8d3d335cfb5581baadf55ef40a88 netpanzer-0.8-r1.ebuild 2087
+MISC ChangeLog 3669 RMD160 b012af3a825269d3d7de57966fcb7b8435ae6477 SHA1 89182278733c8ee1ed0077f55843779351148d38 SHA256 6b6fcae5dcc1ac49b1d028044bd1298c242f6e740e527dab24e23330e971e980
+MD5 8fe07dc99e7d6aae1839f97d85f69b8f ChangeLog 3669
+RMD160 b012af3a825269d3d7de57966fcb7b8435ae6477 ChangeLog 3669
+SHA256 6b6fcae5dcc1ac49b1d028044bd1298c242f6e740e527dab24e23330e971e980 ChangeLog 3669
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 b31fb3b6d8c97b5f87ef8a825a60db2e files/digest-netpanzer-0.8-r1 139
-RMD160 8aba730960879ef7972e757ee65fd1c6873861ab files/digest-netpanzer-0.8-r1 139
-SHA256 7709700cb7fc5e79f25ddcee4d5878af1414f7cb162697576957b575eafd7930 files/digest-netpanzer-0.8-r1 139
+MD5 1d32d5dcce16f2225cde587494fd92e4 files/digest-netpanzer-0.8-r1 509
+RMD160 c1dcd945ccaf8b39cda7032bcee23cbc6b7aa5c9 files/digest-netpanzer-0.8-r1 509
+SHA256 295fd5788341584e2e31752ae5e6d7d278514f555423c94a4766ed542ee16833 files/digest-netpanzer-0.8-r1 509
diff --git a/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1 b/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
index 1f7f2a2367ef..b799f2f8cf5f 100644
--- a/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
+++ b/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
@@ -1,2 +1,6 @@
 MD5 c08c1b703eac533407db02510deca68e netpanzer-0.8.tar.bz2 382007
+RMD160 1be9730ae1ac56765eda87251207b0cf35affbdb netpanzer-0.8.tar.bz2 382007
+SHA256 468e0d7a6d16aeeb9f7f68214a26db7ceb90fc4876a3da2de63b711b83d71233 netpanzer-0.8.tar.bz2 382007
 MD5 d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 10123751
+RMD160 a2746ba759b61a1ddc31847144e407674dc46900 netpanzer-data-0.8.tar.bz2 10123751
+SHA256 0ed4398f5e0a796422474fcc518934d74ceb056ca7ab624d8d239b749535277b netpanzer-data-0.8.tar.bz2 10123751
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch b/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch
new file mode 100644
index 000000000000..f81008c45fa3
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch
@@ -0,0 +1,36 @@
+--- src/Lib/Network/Address.hpp
++++ src/Lib/Network/Address.hpp
+@@ -34,7 +34,7 @@
+     /** resolves a hostname or IP-Number together with a port and returns a
+      * new Address object.
+      */
+-    static Address Address::resolve(const std::string& name, uint16_t port);
++    static Address resolve(const std::string& name, uint16_t port);
+ 
+     /** returns the ip address of this Address as string */
+     std::string getIP() const;
+
+--- src/NetPanzer/Classes/PlayerState.hpp
++++ src/NetPanzer/Classes/PlayerState.hpp
+@@ -81,8 +81,8 @@
+ public:
+     PlayerUnitConfig unit_config;
+ 
+-    PlayerState::PlayerState();
+-    PlayerState::PlayerState(const PlayerState& other);
++    PlayerState();
++    PlayerState(const PlayerState& other);
+ 
+     void operator= (const PlayerState& other);
+ 
+--- src/NetPanzer/Interfaces/Console.cpp
++++ src/NetPanzer/Interfaces/Console.cpp
+@@ -46,7 +46,7 @@
+         setp(buf, buf+sizeof(buf));
+     }
+ 
+-    FileStampStreamBuf::~FileStampStreamBuf()
++    ~FileStampStreamBuf()
+     {
+         sync();
+         if(file)
diff --git a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild b/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
index 687e64dd524d..fde014bfd7fc 100644
--- a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
+++ b/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.2 2005/12/22 19:18:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.3 2006/10/04 00:05:46 nyhm Exp $
 
 inherit eutils games
 
@@ -26,8 +26,10 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-#	epatch "${FILESDIR}"/${P}-min-size-check.patch
-#	epatch "${FILESDIR}"/${P}-robust.patch
+	epatch \
+		"${FILESDIR}"/${P}-min-size-check.patch \
+		"${FILESDIR}"/${P}-robust.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {
@@ -63,6 +65,7 @@ src_install() {
 			"${D}${GAMES_BINDIR}/netpanzer-ded" \
 			|| die "sed failed"
 	fi
-	make_desktop_entry netpanzer NetPanzer netpanzer.png
+	rm -rf "${D}/${GAMES_DATADIR}"/{applications,pixmaps}
+	make_desktop_entry ${PN} NetPanzer
 	prepgamesdirs
 }