gentoo resync : 14.04.2018

3 files changed, 189 insertions, 0 deletions

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index bc79948eb9cf..cbdf96d121f0 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,7 +1,10 @@
 AUX nomacs-3.6.1-batch-resize.patch 757 BLAKE2B 0eba44f34bcde704fcb5ae907ee25fbab3752481409df81d48feb7b923328dd03ceeb0958f5221da493eb9e847f9c8ca7c13a313f532a929e7c6627ddf12f2ff SHA512 781921c31fdd7714e654c7112b4b866c76a2140f5b7e2e9ec2859a06281e01d00912813bae8b6b44b2cc263c27da03ee4610cde692a184125d82747c8c8cf9df
+AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f3b01cbeadf388339f836091c4a0880346a1d06344e1935c79fa1f25d30f76e1bba87363b777235a181c28aba713b SHA512 14495e3f1a93c5559fef6bfa3a141ec8b9b84e11cce09d3f362f1a8f9de1ab2b31b6c3f1407fa3f79f828b79d65f940118a311c69ae0aefee9c19cd87880bb3c
 DIST nomacs-3.6.1.tar.gz 28604636 BLAKE2B 74045163d5dabf9858de4e11a2300a298c15d691b3991a56dc802e6b16ee484637de05674aa13ba1d31848bce2df4724c3e083c5d35f82dba926b16aeaf81327 SHA512 cfbda2be5ed015a5ea39cc3c3c9273e3164bb67f0c5fd4fac0e3c607075cf67cfea2311b21420585363a841d65a53c03e100af57c209786243c2c3dcaba11f8e
 DIST nomacs-3.8.0.tar.gz 32240476 BLAKE2B b0bf2832cda09c01b98c5ef540a0d3d61046ca652c2c0b8b382ba69b7623327f6bcaf030cce2b87719a4bda1141b2118cb184700bfbff83fc86b496622178a16 SHA512 90ffd1ea7f6d8e2f07b2b093ebc7cfec682f11b874d95e249f3d35a2ceb8b75e7a0c55f19c978231c3c8342abe5cb251359771fd90aa39b50ee0a6d1514e88e1
+DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
 EBUILD nomacs-3.6.1-r1.ebuild 1598 BLAKE2B 95aa8b0faf792aa1a6fdd92f1b3ef1f3ab740eb3900e454f2ba45a7f4700b0ddd20ecf9f40cbe086932058b2a9a670d71c3c11c0b7f7e57d1efc57b1abd1cdfa SHA512 57fce8366da69eff7739e5cd05c461ab1a577e59caf194d2b472ab1db83c29ad2ed12da6372d651d15339ae0307d58e260686e78f67ede84fcfd71f86b6054a8
 EBUILD nomacs-3.6.1.ebuild 1516 BLAKE2B 6f90ecc2401786a6ff3c06649006fd7994fe8dc53c1507937923eea49592b629102c5d49bf3047901a0d1464eb452e9294af482c0b75b3757870126914763513 SHA512 7852f9e0d3c4091b5326f4081bd3fa90d729910a036832a901f83880f55a196c26b12ff89e7f2c0cd2514af67e86c89ee939342aa459c333e0d580e17e9615bc
 EBUILD nomacs-3.8.0.ebuild 1661 BLAKE2B 286200d262f759b648747fb014ca76c24718153b9cbca0630b645637976a1b8871126809ab47971a1b03ac010ee3b3b163936c31d6a35e736c4eeead0dd8d528 SHA512 1edc2400b6f53cfbcc900cb8e3c94d82b3a1a4fc216383de413a73b9c76eada1bf5a8ffbb03a3aa35ccdd229171451352a334e34f1b90906bfc5c038c4f1fd31
