Build with boost-1.51 Bug #442502

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

4 files changed, 127 insertions, 10 deletions

diff --git a/games-arcade/smc/ChangeLog b/games-arcade/smc/ChangeLog
index b9861e9bcf80..d5ea3021ddc7 100644
--- a/games-arcade/smc/ChangeLog
+++ b/games-arcade/smc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/smc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/ChangeLog,v 1.26 2012/05/04 04:22:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/ChangeLog,v 1.27 2012/11/14 16:23:31 tupone Exp $
+
+  14 Nov 2012; Tupone Alfredo <tupone@gentoo.org> smc-1.9.ebuild,
+  +files/smc-1.9-boost150.patch:
+  Build with boost-1.51 Bug #442502 by Ben Longbons
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> smc-1.9.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/games-arcade/smc/Manifest b/games-arcade/smc/Manifest
index b34bae6a3990..14a1e470c594 100644
--- a/games-arcade/smc/Manifest
+++ b/games-arcade/smc/Manifest
@@ -1,5 +1,16 @@
-DIST SMC_Music_4.1_high.zip 36605212 RMD160 a4e9e8e930213ae69b870f68522457939ee9afcb SHA1 f8364f9b7f1b473ae6d1cf0e57c3153b0ee488e9 SHA256 0ab0e232bbdcde5c5e2391518593c5b3b2d152481946dd29d2ba7f6e22d83034
-DIST smc-1.9.tar.bz2 49568474 RMD160 1d73f92832909e37ecace5fdece8f4813959f726 SHA1 9a4ec12c64378d804848357bf143755a98d14baa SHA256 b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d
-EBUILD smc-1.9.ebuild 1244 RMD160 f3e4c1614cca45c02ea629b1a47537b99e2bee1b SHA1 242b40ae83fa05bc7c0cc62eb0f37f4d9663eedd SHA256 7d4e15d33fde3c3d4fe3b81384eb79cfda98561d7333916ee5a40e46766b756e
-MISC ChangeLog 6443 RMD160 82e87be0c86bbdeadf5ec85ac7d0bcef6620a3a1 SHA1 227b43e3feb009b55f79c1ca7789b6001336fb7c SHA256 2c9462a216929403bdfe050cadd248a7541ad608cbb6df1cc8163bd6dd6187c6
-MISC metadata.xml 239 RMD160 7367376202273040de00f4efe10e4cf8630519f7 SHA1 36a16f3c9c564d5a065a4dc0e3bb9d4adea05b86 SHA256 6b895868af60d56f4562164f82d0752bbc1e1da17f083e477790bfb22b5a96a2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX smc-1.9-boost150.patch 3624 SHA256 d56114d4acaf9ba9e742047a635985fe42aecaf6e31405337685c14217d82f64 SHA512 5e840d82b8d3ccb6251d07c4cd52c9024a1b2a0ca2c4c81612ecd67a5cf5a7377ce75fe47cf972b0edd1caea1d739a358c930ad488180b3397a83e809704db4f WHIRLPOOL fcd8bf2b8a748428151a2715d5fdf270dedf569c461e5881b8bdbfa14f4c42fa052cdd306012c82fe631e09aad2fbb65ef65851df40a31e91b0115d5eadeccae
+DIST SMC_Music_4.1_high.zip 36605212 SHA256 0ab0e232bbdcde5c5e2391518593c5b3b2d152481946dd29d2ba7f6e22d83034 SHA512 e82e514fd2bcb0dad8973f91a40d13445498a8a0af237c83739da6b9f85d6829d9a68739677842519484cdb45e969d221cd9bb53042d0cf1981e2e5765a0da08 WHIRLPOOL c355b3440ba991f45dbda93f485282a665d8262aee00cca901807356d8cebab1deb64f6e7f79a603f8b70386a9bfa50ed41db8c9d49d995a1526db92b7c8b75a
+DIST smc-1.9.tar.bz2 49568474 SHA256 b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d SHA512 f7fdb3dd48e2c4503158e5237911906d1de23b9c8ac0f494affa6e79eb57620c61cc757e4ba6e83fdd556fc5ee061b42be0b27055deb96e9d6e5b3ea8199124e WHIRLPOOL 9bf6ea2a7db552200e57b10968ffa13ae524b91c868fc3c5d45f7ab2ee7c547563b5f337f536183538369bde86530b272befb1601b551739b62acc71305fc697
+EBUILD smc-1.9.ebuild 1197 SHA256 0b70b8e112056c02c878fec1620be38fbe4c799da1f3dd174a08c8633bffe02b SHA512 8ba6fb1b2145fd26959fd7ea4169e783987e9154c5cbe156ecfd91e3081861ec238665110b0362bc2df82f30d1344fa003e345873062b3067f77d7516ff4bdd7 WHIRLPOOL 689be58eaffd05f4b7e7ff25ae16e67ba444fd24b1c4c6d67f8607ea761356aa24dabd33fa84fb4d21918c536a4a0ec09668f141b1474eec1adfd85800a72fb3
+MISC ChangeLog 6595 SHA256 9645d0fcd26a7b3b8d5cc9e3da6e5b5e72d86ee7303a193506b6becbc3b17ffc SHA512 917e89b33838c04e839f6a0f4b5aa2814a595e7f9d9a114bb11d8f9976de39bf30cc11d92a9c972e30fce75341cc4ca609399e5d6f7066307a048bf9f9707a46 WHIRLPOOL d12b1358fdaf92534f20d7ade3fc816967289208528867c3facc2682e0d7113016ec41ae898468bfb8747a97a1e5d9e7af2d1aa7e9bad852a3a52375466bb104
+MISC metadata.xml 239 SHA256 6b895868af60d56f4562164f82d0752bbc1e1da17f083e477790bfb22b5a96a2 SHA512 1e0b8ae0bd8e92f4b0acd9dc8af904a2ccb19724c7b6821ebbc3e4463e761c6642fab77ca6d4888312a18a5199ae905bd2cc5d5f32e4ea6275af6cb4e68babc4 WHIRLPOOL aad3c83dd4a6fd21510664baffc975b036a97712e52dc0bcab58bd0327821f3c85b99502cf37924dd28c368ff7f9857214525a7767fc86fa65ad447a8215f1a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCjxYkACgkQIY77eQFFFC2O8gCfaaNYj2sV2624hAKSmVNc2pZz
+iBwAnAoKDnwzNVjPhbUumh1fP2etoAbS
+=tUG+
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/smc/files/smc-1.9-boost150.patch b/games-arcade/smc/files/smc-1.9-boost150.patch
new file mode 100644
index 000000000000..42d7ce2bc66c
--- /dev/null
+++ b/games-arcade/smc/files/smc-1.9-boost150.patch
@@ -0,0 +1,101 @@
+--- src/overworld/world_manager.cpp.old	2012-11-14 17:05:19.759087973 +0100
++++ src/overworld/world_manager.cpp	2012-11-14 17:06:55.365644219 +0100
+@@ -111,14 +111,14 @@
+ void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ ) 

