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

15 files changed, 102 insertions, 246 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9937a2e472be..bc37cefd9bd7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index fae927a8135e..1dd485cf2dc1 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 DIST eog-42.3.tar.xz 4460968 BLAKE2B ce589ec50210870bf11d8737c0ca18dd7da308de59654639623f15984f9d62f36cb1b87854fa4f67b7885cb5802e576281fc91c6e2c86e9d285d9a952193a8cc SHA512 bc82830897c55769cd2cb0c0d428b9456465c0f4e793c597ea74b3c84d5c052f051b772413cb32754153714239a9815a09fe93daf928f13e16f8d997b1e58b45
 DIST eog-43.0.tar.xz 4461552 BLAKE2B 3afc0da472e9b57d6cde097c0aad08d2880ba596eb94cf8091fa99b802a2c11ee87e04b617f65e31bf11bf8885c92023dbb422ad58c2a768995eb5676b993d30 SHA512 ee9de8469f408a247577e71854cb45e0a8058f8ffd3cc42bbead67994862179d24bf9fbf7d8e18ba20ac13b3a11479053b87abe7da07358f5816d0f94b1f4f8d
+DIST eog-43.1.tar.xz 4649476 BLAKE2B 0c7225f8f7fd60ff66469c43a0d11c15fa26956cf22706ee5d2a8c06597a8b4ef51a7d3754cde968bf2f98301d5f59326db05213217c7012fe193c57f0ce04ef SHA512 10fd4f6ad07d5a0c13931cb47c3a16d208eb6aa107f288e32fa0f1fd711d17893be9d9980fa64fa530047da131ef4e10d729421ac46d3549a9ab731be45479bc
 EBUILD eog-42.3.ebuild 1713 BLAKE2B ab54d270a0702792c60a7e3d069a0a842b99f2615ed840c8c40c4648f20bf53b35e490e9336d8070e1d7628240505e30bb063182cf0c86f5fe0905eb82482aae SHA512 21334df0eb38c1631b98afbf52e701281345177dc38020a05f45470a15550e6702755405508128e345c494a469c8ebdf81d368ca93ff522dae0a97270626f23c
 EBUILD eog-43.0.ebuild 1747 BLAKE2B 0c3270091bcb648893290dd7ed772458c1f0a54e5448943dad43162045d284fb43a3a3cc3563bba898c883c97cd6c98d121beb99c4d8f26fa002923420a946c3 SHA512 80f94f87e9814cde7850d0c30c6c7807c4514baa0f762f29d9433076126e33e99f40afbe6603f76ab9c1999889bb790359a2ed56ac53ecb57b07cdcce7d09644
+EBUILD eog-43.1.ebuild 1745 BLAKE2B d5eeed8b34a65cc88a4c57212ee7bdcc0b10a79fedd5273be9d217fdb2e2d5d7156185eb0ca4a605307cd75c0541c28e6e3271dbbf88c2a63a9d950e748abd0a SHA512 157de1c1e0eb22c75e0b110196bdffcba1a670bf74d14f3579690c1411452765eece200b21dbff4015edc1199016c00727fb3ff75c55e4a4e2bf1317e9f0ee5b
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-43.1.ebuild b/media-gfx/eog/eog-43.1.ebuild
new file mode 100644
index 000000000000..e05a0fa8da4e
--- /dev/null
+++ b/media-gfx/eog/eog-43.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="
+	exif? ( jpeg )
+	gtk-doc? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index fced338d44b5..8f8bdd64a835 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.5-musl-tests.patch 2390 BLAKE2B b6e69abee39168f0ecf1cfe6220d017802abae12a22ffaefe96c9a4c3a47748810bbc27bfc65d7b2a1c0b8499b5756123e7d475ef872c87337851d93241012fb SHA512 ba1bffe8a477ec90a8cc83eebaecc9608f5a953bba433cff0d62e807457969f37bdc97c205ffcf8d0fe4c948f2b67172f33adca5edacd68e35ba10366bbc4c85
 DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
-EBUILD exiv2-0.27.5-r1.ebuild 2835 BLAKE2B 66c42243507c17dc62ade055e31bdf9ce9f3634b731ff70ecbf630415f3834cc21e68332e930bb667ad8bd1c296dd7c8da2c564554683395271eb3837714c13e SHA512 3916c243271d592e26370c0ac56c07fa163102697bdac5b26b653d0e2fa764abca1fbc372f99b20cdb74f80f511007fdb509365810c284c709c426b2c0158f70
+EBUILD exiv2-0.27.5-r1.ebuild 2836 BLAKE2B d8309f07f5b7b7da67dc40b66f5774520cfa2df4ed77d488f4fc49daabe50ee2c255eff1610696dc6032503817f4159b1614ce4255dd62f3d041f0f87feda039 SHA512 cff29ff6c76853098da4a7aeff9ca105615702b386608a3e86ca1fd4a1b8990ffb267f3a9745aa40ca039246cac6bce7c719b093f5793cac865cd2675d0b9cdf
 MISC metadata.xml 686 BLAKE2B 2d1079660cf4268216f8835d1ae6655ebafc99d5402872bb05dac6342034a28a07dcff587fc616a5eedc8c538ea3e43e013711d39c2541295e89629e39a244ee SHA512 40f9225a42386fa6f03bf9436d675bb01bd6eb859974bfed22d1316536ceaf40752fabffdab20b439e87c57f65d193d8d249e5aa022584de3f869f4162660b4e
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
index 0b3c07acc565..76dad821c808 100644
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
 	inherit git-r3
 else
