gentoo resync : 10.02.2019

4 files changed, 3 insertions, 126 deletions

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 6f9472019be4..79c7818a79fc 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,6 +1,3 @@
-AUX nomacs-3.10.2_fix_move_crop_area_tooltip.patch 1254 BLAKE2B 5dec4f07fc0cdcd1316a61c179da94bdeaf01d56bb8c2d5327261280d176a976dc406c851f2f2b84d6ac5c62df5646ac8be64de1561edf8ad3220a353a95b887 SHA512 2866be24f07534bb34f15374145240580552fcfd3c33c0193236f597d9edaa256809b5a0da88cb58230d7d0efc19ae56bbf5247b789d5b82ae3ae89c489828ed
-DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-EBUILD nomacs-3.10.2.ebuild 1748 BLAKE2B 52611e005972dab2c3b70605c59e5a9d02f2bfad1a214aa80c9cd3043cbb43317b475cba69fcccf58b50c010d68da8fb328002d423bff85b0c20ebfc1aa6fbde SHA512 4275890d496f26f7de207c986cfb7b8d8c37f0db992111e3b9f4c34980f0c76124bba71ddabf44e578aeb491099a4790ae79f855008ec00cb9f1ec6f33203489
-EBUILD nomacs-3.12.ebuild 1341 BLAKE2B 66c969a82102d950b72e0b2fdce39d4970bf4fe8b3d36ac2e751f6e31616f551f2bb6615c4586236de9fd7b0ce374f9da2e2c3eb4af6f28783ccc87a7b3c9af5 SHA512 7edc9b02d4721c46be37d77aad4912a65081098c50084753ab501974033dc3bc383860b7a4a7667eeacbd12a0c60a41a9c5a511b2ba1eae692dfd71ad44cc6f0
+EBUILD nomacs-3.12.ebuild 1339 BLAKE2B 0f6501b09d0efb5881a3f64120e75e512c224e190d17f210f4b4ec7e925f6490c39f238f7be8935ef88434c445c0709819ca455a464e56ed3dfc629303abf636 SHA512 ef0c676c97d0e0615cf2f24117d16734bf7ab9958f547414abe39e2b27cc7b470dbac96cd9a4d4eb0ca8b04db6c31e2150989c03593963659e0c7513a41a077b
 MISC metadata.xml 658 BLAKE2B 72c4850c61d0aa0c068870eb15f33471279182f0b4fb09a18f24b4a497df4f0928492a2cb24d6f47bd6adc54f3e8be95d937c65f95db01dfc5a4bda83830e3ea SHA512 7388bf834b7483835054cf4550984916a6ccd56902d7992b24f83affd39e2aac8a50599b81370f85683882425c93bfd081fffa5f7e693b6d1683b5429be1cae0
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 ace6f3d51527..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.10.2_fix_move_crop_area_tooltip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e963ab5870945b40055b8fc7eb2708ee11f8d4fd Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Fri, 7 Sep 2018 15:11:18 +0200
-Subject: [PATCH] show crop info when moving
-
-- fixes #253
----
- ImageLounge/src/DkGui/DkWidgets.cpp | 6 +++---
- ImageLounge/src/nomacs.rc           | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ImageLounge/src/DkGui/DkWidgets.cpp b/ImageLounge/src/DkGui/DkWidgets.cpp
-index 61c0c05e..b6a5eadb 100644
---- a/src/DkGui/DkWidgets.cpp
-+++ b/src/DkGui/DkWidgets.cpp
-@@ -1820,7 +1820,7 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
- 		setAngle(angle, false);

- 	}

- 

--	if (event->buttons() == Qt::LeftButton && mState != moving) {

-+	if (event->buttons() == Qt::LeftButton) {

- 

- 		QPolygonF p = mRect.getPoly();

- 

-@@ -1833,11 +1833,11 @@ void DkEditableRect::mouseMoveEvent(QMouseEvent *event) {
- 		QPoint tl;

- 

- 		if (sAngle == 0.0f || fabs(sAngle) == 90.0f) {

--			tl = mRect.getTopLeft().toPoint();

-+			tl = mRtform.map(mRect.getTopLeft()).toPoint();

- 			info += "x: ";

- 		}

- 		else {

--			tl = mRect.getCenter().toPoint();

-+			tl = mRtform.map(mRect.getCenter()).toPoint();

- 			info += "center x: ";

- 		}

- 		info += QString::number(tl.x()) + ", y: ";

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