Build with automake 1.12 Bug #442310

Build with new boost

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

5 files changed, 69 insertions, 13 deletions

diff --git a/games-action/clanbomber/ChangeLog b/games-action/clanbomber/ChangeLog
index 5c14be461627..cf2ba8cd9542 100644
--- a/games-action/clanbomber/ChangeLog
+++ b/games-action/clanbomber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/clanbomber
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.18 2012/11/04 04:42:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/ChangeLog,v 1.19 2012/11/15 11:43:55 tupone Exp $
+
+  15 Nov 2012; Tupone Alfredo <tupone@gentoo.org> clanbomber-2.1.1.ebuild,
+  +files/clanbomber-2.1.1-automake112.patch,
+  +files/clanbomber-2.1.1-boost150.patch:
+  Build with automake 1.12 Bug #442310 by Diego
+  Build with new boost
 
   04 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> clanbomber-2.1.1.ebuild:
   unclamp the boost dep (bug #441602)
diff --git a/games-action/clanbomber/Manifest b/games-action/clanbomber/Manifest
index 335894323576..df9e0285a113 100644
--- a/games-action/clanbomber/Manifest
+++ b/games-action/clanbomber/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clanbomber-2.0.9.1-gcc43.patch 2224 SHA256 f1ba1ab3689ad24e6370df95c18e6ea076233c5e401812c3af02c03824fdbf6f SHA512 231add247394dbcf0281b455e9ab64406f37cb4ae2f72fdeee7f62df27ff8bc9944b43cea235f82d2677cc2d2b18ca4b62ddb4e86f958317f988fec6bd762191 WHIRLPOOL af020c122d40c7947923113575a88216c11816820d94d4c5abb1de77c6352107f6894f8a826883676b7a2c4385c34573e2556a483b73d67bbcad92f0796bd21e
+AUX clanbomber-2.1.1-automake112.patch 373 SHA256 b002281cc9baa344fd2bc521f26dab598f5d54d151c625258e23eb23419657c6 SHA512 ed080f9e43b7268724cce0445ac55fdd0b0a5653692627e78342f941c19341f781b99dcbf008d348d8643cc611e6e48eb448b5bc042ad317f2a329117660ae93 WHIRLPOOL 54aa87093c31a227d22e73ac609ccce2d2b6fc1cef5df067e53c58fbb9d32708faea0cc7a65f4475d0202ce783a7126df04c4ceb8eaa5df01d4940ae773ddff5
+AUX clanbomber-2.1.1-boost150.patch 1140 SHA256 1931d959e25ae9240b62115ea2d4908d00f843cd5c6fec925aa01dfec62eb093 SHA512 7df81678a98e693b8bf2de79aa19ad0daecd3425a2ee2098a79ed2d4a0c8b3063b72d094fcdfc1c95ff9a66a684293f12692b48f7f177c9fc956197e895ceffb WHIRLPOOL 1a1b639b40a280f91a08482b96d00c1458aed2ff67a5560d2f216f9c01546b5f902a735bf11cf0ba9b37fd17df233962e1aec196c4613c629c87175f1fb28e21
 DIST clanbomber-2.1.1.tar.lzma 2070392 SHA256 82aa263e6560f7e12a9bf590df1046cb4da8fc855162ab9ad09f89ec2e617e3b SHA512 b2d634c20d60cd7c080263a8ebea931bd623342c32380494c0076441021719135ca7861e0467e0c71cd46bb4ed85d3ce364dbfa2c8399eaf058f62f294a21c32 WHIRLPOOL d7d9c71ea20d8f1bcd1420156516c9f969880d4ba7907093361ee1713b8984a1fe1c11bda1f7f3f46a3503d257b180be8ec9e028a5b624531cfc7a493fa9c144
-DIST clanbomber2-0.9.1.tar.gz 1935881 SHA256 2b43fa786528892cc6c43014e142051783ace19e42e84d0db9160d5a6d0a7773
+DIST clanbomber2-0.9.1.tar.gz 1935881 SHA256 2b43fa786528892cc6c43014e142051783ace19e42e84d0db9160d5a6d0a7773 SHA512 f341fb7ed161d48e0afeb3aad091b792debacd9567b1e08f73735de98f50a2f2b1f73284b8055972a4477155ed3880cb86ec116e6898d50f99aa5f8acbdbd129 WHIRLPOOL ae1c1a09a93121512eb1c45cd034327fc1da0cbafe2f9dc2e3164aa52fbe1a8a7c00f0e7ece8374da80cc41e1c47a3371923a2f1b9be5833a00d575ceea50f25
 EBUILD clanbomber-2.0.9.1.ebuild 853 SHA256 2db1a1ffb947144b21b45abec7faff0865b4b3756135707fe55e7416ad699ead SHA512 802cf0315b6f2251776578f783e3abed89d63df68fd84567e4dafda93156309ec4f6f5d9b279c96d20e111dbd93d8868fd7d04db54d84dec00303e9a99edd9d0 WHIRLPOOL 774e2dcdcdebcb97131554982cc46f10f72ff99f90fd474c15e8a7e89ba1a9d08819b412f23bc33ed77e05b08079cc241455a5c578e8a733c7f5142ffecd787a
-EBUILD clanbomber-2.1.1.ebuild 1671 SHA256 0982b4f0402987c3059883dec8b23d53954a9d9a8e2961c1c1153406c5f938b0 SHA512 b0e1d553e21b6bd00288e8a71b06386728759c18da4f90e00e920082562f453dfe642a8cbb1a0f9fd26e471f95fb01c8aeddbbfa3b060c6d87661601afe4a21d WHIRLPOOL 13faab7bd3a517c006ec637b35b39b9fb100ae407392f215250054b66150c15b1f9a1b162aa29e8ac9867cab500a6a01ce11438f369091179fa83c98c3964703
-MISC ChangeLog 2463 SHA256 b0fbdb7510c176a8a8220968ab0108430de8bb4b95513c35fe7fc3a5a2cdd8e7 SHA512 87cffc83375bc4356cd5af3cc111267b6ff8cd2962b470929533612fadc8b57f8b5de8037c64eabae99e221eef2bc05ccb280637b97d254df757f748a6f591ad WHIRLPOOL a014003843464c8ac9a507c82037bedda8486d72d222d2e97386b8910f02ad786aab73c7bd0095169083d18ae96f661b4cf8cfcddef960bed7e2b57ef5460d78
+EBUILD clanbomber-2.1.1.ebuild 1546 SHA256 98476af082073d89ffda13a38123946a5ded0d9e3d0704bda8e4ab5f16959015 SHA512 02d732d547fd109813462fa4c3c79ccf6090929782717c70f07d350fa52884f8cfc7ba3ae2535b27a1ea9dcd81e8100a076eb4eaa1ed14c9ad25f3c73a1a6859 WHIRLPOOL 670dd9bc46521ee0c7db5d39c4d9d06d23d55a93bfbdc978d4b8bbdc5fdb75690c01362aad2a2179ad108c2ddb9af14db7648fbc761c422b9de49990c837d04b
+MISC ChangeLog 2694 SHA256 aa943a5afdf3b370b4b3d4a9ddb7d8fcc939743295898a3e4d7b9631313e0713 SHA512 9fc57f9fb1e351ba8e7112f70e424edde6fe1f6ee49e64a2f0bc814d6aa19bbfb6987d4b6365ae7c3fb9633a7a27a4ac719d93d9e4f16a2d8434093d49507b3c WHIRLPOOL b89bddf4685a4d969cc32f1fa13f1146f934b2d2cc0aac1039c221b35a20ab8618b26a2f1095b5d3a6d191cb0a0573188a25949cf8f94d8d0b1ce70d6877a75c
 MISC metadata.xml 664 SHA256 4191923c5c67851dc9a2bbea0ec54b6b6ae9dfd93e35700b1b9c0a8f659d59bf SHA512 b34fc42937bb34af02da2ec929354cd9f3db01bd4509382723f455a7530e6ed2028f6489b8198ffba86e84e91918828d153cc20a9b8c22726ed5f64a63e77d9c WHIRLPOOL 594f68de1b346e736f755cba7fbb31a4aeb6423632be76052db44d573eeb6bfb8bd600beeb643d2781b42062584e2f5d06096fb82e17133131b22609095e6647
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCk1YIACgkQIY77eQFFFC0KHgCfZKz1xMWZAcCzJGpK5wGST25k
+Ap4AnjtIYLqJ0tHvgWxsBZTVnBZO33ID
+=rflZ
+-----END PGP SIGNATURE-----
diff --git a/games-action/clanbomber/clanbomber-2.1.1.ebuild b/games-action/clanbomber/clanbomber-2.1.1.ebuild
index 2b5e222644d3..0b689a9a95e9 100644
--- a/games-action/clanbomber/clanbomber-2.1.1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-2.1.1.ebuild,v 1.5 2012/11/04 04:42:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/clanbomber/clanbomber-2.1.1.ebuild,v 1.6 2012/11/15 11:43:55 tupone Exp $
 
 EAPI=2
 inherit autotools base eutils flag-o-matic games
@@ -19,7 +19,7 @@ RDEPEND="media-libs/libsdl[audio,joystick,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	media-libs/sdl-gfx
-	>dev-libs/boost-1.49.0
+	dev-libs/boost
 	media-fonts/dejavu"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -33,16 +33,12 @@ src_prepare() {
 	boost_ver=${boost_ver%.*}
 	boost_ver=${boost_ver/./_}
 
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-		-I/usr/include/boost-${boost_ver}
-	append-ldflags \
-		-L/usr/$(get_libdir)/boost-${boost_ver}
-	append-flags -DBOOST_FILESYSTEM_VERSION=2
-
 	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
 	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
 	sed -i -e 's/menuentry//' src/Makefile.am || die
+	epatch \
+		"${FILESDIR}"/${P}-automake112.patch \
+		"${FILESDIR}"/${P}-boost150.patch
 	eautoreconf
 }
 
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch b/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
new file mode 100644
index 000000000000..e3223108c36a
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old	2012-11-15 09:35:24.682199511 +0100
++++ configure.ac	2012-11-15 09:36:02.367839076 +0100
+@@ -2,7 +2,7 @@
+ AC_PREREQ([2.63])
+ AC_INIT([ClanBomber], [2.1.1], [rsl@members.fsf.org])
+ #AM_INIT_AUTOMAKE([-Wall -Werror foreign])#foreign is for NEWS COPYING ETC
+-AM_INIT_AUTOMAKE([dist-lzma -Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ 
+ #CXXFLAGS="-O6 -g3"
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch b/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
new file mode 100644
index 000000000000..34335bc79f9b
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
@@ -0,0 +1,31 @@
+--- src/MapEntry.cpp.old	2012-11-15 10:55:40.123259605 +0100
++++ src/MapEntry.cpp	2012-11-15 10:57:35.217379211 +0100
+@@ -50,7 +50,7 @@
+   enabled = true;
+ 
+   // extract map name
+-  map_name = filename.stem();
++  map_name = filename.stem().string();
+ 
+   // is the file writable?
+   if (access(path / filename, W_OK) == 0) {
+--- src/Map.cpp.old	2012-11-15 10:52:56.884424228 +0100
++++ src/Map.cpp	2012-11-15 10:54:16.334992079 +0100
+@@ -116,7 +116,7 @@
+     for (boost::filesystem::directory_iterator dir_iter(path);
+          dir_iter != end_iter; dir_iter++) {
+       if (dir_iter->path().extension() == ".map") {
+-        map_list.push_back(new MapEntry(path, dir_iter->filename()));
++        map_list.push_back(new MapEntry(path, dir_iter->path().filename()));
+       }
+     }
+   }
+@@ -126,7 +126,7 @@
+     for (boost::filesystem::directory_iterator dir_iter(path);
+          dir_iter != end_iter; dir_iter++) {
+       if (dir_iter->path().extension() == ".map") {
+-        map_list.push_back(new MapEntry(path, dir_iter->filename()));
++        map_list.push_back(new MapEntry(path, dir_iter->path().filename()));
+       }
+     }
+   }