From af3da8f94a761851a38ef86d7b82106577d7f60e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 4 Oct 2015 21:37:56 +0200
Subject: media-gfx/nomacs: Version bump, add USE=qt5

Package-Manager: portage-2.2.20.1
---
 media-gfx/nomacs/Manifest               |  1 +
 media-gfx/nomacs/nomacs-2.4.4-r1.ebuild | 57 ---------------------------
 media-gfx/nomacs/nomacs-2.4.6.ebuild    | 70 +++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 57 deletions(-)
 delete mode 100644 media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
 create mode 100644 media-gfx/nomacs/nomacs-2.4.6.ebuild

(limited to 'media-gfx')

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 8925a44092a0..acc003c7a667 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1,3 @@
 DIST nomacs-2.4.2-source.tar.bz2 1443270 SHA256 b0f52b919025a48a0e0300ea15c90b40d6ad892b055088fca02a8137e229bc3a SHA512 e3fae11ae8c385f9548bda32b2364967a457e9645fa4375da9d1cf85dc8fb150a56a19c3eab12ddef90d58f20a57d02a8720ddb8fef22c569ab6c28d54654f02 WHIRLPOOL ac21dd3afe3b45324daa6e07030203611c9f2de4ad1427ce4bb388d84ade5e38a686b42e0d757adbaa3a91fbb658d94f9f47de61e9ccf4ccc339af4ce1c4fd8d
 DIST nomacs-2.4.4-source.tar.bz2 1448716 SHA256 01b0cb48936ca0214c120a126069c50a9b8fe7ecbdb69bb4e5fe283d6b198257 SHA512 76cd5efaba09584757843e895b5b8293adcdab7df68a7d5bdcf38e9e5df04e38382944cf64293c9820815b9e6328793dd8e46afef5ffeaa80ddc4f7d43290fc2 WHIRLPOOL d858887f66cbbed858c1985313107839a8162052bfb825bc48f344516444a1e184e839c9a067283d7503b98a6993126ade3f39c0a85b50ca534f963335c85513
+DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
diff --git a/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild b/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
deleted file mode 100644
index d45dba7f19c8..000000000000
--- a/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	>=media-gfx/exiv2-0.25:=[png]
-	opencv? ( >=media-libs/opencv-2.4:=[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
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT5=OFF
-		$(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)
-		-DUSE_SYSTEM_WEBP=ON
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild
new file mode 100644
index 000000000000..01cf47ad35d2
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt-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 qt5 raw tiff webp zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	>=media-gfx/exiv2-0.25:=
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		opencv? ( media-libs/opencv:=[qt5] )
+		zip? ( dev-libs/quazip[qt5] )
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		opencv? ( >=media-libs/opencv-2.4:=[qt4] )
+		zip? ( dev-libs/quazip[qt4] )
+	)
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( >=media-libs/libwebp-0.3.1:= )
+"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable opencv)
+		$(cmake-utils_use_enable qt5)
+		$(cmake-utils_use_enable raw)
+		$(cmake-utils_use_enable tiff)
+		$(cmake-utils_use_enable webp)
+		$(cmake-utils_use_enable zip QUAZIP)
+		-DUSE_SYSTEM_WEBP=ON
+		-DUSE_SYSTEM_QUAZIP=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
-- 
cgit v1.2.3-65-gdbad