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

[Andreas Sturmlechner]

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

media-gfx/nomacs: Drop 3.8.1

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

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

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

diff --git a/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch b/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch
deleted file mode 100644
index e9e68af826f..00000000000
--- a/media-gfx/nomacs/files/nomacs-3.8.1-qt-5.11.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8480a1c62aa99b6a73a76c9af80392568e0dae5e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-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@g.o>
-Date: Fri, 13 Apr 2018 21:36:15 +0200
-Subject: [PATCH 2/2] Require minimum Qt5 version as documented in README.md
-
----
- CMakeLists.txt    | 2 ++
- cmake/Utils.cmake | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5869c2c6..5b9abe67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,6 +36,8 @@ set(NOMACS_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
- # include macros needed
- include("cmake/Utils.cmake")
- 
-+set(QT5_MIN_VERSION 5.2.1)
-+
- # different compile options
- option(ENABLE_OPENCV "Compile with Opencv (needed for RAW and TIFF)" ON)
- option(ENABLE_RAW "Compile with raw images support (libraw)" ON)
-diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
-index 5ea88a69..bdd547cb 100644
---- a/cmake/Utils.cmake
-+++ b/cmake/Utils.cmake
-@@ -17,10 +17,10 @@ macro(NMC_FINDQT)
- 	 set(QT_ROOT ${QT_QMAKE_PATH}/)
- 	 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_QMAKE_PATH}\\..\\lib\\cmake\\Qt5)
- 	 	 
--	 find_package(Qt5 REQUIRED  Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg)
-+	 find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Widgets Network LinguistTools PrintSupport Concurrent Gui Svg)
- 	 
- 	if (MSVC)
--		find_package(Qt5 REQUIRED WinExtras)
-+		find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED WinExtras)
- 	endif()
- 	 
- 	 if (NOT Qt5_FOUND)
--- 
-2.17.0
-

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