gentoo auto-resync : 25:10:2022 - 21:54:27

5 files changed, 2 insertions, 180 deletions

diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 70d2befd956d..ce2d324c35aa 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,7 +1,3 @@
-AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726
-AUX photoqt-1.7.1-exiv2-0.27.patch 3900 BLAKE2B 080ed5afb4c9a29779b6a875261a893315529dd87caacec31bca34b91a626bc196acb9ce3f7ed4427478855e31a4e24a14ef9d12834054c2c766e42596435fad SHA512 6a8b56ab47b4e2f21f951b8e78455b5ba7757c1a1d98ffd0f754a245662f87877a6a326409868091d0a163caa639ff7fc497151baee3b9fdae26b3cd291065f4
-DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
 DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
-EBUILD photoqt-1.7.1-r1.ebuild 1265 BLAKE2B 6f6d7be992fc9fca2f99ca9aa7c3026c7c02595b55318be69c838182310e0d68a51c335ff08a6d948a1810fb7a7e8f9d27c695ff67da5e41fb7689e143037cf2 SHA512 c0ea40aeafede7202f4bff59a00071117d1ca4a79d8e805ef08c2f5d143cb1df8f4e9c433cfb3e0e5a8a599297027db27d0e197e54a20cf57a8bd6c954cefc07
-EBUILD photoqt-2.9.1.ebuild 1746 BLAKE2B 9f6a72b5ce7019e5e299f917f3e96d72597d43399a34b6854736922e45b348bb51ed7d053fccf5422468846e53da01a8539de3765079ca7571ee5cf178275933 SHA512 7102d6e4cd403f5974e760480f396445bcdc3f3c3b13291f98118c6e48db72e5d7fb47430227ffdb30f53406c7017a1dd72fce23d6ae5441b7ed40d90bd236fe
+EBUILD photoqt-2.9.1.ebuild 1744 BLAKE2B ed42404d0106e24b1f53ea5e6b233a4336b7259098b038be8b6f0953997ff12e6ca5d0a223c9cbc718c429f19809777386026d92aabe638c9f167ff398df62f2 SHA512 f53168021cf7cff26054d0568a9b2f25fde0136f0244633d9f045ff96b989bfbba07f887ddfbb730675de422fde032b7d58b1d6b97f70751b3f7efeaab76141c
 MISC metadata.xml 544 BLAKE2B 050620e07354fb5d5808b90f3a412a81adf17dfa99b5a0afb9f75cc76051da1b0c693a34cf7e325f465871107f8dbbbe59c6f5adb77de6f9625cbeb6acd8fd75 SHA512 56acfa4ec0047826ee31e1b7216c5860790850f3f84f0ccd454baa0d2cb82db06a08f8a5c9458cc562d0b14082815ee1623e5171f579dcecaa45a759ac47cb84
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch b/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
deleted file mode 100644
index 5dfacf435a0e..000000000000
--- a/media-gfx/photoqt/files/photoqt-1.7.1-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMake/FindExiv2.cmake	2018-06-03 05:21:04.143148857 +0200
-+++ b/CMake/FindExiv2.cmake	2018-12-29 22:35:40.770393025 +0100
-@@ -13,8 +13,8 @@
-     "${EXIV2_LOCATION}"
-     "${EXIV2_LOCATION}/include"
-     /usr/include
--    /usr/include/Exiv2
--    /opt/local/include/Exiv2
-+    /usr/include/exiv2
-+    /opt/local/include/exiv2
- )
- 
- IF(EXIV2_INCLUDE_DIR)
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
deleted file mode 100644
index 48734ce70593..000000000000
--- a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c6fd41478e818f3a651d40f96cab3d790e1c09a4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 20 Jan 2019 18:25:45 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
-Fixes https://gitlab.com/luspi/photoqt/issues/64
----
- cplusplus/scripts/getanddostuff/manipulation.h | 3 +--
- cplusplus/scripts/getmetadata.cpp              | 4 ++--
- cplusplus/scripts/getmetadata.h                | 3 +--
- cplusplus/scripts/managepeopletags.cpp         | 4 ++--
- cplusplus/scripts/managepeopletags.h           | 3 +--
- 5 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/cplusplus/scripts/getanddostuff/manipulation.h b/cplusplus/scripts/getanddostuff/manipulation.h
-index b3fa9b42..465d9372 100644
---- a/cplusplus/scripts/getanddostuff/manipulation.h
-+++ b/cplusplus/scripts/getanddostuff/manipulation.h
-@@ -38,8 +38,7 @@
- #include "../../logger.h"
- 
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
- 
- class GetAndDoStuffManipulation : public QObject {
-diff --git a/cplusplus/scripts/getmetadata.cpp b/cplusplus/scripts/getmetadata.cpp
-index deb89a25..df92de6b 100644
---- a/cplusplus/scripts/getmetadata.cpp
-+++ b/cplusplus/scripts/getmetadata.cpp
-@@ -203,7 +203,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
-                 }
- 
-             } catch(Exiv2::Error &e) {
--                LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+                LOG << CURDATE << "GetMetaData::getExiv2() Unable to read Exif metadata: " << e.what() << NL;
-             }
- 
-             // If GPS is set, compose into one string
-@@ -246,7 +246,7 @@ QVariantMap GetMetaData::getExiv2(QString path) {
-                 }
- 
-             } catch(Exiv2::Error &e) {
--                LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+                LOG << CURDATE << "GetMetaData::getExiv2() ERROR reading IPTC metadata: " << e.what() << NL;
-             }
- 
-             QString city = returnMap["Iptc.Application2.City"].toString();
-diff --git a/cplusplus/scripts/getmetadata.h b/cplusplus/scripts/getmetadata.h
-index e427cbc1..c5b99140 100644
---- a/cplusplus/scripts/getmetadata.h
-+++ b/cplusplus/scripts/getmetadata.h
-@@ -34,8 +34,7 @@
- #include "../logger.h"
- 
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
- 
- class GetMetaData : public QObject {
-diff --git a/cplusplus/scripts/managepeopletags.cpp b/cplusplus/scripts/managepeopletags.cpp
-index 9b8c7503..96baeb9e 100644
---- a/cplusplus/scripts/managepeopletags.cpp
-+++ b/cplusplus/scripts/managepeopletags.cpp
-@@ -98,7 +98,7 @@ QVariantList ManagePeopleTags::getFaceTags(QString path) {
- 
-     } catch(Exiv2::Error& e) {
-         LOG << CURDATE << "GetPeopleTag::getPeopleLocations() 2 - ERROR reading exiv data (caught exception): "
--            << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+            << e.what() << NL;
-         return ret;
-     }
- 
-@@ -201,7 +201,7 @@ void ManagePeopleTags::setFaceTags(QString filename, QVariantList tags) {
- 
-     } catch(Exiv2::Error& e) {
-         LOG << CURDATE << "GetPeopleTag::setFaceTags() - ERROR reading exiv data (caught exception): "
--            << e << " (" << Exiv2::errMsg(e.code()) << ")" << NL;
-+            << e.what() << NL;
-         return;
-     }
- 
-diff --git a/cplusplus/scripts/managepeopletags.h b/cplusplus/scripts/managepeopletags.h
-index 1908ba0a..59686cc1 100644
---- a/cplusplus/scripts/managepeopletags.h
-+++ b/cplusplus/scripts/managepeopletags.h
-@@ -29,8 +29,7 @@
- #include "../logger.h"
- 
- #ifdef EXIV2
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #endif
- 
- class ManagePeopleTags : public QObject {
--- 
-2.18.1
diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
deleted file mode 100644
index 53e9fae1e605..000000000000
--- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_KDEINSTALLDIRS=false
-inherit ecm
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="devil exif freeimage graphicsmagick pdf raw"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtimageformats:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	app-arch/libarchive:=
-	app-arch/unrar
-	devil? ( media-libs/devil )
-	exif? ( media-gfx/exiv2:= )
-	freeimage? ( media-libs/freeimage )
-	graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= )
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( media-libs/libraw:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-exiv2-0.27.patch" # bugs 675714, 676194
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEVIL=$(usex devil)
-		-DEXIV2=$(usex exif)
-		-DFREEIMAGE=$(usex freeimage)
-		-DGM=$(usex graphicsmagick)
-		-DPOPPLER=$(usex pdf)
-		-DRAW=$(usex raw)
-	)
-	ecm_src_configure
-}
diff --git a/media-gfx/photoqt/photoqt-2.9.1.ebuild b/media-gfx/photoqt/photoqt-2.9.1.ebuild
index af9a0fe11515..f73af804f930 100644
--- a/media-gfx/photoqt/photoqt-2.9.1.ebuild
+++ b/media-gfx/photoqt/photoqt-2.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
 
 COMMON_DEPEND="