@@ -12,7 +12,7 @@ else
 	S="${WORKDIR}/${P}-Source"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
@@ -24,16 +24,6 @@ SLOT="0/27.5"
 IUSE="+bmff doc examples nls +png test webready +xmp"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
 RDEPEND="
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
@@ -45,13 +35,22 @@ RDEPEND="
 	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 "
 DEPEND="${DEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.27.5-musl-tests.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-0.27.5-musl-tests.patch )
 
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 0b5639ca166e..6aa6e9c8e558 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -2,6 +2,5 @@ AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827
 AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd
 AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-EBUILD kgraphviewer-2.4.3-r1.ebuild 1134 BLAKE2B 98138f2be42b6e006d96576dac964717aafbcae7eaf222cde033791b6cfac6131ead11ecc81d68675e154448e9064b1b2fa19d714cabccb41daa27ca92544ccf SHA512 9da0a9b995323a44bc274838b33a16eaafd4584a4f54249ccaed1b638c762599dfb915a50a3207a5abf970a49b26b5d6af3cb40978f4266f488482bcdabfbabc
-EBUILD kgraphviewer-2.4.3-r2.ebuild 1098 BLAKE2B 90ba69ef9a3118e4ee61bd53dd1a8585dabbe1094c99d180e553505786b633b8f891118c8df600a279cd4622d4913001ca04e3158f16ada49cf1f6331a35a85d SHA512 ea112d1219f7f577bf1f2992b2a8254da11945c3a6f8caf78fc06d719abb6fedefc849058edb5b74b90762eeb97d3da35016614b98ee559714b48f4f4c436e7f
+EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
deleted file mode 100644
index 036079737c78..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://apps.kde.org/en/kgraphviewer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/kgraphviewer:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-set-startupwmclass.patch" )
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
index 41ddd6b6b4c0..4716b8e8e2e9 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kgraphviewer"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
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="
diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest
index 406e3870ae51..bfda5de83e44 100644
--- a/media-gfx/pngtools/Manifest
+++ b/media-gfx/pngtools/Manifest
@@ -5,5 +5,5 @@ AUX pngtools-0.4_p20220314-docbook-dtd.patch 2482 BLAKE2B b6f48ff4fa4d3f20f3d720
 DIST pngtools-0.4_p20220314.tar.gz 651338 BLAKE2B 9df108da4a52c6292c52a08ddc59163d386bc5de4aaaac96a166ba1e5dc38029b4261e80b8a186997d199ecd11b43fe9e46a41b6b25c65595b7baa4eab43376e SHA512 d1812051d4d1e6306805c96f686798e5af0a304ec045dbf02d77ab3f6432bc0f4e0c96c800bbb159d6ca9e83e8ef479c6d4ba742072fa897ec55808061001676
 DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1
 EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788
-EBUILD pngtools-0.4_p20220314.ebuild 804 BLAKE2B 81c3350e0bf7fd95bc6f0ef0ca0a63aa9ae730961e2032c33a05c548322db0290b74ec74f4beecb0e7663e2b6b51b7a049be8f1c3b8e1210654a7d4488163265 SHA512 071794966d5e816ebea4544efd5c95fc55d807c2216d6773d2c40ca146dfd4cc038562de9557f944536785b5b634aa425b78a5b17c4549514d558dd6487a44af
+EBUILD pngtools-0.4_p20220314.ebuild 803 BLAKE2B b5009769d08578c92a06cc3a8429123ed1bd18d7256dbafad46774d6fcb22c378508a9efe717cd2815d11aa4cbe4885fb930127bf0aab78b7660e407e6af11ca SHA512 c5f9849ac346e938bcc0ea07d00f3206e58e2fbfef2dce0050654429698a7864317fb37623ed5996c90789265d4d1a228b2a1601e00d97b2c599f36a0931aac3
 MISC metadata.xml 303 BLAKE2B f87e0bb36559ffa7e785a019927f1f11d4d5de135c5b82331ee1a4acf21ceb94f8fd41486235be173e5e966b270b270772153ea74ec5a71036cec2f56b91ee8d SHA512 5ece8e5c353817fa3e6825116f62f610285cbb7ad4cc3b6b06d6d4136fd6969dc0662b92363bd2441d544038e438be721b00af4780420cb64547c01729db2b07
diff --git a/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild b/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
index 68eea465975b..8889ed8a1a47 100644
--- a/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
+++ b/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/libpng:="
 DEPEND="${RDEPEND}"