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

[Andreas Sturmlechner]

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

media-gfx/nomacs: Drop old

Package-Manager: portage-2.3.0

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

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

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

diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 79b5bc4..e79d388 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -11,7 +11,6 @@
 	</upstream>
 	<use>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
-		<flag name="webp">Build support for WEBP image format</flag>
 		<flag name="zip">Build support for zip archives</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild
deleted file mode 100644
index f650d1c..00000000
--- a/media-gfx/nomacs/nomacs-2.4.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils fdo-mime
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="opencv qt5 raw tiff webp zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	>=media-gfx/exiv2-0.25:=
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		opencv? ( media-libs/opencv:=[qt5] )
-		zip? ( dev-libs/quazip[qt5] )
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		opencv? ( >=media-libs/opencv-2.4:=[qt4] )
-		zip? ( dev-libs/quazip[qt4] )
-	)
-	raw? ( >=media-libs/libraw-0.14:= )
-	tiff? ( media-libs/tiff:0 )
-	webp? ( >=media-libs/libwebp-0.3.1:= )
-"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable opencv)
-		$(cmake-utils_use_enable qt5)
-		$(cmake-utils_use_enable raw)
-		$(cmake-utils_use_enable tiff)
-		$(cmake-utils_use_enable webp)
-		$(cmake-utils_use_enable zip QUAZIP)
-		-DUSE_SYSTEM_WEBP=ON
-		-DUSE_SYSTEM_QUAZIP=ON
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}