Version bump wrt bug #525156.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 95 insertions, 12 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/Manifest b/media-gfx/nomacs/Manifest
index a92c1784d97f..a3cca9d7e13f 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -2,20 +2,30 @@
 Hash: SHA256
 
 AUX nomacs-1.6.2-use-system-webp.patch 3180 SHA256 e6acae6e4235db962ca85508af105273351e5b31ef6a37b2f34f386985bd6ec3 SHA512 82ef414c9992cd98140a88c1b238f8b11c883bbb7b06fdcd404e4cfcc663012d4e253088762b525a95c1be4d328e806cc5efd285d2ac827a9c2f944f350da6b5 WHIRLPOOL a8f32d87ae3b82a0a143040aa09da0600cc8d0352b6274adfc920687ad847c762e1357dae2ba331570721d8a2ea525896e4d093a87322f29fe8a5715850915b7
+AUX nomacs-2.4.2-include.patch 223 SHA256 79c27b7e0b2a4ccbef12af4e7c31c77cb31e879eb578d7a1f5dac6984221aa7c SHA512 64876a8cf489813ae503c848e46adcb847c9c1e7dd4974580883b7ca291265401848549e11f6f383669bf796309ed4e49279a783c8869b60e9cbaabd981ae2c5 WHIRLPOOL 4fb9892d2ecf1941443dd0368b9d4c3e93925e28fb97cab4aebe56ef7b07febf2cdc70d938250867caebcd473b9caae34119ed9622f017c3431ef8e871bbbf76
 DIST nomacs-1.0.2.tar.bz2 803288 SHA256 6ffe3ca7e5ece7bcde5ba309447eff5df59fc0805d695d4d5639f9083a033218 SHA512 3d9285526d7b76ebf881f4ea014ff449dda75c05ef3b338650dbd2d5422cc604f4e80da81f6e6ef8cd4ae45c97e141f6e1af7eba7e98fb9b252219826d3f6718 WHIRLPOOL 77dd5c9e308ffdc224edfa2f28dc90ca1a364609c8af409f391000009f7213c631a9534cf1c022f66348754357d34892cf813f391803256f25a84e9610462830
 DIST nomacs-1.6.2-source.tar.bz2 1168631 SHA256 c9a7bea91db1f12513b43d5d194009f9281f6084ffc30ceeadb5ec4a598a6c71 SHA512 89e4ce93ee92bcbc0b7f5e9829bdadc694b1bf4ec9cedfc67b058721af2d2900faf41a22f6c23a4a0e6a4b6a85de5256253ce5c08bea97c984c63b934269bb9d WHIRLPOOL 161bc16699eb913272db3601e6e8bf476b58d183f1234f52534c9a636e426c72572b0dacf0eb246792b7ce3ae0e281cea4847879dfd837999db7898089adc500
+DIST nomacs-2.4.2-source.tar.bz2 1443270 SHA256 b0f52b919025a48a0e0300ea15c90b40d6ad892b055088fca02a8137e229bc3a SHA512 e3fae11ae8c385f9548bda32b2364967a457e9645fa4375da9d1cf85dc8fb150a56a19c3eab12ddef90d58f20a57d02a8720ddb8fef22c569ab6c28d54654f02 WHIRLPOOL ac21dd3afe3b45324daa6e07030203611c9f2de4ad1427ce4bb388d84ade5e38a686b42e0d757adbaa3a91fbb658d94f9f47de61e9ccf4ccc339af4ce1c4fd8d
 EBUILD nomacs-1.0.2.ebuild 734 SHA256 71e89fedf8bce5211586d74411aa447a86262b2566c2cb1764985c32288076a4 SHA512 cd9450b54c05690c3f360f32f24b7f35fba32ef697707a3fe59471c8cc3d89de12e46d203dacb10d06029db5ef629d0bea13626715053c8e0810e18aab22ed71 WHIRLPOOL 6568515bca54a6626edc9853982733e6a8a135db856a74d5162edfbd228262dd34b7e820c17a88485eb257b7085b3ecca3ea61b60da07908628c0a3c5ccaa86a
 EBUILD nomacs-1.6.2.ebuild 945 SHA256 bfabc1f89b1e2e986eace4841aa875bf221e66286e9d8c6062fae94461337617 SHA512 34d86592dea56e00e3dca0a18817d1b98d768c2ccc9b3a203bf63f263f27ecbb2f55475f5c814dc64c6f1315c86199ca2540de8a0a2bf51c52b4d2877c90d83e WHIRLPOOL 331dad608f38fadbb376f1336648b13a2cf9340973327a4a4830368dcce22b68856943271d2cb3c23728dacac53ebaecdfc49bfd753f632324a141b942009912