+EBUILD nomacs-3.8.1.ebuild 1735 BLAKE2B 2bb1754a19a26e8547de56d1e97bbb49a36ac244df4e26fc86f50a224d1b1af2f64a49f62229c00f19a01c44669c410d05fac5ceacef8e776002b3892e28d1a5 SHA512 55c837c5117ce8ab7f97c95ed0b053c1139f257d6d9edfb38403828470bb6facd80a6a62ad84a166d4631d81a582f575970fa865f92f0a18f515320e78afab6e
 MISC metadata.xml 588 BLAKE2B 544009f8f7b184b666e5b7bbb88ce395028032bd060a7abe16f2ed096accb11b0819c19b3898ca1fc96c61aacc9cf0bb5960716f711ba77c5f545f040dd31567 SHA512 f681a8f2f1ec2c2902d34829245790edd014eca1829479f2a47b9179f370d3c3d3c562c32dae1918a7616c8f75c7d94b525beec410ad39704b25fd502cefb5fb
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 000000000000..e9e68af826fb
--- /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 <asturm@gentoo.org>
+Date: Fri, 13 Apr 2018 21:09:17 +0200
+Subject: [PATCH 1/2] Fix cmake with Qt 5.11_beta3
+
+---
+ cmake/MacBuildTarget.cmake  | 4 ++--
+ cmake/UnixBuildTarget.cmake | 4 ++--
+ cmake/WinBuildTarget.cmake  | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/MacBuildTarget.cmake b/cmake/MacBuildTarget.cmake
+index eae9a76b..54633ca1 100644
+--- a/cmake/MacBuildTarget.cmake
++++ b/cmake/MacBuildTarget.cmake
+@@ -66,8 +66,8 @@ add_dependencies(
+ 	${QUAZIP_DEPENDENCY} 
+ 	${LIBQPSD_LIBRARY}) 
+ 
+-qt5_use_modules(${BINARY_NAME} 		Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
+-qt5_use_modules(${DLL_CORE_NAME} 	Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
++qt5_use_modules(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
++qt5_use_modules(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
+ 
+ # core flags
+ set_target_properties(${DLL_CORE_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
+diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake
+index 4eb3108e..3f592764 100644
+--- a/cmake/UnixBuildTarget.cmake
++++ b/cmake/UnixBuildTarget.cmake
+@@ -58,8 +58,8 @@ add_dependencies(
+ 	${QUAZIP_DEPENDENCY}
+ 	${LIBQPSD_LIBRARY})
+ 
+-qt5_use_modules(${BINARY_NAME} 		Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
+-qt5_use_modules(${DLL_CORE_NAME} 	Widgets Gui Network LinguistTools PrintSupport Concurrent Svg)
++target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
++target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
+ 
+ # core flags
+ set_target_properties(${DLL_CORE_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
+diff --git a/cmake/WinBuildTarget.cmake b/cmake/WinBuildTarget.cmake
+index 9a71d508..63a4b27d 100644
+--- a/cmake/WinBuildTarget.cmake
++++ b/cmake/WinBuildTarget.cmake
+@@ -62,8 +62,8 @@ add_dependencies(
+ target_include_directories(${BINARY_NAME} 		PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+ target_include_directories(${DLL_CORE_NAME} 	PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
+ 
+-qt5_use_modules(${BINARY_NAME} 		Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras)
+-qt5_use_modules(${DLL_CORE_NAME} 	Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras)
++target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras)
++target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras)
+ 
+ # set(_moc ${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles)
+ file(GLOB NOMACS_AUTOMOC "${CMAKE_BINARY_DIR}/*_automoc.cpp ${CMAKE_BINARY_DIR}/moc_.cpp")
+-- 
+2.17.0
+
+
+From 6c400cb6341e4c15413b0406d575779a6f3ce6c5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 13 Apr 2018 21:36:15 +0200
+Subject: [PATCH 2/2] Require minimum Qt5 version as documented in README.md
+
+---
+ CMakeLists.txt    | 2 ++
+ cmake/Utils.cmake | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5869c2c6..5b9abe67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,6 +36,8 @@ set(NOMACS_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
+ # include macros needed
+ include("cmake/Utils.cmake")
+ 
++set(QT5_MIN_VERSION 5.2.1)
++
+ # different compile options
+ option(ENABLE_OPENCV "Compile with Opencv (needed for RAW and TIFF)" ON)
+ option(ENABLE_RAW "Compile with raw images support (libraw)" ON)
+diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
+index 5ea88a69..bdd547cb 100644
+--- a/cmake/Utils.cmake
++++ b/cmake/Utils.cmake
+@@ -17,10 +17,10 @@ macro(NMC_FINDQT)
+ 	 set(QT_ROOT ${QT_QMAKE_PATH}/)
+ 	 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_QMAKE_PATH}\\..\\lib\\cmake\\Qt5)
+ 	 	 
+-	 find_package(Qt5 REQUIRED  Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg)
++	 find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg)
+ 	 
+ 	if (MSVC)
+-		find_package(Qt5 REQUIRED WinExtras)
++		find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED WinExtras)
+ 	endif()
+ 	 
+ 	 if (NOT Qt5_FOUND)
+-- 
+2.17.0
+
diff --git a/media-gfx/nomacs/nomacs-3.8.1.ebuild b/media-gfx/nomacs/nomacs-3.8.1.ebuild
new file mode 100644
index 000000000000..782838abb005
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.8.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+jpeg +opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/exiv2-0.25:=
+	opencv? ( media-libs/opencv:=[-qt4(-)] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff:0
+	)
+	zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# fix build with quazip-0.7.2 - bug 598354
+	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
+	sed -e "s/include <quazip/&5/" \
+		-i src/DkCore/DkImageLoader.cpp \
+		-i src/DkCore/DkImageContainer.cpp \
+		-i src/DkCore/DkBasicLoader.cpp \
+		-i src/DkGui/DkDialog.cpp || die
+
+	sed -i -e "/setup_target_for_coverage/s/^/#/" CMakeLists.txt || die
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}