Fix compability with -DBOOST_FILESYSTEM_VERSION=3 and dev-libs/boost >= 1.50 wrt #425364 by Dennis Freise (and Diego Elio Pettenò)

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 77 insertions, 15 deletions

diff --git a/media-gfx/sfftobmp/ChangeLog b/media-gfx/sfftobmp/ChangeLog
index 57db9f4100d6..1c72b9ddb044 100644
--- a/media-gfx/sfftobmp/ChangeLog
+++ b/media-gfx/sfftobmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/sfftobmp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/ChangeLog,v 1.22 2013/02/02 19:22:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/ChangeLog,v 1.23 2013/02/03 10:39:25 ssuominen Exp $
+
+*sfftobmp-3.1.2-r1 (03 Feb 2013)
+
+  03 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +sfftobmp-3.1.2-r1.ebuild, +files/sfftobmp-3.1.2-boost_fs3.patch:
+  Fix compability with -DBOOST_FILESYSTEM_VERSION=3 and dev-libs/boost >= 1.50
+  wrt #425364 by Dennis Freise (and Diego Elio Pettenò)
 
   02 Feb 2013; Ulrich Müller <ulm@gentoo.org> sfftobmp-3.1.1.ebuild,
   sfftobmp-3.1.2.ebuild:
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 1b6ed673a4ab..386a3a0e2903 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -3,26 +3,22 @@ Hash: SHA256
 
 AUX sfftobmp-3.1.1-gcc43-and-cerrno.patch 1066 SHA256 5adbfcdfd1e6ef6993e507af66c47c0d6a7fd95c2e97ce5c2d7cf74af960ada6 SHA512 5e71296f5b620b1c9df9c41b49db9969a6c87f10a9dbb02b29b80fe12bead56201af683aede92c85a58843a5d4f7c90a2f55d6aaf5135961fe2ef6d63850e045 WHIRLPOOL 015dedaf7c27db93866e98a99d824264a78ea20e2c035e05ca220b4e487ae91bcd21bf6b8926be5c36b48e34da85cb66d4be02bdbe08d8eea058b1823e7b0ee4
 AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 SHA256 cd0630bab67b6a02887f02b69013aa2fbb038e38fab6e2ec22dd5b1870f5acd4 SHA512 bd92e0f3e6743941080319da764ce6bbdb0b8d0694a9e5dd113e3a64c0deb0a86ce33a9a9f306c8a2c75d08f6fb33c78c1fe60f36309acf9c6223ec02b158f5b WHIRLPOOL c3be5ed263e5c2e8236ef838087424ddd8ccc00b348888350bd840a7aef5543342a9ad9445c7caf39da5d9f486111b02e2e817be94af46369e8f68ae467186a3
+AUX sfftobmp-3.1.2-boost_fs3.patch 538 SHA256 a2314dd69429eec8d3d44c066a69ee7cf021315a10b47c64c74fd5d01b1158ed SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e WHIRLPOOL bd05410507f8dc16c39e34e79f385208b1ae833ee03096c8afa7e1f40babf633065d343728bd0854d98a8d322311310547a8369a0b4be2126ec10b8d42b0a9db
 DIST sfftobmp3_1_1.zip 121209 SHA256 d43d135150f3494a0a6da4349f7c86750519c1cc6c6d6d5120e90ee7c33cf0da
 DIST sfftobmp3_1_2_src.zip 121478 SHA256 08f8080ead0e0c1fee4cfb0061ea08edfd95dae60f333269337ae17d9562d970 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7 WHIRLPOOL bde9c8d2bd9f9b1a25af99fc19e781501764de1715ad7f6be33e53cee88b0672d629de28be2601bf1001eb8be3deb837413e42b72a3125dea01aae3049c4743c
 EBUILD sfftobmp-3.1.1.ebuild 892 SHA256 cf4bdfa8693a6214b79e222c549d4efa1179287649b5ddb1e82744e1099b0899 SHA512 fd3d7dd0e36b16d1e93cee74b3692487c128baa51819b8f139aec874cd4d07f5a8f7c631849efcd529242d1e8c2bc6ddfb350bc5f7795196364e27abace2d2ca WHIRLPOOL fdccafc6ca2e69cbbeb395641a1f4afb70c5f2543be7ff3e7e2669b06e349a614332cc26df0f7c0cf3b3d8392006db8e495051435e7548dd4f94e2a9c2c50476
+EBUILD sfftobmp-3.1.2-r1.ebuild 903 SHA256 3bc519e0a8e3cf7be92034788fb085f16d5a53ebe1bc0658a4735fab355c2a0f SHA512 aab228c12c6a1709835fe2aaba9f7971e63b3d3870e5f7a6fde0f026446a077fca021dfff51ea39551bf40738189280a845ac9f61b46a503daa5193a54f682e2 WHIRLPOOL 20f30339a6cd1d70b34b7ec34c56b55011e1d068753301b82e2619690fda69968a9ebc299d7202d3fd00328b69d9b26751fa58fa5512e19d9c02cecbab7e9d2c
 EBUILD sfftobmp-3.1.2.ebuild 859 SHA256 068d3cac77780a75423eedba12cfbf446d3ec5760739c0709d1ef4d590bd4019 SHA512 d93e6d42a3d0fae34224b6a995658dc5d0016cb1542055cb37efdddbe480534d73b3d172163c5d45f5eb02b647ab9014643698793b55460d6d098c019210b936 WHIRLPOOL 66fd0df068846ae7fd214a704255ddaf521c5a394e44940b46dcf55110f59e46f0e719901b4950b9e14e29a1a4771e858ab60f7decffa77f68046140bf7da5e9
