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

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 67 insertions, 1 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/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}
+}