Build with boost-1.50 Bug #425606

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

4 files changed, 104 insertions, 22 deletions

diff --git a/games-strategy/galaxyhack/ChangeLog b/games-strategy/galaxyhack/ChangeLog
index 8ae44cb1806d..691635422ea6 100644
--- a/games-strategy/galaxyhack/ChangeLog
+++ b/games-strategy/galaxyhack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/galaxyhack
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/ChangeLog,v 1.9 2011/06/17 12:35:23 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/ChangeLog,v 1.10 2012/11/04 18:30:21 tupone Exp $
+
+  04 Nov 2012; Tupone Alfredo <tupone@gentoo.org> galaxyhack-1.74.ebuild,
+  +files/galaxyhack-1.74-boost-1.50.patch:
+  Build with boost-1.50 Bug #425606 by Diego
 
   17 Jun 2011; Tupone Alfredo <tupone@gentoo.org> files/galaxyhack-1.74-gentoo.patch:
   Fix underlink. Bug #369041 by Diego Elio Pettenò
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
index 5a4a3c6fdaff..45175c00e2a2 100644
--- a/games-strategy/galaxyhack/Manifest
+++ b/games-strategy/galaxyhack/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX galaxyhack-1.74-boost.patch 245 RMD160 07182eeefde50834a051bd19a98c45885503226d SHA1 aa702e4fd2e7c4f3e50bfa364fbc5e8f50a52558 SHA256 1aeb8d201d8d76fe9953afa34e93e82cd31c62234a5fd33bb6b776f3e7980722
-AUX galaxyhack-1.74-destdirs.patch 386 RMD160 0410695d3d16856550222eff7fe1ced909be914f SHA1 4ba4c58f7d9fe1e14b510e16c563f17a12890967 SHA256 c9a6ce4657120c0d50f8b606db1b5b54131821397a18187a5f8a4dff12f04927
-AUX galaxyhack-1.74-gcc43.patch 309 RMD160 50961e62a78ac56545307eb0c4ca4f4c68566bf5 SHA1 32b630e1841b4074df1bc6c17190c445ec243b82 SHA256 7808ab6f84a6467b09699762fba3225275936647f34408c423499bed5faa1ca3
-AUX galaxyhack-1.74-gentoo.patch 988 RMD160 0d6e0dfe1f342dec9770588559dcc9235895e91d SHA1 a3bba190ec2cc9424b12741dd4107842f757fcd1 SHA256 d6a1da167e0e53b46f7f4a06cb3cee4757a6e4af88350f73cdf669e556be6420
-DIST galaxyhack-1.74.tar.bz2 9948336 RMD160 b84de9a93709093d572732018f30cafeb3c7439c SHA1 0e5e691662bfe5b52689efda883b94813897a85c SHA256 ae6529008fe5be76607ce78833ef3b5d55e10f60a998b5747255b0854037880a
-DIST galaxyhack.png 819 RMD160 8cf27749f4672158d66a39c760bdef21306ecc23 SHA1 a01db93f2b3c3c32cfd447e26b5b4f389efe05fd SHA256 248d32aeaa03e4183cf0333bd4da1d32ea11883fcb77efe6ebc6e2be201e9903
-EBUILD galaxyhack-1.74.ebuild 1735 RMD160 1eb64a6fdeb30af0d2b815e169bbc0afa170a944 SHA1 c48dc20e3f8a612642f6757f05d70f735e71609f SHA256 241f9e7bb70f5b905e53bf5171d5cf7e30b9ba209f2de20cde93b534b40cd6fc
-MISC ChangeLog 1696 RMD160 e91fbf71dfdd4ca070087d58df30c93817a26aaa SHA1 79f7281d6d092af4b98ac15ef1ac6c7fe61baacb SHA256 7966ea64d59003cf9a9e0e34724233ba3e5c29619f5edfeb29cdf62b35171711
-MISC metadata.xml 1207 RMD160 42f594c141624b20faf04966bda60ef38998871a SHA1 a0e134c3a46fa92c1f076814b5e57da2c1d8dd7f SHA256 b49a896d99275f98ee92e6b225f573551e4eb1af5af57b88ebf2d8d5fa63c295
+AUX galaxyhack-1.74-boost-1.50.patch 3190 SHA256 6995819045078d8df619452995fa3a39b6ce23ff7d1245ad9b195fdba082074e SHA512 72a715cbfcfd8faa7cbe3aa6def2f66f80194cacb50411c3b1a1995f04cdcb5d4d42d3dc8295a50d7969c20ae6e1ca31ad44ff0447f0b2782df27726e8a77de8 WHIRLPOOL 66ac5f07e93c6160767cb47bdc314827a5371efee1e6b02cef985cc4c1220ee9fe33facdb286af46862420d7fda8fc51d861a4e7ee990f0752fd4246276c1cde
+AUX galaxyhack-1.74-boost.patch 245 SHA256 1aeb8d201d8d76fe9953afa34e93e82cd31c62234a5fd33bb6b776f3e7980722 SHA512 19a6ef4ee430edab619d60d4410d318e07ba3dd75b48036331029ff0de11ad5ccc73970825708764a7da9870d9ae8a7708a22176aa6698fdd4c2837bf3a91885 WHIRLPOOL ebc1153424359706c4bda172fd25277856fa9987429e3e8b61542b485325f120b72e52ef60d26325c5f02cc159128baf65b9a27b0db74ebfdc99e667a78bd0b7
+AUX galaxyhack-1.74-destdirs.patch 386 SHA256 c9a6ce4657120c0d50f8b606db1b5b54131821397a18187a5f8a4dff12f04927 SHA512 d48bbc0b55baccbf290e81fce500436e9b13958d8028171608c220da05ecc676c4e3d3e78141d097569715fa7c4e8d4ea7a380fbd485bee1ea85178a6b3235b7 WHIRLPOOL 96f92fc178a11f9306fe199cfe1c8100f17c72ba44f6f8768b58bf1d28df2b1c9b2e6a4018c7ac41b7c6b1b44595e030dd796044092ef0d32b3a471232e685a3
+AUX galaxyhack-1.74-gcc43.patch 309 SHA256 7808ab6f84a6467b09699762fba3225275936647f34408c423499bed5faa1ca3 SHA512 21169edbaf8f4c0d8f4fcd44a494e0121fb332b42cf14ba09818cf871cfdb792e4bbe00c7ae1b9ddc9094c96edda785f2763c76a70dcf92ec7ea163e3248aaa0 WHIRLPOOL a4514dd99a8d4e7e27600c27040c62b8a409d7853f440bfc99cacc6162d24ea228a1a503de363121321fd0709be3cd60b0c367c5366e708ac197c4e86732b1c3
+AUX galaxyhack-1.74-gentoo.patch 988 SHA256 d6a1da167e0e53b46f7f4a06cb3cee4757a6e4af88350f73cdf669e556be6420 SHA512 5cff46c4443d402e835eb6bebb6f037bd9c443b6522c6d05cc1abc101d0ad52d625fe2039bf2bc508b08bff9403dbfd6afa8e3dcefc0201d07596b5ac431a70e WHIRLPOOL 722f1823b1e1ae4774f9febe5d968d66338bf04b6474bec5b56409241202e9c8cc20fd9c91bc6c6abbd7769fc23909e6f71536a335a845d56126f1b9a5f4dba9
+DIST galaxyhack-1.74.tar.bz2 9948336 SHA256 ae6529008fe5be76607ce78833ef3b5d55e10f60a998b5747255b0854037880a SHA512 d708494b1ad572c0243da9e7168b4707112ec3c99a09498b87f8e0cb2e4e5bc9df8dc4631e3fb4d3cd7517ec4b17e937798dec3fcf770de9d0fc1b5e29a0bd58 WHIRLPOOL 59f08b96a2eae620e46d0880dc5ad894c94347c682669dff4e6128dba3071082ac374e34d85bfdbf68627f2670bb5addabfe9f7cabd7e9827afa2a291cbcaf0b
+DIST galaxyhack.png 819 SHA256 248d32aeaa03e4183cf0333bd4da1d32ea11883fcb77efe6ebc6e2be201e9903 SHA512 b8ab4dd1c18c079ec3f60b3d04843fbb7a892feb8f872d498c20eb3142e7de26bff90c93b308656e1afe5ee77074fcb3f78542dfd175c27a9b865a512e0b0200 WHIRLPOOL 6be53f8e5d5eed0e0514c37d1f08163ce59569479751569652821c0021520b9ffb47c23a99ea3ba03dd637838d68a5d4dc8d8d6b34656afaa2d942b2e93ed284
+EBUILD galaxyhack-1.74.ebuild 1680 SHA256 4149e05834dc4865209ea9777cbf2ffbf8615c34e32d3598461e5499e26e71c5 SHA512 988538356c473277548e096d21691084cb81bff3d638b1a5fe68be4577fc7117097e49c633ccfccd83c27dfb8b96051436735d3f2031cf800f77de814e2324a1 WHIRLPOOL fe5a67c0ff53d2f7c2af5d69f86d0661ec4009e3438aeadead2cd33cf6c36addd5999c307a05848ec226915c66124dffaf4b3f88485f0a95cd6411fdf042a356
+MISC ChangeLog 1860 SHA256 dad56d1ca8a2e5d948eb8d7e1a10b85401b63ba91d7b06acff4350665d271471 SHA512 2de673f465689ff9abcedcb6455cecb37348c6e81f1e15ae6022bbbbb0914797d815c51e74745aadc007062f234fdb8b3a006c7ca55c2be3eb174c18bfba4763 WHIRLPOOL 3afe4c39d12873467afb39d744216807469e09584108e0828530a74c166d1bd03e7b8603a696a8b0425649df649279ea5dd33d364516d1efdcb4d9e07c462730
+MISC metadata.xml 1207 SHA256 b49a896d99275f98ee92e6b225f573551e4eb1af5af57b88ebf2d8d5fa63c295 SHA512 bf7f69fccd935e8d0c82d39409320aac5648607fd86c6343382614e219cdad65c5095d8238694587c977bea86619b8fcb50ddf6dd4ada74012a513d6d33269fc WHIRLPOOL 0bf905a23ef7e500f4f15d494681ca698df39b346c74666151428411b7594ea6bded56a8c41e6709aa9cefb0e338abd460832d18feea4484a4ef1792a4fd296c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk37ShUACgkQIY77eQFFFC3TkwCdHFS2vOYq+5tbzNNmXcaiLsN1
-vH8AoN2PdOlgdms1bbZnkiYkBFMuOVTt
-=1xT4
+iEYEAREIAAYFAlCWtEIACgkQIY77eQFFFC0HMQCeNABbgL6DP/i5daI1TXHauKsE
+r/kAoNmYJypCI0i2g7MGVy658CVLAGW/
+=9LHG
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
new file mode 100644
index 000000000000..1b630c66fb20
--- /dev/null
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
@@ -0,0 +1,77 @@
+--- ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
++++ ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
+@@ -1596,15 +1596,15 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {

+ 		if (is_directory(*iter)) {

+-			fs::create_directory(destPath.string() + "/" + iter->leaf());

+-			DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());

++			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());

