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

2024-03-07 Thread Andreas Sturmlechner 
commit: cfd8ad134ee2c257653917e74c59d8e14fb89826
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar  7 13:37:10 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar  7 23:08:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd8ad13

media-gfx/nomacs: drop 3.16.224-r5

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r5.ebuild | 92 --
 1 file changed, 92 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r5.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r5.ebuild
deleted file mode 100644
index 6bba47db9342..
--- a/media-gfx/nomacs/nomacs-3.16.224-r5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 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 ~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
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-quazip1.patch
-   "${FILESDIR}"/${P}-DkMath-ostream.patch
-)
-
-src_prepare() {
-   if use plugins ; then
-   rmdir plugins || die
-   mv -v ../../${PLUGIN_PKG} plugins || die
-   # Fix bug #847112
-   sed -e 's:QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake-qt5" 
"qmake.exe":QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake5" "qmake.exe":' \
-   -i plugins/cmake/Utils.cmake || 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/

2023-11-22 Thread Arthur Zamarin 
commit: 0a62f56a5b1e6cda21832c935437b9836d51a836
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 22 11:31:20 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 22 11:31:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a62f56a

media-gfx/nomacs: Stabilize 3.16.224-r6 x86, #913580

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
index 809a43565727..d174453289b1 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
@@ -15,7 +15,7 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
 IUSE="+opencv plugins raw +tiff zip"
 
 REQUIRED_USE="

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

2023-10-09 Thread Sam James 
commit: 2427eca30c8e1009414564606f7408c4e7889cd8
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 07:04:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 07:04:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2427eca3

media-gfx/nomacs: Stabilize 3.16.224-r6 amd64, #913580

Signed-off-by: Sam James  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
index ddfa980d7e71..809a43565727 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
@@ -15,7 +15,7 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
 IUSE="+opencv plugins raw +tiff zip"
 
 REQUIRED_USE="

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

2023-09-03 Thread Andreas Sturmlechner 
commit: 7707a66f2b6329bed44fb75c9478cebac0888ce5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  3 11:45:47 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 12:18:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7707a66f

media-gfx/nomacs: Fix build with >=exiv2-0.28

Closes: https://bugs.gentoo.org/906488
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../nomacs/files/nomacs-3.16.224-exiv2-0.28.patch  | 241 +
 media-gfx/nomacs/nomacs-3.16.224-r6.ebuild |   5 +-
 2 files changed, 245 insertions(+), 1 deletion(-)

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
new file mode 100644
index ..280d7ec59e8b
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-exiv2-0.28.patch
@@ -0,0 +1,241 @@
+From 6785f15d9ed05ebc66ee200b3c94451c6c633646 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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 
+---
+ 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, 
QSharedPointerconstData(), 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& ba, bool force) {
+   Exiv2::ExifData  = mExifImg->exifData();
+   Exiv2::XmpData  = mExifImg->xmpData();
+   Exiv2::IptcData  = mExifImg->iptcData();
+-
+-  Exiv2::Image::AutoPtr exifImgN;
++  std::unique_ptr 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& 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 tmp = QSharedPointer(new 
QByteArray((const char *)exifBuf.c_data(), exifBuf.size()));
++#else
+   if (exifBuf.pData_) {
+   QSharedPointer tmp = QSharedPointer(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& 
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 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 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 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 !=

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

2023-09-03 Thread Andreas Sturmlechner 
commit: 19c059c4f11698506428f6527483fbe60932f8d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  3 10:56:23 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 12:18:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c059c4

media-gfx/nomacs: Drop IUSE jpeg

It's an image viewer - get over it.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
index 0a8340d039e3..d7020dcb57d8 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r6.ebuild
@@ -16,7 +16,7 @@ CMAKE_USE_DIR="${S}/ImageLounge"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux"
-IUSE="+jpeg +opencv plugins raw +tiff zip"
+IUSE="+opencv plugins raw +tiff zip"
 
 REQUIRED_USE="
raw? ( opencv )
@@ -26,7 +26,7 @@ REQUIRED_USE="
 RDEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
-   dev-qt/qtgui:5[jpeg?]
+   dev-qt/qtgui:5[jpeg]
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtsvg:5

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

2023-09-03 Thread Andreas Sturmlechner 
commit: f00d74be68cdafcc64ae0fe4090f5505243d4db7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  3 10:48:37 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 12:18:06 2023 +
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  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 ..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 
+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 ..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 
+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 
+ #include 
+ #include 
++#include 
+ #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 ..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=(

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

2022-09-09 Thread Sam James 
commit: 20413b8b04cfe8c1cd0a5b124f3e234943b69515
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 00:25:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 00:25:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20413b8b

media-gfx/nomacs: revbump for quazip USE-dep change

Fixes: 0eacaf42a67db09ef1260b1a2f0f04dd003aa74b
Signed-off-by: Sam James  gentoo.org>

 media-gfx/nomacs/{nomacs-3.16.224-r2.ebuild => nomacs-3.16.224-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r3.ebuild
similarity index 100%
rename from media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
rename to media-gfx/nomacs/nomacs-3.16.224-r3.ebuild

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

2022-09-09 Thread Andrew Ammerlaan 
commit: 0eacaf42a67db09ef1260b1a2f0f04dd003aa74b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Sep  9 16:03:23 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Sep  9 16:09:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eacaf42

media-gfx/nomacs: depend on quazip[qt5(+)]

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index 4fb8d3913800..c507658d1a9f 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
dev-qt/qtimageformats:5
media-libs/tiff
)
-   zip? ( dev-libs/quazip:0= )
+   zip? ( dev-libs/quazip:0=[qt5(+)] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="

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

2022-08-06 Thread James Le Cuirot 
commit: 86473be29f70c53a17c71f96cbbb51cc23caca7e
Author: Kalin KOZHUHAROV  gmail  com>
AuthorDate: Thu Jul 21 07:43:09 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Aug  6 21:48:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86473be2

media-gfx/nomacs-3.16.224-r3: Fix building with USE=plugins

It looks like qmake was renamed to qmake5 and could not be found, see
2022-03-30-qt-5_15_3-bump in Gentoo news and
https://archives.gentoo.org/gentoo-dev/message/5f3681b5b28dabeb5339d44e9585d29f

Closes: https://bugs.gentoo.org/847112
Signed-off-by: Kalin KOZHUHAROV  thinrope.net>
Signed-off-by: James Le Cuirot  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index 0102090380d2..4fb8d3913800 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -57,6 +57,9 @@ src_prepare() {
if use plugins ; then
rmdir plugins || die
mv -v ../../${PLUGIN_PKG} plugins || die
+   # Fix bug #847112
+   sed -e 's:QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake-qt5" 
"qmake.exe":QT_QMAKE_EXECUTABLE NAMES "qmake" "qmake5" "qmake.exe":' \
+   -i plugins/cmake/Utils.cmake || 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

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

2022-01-23 Thread Stephan Hartmann 
commit: 3edc3889c88ec28a48c6d3a474705dac18f875eb
Author: Stephan Hartmann  gentoo  org>
AuthorDate: Sun Jan 23 17:57:28 2022 +
Commit: Stephan Hartmann  gentoo  org>
CommitDate: Sun Jan 23 17:58:01 2022 +
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  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 ..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 
+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 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+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/

2021-02-23 Thread Andreas Sturmlechner 
commit: 7cd2ccbbdbfcb61f94a5f51dcabdce0074d061a2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 18:47:02 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:28 2021 +
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  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 000..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 
+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 
++#else
+ #include 
+ #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 
++#else
+ #include 
+ #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 
++#else
+ #include 
+ #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 
++#else
+ #include 
+ #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 000..9c6f50df160
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright

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

2021-02-23 Thread Andreas Sturmlechner 
commit: 07ca967d1ac42fcd52b38d51dd79b88b545cb0c3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 18:47:16 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ca967d

media-gfx/nomacs: Drop 3.16.224-r1

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

 media-gfx/nomacs/nomacs-3.16.224-r1.ebuild | 84 --
 1 file changed, 84 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild
deleted file mode 100644
index efac4a65c05..000
--- a/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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 )
-
-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/

2021-02-14 Thread Sam James 
commit: 7cbd27baa7f7992245568f6ec7ca7f707df1f792
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 03:30:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 03:30:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbd27ba

media-gfx/nomacs: fix quazip slot dep

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../nomacs/{nomacs-3.16.224.ebuild => nomacs-3.16.224-r1.ebuild}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild
similarity index 96%
rename from media-gfx/nomacs/nomacs-3.16.224.ebuild
rename to media-gfx/nomacs/nomacs-3.16.224-r1.ebuild
index 252958e43a9..efac4a65c05 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
dev-qt/qtimageformats:5
media-libs/tiff
)
-   zip? ( dev-libs/quazip )
+   zip? ( dev-libs/quazip:0 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="

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

2020-10-10 Thread Andreas Sturmlechner 
commit: 654edfea6d17f529865eaca611dac26a5a72e85f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 10 10:09:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 10 11:56:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654edfea

media-gfx/nomacs: Drop 3.14.2

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/Manifest |  2 -
 media-gfx/nomacs/nomacs-3.14.2.ebuild | 91 ---
 2 files changed, 93 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 6ce46794b9f..2b10efe5231 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,2 @@
-DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 
6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded
 SHA512 
58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 
4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602
 SHA512 
7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
-DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B 
fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6
 SHA512 
c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 
2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409
 SHA512 
cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747

diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild 
b/media-gfx/nomacs/nomacs-3.14.2.ebuild
deleted file mode 100644
index 399cf622d2d..000
--- a/media-gfx/nomacs/nomacs-3.14.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
-
-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 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 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-src_unpack() {
-   unpack "${P}.tar.gz"
-   if use plugins ; then
-   unpack "${PLUGIN_PKG}.tar.gz"
-   mv "${PLUGIN_PKG}" "${S}/plugins" || die
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-   if use plugins ; then
-   # Fix nomacs-plugins installation and search library directory
-   sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" 
"${S}/plugins/cmake/Utils.cmake" || die
-   sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" 
"${S}/src/DkCore/DkPluginManager.cpp" || die
-   fi
-}
-
-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/

2020-10-09 Thread Agostino Sarubbo 
commit: 94858d683cd3f1e48bbe985a6a120060545c03b7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct  9 08:40:50 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct  9 08:40:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94858d68

media-gfx/nomacs: x86 stable wrt bug #740372

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index fa7e271df5e..252958e43a9 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -13,7 +13,7 @@ plugins? ( 
https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="

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

2020-10-04 Thread Sam James 
commit: 793e3612726260c49dfadde93d1e4c98d5b70bf2
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  4 16:59:20 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  4 16:59:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793e3612

media-gfx/nomacs: Stabilize 3.16.224 amd64, #740372

Signed-off-by: Sam James  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index 694ae3a802b..fa7e271df5e 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -13,7 +13,7 @@ plugins? ( 
https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="

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

2020-08-29 Thread Sam James 
commit: b1ca12dbacbb95eb6729fda7525afe9600e528c6
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 30 05:19:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 30 05:19:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ca12db

media-gfx/nomacs: Keyword 3.16.224 arm64, #734832

Signed-off-by: Sam James  gentoo.org>

 media-gfx/nomacs/nomacs-3.16.224.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index 3d0a8e506dd..694ae3a802b 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -13,7 +13,7 @@ plugins? ( 
https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="

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

2020-08-09 Thread Andreas Sturmlechner 
commit: c411e5c5149c372c18fe3056be1b01097bb8be21
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  8 21:46:35 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug  9 08:31:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c411e5c5

media-gfx/nomacs: 3.16.224 version bump, set IUSE="+tiff"

Image Viewer arguably should support most common image formats by default.

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/Manifest   |  2 +
 media-gfx/nomacs/metadata.xml   |  2 +-
 media-gfx/nomacs/nomacs-3.16.224.ebuild | 84 +
 3 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index b35cedb5a0a..6ce46794b9f 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1,4 @@
 DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 
6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded
 SHA512 
58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
+DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 
4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602
 SHA512 
7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B 
fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6
 SHA512 
c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
+DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 
2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409
 SHA512 
cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 17d5f379444..5d40018fc73 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,6 +12,6 @@


Build support for 
media-libs/opencv
-   Build plugins
+   Build officially support plugins

 

diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild 
b/media-gfx/nomacs/nomacs-3.16.224.ebuild
new file mode 100644
index 000..3d0a8e506dd
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 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 ~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 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+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)
+   )
+

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

2020-07-18 Thread Andreas Sturmlechner 
commit: c97e7b1c25f32e8e6b0fb70a74b9af2ad607db4c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 18 00:53:48 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul 18 08:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97e7b1c

media-gfx/nomacs: Drop 3.12

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/Manifest |  1 -
 media-gfx/nomacs/files/nomacs-3.12-gcc9.patch | 39 ---
 media-gfx/nomacs/nomacs-3.12.ebuild   | 69 ---
 3 files changed, 109 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 8b3319018db..b35cedb5a0a 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,2 @@
-DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 
533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2
 SHA512 
4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
 DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 
6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded
 SHA512 
58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
 DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B 
fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6
 SHA512 
c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd

diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch 
b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
deleted file mode 100644
index ccf6ea31d9d..000
--- a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
-From: Michael Palimaka 
-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 
- #pragma warning(pop)  // no warnings from includes - end
- 
-+#include 
-+
- 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 
- 
-+#include 
-+
- 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
deleted file mode 100644
index a527bc46b3e..000
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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:=
-   opencv? ( >=media-libs/opencv-3.4:= )
-   raw? ( media-libs/libraw:= )
-   tiff? (
-   dev-qt/qtimageformats:5
-   media-libs/tiff:0
-   )
-   zip? ( dev-libs/quazip[qt5(+)] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-PATCHES=( "${FILESDIR}/${P}-gcc9.patch" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_CODE_COV=OFF
-   -DUSE_SYSTEM_QUAZIP=ON
-   -DENABLE_TRANSLATIONS=ON
-   -DENABLE_OPENCV=$(usex opencv)
-   -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/

2020-07-17 Thread Agostino Sarubbo 
commit: abfc6a0ff216611f6e81cf90269bfe5ed0580727
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 15:16:08 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 15:16:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abfc6a0f

media-gfx/nomacs: x86 stable wrt bug #732602

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/nomacs/nomacs-3.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild 
b/media-gfx/nomacs/nomacs-3.14.2.ebuild
index f2386e82a78..399cf622d2d 100644
--- a/media-gfx/nomacs/nomacs-3.14.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw tiff zip"
 
 REQUIRED_USE="

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

2020-07-17 Thread Agostino Sarubbo 
commit: 6e0eca5433b1462187a9f7913d5026356590712d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 17 15:03:36 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 17 15:03:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0eca54

media-gfx/nomacs: amd64 stable wrt bug #732602

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/nomacs/nomacs-3.14.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild 
b/media-gfx/nomacs/nomacs-3.14.2.ebuild
index ff12e28b2c9..f2386e82a78 100644
--- a/media-gfx/nomacs/nomacs-3.14.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw tiff zip"
 
 REQUIRED_USE="

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

2020-06-16 Thread Andreas Sturmlechner 
commit: f0f3dd60604bd36d35ee19e6d8cbf6e58f69386b
Author: Sergey Torokhov  yandex  ru>
AuthorDate: Tue May  5 11:08:49 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 16 13:38:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f3dd60

media-gfx/nomacs: 3.14.2 version bump. Add plugins support.

The updated nomacs ebuild contains:
- add 'plugins' USE-flag with appropriate SRC_URI variable,
  and changes within src_unpack() and src_configure() functions;
- add src_prepare() section as there is no PATCHES array in ebuild
  with fix for nomacs-plugins intallation and search path.

Closes: https://bugs.gentoo.org/712918

Signed-off-by: Sergey Torokhov  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/15649
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/Manifest |  2 +
 media-gfx/nomacs/metadata.xml |  1 +
 media-gfx/nomacs/nomacs-3.14.2.ebuild | 91 +++
 3 files changed, 94 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index e0aca8ce306..8b3319018db 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1 +1,3 @@
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 
533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2
 SHA512 
4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
+DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 
6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded
 SHA512 
58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
+DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B 
fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6
 SHA512 
c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index b27b6fcfc0e..17d5f379444 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,5 +12,6 @@


Build support for 
media-libs/opencv
+   Build plugins

 

diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild 
b/media-gfx/nomacs/nomacs-3.14.2.ebuild
new file mode 100644
index 000..ff12e28b2c9
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
+
+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 ~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 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+src_unpack() {
+   unpack "${P}.tar.gz"
+   if use plugins ; then
+   unpack "${PLUGIN_PKG}.tar.gz"
+   mv "${PLUGIN_PKG}" "${S}/plugins" || die
+   fi
+}
+
+src_prepare() {
+   cmake_src_prepare
+   if use plugins ; then
+   # Fix nomacs-plugins installation and search library directory
+   sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" 
"${S}/plugins/cmake/Utils.cmake" || die
+   sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" 
"${S}/src/DkCore/DkPluginManager.cpp" || die
+   fi
+}
+
+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
+}
+

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

2019-08-09 Thread Michael Palimaka 
commit: 846af216a621a08e183997ba8489f846bb2e66ff
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Aug 10 01:13:27 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Aug 10 01:13:52 2019 +
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  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 000..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 
+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 
+ #pragma warning(pop)  // no warnings from includes - end
+ 
++#include 
++
+ 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 
+ 
++#include 
++
+ 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/

2019-04-18 Thread Michael Palimaka 
commit: ef64ac5af67516e07a74ab12456b6b658c152325
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 18 09:02:41 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 18 09:02:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef64ac5a

media-gfx/nomacs: remove heif USE flag

Support for heif is not part of a release yet.

Closes: https://bugs.gentoo.org/682598
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 media-gfx/nomacs/metadata.xml   | 1 -
 media-gfx/nomacs/nomacs-3.12.ebuild | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 462a1644b16..b27b6fcfc0e 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -11,7 +11,6 @@
nomacs


-   Enable support for ISO/IEC 23008-12:2017 
HEIF/HEIC image format using media-libs/libheif
Build support for 
media-libs/opencv

 

diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild 
b/media-gfx/nomacs/nomacs-3.12.ebuild
index ed18ddad761..32fc7db491a 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -12,7 +12,7 @@ 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="heif +jpeg +opencv raw tiff zip"
+IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
raw? ( opencv )
@@ -28,7 +28,6 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
media-gfx/exiv2:=
-   heif? ( media-libs/libheif:= )
opencv? ( >=media-libs/opencv-3.4:= )
raw? ( media-libs/libraw:= )
tiff? (
@@ -52,7 +51,6 @@ src_configure() {
-DENABLE_CODE_COV=OFF
-DUSE_SYSTEM_QUAZIP=ON
-DENABLE_TRANSLATIONS=ON
-   -DENABLE_HEIF=$(usex heif)
-DENABLE_OPENCV=$(usex opencv)
-DENABLE_RAW=$(usex raw)
-DENABLE_TIFF=$(usex tiff)

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

2019-02-07 Thread Andreas Sturmlechner 
commit: 2da8acdeb12e960ab2bce41da27588001916dcfd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb  7 11:49:01 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  7 12:59:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da8acde

media-gfx/nomacs: Drop 3.10.2

Signed-off-by: Andreas Sturmlechner  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 
977dbe24e09b1dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 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..000
--- 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 
-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..000
--- 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

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

2019-02-07 Thread Mikle Kolyada 
commit: 814ffc89ee2fb431f738c364bae5e7ba782404eb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Feb  7 11:46:15 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Feb  7 11:46:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814ffc89

media-gfx/nomacs: amd64 stable wrt bug #676968

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/nomacs/nomacs-3.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild 
b/media-gfx/nomacs/nomacs-3.12.ebuild
index b949461d348..ed18ddad761 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="heif +jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="

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

2019-01-31 Thread Thomas Deutschmann 
commit: 9ffcc859abca7bdcb60e9149c2388114f6246563
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jan 31 21:56:54 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jan 31 22:10:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffcc859

media-gfx/nomacs: x86 stable (bug #676968)

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/nomacs/nomacs-3.12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild 
b/media-gfx/nomacs/nomacs-3.12.ebuild
index cd901145389..b949461d348 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="heif +jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="

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

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

media-gfx/nomacs: Drop 3.8.1

Signed-off-by: Andreas Sturmlechner  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 
977dbe24e09b1dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 
533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2
 SHA512 
4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 
3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110
 SHA512 
ff27570bc15096d0e331ad2c871b2f504a414927b8e6418dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134

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..000
--- 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 
-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

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

2019-01-14 Thread Mikle Kolyada 
commit: 8670ca29d28cbb3b413decb0e701e946e8c522b9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan 14 14:33:34 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan 14 14:35:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8670ca29

media-gfx/nomacs: amd64 stable wrt bug #674030

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/nomacs/nomacs-3.10.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild 
b/media-gfx/nomacs/nomacs-3.10.2.ebuild
index 049b159eda8..8e7356daf99 100644
--- a/media-gfx/nomacs/nomacs-3.10.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="

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

2018-12-31 Thread Thomas Deutschmann 
commit: fc10fa2d8fde2668a9ae26fe860a2251c17f10c5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Dec 31 16:33:56 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Dec 31 16:33:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc10fa2d

media-gfx/nomacs: x86 stable (bug #674030)

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/nomacs/nomacs-3.10.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild 
b/media-gfx/nomacs/nomacs-3.10.2.ebuild
index bd6b71e7f27..049b159eda8 100644
--- a/media-gfx/nomacs/nomacs-3.10.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="

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

2018-12-29 Thread Andreas Sturmlechner 
commit: 2afd1614ad79f4724bbade719f634bec90a16bfe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 29 20:51:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 29 22:02:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afd1614

media-gfx/nomacs: 3.12 version bump

Closes: https://bugs.gentoo.org/672486
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/nomacs/Manifest   |  1 +
 media-gfx/nomacs/metadata.xml   |  1 +
 media-gfx/nomacs/nomacs-3.12.ebuild | 70 +
 3 files changed, 72 insertions(+)

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

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index b27b6fcfc0e..462a1644b16 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -11,6 +11,7 @@
nomacs


+   Enable support for ISO/IEC 23008-12:2017 
HEIF/HEIC image format using media-libs/libheif
Build support for 
media-libs/opencv

 

diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild 
b/media-gfx/nomacs/nomacs-3.12.ebuild
new file mode 100644
index 000..cd901145389
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="heif +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:=
+   heif? ( media-libs/libheif:= )
+   opencv? ( >=media-libs/opencv-3.4:= )
+   raw? ( media-libs/libraw:= )
+   tiff? (
+   dev-qt/qtimageformats:5
+   media-libs/tiff:0
+   )
+   zip? ( dev-libs/quazip[qt5(+)] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_CODE_COV=OFF
+   -DUSE_SYSTEM_QUAZIP=ON
+   -DENABLE_TRANSLATIONS=ON
+   -DENABLE_HEIF=$(usex heif)
+   -DENABLE_OPENCV=$(usex opencv)
+   -DENABLE_RAW=$(usex raw)
+   -DENABLE_TIFF=$(usex tiff)
+   -DENABLE_QUAZIP=$(usex zip)
+   )
+   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/, dev-games/ogre/, dev-games/physfs/, media-sound/mpd/, ...

2018-10-20 Thread Michał Górny 
commit: eeb0cde5342bc9f02f5f6478ad2b709b5c31b808
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 20 06:46:51 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 20 06:46:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb0cde5

*/*: remove redundant 'zip' flag descriptions

Signed-off-by: Michał Górny  gentoo.org>

 dev-games/ogre/metadata.xml   | 1 -
 dev-games/physfs/metadata.xml | 1 -
 dev-lang/php/metadata.xml | 1 -
 media-gfx/nomacs/metadata.xml | 1 -
 media-sound/mpd/metadata.xml  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 5db91d3cf65..841aaefd7dc 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -116,7 +116,6 @@ Exporters
 
 When USE=threads, use tbb for threading
 Build and install helper tools
-Support zip archives
   
   
 sinbad/ogre

diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
index 62272a610b6..4c12a220b84 100644
--- a/dev-games/physfs/metadata.xml
+++ b/dev-games/physfs/metadata.xml
@@ -32,6 +32,5 @@ etc.
 Enable Gothic/Gothic II VDF archive support
 Enable Doom WAD archive support
 Enable Quake I/II QPAK archive support
-Enable ZIP archive support
 
 

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index cca331a3fa1..609c0dce3af 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -51,7 +51,6 @@
 Enable the XSL extension
 Enable webp support for GD in php-5.x
 Enable webp support for GD in php-7.x
-Enable ZIP file support
 Enable ZIP file encryption from 
dev-libs/libzip
   
 

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 9f062f24a87..b27b6fcfc0e 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,6 +12,5 @@


Build support for 
media-libs/opencv
-   Build support for zip archives

 

diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 422ce7b850e..f1cfe2d81d6 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -36,7 +36,6 @@
 Support twolame MPEG-2 encoding
 Enable using music from a WebDAV share
 Enable MIDI support via wildmidi
-Support for ZIP files
   
   
 MusicPlayerDaemon/MPD

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

2018-10-11 Thread Michael Palimaka 
commit: fdef1668253c80e7ca1fa7d6dbc4ebc0424a9a72
Author: band-a-prend  yandex  ru>
AuthorDate: Mon Oct  1 23:43:38 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct 11 11:44:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdef1668

media-gfx/nomacs: 3.10.2 version bump

Nomacs-3.10.2 was released on 5 July 2018 and brings several enhancements:

* anti-aliasing improved
* printing improved
* print multiple pages from thumbnail preview
* animiated WebP support
* JPG compressed TIFFs supported
* batch cropping added
* PSD lib updated
* new translations: Bosnian, Croation, and Serbian
* adds Qt style/ plugins
* adds padding to HUD labels (e.g. zoom)
* fixes disabling update interactions
* adds config.ini that can be used for multi-user systems
* adds mng & jp2 support (again)

Closes: https://bugs.gentoo.org/664962
Closes: https://github.com/gentoo/gentoo/pull/10041

Signed-off-by: Sergey Torokhov  mail.ru>
Signed-off-by: Michael Palimaka  gentoo.org>

 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 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 10318c615c6..c1c1c77ff1f 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1 +1,2 @@
+DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 
14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af
 SHA512 
977dbe24e09b1dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 
3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110
 SHA512 
ff27570bc15096d0e331ad2c871b2f504a414927b8e6418dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134

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
new file mode 100644
index 000..ace6f3d5152
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
@@ -0,0 +1,38 @@
+From e963ab5870945b40055b8fc7eb2708ee11f8d4fd Mon Sep 17 00:00:00 2001
+From: Markus Diem 
+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
new file mode 100644
index 000..bd6b71e7f27
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -0,0 +1,82 @@
+# 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
+   )
+

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

2018-06-07 Thread Andreas Sturmlechner 
commit: 6f5102c0bbef4fe46e79764d5e449b1450c49ac2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  7 10:41:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  7 10:48:35 2018 +
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 
ff27570bc15096d0e331ad2c871b2f504a414927b8e6418dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134

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..000
--- 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 
-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 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..000
--- 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 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
-

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

2018-06-07 Thread Agostino Sarubbo 
commit: f135b7807757710cba8c19cd794c949577a2cda6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  7 10:12:52 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  7 10:12:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f135b780

media-gfx/nomacs: amd64 stable wrt bug #657002

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"

 media-gfx/nomacs/nomacs-3.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild 
b/media-gfx/nomacs/nomacs-3.8.1.ebuild
index 8581a4dd9f8..4720454ff09 100644
--- a/media-gfx/nomacs/nomacs-3.8.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="

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

2018-04-13 Thread Andreas Sturmlechner 
commit: 562d2464e9c757a3005865796b10ad7bc2a960e7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 13 19:05:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 13 19:59:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562d2464

media-gfx/nomacs: Fix cmake with Qt 5.11

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch | 103 ++
 media-gfx/nomacs/nomacs-3.8.1.ebuild  |   2 +
 2 files changed, 105 insertions(+)

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
new file mode 100644
index 000..e9e68af826f
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch
@@ -0,0 +1,103 @@
+From 8480a1c62aa99b6a73a76c9af80392568e0dae5e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+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 
+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 @@

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

2018-04-13 Thread Andreas Sturmlechner 
commit: 1f7014c49612c1e20fe67a1b2e53630c20f6e9e1
Author: Stefan Strogin  gmail  com>
AuthorDate: Fri Apr 13 17:55:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 13 19:59:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7014c4

media-gfx/nomacs: version bump to 3.8.1

Closes: https://bugs.gentoo.org/653114
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7972

 media-gfx/nomacs/Manifest|  1 +
 media-gfx/nomacs/nomacs-3.8.1.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 0695a722bb2..306f606ce44 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1,3 @@
 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 
ff27570bc15096d0e331ad2c871b2f504a414927b8e6418dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134

diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild 
b/media-gfx/nomacs/nomacs-3.8.1.ebuild
new file mode 100644
index 000..819f349f01c
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild
@@ -0,0 +1,80 @@
+# 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 )
+
+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

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

2018-04-13 Thread Andreas Sturmlechner 
commit: 0bf9215079bb317425b8b910e9b338553b2c2f43
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 13 19:40:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 13 19:59:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf92150

media-gfx/nomacs: Add ENABLE_TRANSLATIONS (fix missing translations)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/nomacs/nomacs-3.8.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild 
b/media-gfx/nomacs/nomacs-3.8.1.ebuild
index c3951a6a70e..782838abb00 100644
--- a/media-gfx/nomacs/nomacs-3.8.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild
@@ -69,6 +69,7 @@ src_configure() {
-DENABLE_TIFF=$(usex tiff)
-DENABLE_QUAZIP=$(usex zip)
-DUSE_SYSTEM_QUAZIP=ON
+   -DENABLE_TRANSLATIONS=ON
)
cmake-utils_src_configure
 }

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

2018-04-10 Thread Andreas Sturmlechner 
commit: ce2b63ca218ea39ae2fb69943c2197d1430e93fa
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sun Apr  8 18:49:08 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 09:22:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2b63ca

media-gfx/nomacs: fdo-mime->xdg-utils

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/nomacs/nomacs-3.6.1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild 
b/media-gfx/nomacs/nomacs-3.6.1.ebuild
index c88239195c8..7d4943b91dc 100644
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils fdo-mime
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Qt-based image viewer"
 HOMEPAGE="https://nomacs.org/;
@@ -65,9 +65,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
 }

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

2017-12-07 Thread Michael Palimaka 
commit: d2df3e32770987c0f025c33eb8a27020f9c22c80
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Dec  7 11:30:51 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec  7 11:31:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2df3e32

media-gfx/nomacs: version bump 3.8.0

Closes: https://bugs.gentoo.org/638556
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 media-gfx/nomacs/Manifest|  3 +-
 media-gfx/nomacs/nomacs-3.8.0.ebuild | 80 
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index c9eb6c47348..0695a722bb2 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1 +1,2 @@
-DIST nomacs-3.6.1.tar.gz 28604636 SHA256 
09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068 SHA512 
cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
 WHIRLPOOL 
34125377dee0977ed6e48008d4d8e3ff461c39ab72e89c4dc3c3e8dd0eb0544da91db5a1cd1b38b1bad119a539a60664fd91cea90b21140042db06601d00604b
+DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 
74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327
 SHA512 
cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
+DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B 
b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16
 SHA512 
90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1

diff --git a/media-gfx/nomacs/nomacs-3.8.0.ebuild 
b/media-gfx/nomacs/nomacs-3.8.0.ebuild
new file mode 100644
index 000..bf86f10b9e3
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.8.0.ebuild
@@ -0,0 +1,80 @@
+# 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

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

2017-09-13 Thread Michael Palimaka 
commit: 9677964baab97edb18a9b2d6422d707e9b89c5d5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 13 12:20:06 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 13 12:20:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9677964b

media-gfx/nomacs: add missing dependency required to view tiff files

Closes: https://bugs.gentoo.org/630764
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-gfx/nomacs/nomacs-3.6.1-r1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild 
b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
index 719d2960818..6ae732365e6 100644
--- a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
>=media-gfx/exiv2-0.25:=
opencv? ( media-libs/opencv:=[-qt4(-)] )
raw? ( >=media-libs/libraw-0.14:= )
-   tiff? ( media-libs/tiff:0 )
+   tiff? (
+   dev-qt/qtimageformats:5
+   media-libs/tiff:0
+   )
zip? ( >=dev-libs/quazip-0.7.2[qt5] )
 "
 DEPEND="${RDEPEND}

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

2017-08-30 Thread Michael Palimaka 
commit: d380638becc3a9476fa45c5489a03a10bfa38be6
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Aug 30 13:39:46 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 30 13:40:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d380638b

media-gfx/nomacs: backport patch from upstream fixing batch resize issue

Gentoo-bug: 629330
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../nomacs/files/nomacs-3.6.1-batch-resize.patch   | 23 +++
 media-gfx/nomacs/nomacs-3.6.1-r1.ebuild| 75 ++
 2 files changed, 98 insertions(+)

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
new file mode 100644
index 000..b2dd078d0e9
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
@@ -0,0 +1,23 @@
+From 11cbd66ca66ea9d97d72546a92fe2b487e62481b Mon Sep 17 00:00:00 2001
+From: diemmarkus 
+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 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
new file mode 100644
index 000..719d2960818
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
@@ -0,0 +1,75 @@
+# 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? ( 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

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

2017-08-27 Thread Michael Palimaka 
commit: a0053bbc3512745d738e89ce5c555b949d718242
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug 27 07:08:52 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 27 07:13:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0053bbc

media-gfx/nomacs: update HOMEPAGE

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-gfx/nomacs/nomacs-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild 
b/media-gfx/nomacs/nomacs-3.6.1.ebuild
index c80388f8d92..d110997b2f3 100644
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils fdo-mime
 
 DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="http://www.nomacs.org/;
+HOMEPAGE="https://nomacs.org/;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"

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

2017-08-27 Thread Michael Palimaka 
commit: 9d4905c1e9eab71cb10e585c8ea7ad43bf6203e9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug 27 07:09:22 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 27 07:13:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d4905c1

media-gfx/nomacs: update metadata

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-gfx/nomacs/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 81a0d2ec10b..9f062f24a87 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -6,9 +6,9 @@
Gentoo Qt Project


-   nomacs
-   http://www.nomacs.org/redmine/projects/nomacs
+   https://nomacs.org/redmine/projects/nomacs
nomacs/nomacs
+   nomacs


Build support for 
media-libs/opencv

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

2017-06-20 Thread Davide Pesavento 
commit: 19982608ac700e43d912f4f555dddff7013d40bf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jun 20 16:25:08 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jun 20 16:25:08 2017 +
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..000
--- 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 = 
QSharedPointer(), QSize = QSize()) { return false; };
-+  bool loadOpenCVVecFile(const QString&, QImage&, 
QSharedPointer = QSharedPointer(), 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..000
--- 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

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

2017-06-19 Thread Agostino Sarubbo 
commit: f8eaf4f879af05504a15fc5ae25aa2a3efbd2368
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun 20 05:15:55 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun 20 05:15:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8eaf4f8

media-gfx/nomacs: x86 stable wrt bug #622088

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/nomacs/nomacs-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild 
b/media-gfx/nomacs/nomacs-3.6.1.ebuild
index 004a7fe7834..c80388f8d92 100644
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg opencv raw tiff zip"
 
 REQUIRED_USE="

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

2017-06-18 Thread Agostino Sarubbo 
commit: 93ff5d1fff7111ccbd990ddd61da5b8bcd1c27c2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 18 13:57:36 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 18 13:57:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ff5d1f

media-gfx/nomacs: amd64 stable wrt bug #622088

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/nomacs/nomacs-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-3.6.1.ebuild 
b/media-gfx/nomacs/nomacs-3.6.1.ebuild
index 95b3193b230..004a7fe7834 100644
--- a/media-gfx/nomacs/nomacs-3.6.1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="+jpeg opencv raw tiff zip"
 
 REQUIRED_USE="

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

2017-04-25 Thread Michael Palimaka 
commit: e155323c039d4a0fe1eae49fe80456281d34211b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Apr 25 08:07:48 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Apr 25 08:07:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e155323c

media-gfx/nomacs: verison bump 3.6.1

Gentoo-bug: 616040
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/nomacs/Manifest|  1 +
 media-gfx/nomacs/nomacs-3.6.1.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 10c1d819604..16f42432eca 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1 +1,2 @@
 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/nomacs-3.6.1.ebuild 
b/media-gfx/nomacs/nomacs-3.6.1.ebuild
new file mode 100644
index 000..95b3193b230
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.6.1.ebuild
@@ -0,0 +1,73 @@
+# 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/${PV}.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"
+
+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

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

2017-01-22 Thread Andreas Sturmlechner 
commit: 45e3f5a49655535d388c9b87025a3d046b7f16f3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 22 18:28:00 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 22 18:32:59 2017 +
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..
--- a/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df
-Author: Andreas Sturmlechner 
-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 @@


Build support for 
media-libs/opencv
-   Build support for WEBP image format
Build support for zip archives

 

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..
--- 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)
-

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

2017-01-09 Thread Aaron Bauman 
commit: 4f7c52df7b4e2eb5df9ab4aa80a9c2e2b62270bc
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jan  9 12:25:45 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jan  9 12:25:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7c52df

media-gfx/nomacs: amd64 stable

Gentoo-bug: 604996

Package-Manager: portage-2.3.0

 media-gfx/nomacs/nomacs-3.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.4-r1.ebuild 
b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
index 7cde2ab..d53935e 100644
--- a/media-gfx/nomacs/nomacs-3.4-r1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="+jpeg opencv raw tiff zip"
 
 REQUIRED_USE="

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

2017-01-07 Thread Andreas Sturmlechner 
commit: 24b983dc9155c89be0173954e11891e1fec296b0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  7 20:02:40 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  7 20:26:10 2017 +
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 
82462f36659b0b09ef4169d927d0861244ecf83790ba03185a20278c49ad 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..
--- 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 
-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 
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 
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..
--- 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 
-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}

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

2016-12-22 Thread Michael Palimaka 
commit: 430d69dca30375cec6631d151c612207c1c94883
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Dec 22 17:07:24 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec 22 17:07:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430d69dc

media-gfx/nomacs: account for media-libs/opencv versions which no longer have a 
qt4 USE flag

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/nomacs/nomacs-3.4-r1.ebuild | 2 +-
 media-gfx/nomacs/nomacs-3.4.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/nomacs-3.4-r1.ebuild 
b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
index 5482647..7cde2ab 100644
--- a/media-gfx/nomacs/nomacs-3.4-r1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
>=media-gfx/exiv2-0.25:=
-   opencv? ( media-libs/opencv:=[-qt4] )
+   opencv? ( media-libs/opencv:=[-qt4(-)] )
raw? ( >=media-libs/libraw-0.14:= )
tiff? ( media-libs/tiff:0 )
zip? ( >=dev-libs/quazip-0.7.2[qt5] )

diff --git a/media-gfx/nomacs/nomacs-3.4.ebuild 
b/media-gfx/nomacs/nomacs-3.4.ebuild
index 564fc85..a113420 100644
--- a/media-gfx/nomacs/nomacs-3.4.ebuild
+++ b/media-gfx/nomacs/nomacs-3.4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
>=media-gfx/exiv2-0.25:=
-   opencv? ( media-libs/opencv:=[-qt4] )
+   opencv? ( media-libs/opencv:=[-qt4(-)] )
raw? ( >=media-libs/libraw-0.14:= )
tiff? ( media-libs/tiff:0 )
zip? ( dev-libs/quazip[qt5] )

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

2016-10-28 Thread Michael Palimaka 
commit: e0479650fd397df627af31c09a25a16cab0ba8fc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 28 20:38:26 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 28 20:38:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0479650

media-gfx/nomacs: fix build with dev-libs/quazip-0.7.2

Gentoo-bug: 598354

Package-Manager: portage-2.3.2

 media-gfx/nomacs/nomacs-3.4-r1.ebuild | 76 +++
 1 file changed, 76 insertions(+)

diff --git a/media-gfx/nomacs/nomacs-3.4-r1.ebuild 
b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
new file mode 100644
index ..5482647
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
@@ -0,0 +1,76 @@
+# 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-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

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

2016-10-23 Thread Michael Palimaka 
commit: 8a158a4cebd6ae94a54e8191b83c73ac6507956c
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 14:59:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Oct 23 16:58:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a158a4c

media-gfx/nomacs: Add USE=jpeg, fix build with !opencv

Gentoo-bug: 592118, 592134

Package-Manager: portage-2.3.0

 media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch | 11 +++
 media-gfx/nomacs/nomacs-3.4.ebuild|  6 --
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch 
b/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch
new file mode 100644
index ..698b45c
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.4-no-opencv.patch
@@ -0,0 +1,11 @@
+--- 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 = 
QSharedPointer(), QSize = QSize()) { return false; };
++  bool loadOpenCVVecFile(const QString&, QImage&, 
QSharedPointer = QSharedPointer(), 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.ebuild 
b/media-gfx/nomacs/nomacs-3.4.ebuild
index 51f52db..564fc85 100644
--- a/media-gfx/nomacs/nomacs-3.4.ebuild
+++ b/media-gfx/nomacs/nomacs-3.4.ebuild
@@ -13,7 +13,7 @@ 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="opencv raw tiff zip"
+IUSE="+jpeg opencv raw tiff zip"
 
 REQUIRED_USE="
raw? ( opencv )
@@ -23,7 +23,7 @@ REQUIRED_USE="
 RDEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
-   dev-qt/qtgui:5
+   dev-qt/qtgui:5[jpeg?]
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtsvg:5
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}/ImageLounge"
 
+PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134
+
 src_configure() {
local mycmakeargs=(
-DENABLE_OPENCV=$(usex opencv)

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

2016-08-11 Thread Michael Palimaka 
commit: 95d16c4f50c3fdb99ddd4aaa333dc81a5b436fe9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Aug 11 16:02:15 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 11 16:02:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d16c4f

media-gfx/nomacs: version bump

Gentoo-bug: 590494

Package-Manager: portage-2.3.0

 media-gfx/nomacs/Manifest  |  1 +
 media-gfx/nomacs/nomacs-3.4.ebuild | 61 ++
 2 files changed, 62 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index a7fc59a..e2e9dbf 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,4 @@
 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 
82462f36659b0b09ef4169d927d0861244ecf83790ba03185a20278c49ad SHA512 
efd27d97a3843d2527c4423321ad946f32381a917f328878a04e39275e0fde2879e5836eb4ac2a54b489c47364f4ad76fd8dc7190fc8ebc1d9507d957fd66049
 WHIRLPOOL 
076390f77bcc47e88023f65bcdc5d17e939b08419c7ed9b3ed65f141a76d65ce64c3256b57fed3aecc7cd2b68b89dd871734ac248c6d1719e977ff14e0b117ec
+DIST nomacs-3.4.tar.gz 30026261 SHA256 
552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f SHA512 
67a1b57971dc373d5a3be75b7deaff6702893252568eef135903754b2465416a58b40f18f55cf2994c8c3853ae96b82506c1caf26b0e645c20179a9cd81c0d36
 WHIRLPOOL 
f082d568ba56eaa1effc5e8552d16b816d558b7d4c2d7ddfd14a39f8805490d772116ca6ee35c8a38bd6b5fc69917287b7c596986f6a15b854bfebcbbe14304f

diff --git a/media-gfx/nomacs/nomacs-3.4.ebuild 
b/media-gfx/nomacs/nomacs-3.4.ebuild
new file mode 100644
index 000..51f52db
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.4.ebuild
@@ -0,0 +1,61 @@
+# 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="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:=[-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"
+
+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/

2016-06-09 Thread Michael Palimaka 
commit: e61b95ff2ac80c5242d07d521a0535c4e4617f29
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jun  9 11:17:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jun  9 11:18:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61b95ff

media-gfx/nomacs: version bump

Package-Manager: portage-2.3.0_rc1

 media-gfx/nomacs/Manifest|  1 +
 media-gfx/nomacs/nomacs-3.2.0.ebuild | 59 
 2 files changed, 60 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 69aa532..a7fc59a 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1,3 @@
 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 
82462f36659b0b09ef4169d927d0861244ecf83790ba03185a20278c49ad SHA512 
efd27d97a3843d2527c4423321ad946f32381a917f328878a04e39275e0fde2879e5836eb4ac2a54b489c47364f4ad76fd8dc7190fc8ebc1d9507d957fd66049
 WHIRLPOOL 
076390f77bcc47e88023f65bcdc5d17e939b08419c7ed9b3ed65f141a76d65ce64c3256b57fed3aecc7cd2b68b89dd871734ac248c6d1719e977ff14e0b117ec

diff --git a/media-gfx/nomacs/nomacs-3.2.0.ebuild 
b/media-gfx/nomacs/nomacs-3.2.0.ebuild
new file mode 100644
index 000..7ddaeb3
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.2.0.ebuild
@@ -0,0 +1,59 @@
+# 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
+}

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

2016-03-06 Thread Davide Pesavento 
commit: 61f16acdacfccb94f6d16314d2145c269b2732f9
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Mar  6 13:13:57 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Mar  6 13:13:57 2016 +
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..000
--- 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 
-+#include 
- #include 
- #include 
- #include 

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..000
--- 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..000
--- 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/;

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

2016-03-06 Thread Agostino Sarubbo 
commit: a346bce001f8e06858955eb24f39e64f6c244011
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  6 12:55:36 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  6 12:58:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a346bce0

media-gfx/nomacs: amd64 stable wrt bug #574904

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/nomacs/nomacs-2.4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild 
b/media-gfx/nomacs/nomacs-2.4.6.ebuild
index ecda8a1..f650d1c 100644
--- a/media-gfx/nomacs/nomacs-2.4.6.ebuild
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
 IUSE="opencv qt5 raw tiff webp zip"
 
 REQUIRED_USE="

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

2016-01-31 Thread Michael Palimaka 
commit: d44dfcaf2545c50c28ed4c066efbbc912de643da
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Jan 31 17:05:26 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jan 31 17:28:20 2016 +
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 000..a13d90f
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch
@@ -0,0 +1,21 @@
+commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df
+Author: Andreas Sturmlechner 
+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/files/, media-gfx/nomacs/

2016-01-14 Thread Michael Palimaka 
commit: 1c670dcff7734dbb86f8dbfeb9495a1cbfeefd0a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jan 14 16:04:03 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jan 14 16:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c670dcf

media-gfx/nomacs: version bump

Gentoo-bug: 571534

Package-Manager: portage-2.2.26

 media-gfx/nomacs/Manifest  |  1 +
 .../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   | 68 ++
 5 files changed, 154 insertions(+)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index acc003c..eabafb6 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,4 @@
 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-3.0.0-quazip-build.patch 
b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
new file mode 100644
index 000..5f33b65
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
@@ -0,0 +1,32 @@
+From 204dd809ae0d6287385905d44c1a60a38a7c4084 Mon Sep 17 00:00:00 2001
+From: diemmarkus 
+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 
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 
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
new file mode 100644
index 000..d31f650
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch
@@ -0,0 +1,25 @@
+From 060f4e972fec0308404a7e535b43254b06908a84 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka 
+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})
+-

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

2015-10-04 Thread Michał Górny 
commit: fb989d0d6694b579fe859ea17b1d9d29537d9b11
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Oct  4 13:09:14 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct  4 14:21:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb989d0d

media-gfx/nomacs: Revision bump for compatibility with exiv2-0.25

Package-Manager: portage-2.2.20.1

 media-gfx/nomacs/nomacs-2.4.4-r1.ebuild | 57 +
 1 file changed, 57 insertions(+)

diff --git a/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild 
b/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
new file mode 100644
index 000..d45dba7
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt4-based image viewer"
+HOMEPAGE="http://www.nomacs.org/;
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="opencv raw tiff webp zip"
+
+REQUIRED_USE="
+   raw? ( opencv )
+   tiff? ( opencv )
+"
+
+RDEPEND="
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   >=media-gfx/exiv2-0.25:=[png]
+   opencv? ( >=media-libs/opencv-2.4:=[qt4] )
+   raw? ( >=media-libs/libraw-0.14:= )
+   tiff? ( media-libs/tiff:0 )
+   webp? ( >=media-libs/libwebp-0.3.1:= )
+   zip? ( dev-libs/quazip )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_QT5=OFF
+   $(cmake-utils_use_enable opencv)
+   $(cmake-utils_use_enable raw)
+   $(cmake-utils_use_enable tiff)
+   $(cmake-utils_use_enable webp)
+   $(cmake-utils_use_enable zip QUAZIP)
+   -DUSE_SYSTEM_WEBP=ON
+   -DUSE_SYSTEM_QUAZIP=ON
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+}

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

2015-10-04 Thread Michał Górny 
commit: af3da8f94a761851a38ef86d7b82106577d7f60e
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Oct  4 19:37:56 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct  4 21:26:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af3da8f9

media-gfx/nomacs: Version bump, add USE=qt5

Package-Manager: portage-2.2.20.1

 media-gfx/nomacs/Manifest  |  1 +
 ...{nomacs-2.4.4-r1.ebuild => nomacs-2.4.6.ebuild} | 29 --
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 8925a44..acc003c 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,2 +1,3 @@
 DIST nomacs-2.4.2-source.tar.bz2 1443270 SHA256 
b0f52b919025a48a0e0300ea15c90b40d6ad892b055088fca02a8137e229bc3a SHA512 
e3fae11ae8c385f9548bda32b2364967a457e9645fa4375da9d1cf85dc8fb150a56a19c3eab12ddef90d58f20a57d02a8720ddb8fef22c569ab6c28d54654f02
 WHIRLPOOL 
ac21dd3afe3b45324daa6e07030203611c9f2de4ad1427ce4bb388d84ade5e38a686b42e0d757adbaa3a91fbb658d94f9f47de61e9ccf4ccc339af4ce1c4fd8d
 DIST nomacs-2.4.4-source.tar.bz2 1448716 SHA256 
01b0cb48936ca0214c120a126069c50a9b8fe7ecbdb69bb4e5fe283d6b198257 SHA512 
76cd5efaba09584757843e895b5b8293adcdab7df68a7d5bdcf38e9e5df04e38382944cf64293c9820815b9e6328793dd8e46afef5ffeaa80ddc4f7d43290fc2
 WHIRLPOOL 
d858887f66cbbed858c1985313107839a8162052bfb825bc48f344516444a1e184e839c9a067283d7503b98a6993126ade3f39c0a85b50ca534f963335c85513
+DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 
b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 
9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71
 WHIRLPOOL 
97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940

diff --git a/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild 
b/media-gfx/nomacs/nomacs-2.4.6.ebuild
similarity index 64%
rename from media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
rename to media-gfx/nomacs/nomacs-2.4.6.ebuild
index d45dba7..01cf47a 100644
--- a/media-gfx/nomacs/nomacs-2.4.4-r1.ebuild
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild
@@ -6,14 +6,14 @@ EAPI=5
 
 inherit cmake-utils fdo-mime
 
-DESCRIPTION="Qt4-based image viewer"
+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 raw tiff webp zip"
+IUSE="opencv qt5 raw tiff webp zip"
 
 REQUIRED_USE="
raw? ( opencv )
@@ -21,23 +21,36 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   >=media-gfx/exiv2-0.25:=[png]
-   opencv? ( >=media-libs/opencv-2.4:=[qt4] )
+   >=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:= )
-   zip? ( dev-libs/quazip )
 "
 DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
virtual/pkgconfig
 "
 
 src_configure() {
local mycmakeargs=(
-   -DENABLE_QT5=OFF
$(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)