Version bump wrt bug #525156.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

4 files changed, 75 insertions, 2 deletions

diff --git a/media-gfx/nomacs/ChangeLog b/media-gfx/nomacs/ChangeLog
index 1b294eddc847..fc5fd39b5d8d 100644
--- a/media-gfx/nomacs/ChangeLog
+++ b/media-gfx/nomacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/nomacs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/ChangeLog,v 1.7 2014/01/16 07:47:30 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/ChangeLog,v 1.8 2015/03/04 18:28:57 kensington Exp $
+
+*nomacs-2.4.2 (04 Mar 2015)
+
+  04 Mar 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/nomacs-2.4.2-include.patch, +nomacs-2.4.2.ebuild, metadata.xml:
+  Version bump wrt bug #525156.
 
   16 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> nomacs-1.6.2.ebuild:
   Add ~amd64-linux keyword
diff --git a/media-gfx/nomacs/files/nomacs-2.4.2-include.patch b/media-gfx/nomacs/files/nomacs-2.4.2-include.patch
new file mode 100644
index 000000000000..abf3d406ce5e
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-2.4.2-include.patch
@@ -0,0 +1,10 @@
+--- src/DkMath.h
++++ src/DkMath.h
+@@ -29,6 +29,7 @@
+ 

+ #pragma warning(push, 0)	// no warnings from includes - begin

+ #include <cmath>

++#include <float.h>

+ #include <QDebug>

+ #include <QPointF>

+ #include <QPolygonF>

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 1e2a6d883a56..0025d46170c3 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -7,6 +7,8 @@
 		<bugs-to>http://www.nomacs.org/redmine/projects/nomacs</bugs-to>
 	</upstream>
 	<use>
+		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
 		<flag name="webp">Build support for WEBP image format</flag>
+		<flag name="zip">Build support for zip archives</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-2.4.2.ebuild b/media-gfx/nomacs/nomacs-2.4.2.ebuild
new file mode 100644
index 000000000000..9ff2e57917b2
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-2.4.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nomacs/nomacs-2.4.2.ebuild,v 1.1 2015/03/04 18:28:57 kensington Exp $
+
+EAPI=5
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt4-based image viewer"
+HOMEPAGE="http://www.nomacs.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="opencv raw tiff webp zip"
+
+REQUIRED_USE="raw? ( opencv ) tiff? ( opencv )"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.20[zlib]
+	>=dev-qt/qtcore-4.7.0:4
+	>=dev-qt/qtgui-4.7.0:4
+	opencv? ( >=media-libs/opencv-2.4.0[qt4] )
+	raw? ( >=media-libs/libraw-0.14 )
+	tiff? ( media-libs/tiff:0= )
+	webp? ( >=media-libs/libwebp-0.3.1:= )
+	zip? ( dev-libs/quazip )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_WEBP=true
+		-DUSE_SYSTEM_QUAZIP=true
+		$(cmake-utils_use_enable opencv)
+		$(cmake-utils_use_enable raw)
+		$(cmake-utils_use_enable tiff)
+		$(cmake-utils_use_enable webp)
+		$(cmake-utils_use_enable zip QUAZIP)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}