++			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());

+ 			continue;

+ 		}

+ 		string destFile;

+-		if (iter->leaf() == sideName + ".dat")

++		if (iter->path().filename() == sideName + ".dat")

+ 			destFile = theInput + ".dat";

+ 		else	

+-			destFile = iter->leaf();

++			destFile = iter->path().filename().string();

+ 		

+ 		fs::copy_file(*iter, destPath.string() + "/" + destFile);

+ 	}

+--- Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
++++ Main.cpp	2012-08-20 17:50:51.000000000 +0200
+@@ -339,12 +339,6 @@
+ 

+ void GameInit(char* argv[]) {

+ 	namespace fs = boost::filesystem;

+-	//boost is really quite stupid

+-	#ifndef WIN32

+-		fs::path::default_name_check(fs::windows_name);

+-	#else

+-		fs::path::default_name_check(fs::native);

+-	#endif

+ 	

+ 	FindHomePath();

+ 	LoadSettings(argv);

+--- Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
++++ Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
+@@ -206,7 +206,7 @@
+ 

+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {

+-		string filename = iter->leaf();

++		string filename = iter->path().filename().string();

+ 

+ 		if (filename.find('.') == filename.npos)

+ 			continue;

+@@ -237,7 +237,7 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {

+ 		if (fs::is_directory(*iter)) {

+-			string fleetName = iter->leaf();

++			string fleetName = iter->path().filename().string();

+ 

+ 			if (CheckFleetExists(fleetName)) {

+ 				tempItem.desc = fleetName;

+@@ -261,7 +261,7 @@
+ 	fs::path iterPath(GetFleetDir(whichSide));

+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {

+-		string filename = iter->leaf();

++		string filename = iter->path().filename().string();

+ 

+ 		if (filename.find('.') == filename.npos)

+ 			continue;

+--- Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
++++ Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
+@@ -657,7 +657,7 @@
+ 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

+ 	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {

+ 		if (fs::is_directory(*iter) && !fs::is_empty(*iter))

+-			RemoveDirectory(iter->string());

++			RemoveDirectory(iter->path().string());

+ 		else

+ 			fs::remove(*iter);

+ 	}

diff --git a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
index 16548345d1df..e6bacce41806 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/galaxyhack-1.74.ebuild,v 1.4 2011/04/27 03:06:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/galaxyhack/galaxyhack-1.74.ebuild,v 1.5 2012/11/04 18:30:21 tupone Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils flag-o-matic games
 
 DESCRIPTION="Multiplayer AI script based strategy game."
@@ -28,6 +28,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-destdirs.patch \
 		"${FILESDIR}"/${P}-boost.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-boost-1.50.patch \
 		"${FILESDIR}"/${P}-gentoo.patch
 	sed -i "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
 		Main.cpp \
@@ -35,15 +36,14 @@ src_prepare() {
 	sed -i "/Base data path/s:pwd:${GAMES_DATADIR}/${PN}:" \
 		../settings.dat \
 		|| die "sed settings.dat failed"
-	append-flags -DBOOST_FILESYSTEM_VERSION=2
 }
 
 src_install() {
-	dogamesbin "${PN}" || die "dogamesbin failed"
+	dogamesbin "${PN}"
 	cd ..
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r fleets gamedata graphics music standardpictures \
-		settings.dat || die "doins failed"
+		settings.dat
 	dodoc readme.txt
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} GalaxyHack