-MISC ChangeLog 1292 SHA256 0d56e31bcb628037d377c0efb28930cc2c75c783a3dcfa714ae2392e82b18963 SHA512 ef69cc4824c1a24aee4b006d27dff0c6c9cdd9f5e2fb913bb4e3515d6b06f3467ff9bd25c76d7b8d2bfed6607f08f482d336eedb5cae1795ade6a444d923d649 WHIRLPOOL 0b9f610f5f415379909cfd9aedd4d78eb936b7e5b3a255dea0da93839c88b0ce223c8a6b8f6bacc7d91ccebfaa83e056f38f887c2137a6c0e14ae4aa8563a077
-MISC metadata.xml 377 SHA256 633cf751d978a277361ba0addfc3ac1def3372f19885dbac3e1ae82b67576037 SHA512 e8da77a394211c9134668c84a42881d0443cf71bb44b791969eb76898ca3375716a52e96e3c7847be90a44446a5cb06d6bf89581085464bfb43bb396f5a69027 WHIRLPOOL a84c1d6c4aa484a3e0669fe41fd77edb9a47822e9087dcb5b3383348a84627fcd84ac21c658112b855a4e9a959ae7911764243ccf4c204200d5ade296981c7cd
+EBUILD nomacs-2.4.2.ebuild 1282 SHA256 0ae9b77f5593a4b92d2ff15e98392244799531895849d0ff0a1a58965abb987c SHA512 eaa6de5617a823916a1705dc44eb40e2cb9cd3423c140adc490b2995e1126ba918ce4b6e491872d2c2c43e028937a450947c23999db0cccaa69c0c6c23b8fe73 WHIRLPOOL e146d34c340f7a74d66307bc9dd29be9cce65508433b6d4c5c27f3fd26b1e0773ff1378a386fe21de9e6454ee9615c43ddd1c8090123d5f29cf2e000c7bda158
+MISC ChangeLog 1485 SHA256 bd2f098e5eedfd313514c38c12d11344c1e75851f6617ea0448860db2fb968f4 SHA512 f57a2b6a61db478ee54aa4c51e11a428b30ee92e2b09f97fc075a7c14b02d67df5f937922777554fb89662460cf27b2b279491128346bca00d975f7109edbe44 WHIRLPOOL c86d71b4ff2fde716a1a75d61a7b6177aa4519204ab7dcf96014b5b719b2285c36630fabedeef76c1b7bbe36e45ed9638df512de28143b0b14b1e15e03564ee8
+MISC metadata.xml 510 SHA256 345178bb85b32cc45ecf0d671ca5ac4623d1ca679e019ae16c0e491e29ba4f3d SHA512 43045f597f06e35bb38bbe025c9ddbfb36adb4a5f6e56fccd19c70df093d1e18ec042ffff93a67afaddedd5cd745ea9d523a0d533c3f7539ee028c64dc6be8ae WHIRLPOOL 69a7b6794fc0915227869e6c21f1a7719fe89acbd2064d7810c7568e8bda82f7513a5387b20d0f31bd2b2a00847da54dccf7ccc7e63751275a22ae06a686b428
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJS146RAAoJECo/aRed92672Y0IAMxquu/3GniLqdvOOszyo78X
-MZRQ6VD02pyBquG8w2I86VN6+iLVUP82Mmjc0xAK9Y6L7+T1OcR1dZf+Ocm8qVUx
-SZ90HFi22iuFyOk52f0xnIe2mdVjioMY+B1V9KDI1hEFlV0OQd+VlksXog5TVMLv
-gkLUuyxqfhWJrITV2K7kq4Dp0w+/wf3afZunkXdGCOUm5U72juOXHdTphbSuh2FW
-qSGNqNYab4tmbvIkasx4bmCI+t/DSG2jmiOMxJe7Or7r4p+tRAFOh8ZZfvK+bMRS
-CqKirHQupFD+nopA7YtKYKvKtnA1chvblcKUNrQulo2M3kdgQ/Qxab7zkU8M0xI=
-=CIaQ
+iQJiBAEBCABMBQJU907sRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7MJPD/4ubj2JL+waOoRfp/jvyos0sD1uF5CkDCj8hxz+5+M9nSphj9+Ojbj5h7Fj
+iSGtXXtzDoUHGpWMPTKMbsC0oRr+dW4b9SUug6wEbc1nSyMjpSPINMriz9NETZt6
+Eq281SXWDQ1H+Ci05KWcIOLjQ4qSsW3NkfhrCeBHUWXoC5lHT8X7afCzmjI0bPtb
+gJgRouqv1We4mmGW5PLVvaCaMyyJAwgtulpdSjzJBeXVLmAT1yzHNYs/BkoiwWC8
+T2/891AQBpjH9Vm+roG82Yb/ChVMmWLa85GPBH5zwfscyWRiDERyYl+875dLYj4T
+Z2yKzX1SPnp/M0SiFDbgnZ1tt51XKWqVL3ekdCZ1AKOrKnh8p1W5qNpgnYEXEMik
+IQV9mKcBBxpYb5LReRFc6FKFnVqOR9XHhctql5q9hm9VJZqOhcqottP/oDL7i4eC
+hKcqz5r/WywMqDnLFzFVigrMM/kGxVMDx24LTtz+mjyz7DGC8a3aYtNNVMU4zfae
+Hdusr7rBSMsSjMifcZNRPDjhiU4x/kW+yGs/grQz8OSxP2jAqNGEpVYVoTyvXXOj
+PUHMT35AgHZVTrD3c/OIJgH6AmEoOwXGw+dnTmIfHSaBDHKSSZG6RJ3TjqRl6reZ
+dKvGAjw9EsWfzlgsVZ64EntCvGcZ7V/lFBc2m1ANSMurBCaEng==
+=/Tt0
 -----END PGP SIGNATURE-----
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
+}