-MISC ChangeLog 3019 SHA256 9871f6a5f4df97ccc9418e3cb4007cec8135058da32e889e57272d3ca4f64279 SHA512 65c3e814f7eccd0cbd7ca4e2825b6c6100839ef40ddff201d56b10d2409134d4c48f47a800977aeef0f49388888c63d1a8fe4f0a53fa8b1e72373528e1095011 WHIRLPOOL d656a58366974bf4cb5fcfe35934152905156b40f6c69a5ebc899996cc3f5bcc3233d6085272595af8224c1d4c1990117a22dd2434627d785f8b0283a7875e0b
+MISC ChangeLog 3318 SHA256 c94cdb8dda44532ef4ae4587410d401d4ead8931557ff3a7e5847df314408334 SHA512 e9ce3b9ee2f010530387cd2cad61f18b1fb656e434a65934ea2abcdf30011d1427a9b132d99edcb490ba4be8edf0e88dc96bd39758584cc645a8b91ddcc1c279 WHIRLPOOL 35c43d75e670be2699c7bd38bccb4a90a6d881c74be881bda3b80e44be94f9e4f23ea2541ae1370862005b2a54967ce7d25ed6f316738325ed8483fcd9d64fa6
 MISC metadata.xml 217 SHA256 83c1617923ee79ac92b6cf61b2008c01ac7ad13f7536237d41354443fa2aadef SHA512 fe8e1891d8d1042f2a2324c394d16559b56a490ec9bb3d477f2a7c6885eccda9c62e7778dc93245b2731676f6b4853e95653eae806690caf004bf84d61f885ff WHIRLPOOL d9d594b1697b87fe653ae9e49fcb10fcb1d8603ff222b68ce82b81282b35f5fed944bce9b78430613a2142ba400edf7dd953a4bb0f6151b3b8d0aab1206f9924
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRDWhaAAoJEDxpGckxwJCB/HoP/AmDfV4Qvud7hiB7zNlFb7L4
-4SLvCeXLsXkSKMdmm+ODFKeg5Fk3FmiBP763iXA6F7pB+9Vp1lKHDPoUNAYJvGXj
-se23P67J5dz7VfXn6m8IDZ+AKteVnZw7TaWiNX2TYd9vcUTRTzuL7/8iEo4m9OuB
-fKukQ8g+MP0H9SnVk/IPk22FKc6bqfXSlB/5D0VD9sfJT+/XHGhbk3Z3bu+ADqVj
-uTqI7eeJor+7rax2jcWFv8kLfhOibBklMr88+x3CglFf3WOK4pCyZoECkWdOP8qT
-4AxBdQqAgR2bO9KOq8zi9cx4shzEgpPAtzLySgXLg0WprGvtruMczLWNjcjTxUBn
-agW1B2RR/5ksUhungfgyRXWbjQfe/mxdkHeWVUy8UUNraaDhInGzDhYfVfxbID0r
-B6kpeHSFTcddGTCjasnCTkIZ/zfyFu7LjBU4lrS6U/AHsNM5QsNn7ik/Mnv52Idb
-hVP2o+d2BKEjtLdr2thOEQsEuWRNoOOV6nsk7yz9/HVZRzy/P8dEWVK/7OH/DOOv
-2Hghp8/ZsJttG9FiJqno/932/LZ5XVJeToohbBQWVb+R0zz2y1fsBf1zYbRZlFaJ
-XsGecv34/syE24vCJ+5GObYtqUZOXk7VZUndpketCI46ZnVicqLNNURn9iXV+uMQ
-xeTZBQKjjeIG/QUDoFu4
-=ZMSy
+iQEcBAEBCAAGBQJRDj5EAAoJEEdUh39IaPFNdToH/3qU1OmyaeqHpYU6i1XicyUh
+9hZD/fa3eJC7pny5JJeTbKBJoF4OfBFC6rpxzjXPyAcJkbcFD/Q6EXVlVTP3+xaj
+R+MC0r/hkG6G3y3+nPfA2LnROjL1osLjIbUQB52rMkeYSBHazQF+DGRk1cX6omBS
+1dMaq0n/Qf0bI0Ep0Cw2l2T+PtMrtnGz8FJaQY0AA61BGaDL0A9tHmpTVcW3amu2
+KNy4He4BonBEbnTdD3333UYsV8Dn8X8EVat7ryAr5PUBB0ZfwYNxD/KzsmidIP5s
+8hqyR/zp/5nOFwp3LFqr4UCiR1s6dTsWi2tZMoMWAmzGLKT7C5zrSR0z0E/DaZ8=
+=emUv
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
new file mode 100644
index 000000000000..f39d157e1972
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/425364
+
+--- src/cmdline.cpp
++++ src/cmdline.cpp
+@@ -264,14 +264,14 @@
+   }
+   do {
+     if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
+-      m_vFiles.push_back( fs::path(fd.cFileName, fs::native) );
++      m_vFiles.push_back( fs::path(fd.cFileName) );
+     }
+   } while (::FindNextFile(hFind, &fd));
+   ::FindClose(hFind);
+ #else
+   int n = optind;
+   while (n < m_argc) {
+-    m_vFiles.push_back( fs::path(m_argv[n], fs::native) );
++    m_vFiles.push_back( fs::path(m_argv[n]) );
+     ++n;
+   }
+ #endif
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..e19938454f20
--- /dev/null
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild,v 1.1 2013/02/03 10:39:25 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+MY_P=${PN}${PV//./_}
+
+DESCRIPTION="sff to bmp converter"
+HOMEPAGE="http://sfftools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
+
+LICENSE="HPND MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/boost-1.49
+	media-libs/tiff:0
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch \
+		"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
+	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/{changes,credits,readme}
+}