[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Michael Palimaka]

commit:     d44dfcaf2545c50c28ed4c066efbbc912de643da
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 17:05:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 17:28:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44dfcaf

media-gfx/nomacs: Fix configure with >=opencv-3

Package-Manager: portage-2.2.27

 media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch | 21 +++++++++++++++++++++
 media-gfx/nomacs/nomacs-2.4.2.ebuild              |  7 +++++--
 media-gfx/nomacs/nomacs-2.4.4.ebuild              |  4 +++-
 media-gfx/nomacs/nomacs-2.4.6.ebuild              |  4 +++-
 media-gfx/nomacs/nomacs-3.0.0.ebuild              |  1 +
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch b/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch
new file mode 100644
index 0000000..a13d90f
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch
@@ -0,0 +1,21 @@
+commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Jan 31 17:38:21 2016 +0100
+
+    Drop minimum OpenCV version messing with detection of >=3.0.0
+    
+    Similar to commit 624a2fa7fba25a9432dc15031f3fd569367927bd
+
+diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake
+index 4e91135..e9ec436 100644
+--- a/ImageLounge/cmake/Unix.cmake
++++ b/ImageLounge/cmake/Unix.cmake
+@@ -43,7 +43,7 @@ endif(NOT EXIV2_FOUND)
+ # search for opencv
+ unset(OpenCV_FOUND CACHE)
+ if(ENABLE_OPENCV)
+-	find_package(OpenCV 2.1.0 REQUIRED core imgproc)
++	find_package(OpenCV REQUIRED core imgproc)
+ 	if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is set in Ubuntu 12.04 (without finding opencv)
+ 		# Older OpenCV versions only supplied pkg-config files
+ 		if(PKG_CONFIG_FOUND)

diff --git a/media-gfx/nomacs/nomacs-2.4.2.ebuild b/media-gfx/nomacs/nomacs-2.4.2.ebuild
index b3ef73b..f666011 100644
--- a/media-gfx/nomacs/nomacs-2.4.2.ebuild
+++ b/media-gfx/nomacs/nomacs-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-include.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-include.patch"
+	"${FILESDIR}/${PN}-3.0.0-opencv3.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/media-gfx/nomacs/nomacs-2.4.4.ebuild b/media-gfx/nomacs/nomacs-2.4.4.ebuild
index dee2bc0..d267681 100644
--- a/media-gfx/nomacs/nomacs-2.4.4.ebuild
+++ b/media-gfx/nomacs/nomacs-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_QT5=OFF

diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild
index 01cf47a..ecda8a1 100644
--- a/media-gfx/nomacs/nomacs-2.4.6.ebuild
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_enable opencv)

diff --git a/media-gfx/nomacs/nomacs-3.0.0.ebuild b/media-gfx/nomacs/nomacs-3.0.0.ebuild
index 67552f9..3915d6d 100644
--- a/media-gfx/nomacs/nomacs-3.0.0.ebuild
+++ b/media-gfx/nomacs/nomacs-3.0.0.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-tiff-build.patch"
 	"${FILESDIR}/${P}-quazip-build.patch"
 	"${FILESDIR}/${P}-quazip-link.patch"
+	"${FILESDIR}/${P}-opencv3.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Davide Pesavento]

commit:     61f16acdacfccb94f6d16314d2145c269b2732f9
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 13:13:57 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 13:13:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f16acd

media-gfx/nomacs: drop old versions

Package-Manager: portage-2.2.27

 media-gfx/nomacs/Manifest                         |  2 -
 media-gfx/nomacs/files/nomacs-2.4.2-include.patch | 10 ----
 media-gfx/nomacs/nomacs-2.4.2.ebuild              | 58 ----------------------
 media-gfx/nomacs/nomacs-2.4.4.ebuild              | 59 -----------------------
 4 files changed, 129 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index eabafb6..69aa532 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,2 @@
-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
 DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d

diff --git a/media-gfx/nomacs/files/nomacs-2.4.2-include.patch b/media-gfx/nomacs/files/nomacs-2.4.2-include.patch
deleted file mode 100644
index abf3d40..0000000
--- a/media-gfx/nomacs/files/nomacs-2.4.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/nomacs-2.4.2.ebuild b/media-gfx/nomacs/nomacs-2.4.2.ebuild
deleted file mode 100644
index f666011..0000000
--- a/media-gfx/nomacs/nomacs-2.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 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="
-	>=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"
-	"${FILESDIR}/${PN}-3.0.0-opencv3.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
-}

diff --git a/media-gfx/nomacs/nomacs-2.4.4.ebuild b/media-gfx/nomacs/nomacs-2.4.4.ebuild
deleted file mode 100644
index d267681..0000000
--- a/media-gfx/nomacs/nomacs-2.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 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.20:=[zlib]
-	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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" )
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     24b983dc9155c89be0173954e11891e1fec296b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 20:02:40 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 20:26:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b983dc

media-gfx/nomacs: Drop old, broken by quazip-0.7.2 ebuilds

Package-Manager: portage-2.3.0

 media-gfx/nomacs/Manifest                          |  2 -
 .../nomacs/files/nomacs-3.0.0-quazip-build.patch   | 32 ----------
 .../nomacs/files/nomacs-3.0.0-quazip-link.patch    | 25 --------
 .../nomacs/files/nomacs-3.0.0-tiff-build.patch     | 28 ---------
 media-gfx/nomacs/nomacs-3.0.0.ebuild               | 69 ----------------------
 media-gfx/nomacs/nomacs-3.2.0.ebuild               | 59 ------------------
 media-gfx/nomacs/nomacs-3.4.ebuild                 | 63 --------------------
 7 files changed, 278 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index e2e9dbf..e0d5832 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,2 @@
 DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
-DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d
-DIST nomacs-3.2.0-source.tar.bz2 1090076 SHA256 82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad SHA512 efd27d97a3843d2527c4423321ad946f32381a917f328878a04e39275e0fde2879e5836eb4ac2a54b489c47364f4ad76fd8dc7190fc8ebc1d9507d957fd66049 WHIRLPOOL 076390f77bcc47e88023f65bcdc5d17e939b08419c7ed9b3ed65f141a76d65ce64c3256b57fed3aecc7cd2b68b89dd871734ac248c6d1719e977ff14e0b117ec
 DIST nomacs-3.4.tar.gz 30026261 SHA256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36 WHIRLPOOL f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f

diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
deleted file mode 100644
index 5f33b65..00000000
--- a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 204dd809ae0d6287385905d44c1a60a38a7c4084 Mon Sep 17 00:00:00 2001
-From: diemmarkus <diemmarkus@gmail.com>
-Date: Thu, 14 Jan 2016 16:35:55 +0100
-Subject: [PATCH] #44 (github) fix proposed by @kensingtion
-
----
- ImageLounge/src/DkImageLoader.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ImageLounge/src/DkImageLoader.cpp b/ImageLounge/src/DkImageLoader.cpp
-index 5d66e09..3a00010 100644
---- a/ImageLounge/src/DkImageLoader.cpp
-+++ b/ImageLounge/src/DkImageLoader.cpp
-@@ -512,6 +512,7 @@ QSharedPointer<DkImageContainerT> DkImageLoader::getSkippedImage(int skipIdx, bo
- 
- 	}
- 
-+#ifdef WITH_QUAZIP
- 	if (mCurrentImage && (newFileIdx < 0 || newFileIdx >= mImages.size()) && mCurrentImage->isFromZip() && mCurrentImage->getZipData()) {
- 
- 		// load the zip again and go on from there
-@@ -522,6 +523,7 @@ QSharedPointer<DkImageContainerT> DkImageLoader::getSkippedImage(int skipIdx, bo
- 
- 		return getSkippedImage(newFileIdx);
- 	}
-+#endif
- 
- 	// this should never happen!
- 	if (mImages.empty()) {
--- 
-2.4.10
-

diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch
deleted file mode 100644
index d31f650..00000000
--- a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 060f4e972fec0308404a7e535b43254b06908a84 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 14 Jan 2016 00:24:05 +1100
-Subject: [PATCH] Fix linking failure with system quazip.
-
----
- ImageLounge/cmake/UnixBuildTarget.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ImageLounge/cmake/UnixBuildTarget.cmake b/ImageLounge/cmake/UnixBuildTarget.cmake
-index ce95617..8a59c97 100644
---- a/ImageLounge/cmake/UnixBuildTarget.cmake
-+++ b/ImageLounge/cmake/UnixBuildTarget.cmake
-@@ -93,7 +93,7 @@ else()
- 		  
-   add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE}  ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC})
-   target_include_directories(${DLL_NAME} PRIVATE  ${OpenCV_INCLUDE_DIRS})
--  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
-+  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${QUAZIP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
-   add_dependencies(${BINARY_NAME} ${DLL_NAME})
-   set_target_properties(${DLL_NAME} PROPERTIES PREFIX "")
- 
--- 
-2.4.10
-

diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch
deleted file mode 100644
index 71f564c..00000000
--- a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0ac51051b7e9460a2958917750d7c31072318313 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 14 Jan 2016 00:55:24 +1100
-Subject: [PATCH] Fix build with tiff disabled.
-
----
- ImageLounge/src/DkBasicLoader.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ImageLounge/src/DkBasicLoader.cpp b/ImageLounge/src/DkBasicLoader.cpp
-index 67ef31f..8c2c71e 100644
---- a/ImageLounge/src/DkBasicLoader.cpp
-+++ b/ImageLounge/src/DkBasicLoader.cpp
-@@ -98,9 +98,11 @@
- #endif
- 
- #else
-+#ifdef WIN32
- #include <olectl.h>
- #pragma comment(lib, "oleaut32.lib")
- #endif
-+#endif
- 
- #pragma warning(pop)
- 
--- 
-2.4.10
-

diff --git a/media-gfx/nomacs/nomacs-3.0.0.ebuild b/media-gfx/nomacs/nomacs-3.0.0.ebuild
deleted file mode 100644
index 3915d6d..00000000
--- a/media-gfx/nomacs/nomacs-3.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 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="https://github.com/${PN}/${PN}/releases/download/${PV}/${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/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[qt5] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	webp? ( >=media-libs/libwebp-0.3.1:= )
-	zip? ( dev-libs/quazip[qt5] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tiff-build.patch"
-	"${FILESDIR}/${P}-quazip-build.patch"
-	"${FILESDIR}/${P}-quazip-link.patch"
-	"${FILESDIR}/${P}-opencv3.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(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-3.2.0.ebuild b/media-gfx/nomacs/nomacs-3.2.0.ebuild
deleted file mode 100644
index 7ddaeb3..00000000
--- a/media-gfx/nomacs/nomacs-3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils fdo-mime
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[qt5] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	zip? ( dev-libs/quazip[qt5] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-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-3.4.ebuild b/media-gfx/nomacs/nomacs-3.4.ebuild
deleted file mode 100644
index a113420..00000000
--- a/media-gfx/nomacs/nomacs-3.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils fdo-mime
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	zip? ( dev-libs/quazip[qt5] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     45e3f5a49655535d388c9b87025a3d046b7f16f3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 18:28:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 18:32:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e3f5a4

media-gfx/nomacs: Drop old

Package-Manager: portage-2.3.0

 media-gfx/nomacs/Manifest                         |  1 -
 media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch | 21 -------
 media-gfx/nomacs/metadata.xml                     |  1 -
 media-gfx/nomacs/nomacs-2.4.6.ebuild              | 72 -----------------------
 4 files changed, 95 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index e0d5832..10c1d81 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1 @@
-DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
 DIST nomacs-3.4.tar.gz 30026261 SHA256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36 WHIRLPOOL f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f

diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch b/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch
deleted file mode 100644
index a13d90f..00000000
--- a/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Jan 31 17:38:21 2016 +0100
-
-    Drop minimum OpenCV version messing with detection of >=3.0.0
-    
-    Similar to commit 624a2fa7fba25a9432dc15031f3fd569367927bd
-
-diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake
-index 4e91135..e9ec436 100644
---- a/ImageLounge/cmake/Unix.cmake
-+++ b/ImageLounge/cmake/Unix.cmake
-@@ -43,7 +43,7 @@ endif(NOT EXIV2_FOUND)
- # search for opencv
- unset(OpenCV_FOUND CACHE)
- if(ENABLE_OPENCV)
--	find_package(OpenCV 2.1.0 REQUIRED core imgproc)
-+	find_package(OpenCV REQUIRED core imgproc)
- 	if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is set in Ubuntu 12.04 (without finding opencv)
- 		# Older OpenCV versions only supplied pkg-config files
- 		if(PKG_CONFIG_FOUND)

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 79b5bc4..e79d388 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -11,7 +11,6 @@
 	</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.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild
deleted file mode 100644
index f650d1c..00000000
--- a/media-gfx/nomacs/nomacs-2.4.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" )
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Davide Pesavento]

commit:     19982608ac700e43d912f4f555dddff7013d40bf
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 16:25:08 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 16:25:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19982608

media-gfx/nomacs: remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-gfx/nomacs/Manifest                         |  1 -
 media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch | 11 ----
 media-gfx/nomacs/nomacs-3.4-r1.ebuild             | 75 -----------------------
 3 files changed, 87 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 16f42432eca..c9eb6c47348 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1 @@
-DIST nomacs-3.4.tar.gz 30026261 SHA256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36 WHIRLPOOL f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f
 DIST nomacs-3.6.1.tar.gz 28604636 SHA256 09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e WHIRLPOOL 34125377dee0977ed6e48008d4d8e3ff461c39ab72e89c4dc3c3e8dd0eb0544da91db5a1cd1b38b1bad119a539a60664fd91cea90b21140042db06601d00604b

diff --git a/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch b/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch
deleted file mode 100644
index 698b45c6ace..00000000000
--- a/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/DkLoader/DkBasicLoader.h
-+++ b/src/DkLoader/DkBasicLoader.h
-@@ -258,7 +258,7 @@ class DllLoaderExport DkBasicLoader : public QObject {
- 	bool readHeader(const unsigned char** dataPtr, int& fileCount, int& vecSize) const;
- 	void getPatchSizeFromFileName(const QString& fileName, int& width, int& height) const;
- #else
--	bool loadOpenCVVecFile(const QString&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; };
-+	bool loadOpenCVVecFile(const QString&, QImage&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; };
- 	int mergeVecFiles(const QStringList&, QString&) const { return 0; };
- 	bool readHeader(const unsigned char**, int&, int&) const { return false; };
- 	void getPatchSizeFromFileName(const QString&, int&, int&) const {};

diff --git a/media-gfx/nomacs/nomacs-3.4-r1.ebuild b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
deleted file mode 100644
index 6972c8f5f35..00000000000
--- a/media-gfx/nomacs/nomacs-3.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils fdo-mime
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	zip? ( >=dev-libs/quazip-0.7.2[qt5] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkLoader/DkImageLoader.cpp \
-		-i src/DkLoader/DkImageContainer.cpp \
-		-i src/DkLoader/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     6f5102c0bbef4fe46e79764d5e449b1450c49ac2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 10:41:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 10:48:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5102c0

media-gfx/nomacs: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/nomacs/Manifest                          |  2 -
 .../nomacs/files/nomacs-3.6.1-batch-resize.patch   | 23 -------
 media-gfx/nomacs/nomacs-3.6.1-r1.ebuild            | 78 ---------------------
 media-gfx/nomacs/nomacs-3.6.1.ebuild               | 73 --------------------
 media-gfx/nomacs/nomacs-3.8.0.ebuild               | 80 ----------------------
 5 files changed, 256 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 306f606ce44..10318c615c6 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1 @@
-DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
-DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134

diff --git a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch b/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
deleted file mode 100644
index b2dd078d0e9..00000000000
--- a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 11cbd66ca66ea9d97d72546a92fe2b487e62481b Mon Sep 17 00:00:00 2001
-From: diemmarkus <diemmarkus@gmail.com>
-Date: Wed, 17 May 2017 10:08:05 +0200
-Subject: [PATCH] fixes #118 batch resizing - used to only work if rotate was
- active
-
----
- ImageLounge/src/DkCore/DkProcess.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/ImageLounge/src/DkCore/DkProcess.cpp b/ImageLounge/src/DkCore/DkProcess.cpp
-index a47b4194..d0dfd97f 100644
---- a/src/DkCore/DkProcess.cpp
-+++ b/src/DkCore/DkProcess.cpp
-@@ -255,8 +255,6 @@ bool DkBatchTransform::compute(QSharedPointer<DkImageContainer> container, QStri
- 		rotationMatrix.rotate((double)mAngle);
- 		tmpImg = tmpImg.transformed(rotationMatrix);
- 	}
--	else
--		tmpImg = img;
- 
- 	// logs
- 	if (!tmpImg.isNull()) {

diff --git a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
deleted file mode 100644
index 4f755d2ab8f..00000000000
--- a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-PATCHES=( "${FILESDIR}/${P}-batch-resize.patch" )
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild b/media-gfx/nomacs/nomacs-3.6.1.ebuild
deleted file mode 100644
index 7d4943b91dc..00000000000
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-src_prepare() {
-	default
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

diff --git a/media-gfx/nomacs/nomacs-3.8.0.ebuild b/media-gfx/nomacs/nomacs-3.8.0.ebuild
deleted file mode 100644
index 91389e8030f..00000000000
--- a/media-gfx/nomacs/nomacs-3.8.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+jpeg opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     98d0ef6652be6d2564d499086d1d56816d85225d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 14:38:55 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 16:03:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d0ef66

media-gfx/nomacs: Drop 3.8.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/nomacs/Manifest                         |   1 -
 media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch | 103 ----------------------
 media-gfx/nomacs/nomacs-3.8.1.ebuild              |  83 -----------------
 3 files changed, 187 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index ce05039a465..19d73acf879 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,2 @@
 DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134

diff --git a/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch b/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch
deleted file mode 100644
index e9e68af826f..00000000000
--- a/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8480a1c62aa99b6a73a76c9af80392568e0dae5e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 21:09:17 +0200
-Subject: [PATCH 1/2] Fix cmake with Qt 5.11_beta3
-
----
- cmake/MacBuildTarget.cmake  | 4 ++--
- cmake/UnixBuildTarget.cmake | 4 ++--
- cmake/WinBuildTarget.cmake  | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/MacBuildTarget.cmake b/cmake/MacBuildTarget.cmake
-index eae9a76b..54633ca1 100644
---- a/cmake/MacBuildTarget.cmake
-+++ b/cmake/MacBuildTarget.cmake
-@@ -66,8 +66,8 @@ add_dependencies(
- 	${QUAZIP_DEPENDENCY} 
- 	${LIBQPSD_LIBRARY}) 
- 
--qt5_use_modules(${BINARY_NAME} 		Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
--qt5_use_modules(${DLL_CORE_NAME} 	Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
-+qt5_use_modules(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
-+qt5_use_modules(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
- 
- # core flags
- set_target_properties(${DLL_CORE_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
-diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake
-index 4eb3108e..3f592764 100644
---- a/cmake/UnixBuildTarget.cmake
-+++ b/cmake/UnixBuildTarget.cmake
-@@ -58,8 +58,8 @@ add_dependencies(
- 	${QUAZIP_DEPENDENCY}
- 	${LIBQPSD_LIBRARY})
- 
--qt5_use_modules(${BINARY_NAME} 		Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
--qt5_use_modules(${DLL_CORE_NAME} 	Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
-+target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
-+target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
- 
- # core flags
- set_target_properties(${DLL_CORE_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
-diff --git a/cmake/WinBuildTarget.cmake b/cmake/WinBuildTarget.cmake
-index 9a71d508..63a4b27d 100644
---- a/cmake/WinBuildTarget.cmake
-+++ b/cmake/WinBuildTarget.cmake
-@@ -62,8 +62,8 @@ add_dependencies(
- target_include_directories(${BINARY_NAME} 		PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
- target_include_directories(${DLL_CORE_NAME} 	PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
- 
--qt5_use_modules(${BINARY_NAME} 		Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras)
--qt5_use_modules(${DLL_CORE_NAME} 	Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras)
-+target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras)
-+target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras)
- 
- # set(_moc ${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles)
- file(GLOB NOMACS_AUTOMOC "${CMAKE_BINARY_DIR}/*_automoc.cpp ${CMAKE_BINARY_DIR}/moc_.cpp")
--- 
-2.17.0
-
-
-From 6c400cb6341e4c15413b0406d575779a6f3ce6c5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 21:36:15 +0200
-Subject: [PATCH 2/2] Require minimum Qt5 version as documented in README.md
-
----
- CMakeLists.txt    | 2 ++
- cmake/Utils.cmake | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5869c2c6..5b9abe67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,6 +36,8 @@ set(NOMACS_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
- # include macros needed
- include("cmake/Utils.cmake")
- 
-+set(QT5_MIN_VERSION 5.2.1)
-+
- # different compile options
- option(ENABLE_OPENCV "Compile with Opencv (needed for RAW and TIFF)" ON)
- option(ENABLE_RAW "Compile with raw images support (libraw)" ON)
-diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
-index 5ea88a69..bdd547cb 100644
---- a/cmake/Utils.cmake
-+++ b/cmake/Utils.cmake
-@@ -17,10 +17,10 @@ macro(NMC_FINDQT)
- 	 set(QT_ROOT ${QT_QMAKE_PATH}/)
- 	 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_QMAKE_PATH}\\..\\lib\\cmake\\Qt5)
- 	 	 
--	 find_package(Qt5 REQUIRED  Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg)
-+	 find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg)
- 	 
- 	if (MSVC)
--		find_package(Qt5 REQUIRED WinExtras)
-+		find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED WinExtras)
- 	endif()
- 	 
- 	 if (NOT Qt5_FOUND)
--- 
-2.17.0
-

diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild b/media-gfx/nomacs/nomacs-3.8.1.ebuild
deleted file mode 100644
index 4720454ff09..00000000000
--- a/media-gfx/nomacs/nomacs-3.8.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg +opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-		-DENABLE_TRANSLATIONS=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     2da8acdeb12e960ab2bce41da27588001916dcfd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 11:49:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 12:59:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da8acde

media-gfx/nomacs: Drop 3.10.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/nomacs/Manifest                          |  1 -
 .../nomacs-3.10.2_fix_move_crop_area_tooltip.patch | 38 ----------
 media-gfx/nomacs/nomacs-3.10.2.ebuild              | 82 ----------------------
 3 files changed, 121 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 19d73acf879..e0aca8ce306 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1 @@
-DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119

diff --git a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
deleted file mode 100644
index ace6f3d5152..00000000000
--- a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e963ab5870945b40055b8fc7eb2708ee11f8d4fd Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Fri, 7 Sep 2018 15:11:18 +0200
-Subject: [PATCH] show crop info when moving
-
-- fixes #253
----
- ImageLounge/src/DkGui/DkWidgets.cpp | 6 +++---
- ImageLounge/src/nomacs.rc           | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ImageLounge/src/DkGui/DkWidgets.cpp b/ImageLounge/src/DkGui/DkWidgets.cpp
-index 61c0c05e..b6a5eadb 100644
---- a/src/DkGui/DkWidgets.cpp
-+++ b/src/DkGui/DkWidgets.cpp
-@@ -1820,7 +1820,7 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
- 		setAngle(angle, false);
- 	}
- 
--	if (event->buttons() == Qt::LeftButton && mState != moving) {
-+	if (event->buttons() == Qt::LeftButton) {
- 
- 		QPolygonF p = mRect.getPoly();
- 
-@@ -1833,11 +1833,11 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
- 		QPoint tl;
- 
- 		if (sAngle == 0.0f || fabs(sAngle) == 90.0f) {
--			tl = mRect.getTopLeft().toPoint();
-+			tl = mRtform.map(mRect.getTopLeft()).toPoint();
- 			info += "x: ";
- 		}
- 		else {
--			tl = mRect.getCenter().toPoint();
-+			tl = mRtform.map(mRect.getCenter()).toPoint();
- 			info += "center x: ";
- 		}
- 		info += QString::number(tl.x()) + ", y: ";

diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild b/media-gfx/nomacs/nomacs-3.10.2.ebuild
deleted file mode 100644
index 8e7356daf99..00000000000
--- a/media-gfx/nomacs/nomacs-3.10.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg +opencv raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/exiv2-0.25:=
-	opencv? ( media-libs/opencv:=[-qt4(-)] )
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:0
-	)
-	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-PATCHES=( "${FILESDIR}/${P}_fix_move_crop_area_tooltip.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix build with quazip-0.7.2 - bug 598354
-	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
-	sed -e "s/include <quazip/&5/" \
-		-i src/DkCore/DkImageLoader.cpp \
-		-i src/DkCore/DkImageContainer.cpp \
-		-i src/DkCore/DkBasicLoader.cpp \
-		-i src/DkGui/DkDialog.cpp || die
-
-	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-		-DUSE_SYSTEM_QUAZIP=ON
-		-DENABLE_TRANSLATIONS=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Michael Palimaka]

commit:     846af216a621a08e183997ba8489f846bb2e66ff
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 01:13:27 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 01:13:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846af216

media-gfx/nomacs: backport upstream patch solving gcc9 build failure

Closes: https://bugs.gentoo.org/686226
Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 media-gfx/nomacs/files/nomacs-3.12-gcc9.patch | 39 +++++++++++++++++++++++++++
 media-gfx/nomacs/nomacs-3.12.ebuild           |  1 +
 2 files changed, 40 insertions(+)

diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
new file mode 100644
index 00000000000..ccf6ea31d9d
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
@@ -0,0 +1,39 @@
+From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sun, 9 Jun 2019 19:15:28 +1000
+Subject: [PATCH] Fix build with GCC9
+
+---
+ ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++
+ ImageLounge/src/DkGui/DkNoMacs.cpp    | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
+index 7540f7b9..fe2bc7ec 100644
+--- a/src/DkCore/DkMetaData.cpp
++++ b/src/DkCore/DkMetaData.cpp
+@@ -42,6 +42,8 @@
+ #include <QApplication>
+ #pragma warning(pop)		// no warnings from includes - end
+ 
++#include <iostream>
++
+ namespace nmc {
+ 
+ // DkMetaDataT --------------------------------------------------------------------
+diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
+index edda14cd..8fcdb59c 100644
+--- a/src/DkGui/DkNoMacs.cpp
++++ b/src/DkGui/DkNoMacs.cpp
+@@ -99,6 +99,8 @@
+ 
+ #include <assert.h>
+ 
++#include <iostream>
++
+ namespace nmc {
+ 
+ DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
+-- 
+2.21.0
+

diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index 32fc7db491a..17e8151bfcf 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 S="${WORKDIR}/${P}/ImageLounge"
 
 DOCS=( src/changelog.txt )
+PATCHES=( "${FILESDIR}/${P}-gcc9.patch" )
 
 src_configure() {
 	local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     7cd2ccbbdbfcb61f94a5f51dcabdce0074d061a2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 18:47:02 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd2ccbb

media-gfx/nomacs: Support build with >=dev-libs/quazip-1.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../nomacs/files/nomacs-3.16.224-quazip1.patch     | 127 +++++++++++++++++++++
 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild         |  86 ++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
new file mode 100644
index 00000000000..06f6b8c2fb8
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
@@ -0,0 +1,127 @@
+From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001
+From: Petr Vanek <petr@yarpen.cz>
+Date: Sun, 15 Nov 2020 19:15:59 +0100
+Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576)
+
+---
+ cmake/Unix.cmake                | 28 +++++++++++++++------
+ src/DkCore/DkBasicLoader.cpp    |  4 +++
+ src/DkCore/DkImageContainer.cpp |  4 +++
+ src/DkCore/DkImageLoader.cpp    |  6 ++++-
+ src/DkGui/DkDialog.cpp          |  4 +++
+ 5 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake
+index 5567084b..c90ba320 100644
+--- a/cmake/Unix.cmake
++++ b/cmake/Unix.cmake
+@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE)
+ 
+ if(ENABLE_QUAZIP)
+   if(USE_SYSTEM_QUAZIP)
+-    SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+-
+-    find_package(QuaZip5 QUIET)
+-    if(NOT QUAZIP_FOUND)
+-	    message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
+-    else()
+-	    add_definitions(-DWITH_QUAZIP)
+-    endif()
++    # Let's try QuaZip1 first (it's the bright future)
++    find_package(QuaZip-Qt5 QUIET)
++    if (QuaZip-Qt5_FOUND)
++      message(STATUS "QUAZIP: QuaZip-1 for Qt5 found")
++      set(QUAZIP_LIBRARIES QuaZip::QuaZip)
++      add_definitions(-DWITH_QUAZIP1)
++    else ()
++      message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x")
++      # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake)
++      # ater the final migration to 1.x in Linux distros
++      SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
++
++      find_package(QuaZip5 QUIET)
++      if(NOT QUAZIP_FOUND)
++        message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
++      endif()
++
++    endif (QuaZip-Qt5_FOUND)
++    # we have any QuaZip after all
++    add_definitions(-DWITH_QUAZIP)
+   else()
+     find_package(ZLIB REQUIRED)
+     set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/)
+diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp
+index 7f9e889c..b7edfd43 100644
+--- a/src/DkCore/DkBasicLoader.cpp
++++ b/src/DkCore/DkBasicLoader.cpp
+@@ -54,8 +54,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ 
+ // opencv
+ #ifdef WITH_OPENCV
+diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp
+index 810994d3..150da9c2 100644
+--- a/src/DkCore/DkImageContainer.cpp
++++ b/src/DkCore/DkImageContainer.cpp
+@@ -41,8 +41,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ #pragma warning(pop)		// no warnings from includes - end
+ 
+ #pragma warning(disable: 4251)	// TODO: remove
+diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp
+index 09d25d23..e4186f2b 100644
+--- a/src/DkCore/DkImageLoader.cpp
++++ b/src/DkCore/DkImageLoader.cpp
+@@ -79,8 +79,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ 
+ // opencv
+ #ifdef WITH_OPENCV
+@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const {
+ 	return mCurrentImage->fileName();
+ }
+ 
+-}
+\ No newline at end of file
++}
+diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp
+index 008c9a3b..85842eca 100644
+--- a/src/DkGui/DkDialog.cpp
++++ b/src/DkGui/DkDialog.cpp
+@@ -97,8 +97,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ 
+ #pragma warning(pop)		// no warnings from includes - end
+ 

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
new file mode 100644
index 00000000000..9c6f50df160
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
+IUSE="+jpeg +opencv plugins raw +tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/exiv2:=
+	opencv? ( >=media-libs/opencv-3.4:= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff
+	)
+	zip? ( dev-libs/quazip:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-quazip1.patch )
+
+src_prepare() {
+	if use plugins ; then
+		rmdir plugins || die
+		mv -v ../../${PLUGIN_PKG} plugins || die
+		# Fix nomacs-plugins installation and search library directory
+		sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
+			-i plugins/cmake/Utils.cmake || die
+		sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
+			-i src/DkCore/DkPluginManager.cpp || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CODE_COV=OFF
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Stephan Hartmann]

commit:     3edc3889c88ec28a48c6d3a474705dac18f875eb
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 17:57:28 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 17:58:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edc3889

media-gfx/nomacs: fix build error due to missing include

Closes: https://bugs.gentoo.org/775620
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 .../files/nomacs-3.16.224-DkMath-ostream.patch     | 24 ++++++++++++++++++++++
 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild         |  7 +++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
new file mode 100644
index 000000000000..318953f7896a
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
@@ -0,0 +1,24 @@
+From aca8443079ff926be873a77e3077b249a12487dd Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <sultan@gentoo.org>
+Date: Sun, 23 Jan 2022 18:51:56 +0100
+Subject: [PATCH] IWYU: add missing ostream in DkMath
+
+---
+ src/DkCore/DkMath.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/DkCore/DkMath.h b/src/DkCore/DkMath.h
+index c37ef23..2c3a5be 100644
+--- a/src/DkCore/DkMath.h
++++ b/src/DkCore/DkMath.h
+@@ -30,6 +30,7 @@
+ #pragma warning(push, 0)	// no warnings from includes - begin
+ #include <cmath>
+ #include <float.h>
++#include <ostream>
+ #include <QDebug>
+ #include <QPointF>
+ #include <QPolygonF>
+-- 
+2.34.1
+

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index bab73e326784..0102090380d2 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,7 +48,10 @@ S="${WORKDIR}/${P}/ImageLounge"
 
 DOCS=( src/changelog.txt )
 
-PATCHES=( "${FILESDIR}"/${P}-quazip1.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-quazip1.patch
+	"${FILESDIR}"/${P}-DkMath-ostream.patch
+)
 
 src_prepare() {
 	if use plugins ; then

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     f00d74be68cdafcc64ae0fe4090f5505243d4db7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 10:48:37 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 12:18:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00d74be

media-gfx/nomacs: update EAPI 7 -> 8, drop all sed modifications

Bug: https://bugs.gentoo.org/847112
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/nomacs-3.16.224-libdir-plugins.patch     | 23 ++++++
 .../nomacs/files/nomacs-3.16.224-libdir.patch      | 30 ++++++++
 media-gfx/nomacs/nomacs-3.16.224-r6.ebuild         | 83 ++++++++++++++++++++++
 3 files changed, 136 insertions(+)

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch
new file mode 100644
index 000000000000..0c613929add0
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch
@@ -0,0 +1,23 @@
+From e1d32cd424462b2ac414d3a4ea3e1285d5ca2aef Mon Sep 17 00:00:00 2001
+From: Markus Diem <diemmarkus@gmail.com>
+Date: Mon, 27 Jul 2020 13:11:31 +0200
+Subject: [PATCH] patches wrong plugin installation path
+
+- thanks to @tieugene
+---
+ ImageLounge/plugins/cmake/Utils.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
+index f2d1b62..5578aa7 100644
+--- a/ImageLounge/plugins/cmake/Utils.cmake
++++ b/ImageLounge/plugins/cmake/Utils.cmake
+@@ -139,7 +139,7 @@ macro(NMC_CREATE_TARGETS)
+ 	
+ 	elseif(UNIX)
+ 		set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/plugins)
+-		install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib/nomacs-plugins)
++        install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib${LIB_SUFFIX}/nomacs-plugins)
+ 		set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH})
+ 		set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR})
+ 	endif(MSVC)

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch
new file mode 100644
index 000000000000..50b73028f303
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch
@@ -0,0 +1,30 @@
+From c8f6c325c5f5170bb473c41ee716b781d37bdd41 Mon Sep 17 00:00:00 2001
+From: Markus Diem <diemmarkus@gmail.com>
+Date: Mon, 27 Jul 2020 13:19:01 +0200
+Subject: [PATCH] fixes plugin path for fedora
+
+- thanks @tieugene
+- beta version: 3.17
+---
+ ImageLounge/src/DkCore/DkPluginManager.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/ImageLounge/src/DkCore/DkPluginManager.cpp
++++ b/ImageLounge/src/DkCore/DkPluginManager.cpp
+@@ -62,6 +62,7 @@
+ #include <QAction>
+ #include <QMenu>
+ #include <QJsonValue>
++#include <QLibraryInfo>
+ #pragma warning(pop)		// no warnings from includes - end
+ 
+ #ifdef QT_NO_DEBUG_OUTPUT
+@@ -1309,7 +1310,7 @@ void DkPluginManager::createPluginsPath() {
+ #ifdef Q_OS_WIN
+ 	QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins";
+ #else
+-	QDir pluginsDir = QCoreApplication::applicationDirPath() +  "/../lib/nomacs-plugins/";
++	QDir pluginsDir = QLibraryInfo::location(QLibraryInfo::LibrariesPath) +  "/nomacs-plugins/";
+ #endif // Q_OS_WIN
+ 
+ 	if (!pluginsDir.exists())

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
new file mode 100644
index 000000000000..0a8340d039e3
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release" # buildsys: what a mess
+PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
+inherit cmake xdg
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )"
+CMAKE_USE_DIR="${S}/ImageLounge"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+IUSE="+jpeg +opencv plugins raw +tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/exiv2:=
+	opencv? ( >=media-libs/opencv-3.4:= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff:=
+	)
+	zip? ( dev-libs/quazip:0=[qt5(+)] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+DOCS=( src/changelog.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-libdir.patch )
+
+src_prepare() {
+	if use plugins ; then
+		rmdir ImageLounge/plugins || die
+		mv -v ../${PLUGIN_PKG} ImageLounge/plugins || die
+	fi
+
+	# from git master # reuse existing patches w/o paths adjusted
+	pushd "ImageLounge" > /dev/null || die
+		eapply "${FILESDIR}"/${P}-quazip1.patch
+		eapply "${FILESDIR}"/${P}-DkMath-ostream.patch
+	popd > /dev/null || die
+
+	use plugins && eapply "${FILESDIR}"/${P}-libdir-plugins.patch
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_QMAKE_EXECUTABLE=qmake5 # bug 847112
+		-DENABLE_CODE_COV=OFF
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+	)
+	cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/, media-gfx/nomacs/files/

[Andreas Sturmlechner]

commit:     3566e1a38aef4edf9344b0d70896a3c0fa36c5a6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 09:04:49 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 10:36:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3566e1a3

media-gfx/nomacs: drop 3.16.224-r6

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/nomacs/Manifest                          |   2 -
 .../files/nomacs-3.16.224-DkMath-ostream.patch     |  24 --
 .../nomacs/files/nomacs-3.16.224-exiv2-0.28.patch  | 241 ---------------------
 .../files/nomacs-3.16.224-libdir-plugins.patch     |  23 --
 .../nomacs/files/nomacs-3.16.224-libdir.patch      |  30 ---
 .../nomacs/files/nomacs-3.16.224-quazip1.patch     | 127 -----------
 media-gfx/nomacs/nomacs-3.16.224-r6.ebuild         |  86 --------
 7 files changed, 533 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 65f4d3852ff5..f36b951538dc 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,2 @@
-DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-3.19.1.tar.gz 1928697 BLAKE2B ee8a10ebd777a589df179b51591893fe083505b066bf409e11a54a4bc21054d6d61d8c5e397cf01fa7907fd2e4b69401729a8fab7f1a8079769bfef53692230b SHA512 7cbe80d6c336547a00761c64e591444827998aa79a52d51219ca69aacca4d3361c1e7cbccba1f9c06c7e93f09f4b732abd25757107e1c50d8a43eb45ced0ee97
-DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
 DIST nomacs-plugins-3.19.0.tar.gz 559925 BLAKE2B 4e3d8e07974d418510d2e806980bc9793567813b9418c0754dcaaa9e6f43e88d76e35264f05e05b2e21345467c8038db3c37ce3d1b003adcd3b019796a737080 SHA512 36b96b0270cb7cc34ee3f9f948eb1f2e5b4facd1f6eb273afe1fbf865c7712fb6487ef59f3d4e7723b9bca7930255f4247a8381c05ee8cfb9acf2b5cc225303c

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
deleted file mode 100644
index 318953f7896a..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From aca8443079ff926be873a77e3077b249a12487dd Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <sultan@gentoo.org>
-Date: Sun, 23 Jan 2022 18:51:56 +0100
-Subject: [PATCH] IWYU: add missing ostream in DkMath
-
----
- src/DkCore/DkMath.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/DkCore/DkMath.h b/src/DkCore/DkMath.h
-index c37ef23..2c3a5be 100644
---- a/src/DkCore/DkMath.h
-+++ b/src/DkCore/DkMath.h
-@@ -30,6 +30,7 @@
- #pragma warning(push, 0)	// no warnings from includes - begin
- #include <cmath>
- #include <float.h>
-+#include <ostream>
- #include <QDebug>
- #include <QPointF>
- #include <QPolygonF>
--- 
-2.34.1
-

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch b/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch
deleted file mode 100644
index 280d7ec59e8b..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 6785f15d9ed05ebc66ee200b3c94451c6c633646 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 3 Sep 2023 13:30:43 +0200
-Subject: [PATCH] Fix 3.16.224 build with exiv2-0.28
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- ImageLounge/src/DkCore/DkMetaData.cpp | 59 ++++++++++++++++++---------
- ImageLounge/src/DkCore/DkMetaData.h   |  4 +-
- 2 files changed, 41 insertions(+), 22 deletions(-)
-
-diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
-index bf1d111e..5eaeebf4 100644
---- a/ImageLounge/src/DkCore/DkMetaData.cpp
-+++ b/ImageLounge/src/DkCore/DkMetaData.cpp
-@@ -73,8 +73,12 @@ void DkMetaDataT::readMetaData(const QString& filePath, QSharedPointer<QByteArra
- 			mExifImg = Exiv2::ImageFactory::open(strFilePath);
- 		}
- 		else {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+			mExifImg = Exiv2::ImageFactory::open((const byte *)ba->constData(), ba->size());
-+#else
- 			Exiv2::BasicIo::AutoPtr exifBuffer(new Exiv2::MemIo((const byte*)ba->constData(), ba->size()));
- 			mExifImg = Exiv2::ImageFactory::open(exifBuffer);
-+#endif
- 		}
- 	} 
- 	catch (...) {
-@@ -155,14 +159,18 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) {
- 	Exiv2::ExifData &exifData = mExifImg->exifData();
- 	Exiv2::XmpData &xmpData = mExifImg->xmpData();
- 	Exiv2::IptcData &iptcData = mExifImg->iptcData();
--
--	Exiv2::Image::AutoPtr exifImgN;
-+	std::unique_ptr<Exiv2::Image> exifImgN;
-+#if !EXIV2_TEST_VERSION(0, 28, 0)
- 	Exiv2::MemIo::AutoPtr exifMem;
-+#endif
- 
- 	try {
--
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+		exifImgN = Exiv2::ImageFactory::open((byte *)ba->data(), ba->size());
-+#else
- 		exifMem = Exiv2::MemIo::AutoPtr(new Exiv2::MemIo((byte*)ba->data(), ba->size()));
- 		exifImgN = Exiv2::ImageFactory::open(exifMem);
-+#endif
- 	} 
- 	catch (...) {
- 
-@@ -186,8 +194,13 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) {
- 
- 	// now get the data again
- 	Exiv2::DataBuf exifBuf = exifImgN->io().read((long)exifImgN->io().size());
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+	if (!exifBuf.empty()) {
-+		QSharedPointer<QByteArray> tmp = QSharedPointer<QByteArray>(new QByteArray((const char *)exifBuf.c_data(), exifBuf.size()));
-+#else
- 	if (exifBuf.pData_) {
- 		QSharedPointer<QByteArray> tmp = QSharedPointer<QByteArray>(new QByteArray((const char*)exifBuf.pData_, exifBuf.size_));
-+#endif
- 
- 		if (tmp->size() > qRound(ba->size()*0.5f))
- 			ba = tmp;
-@@ -197,7 +210,7 @@ bool DkMetaDataT::saveMetaData(QSharedPointer<QByteArray>& ba, bool force) {
- 	else
- 		return false;
- 
--	mExifImg = exifImgN;
-+	mExifImg.swap(exifImgN);
- 	mExifState = loaded;
- 
- 	return true;
-@@ -250,7 +263,7 @@ int DkMetaDataT::getOrientationDegree() const {
- 
- 			if (pos != exifData.end() && pos->count() != 0) {
- 			
--				Exiv2::Value::AutoPtr v = pos->getValue();
-+				std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 				orientation = (int)pos->toFloat();
- 
- 				switch (orientation) {
-@@ -315,7 +328,7 @@ int DkMetaDataT::getRating() const {
- 		Exiv2::ExifData::iterator pos = exifData.findKey(key);
- 
- 		if (pos != exifData.end() && pos->count() != 0) {
--			Exiv2::Value::AutoPtr v = pos->getValue();
-+			std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 			exifRating = v->toFloat();
- 		}
- 	}
-@@ -327,7 +340,7 @@ int DkMetaDataT::getRating() const {
- 
- 		//xmp Rating tag
- 		if (pos != xmpData.end() && pos->count() != 0) {
--			Exiv2::Value::AutoPtr v = pos->getValue();
-+			std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 			xmpRating = v->toFloat();
- 		}
- 
-@@ -336,7 +349,7 @@ int DkMetaDataT::getRating() const {
- 			key = Exiv2::XmpKey("Xmp.MicrosoftPhoto.Rating");
- 			pos = xmpData.findKey(key);
- 			if (pos != xmpData.end() && pos->count() != 0) {
--				Exiv2::Value::AutoPtr v = pos->getValue();
-+				std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 				xmpRating = v->toFloat();
- 			}
- 		}
-@@ -399,7 +412,7 @@ QString DkMetaDataT::getNativeExifValue(const QString& key) const {
- 			if (pos->count () < 2000) {	// diem: this is about performance - adobe obviously embeds whole images into tiff exiv data 
- 
- 				//qDebug() << "pos count: " << pos->count();
--				//Exiv2::Value::AutoPtr v = pos->getValue();
-+				//std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 				info = exiv2ToQString(pos->toString());
- 
- 			}
-@@ -436,7 +449,7 @@ QString DkMetaDataT::getXmpValue(const QString& key) const {
- 		}
- 
- 		if (pos != xmpData.end() && pos->count() != 0) {
--			Exiv2::Value::AutoPtr v = pos->getValue();
-+			std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 			info = exiv2ToQString(pos->toString());
- 		}
- 	}
-@@ -478,7 +491,7 @@ QString DkMetaDataT::getExifValue(const QString& key) const {
- 		}
- 
- 		if (pos != exifData.end() && pos->count() != 0) {
--			//Exiv2::Value::AutoPtr v = pos->getValue();
-+			//std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 			info = exiv2ToQString(pos->toString());
- 		}
- 	}
-@@ -508,7 +521,7 @@ QString DkMetaDataT::getIptcValue(const QString& key) const {
- 		}
- 
- 		if (pos != iptcData.end() && pos->count() != 0) {
--			Exiv2::Value::AutoPtr v = pos->getValue();
-+			std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 			info = exiv2ToQString(pos->toString());
- 		}
- 	}
-@@ -653,8 +666,11 @@ QImage DkMetaDataT::getThumbnail() const {
- 	try {
- 		Exiv2::ExifThumb thumb(exifData);
- 		Exiv2::DataBuf buffer = thumb.copy();
--
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+		QByteArray ba = QByteArray((char *)buffer.c_data(), buffer.size());
-+#else
- 		QByteArray ba = QByteArray((char*)buffer.pData_, buffer.size_);
-+#endif
- 		qThumb.loadFromData(ba);
- 	}
- 	catch (...) {
-@@ -931,9 +947,12 @@ void DkMetaDataT::setThumbnail(QImage thumb) {
- 
- 		try {
- 			// whipe all exif data of the thumbnail
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+			Exiv2::Image::UniquePtr exifImgThumb = Exiv2::ImageFactory::open((const byte *)ba.constData(), ba.size());
-+#else
- 			Exiv2::MemIo::AutoPtr exifBufferThumb(new Exiv2::MemIo((const byte*)ba.constData(), ba.size()));
- 			Exiv2::Image::AutoPtr exifImgThumb = Exiv2::ImageFactory::open(exifBufferThumb);
--
-+#endif
- 			if (exifImgThumb.get() != 0 && exifImgThumb->good())
- 				exifImgThumb->clearExifData();
- 		}
-@@ -1045,11 +1064,11 @@ void DkMetaDataT::setOrientation(int o) {
- 		pos = exifData.findKey(key);
- 	}
- 
--	Exiv2::Value::AutoPtr v = pos->getValue();
-+	std::unique_ptr<Exiv2::Value> v = pos->getValue();
- 	Exiv2::UShortValue* prv = dynamic_cast<Exiv2::UShortValue*>(v.release());
- 	if (!prv) return;
- 
--	Exiv2::UShortValue::AutoPtr rv = Exiv2::UShortValue::AutoPtr(prv);
-+	std::unique_ptr<Exiv2::UShortValue> rv = std::unique_ptr<Exiv2::UShortValue>(prv);
- 	if (rv->value_.empty())	return;
- 
- 	orientation = (int) rv->value_[0];
-@@ -1110,7 +1129,7 @@ void DkMetaDataT::setRating(int r) {
- 		exifData["Exif.Image.Rating"] = uint16_t(r);
- 		exifData["Exif.Image.RatingPercent"] = uint16_t(r);
- 
--		Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText);
-+		std::unique_ptr<Exiv2::Value> v = Exiv2::Value::create(Exiv2::xmpText);
- 		v->read(sRating);
- 		xmpData.add(Exiv2::XmpKey("Xmp.xmp.Rating"), v.get());
- 		v->read(sRatingPercent);
-@@ -1354,9 +1373,9 @@ DkRotatingRect DkMetaDataT::getXMPRect(const QSize& size) const {
- 	return DkRotatingRect(rr);
- }
- 
--Exiv2::Image::AutoPtr DkMetaDataT::loadSidecar(const QString& filePath) const {
-+std::unique_ptr<Exiv2::Image> DkMetaDataT::loadSidecar(const QString& filePath) const {
- 
--	Exiv2::Image::AutoPtr xmpImg;
-+	std::unique_ptr<Exiv2::Image> xmpImg;
- 
- 	//TODO: check if the file type supports xmp
- 
-@@ -1409,7 +1428,7 @@ bool DkMetaDataT::setXMPValue(Exiv2::XmpData& xmpData, QString xmpKey, QString x
- 				setXMPValueSuccessful = true;
- 		}
- 		else {
--			Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::xmpText);
-+			std::unique_ptr<Exiv2::Value> v = Exiv2::Value::create(Exiv2::xmpText);
- 			if (!v->read(xmpValue.toStdString())) {
- 				if (!xmpData.add(Exiv2::XmpKey(key), v.get()))
- 					setXMPValueSuccessful = true;
-diff --git a/ImageLounge/src/DkCore/DkMetaData.h b/ImageLounge/src/DkCore/DkMetaData.h
-index c1f73c93..183a906a 100644
---- a/ImageLounge/src/DkCore/DkMetaData.h
-+++ b/ImageLounge/src/DkCore/DkMetaData.h
-@@ -148,7 +148,7 @@ public:
- 
- protected:
- 	
--	Exiv2::Image::AutoPtr loadSidecar(const QString& filePath) const;
-+	std::unique_ptr<Exiv2::Image> loadSidecar(const QString& filePath) const;
- 
- 	enum {
- 		not_loaded,
-@@ -157,7 +157,7 @@ protected:
- 		dirty,
- 	};
- 
--	Exiv2::Image::AutoPtr mExifImg;
-+	std::unique_ptr<Exiv2::Image> mExifImg;
- 	QString mFilePath;
- 	QStringList mQtKeys;
- 	QStringList mQtValues;
--- 
-2.42.0
-

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch
deleted file mode 100644
index 0c613929add0..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-libdir-plugins.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e1d32cd424462b2ac414d3a4ea3e1285d5ca2aef Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Mon, 27 Jul 2020 13:11:31 +0200
-Subject: [PATCH] patches wrong plugin installation path
-
-- thanks to @tieugene
----
- ImageLounge/plugins/cmake/Utils.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
-index f2d1b62..5578aa7 100644
---- a/ImageLounge/plugins/cmake/Utils.cmake
-+++ b/ImageLounge/plugins/cmake/Utils.cmake
-@@ -139,7 +139,7 @@ macro(NMC_CREATE_TARGETS)
- 	
- 	elseif(UNIX)
- 		set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${NOMACS_BUILD_DIRECTORY}/plugins)
--		install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib/nomacs-plugins)
-+        install(TARGETS ${PROJECT_NAME} RUNTIME LIBRARY DESTINATION lib${LIB_SUFFIX}/nomacs-plugins)
- 		set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH})
- 		set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR})
- 	endif(MSVC)

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch b/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch
deleted file mode 100644
index 50b73028f303..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c8f6c325c5f5170bb473c41ee716b781d37bdd41 Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Mon, 27 Jul 2020 13:19:01 +0200
-Subject: [PATCH] fixes plugin path for fedora
-
-- thanks @tieugene
-- beta version: 3.17
----
- ImageLounge/src/DkCore/DkPluginManager.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/ImageLounge/src/DkCore/DkPluginManager.cpp
-+++ b/ImageLounge/src/DkCore/DkPluginManager.cpp
-@@ -62,6 +62,7 @@
- #include <QAction>
- #include <QMenu>
- #include <QJsonValue>
-+#include <QLibraryInfo>
- #pragma warning(pop)		// no warnings from includes - end
- 
- #ifdef QT_NO_DEBUG_OUTPUT
-@@ -1309,7 +1310,7 @@ void DkPluginManager::createPluginsPath() {
- #ifdef Q_OS_WIN
- 	QDir pluginsDir = QCoreApplication::applicationDirPath() + "/plugins";
- #else
--	QDir pluginsDir = QCoreApplication::applicationDirPath() +  "/../lib/nomacs-plugins/";
-+	QDir pluginsDir = QLibraryInfo::location(QLibraryInfo::LibrariesPath) +  "/nomacs-plugins/";
- #endif // Q_OS_WIN
- 
- 	if (!pluginsDir.exists())

diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
deleted file mode 100644
index 06f6b8c2fb81..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001
-From: Petr Vanek <petr@yarpen.cz>
-Date: Sun, 15 Nov 2020 19:15:59 +0100
-Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576)
-
----
- cmake/Unix.cmake                | 28 +++++++++++++++------
- src/DkCore/DkBasicLoader.cpp    |  4 +++
- src/DkCore/DkImageContainer.cpp |  4 +++
- src/DkCore/DkImageLoader.cpp    |  6 ++++-
- src/DkGui/DkDialog.cpp          |  4 +++
- 5 files changed, 37 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake
-index 5567084b..c90ba320 100644
---- a/cmake/Unix.cmake
-+++ b/cmake/Unix.cmake
-@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE)
- 
- if(ENABLE_QUAZIP)
-   if(USE_SYSTEM_QUAZIP)
--    SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
--
--    find_package(QuaZip5 QUIET)
--    if(NOT QUAZIP_FOUND)
--	    message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
--    else()
--	    add_definitions(-DWITH_QUAZIP)
--    endif()
-+    # Let's try QuaZip1 first (it's the bright future)
-+    find_package(QuaZip-Qt5 QUIET)
-+    if (QuaZip-Qt5_FOUND)
-+      message(STATUS "QUAZIP: QuaZip-1 for Qt5 found")
-+      set(QUAZIP_LIBRARIES QuaZip::QuaZip)
-+      add_definitions(-DWITH_QUAZIP1)
-+    else ()
-+      message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x")
-+      # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake)
-+      # ater the final migration to 1.x in Linux distros
-+      SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-+
-+      find_package(QuaZip5 QUIET)
-+      if(NOT QUAZIP_FOUND)
-+        message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
-+      endif()
-+
-+    endif (QuaZip-Qt5_FOUND)
-+    # we have any QuaZip after all
-+    add_definitions(-DWITH_QUAZIP)
-   else()
-     find_package(ZLIB REQUIRED)
-     set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/)
-diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp
-index 7f9e889c..b7edfd43 100644
---- a/src/DkCore/DkBasicLoader.cpp
-+++ b/src/DkCore/DkBasicLoader.cpp
-@@ -54,8 +54,12 @@
- 
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
- 
- // opencv
- #ifdef WITH_OPENCV
-diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp
-index 810994d3..150da9c2 100644
---- a/src/DkCore/DkImageContainer.cpp
-+++ b/src/DkCore/DkImageContainer.cpp
-@@ -41,8 +41,12 @@
- 
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
- #pragma warning(pop)		// no warnings from includes - end
- 
- #pragma warning(disable: 4251)	// TODO: remove
-diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp
-index 09d25d23..e4186f2b 100644
---- a/src/DkCore/DkImageLoader.cpp
-+++ b/src/DkCore/DkImageLoader.cpp
-@@ -79,8 +79,12 @@
- 
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
- 
- // opencv
- #ifdef WITH_OPENCV
-@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const {
- 	return mCurrentImage->fileName();
- }
- 
--}
-\ No newline at end of file
-+}
-diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp
-index 008c9a3b..85842eca 100644
---- a/src/DkGui/DkDialog.cpp
-+++ b/src/DkGui/DkDialog.cpp
-@@ -97,8 +97,12 @@
- 
- // quazip
- #ifdef WITH_QUAZIP
-+#ifdef WITH_QUAZIP1
-+#include <quazip/JlCompress.h>
-+#else
- #include <quazip5/JlCompress.h>
- #endif
-+#endif
- 
- #pragma warning(pop)		// no warnings from includes - end
- 

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
deleted file mode 100644
index d174453289b1..000000000000
--- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release" # buildsys: what a mess
-PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
-inherit cmake xdg
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )"
-CMAKE_USE_DIR="${S}/ImageLounge"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
-IUSE="+opencv plugins raw +tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/exiv2:=
-	opencv? ( >=media-libs/opencv-3.4:= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff:=
-	)
-	zip? ( dev-libs/quazip:0=[qt5(+)] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-DOCS=( src/changelog.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906488
-)
-
-src_prepare() {
-	if use plugins ; then
-		rmdir ImageLounge/plugins || die
-		mv -v ../${PLUGIN_PKG} ImageLounge/plugins || die
-	fi
-
-	# from git master # reuse existing patches w/o paths adjusted
-	pushd "ImageLounge" > /dev/null || die
-		eapply "${FILESDIR}"/${P}-quazip1.patch
-		eapply "${FILESDIR}"/${P}-DkMath-ostream.patch
-	popd > /dev/null || die
-
-	use plugins && eapply "${FILESDIR}"/${P}-libdir-plugins.patch
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQT_QMAKE_EXECUTABLE=qmake5 # bug 847112
-		-DENABLE_CODE_COV=OFF
-		-DUSE_SYSTEM_QUAZIP=ON
-		-DENABLE_TRANSLATIONS=ON
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-	)
-	cmake_src_configure
-}