+ {

+ 	// set world directory

+-	fs::path full_path( dir, fs::native );

++	fs::path full_path( dir );

+ 	fs::directory_iterator end_iter;

+ 

+ 	for( fs::directory_iterator dir_itr( full_path ); dir_itr != end_iter; ++dir_itr )

+ 	{

+ 		try

+ 		{

+-			std::string current_dir = dir_itr->path().leaf();

++			std::string current_dir = dir_itr->path().filename().string();

+ 

+ 			// only directories with an existing description

+ 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )

+--- src/video/video.cpp.old	2012-11-14 17:10:26.448625365 +0100
++++ src/video/video.cpp	2012-11-14 17:11:37.486580531 +0100
+@@ -749,7 +749,7 @@
+ 		{

+ 			try

+ 			{

+-				fs::remove_all( fs::path( m_imgcache_dir, fs::native ) );

++				fs::remove_all( fs::path( m_imgcache_dir ) );

+ 			}

+ 			// could happen if a file is locked or we have no write rights

+ 			catch( const std::exception &ex )

+@@ -771,7 +771,7 @@
+ 	// no cache available

+ 	if( !Dir_Exists( imgcache_dir_active ) )

+ 	{

+-		fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR, fs::native ) );

++		fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR ) );

+ 	}

+ 	// cache available

+ 	else

+--- src/core/filesystem/filesystem.cpp.old	2012-11-14 09:00:41.965617165 +0100
++++ src/core/filesystem/filesystem.cpp	2012-11-14 16:57:11.282043980 +0100
+@@ -64,7 +64,7 @@
+ 
+ bool Dir_Exists( const std::string &dir )
+ {
+-	return fs::exists( fs::path( dir, fs::native ) );
++	return fs::exists( fs::path( dir ) );
+ 
+ 	/*struct stat file_info;
+ 
+@@ -89,7 +89,7 @@
+ 
+ bool Create_Directory( const std::string &dir )
+ {
+-	return fs::create_directory( fs::path( dir, fs::native ) );
++	return fs::create_directory( fs::path( dir ) );
+ }
+ 
+ size_t Get_File_Size( const std::string &filename )
+@@ -130,7 +130,7 @@
+ {
+ 	vector<std::string> valid_files;
+ 
+-	fs::path full_path( dir, fs::native );
++	fs::path full_path( dir );
+ 	fs::directory_iterator end_iter;
+ 
+ 	// load all available objects
+@@ -142,27 +142,27 @@
+ 			if( fs::is_directory( *dir_itr ) )
+ 			{
+ 				// ignore hidden directories
+-				if( dir_itr->path().leaf().find( "." ) == 0 )
++				if( dir_itr->path().filename().string().find( "." ) == 0 )
+ 				{
+ 					continue;
+ 				}
+ 
+ 				if( with_directories )
+ 				{
+-					valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
++					valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
+ 				}
+ 
+ 				// load all items from the sub-directory
+ 				if( search_in_sub_directories )
+ 				{
+-					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
++					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
+ 					valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
+ 				}
+ 			}
+ 			// valid file
+-			else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
++			else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
+ 			{
+-				valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
++				valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
+ 			}
+ 		}
+ 		catch( const std::exception &ex )
diff --git a/games-arcade/smc/smc-1.9.ebuild b/games-arcade/smc/smc-1.9.ebuild
index 7761f46dc948..3c1964b243e6 100644
--- a/games-arcade/smc/smc-1.9.ebuild
+++ b/games-arcade/smc/smc-1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/smc-1.9.ebuild,v 1.6 2012/05/04 04:22:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/smc/smc-1.9.ebuild,v 1.7 2012/11/14 16:23:31 tupone Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils flag-o-matic games
 
 MUSIC_P=SMC_Music_4.1_high
@@ -30,15 +30,16 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	music? ( app-arch/unzip )"
 
+PATCHES=( "${FILESDIR}"/${P}-boost150.patch )
+
 src_unpack() {
 	unpack ${P}.tar.bz2
 	cd "${S}"
 	use music && unpack ${MUSIC_P}.zip
-	append-flags -DBOOST_FILESYSTEM_VERSION=2
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	newicon data/icon/window_32.png smc.png
 	make_desktop_entry ${PN} "Secret Maryo Chronicles"
 	doman makefiles/unix/man/smc.6