gentoo resync : 25.01.2019

10 files changed, 107 insertions, 451 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d20057d0eb61..474758874097 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index fba3b5ad2d21..bbc0d89e4ee8 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,3 +1,5 @@
 DIST ahoviewer-1.6.4.tar.gz 227225 BLAKE2B c00c89bf80865ddf60a478a8ad030aa136fbc2735598de2b237ea97bc247337d9a12a1423e402c2e95c77df4e70ad68242ed31d5f8d896c1ae835acd860e7a5f SHA512 5e00f086685b7fd6601758e5ae0e6e7d1d24b56c1bd7c81de0be5c3613404fcfc585b8bf035a72a51171a40c8a25c7ad084fc3a9f7ba038e121fb2b7874b4ebd
+DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
 EBUILD ahoviewer-1.6.4.ebuild 1579 BLAKE2B acabb4739b50bf53584157bead036e882154478e413f68d7c85014da3b17aefe7a043b3ec74c8644d113a54e1698cf2a5c2c5844bfefb1eb3837e803e83c4b80 SHA512 1dbe353fcad2f17f4612341e7180ca92a7343f9e566dcf97c410f6383dc444d9fc79a706463bd0e94860d2dee50d7b1c58fb78b29917650f43dd55216fd7d393
+EBUILD ahoviewer-1.6.5.ebuild 1750 BLAKE2B 6c4d365732f480ce61f4d99b0b7a505bdc8bf8698b6698d48c8f9656bb73a3ab5548f715a165fc594be1ca6d7c920bd6a357743fe04746e02e306656527c6246 SHA512 73d6616d4ff8413091a45d867e02e373f6b6a5112ae4d8ee1278c90ac45def3649655f92871a939d5f8854d6b8a962182cd3d177f9e29249eaf0d14730b6bf12
 MISC metadata.xml 532 BLAKE2B 03de1e92365b5abb2e277362cd7e4914e798f98eba5c4f7b1d0a3bd238f1bd35357045b41d96fc979f238c746acd31f35a4557e1251c8786e20420b016648fe4 SHA512 f5a47485137a9721ad98a363167214118f92391f83c75ea66b51c87dfddc5d7585162adc20b23147c6d42781be8c830204af5552fd365d317b7572e2f4fdd260
diff --git a/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild b/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild
new file mode 100644
index 000000000000..9bf5639b9434
--- /dev/null
+++ b/media-gfx/ahoviewer/ahoviewer-1.6.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK2 image viewer, manga reader, and booru browser"
+HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
+SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls +gstreamer libsecret +rar +ssl +zip"
+
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-libs/libconfig[cxx]
+	dev-libs/libxml2:2
+	dev-libs/libsigc++:2
+	net-misc/curl
+	gstreamer? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gstreamer:1.0
+	)
+	libsecret? ( app-crypt/libsecret )
+	rar? ( app-arch/unrar )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:=
+			net-misc/curl[curl_ssl_gnutls]
+		)
+		!gnutls? (
+			>=dev-libs/openssl-1.0.0:0=
+			net-misc/curl[curl_ssl_openssl]
+		)
+	)
+	zip? ( dev-libs/libzip )
+"
+RDEPEND="
+	${DEPEND}
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0[X]
+		media-libs/gst-plugins-good:1.0
+		|| (
+			media-plugins/gst-plugins-vpx
+			media-plugins/gst-plugins-libav
+		)
+	)
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable gstreamer gst)
+		$(use_enable libsecret)
+		$(use_enable rar)
+		$(use_enable zip)
+	)
+
+	if use ssl && use gnutls ; then
+		myconf+=( --disable-ssl --enable-gnutls )
+	elif use ssl && ! use gnutls ; then
+		myconf+=( --enable-ssl --disable-gnutls )
+	else
+		myconf+=( --disable-ssl --disable-gnutls )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 1d7cd798b16a..39649d65ef7c 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -2,5 +2,5 @@ AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528e
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
 EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424
-EBUILD gthumb-3.6.2.ebuild 2656 BLAKE2B 752a1054f960587ac1d9f9a149f6628adc033315310dfad48a7d45112b63fc636f2947986f3d5429348dccb68c9cae09a4590da41ed12a2e6dfb1e41797f7670 SHA512 d2fce54146d41acaf321fb450d2898d550b31388cac17dbfb9e1b58de487438a2cd4fa6e22c4a927b3eef68bae39e66aa67e9c671af575b26869c198793ac1ad
+EBUILD gthumb-3.6.2.ebuild 2655 BLAKE2B 78eb08b445b907ac1cdfec8eee7c2b0768938ec6172077231c6deac7a68a34920634942635110164d807299e46564c2ac389d883967d47cf77f7663c3c3dc541 SHA512 6cb326752e081bf0ff06fceac7bf3ff298ad99c07be11eb05f090ecd3435e6e55219a568d67a12fa12a600b91b58464610b285395faf4f40729c0cf29296e813
 MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index fa3de15b5f1b..26d6763e6c15 100644
--- a/media-gfx/gthumb/gthumb-3.6.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 7261bb4ca76a..cf52ac0331d3 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,8 +1,8 @@
 AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726
-AUX photoqt-1.7.1-exiv2-0.27.patch 19808 BLAKE2B d4f69f279144b864c23b7b2c960c8997efe7ca95b14267ae584261a9c1b4e047873c08b5d7c40804a9e7de2dd875cc5a56466603f92fbfd53d4dcaa82148e0f5 SHA512 fcd4b1c100f7b88d72fb4757b74b7b0c52b1ec732adfbe78878a5afaed7e8bc68ba22f89b5ef58d0871e3bd006032821bc3f4906307bdcb540913198ea888ec7
+AUX photoqt-1.7.1-exiv2-0.27.patch 3900 BLAKE2B 080ed5afb4c9a29779b6a875261a893315529dd87caacec31bca34b91a626bc196acb9ce3f7ed4427478855e31a4e24a14ef9d12834054c2c766e42596435fad SHA512 6a8b56ab47b4e2f21f951b8e78455b5ba7757c1a1d98ffd0f754a245662f87877a6a326409868091d0a163caa639ff7fc497151baee3b9fdae26b3cd291065f4
 DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c
 DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
 EBUILD photoqt-1.5.1-r1.ebuild 1133 BLAKE2B 3b5bf5a7baff887bc09653a2799c3372713252c9668f3d95650e2dfbdcba77dd82e637d9a9a3688039d305e8ec154e7d0a53351dbe8774f45f4f9feb204a6417 SHA512 991c545c015dc3fb89fc3311472e5fa46433015311ae7b8b26e704d910ca3fb8a405dc69241fe2074ed23339f7b185f070e31ccc0d238880e9b7cf43cd08960a
-EBUILD photoqt-1.7.1-r1.ebuild 1418 BLAKE2B 58b48536dfe64b3d7dbaee43882d792e0e4467d8add6e4081fac9a0603b1a63306bc6a2b881c8e0148f1f59db09e0e1bad2111f3884271864327f8e7551f9a46 SHA512 823e9217f525b75b85c42f2c39e44971bfe7d303da5d62bfe3cdb2fcb1a9d193e612b6e35223f2b856d5fb1edfd6a006ae0c4c0c5053fe9a085b8b71ac8d4594
+EBUILD photoqt-1.7.1-r1.ebuild 1473 BLAKE2B 2fc34b5c6dd9b41ddf954a86232c84246723a0e1b3c8aed4afd780602641cf20e61d8423457bfee4b60969f379e8c656d504dc4fd1396fd79f0305fecd8fe9df SHA512 793fa41b7f084c774284cdacf977830d02010bbf01b7b3323e1bafaa88e0e6812eba6dddae84d3dea41b5fdf16c1ddc75dda94ad4c73819be0abc571e8a7124f
 EBUILD photoqt-1.7.1.ebuild 1411 BLAKE2B 3e9d31303859cda721e5929022824df652be69b8f634807513f024d7ed9fc4e9a7523a26b3930f850971696cd837cc89c480e85512e168b8966489cd8aa8166f SHA512 0f8b88e6bcc2d1003d453153635f168bd923c3d3784547ef32af1a3a3f0203760e845e17d259468c4ceedd14485c36426ab59623ff540e40f8afbf533c8b3b9f
 MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
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
index d2b264e01750..48734ce70593 100644
--- 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
@@ -1,448 +1,9 @@
-From 66b2c16c0dec865db9c3d1720385625d22fbf021 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 19 Jan 2019 23:17:32 +0100
-Subject: [PATCH 1/4] Simplify CMakeLists.txt using FeatureSummary
-
----
- CMakeLists.txt | 192 +++++++++++++++++++------------------------------
- 1 file changed, 75 insertions(+), 117 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9af47a75..1ffe7ff3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ include(CMake/ListFilesResources.cmake)
- #### OPTIONS THAT CAN BE SET BY THE USER ####
- #############################################
- 
-+include(FeatureSummary)
-+
- option(RAW "Use libraw library" ON)
- option(EXIV2 "Use exiv2 library" ON)
- option(GM "Use graphicsmagick library" ON)
-@@ -65,35 +67,37 @@ option(TESTING "Enable some tests" OFF)
- #### FIND REQUIRED PACKAGES ####
- ################################
- 
-+find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
-+
- if(WIN32)
--    find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools WinExtras REQUIRED)
--elseif(NOT WIN32)
--    find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
--endif(WIN32)
-+    find_package(Qt5WinExtras REQUIRED)
-+endif()
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
-+
-+find_package(LibArchive REQUIRED)
-+
- if(GM)
--    find_package(Magick)
--endif(GM)
-+    find_package(Magick REQUIRED)
-+endif()
- if(EXIV2)
--    find_package(Exiv2)
--endif(EXIV2)
-+    find_package(Exiv2 REQUIRED)
-+endif()
- if(RAW)
--    find_package(LibRaw)
--endif(RAW)
-+    find_package(LibRaw REQUIRED)
-+endif()
- if(FREEIMAGE)
--    find_package(FreeImage)
--endif(FREEIMAGE)
--find_package(LibArchive)
-+    find_package(FreeImage REQUIRED)
-+endif()
- 
- find_package(ECM REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_MODULE_PATH}")
- if(POPPLER)
--    find_package(Poppler COMPONENTS Qt5)
--endif(POPPLER)
-+    find_package(Poppler COMPONENTS Qt5 REQUIRED)
-+endif()
- if(DEVIL)
--    find_package(DevIL)
--endif(DEVIL)
-+    find_package(DevIL REQUIRED)
-+endif()
- 
- ####################################
- #### TRANSLATIONS AND RESOURCES ####
-@@ -137,14 +141,14 @@ add_definitions(-DSIMPLECRYPTKEY="${CRYPTKEY}")
- #### Add the executeable ####
- #############################
- 
-+add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES})
-+target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core Qt5::Xml)
-+
- # on windows we add application icons
- if(WIN32)
--    add_executable(${PROJECT_NAME} WIN32 ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES} windowsicons.rc)
--    target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core Qt5::Xml Qt5::WinExtras)
--elseif(NOT WIN32)
--    add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES})
--    target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core Qt5::Xml)
--endif(WIN32)
-+    add_executable(${PROJECT_NAME} WIN32 windowsicons.rc)
-+    target_link_libraries(${PROJECT_NAME} Qt5::WinExtras)
-+endif()
- 
- 
- ########################
-@@ -171,7 +175,7 @@ if(TESTING)
-     # And inform the user
-     message("** TESTING ENABLED")
- 
--endif(TESTING)
-+endif()
- 
- 
- ##############################################
-@@ -186,112 +190,65 @@ composeDesktopFile()
- #### CUSTOM OPTIONS ####
- ########################
- 
--if(NOT ${LibArchive_FOUND})
--    message(FATAL_ERROR "** Unable to locate LibArchive... is it installed?")
--elseif(${LibArchive_FOUND})
--    include_directories(${LibArchive_INCLUDE_DIRS})
--    target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
--    message("** Found LibArchive " ${LibArchive_VERSION})
--endif(NOT ${LibArchive_FOUND})
-+include_directories(${LibArchive_INCLUDE_DIRS})
-+target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
- 
- if(POPPLER)
--    if(NOT ${Poppler_FOUND})
--        message(FATAL_ERROR "** Unable to locate Poppler... is it installed?")
--    elseif(${Poppler_FOUND})
--        include_directories(${Poppler_INCLUDE_DIRS})
--        target_link_libraries(${PROJECT_NAME} ${Poppler_LIBRARIES})
--        message("** Poppler enabled")
--        add_definitions(-DPOPPLER)
--    endif(NOT ${Poppler_FOUND})
--elseif(NOT POPPLER)
--    message("** Poppler DISABLED")
--endif(POPPLER)
-+    include_directories(${Poppler_INCLUDE_DIRS})
-+    target_link_libraries(${PROJECT_NAME} ${Poppler_LIBRARIES})
-+    add_definitions(-DPOPPLER)
-+endif()
- 
- if(DEVIL)
--    if(NOT ${IL_FOUND})
--        message(FATAL_ERROR "** Unable to locate DevIL... is it installed?")
--    elseif(${IL_FOUND})
--        include_directories(${IL_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} ${IL_LIBRARIES})
--        message("** DevIL enabled")
--        add_definitions(-DDEVIL)
--    endif(NOT ${IL_FOUND})
--elseif(NOT DEVIL)
--    message("** DevIL DISABLED")
--endif(DEVIL)
-+    include_directories(${IL_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} ${IL_LIBRARIES})
-+    add_definitions(-DDEVIL)
-+endif()
- 
- if(FREEIMAGE)
--    if(NOT ${FREEIMAGE_FOUND})
--        message(FATAL_ERROR "** Unable to locate FreeImage... is it installed?")
--    elseif(${FREEIMAGE_FOUND})
--        include_directories(${FREEIMAGE_INCLUDE_DIRS})
--        target_link_libraries(${PROJECT_NAME} ${FREEIMAGE_LIBRARIES})
--        message("** FreeImage enabled")
--        add_definitions(-DFREEIMAGE)
--    endif(NOT ${FREEIMAGE_FOUND})
--elseif(NOT FREEIMAGE)
--    message("** FreeImage DISABLED")
--endif(FREEIMAGE)
-+    include_directories(${FREEIMAGE_INCLUDE_DIRS})
-+    target_link_libraries(${PROJECT_NAME} ${FREEIMAGE_LIBRARIES})
-+    add_definitions(-DFREEIMAGE)
-+endif()
- 
- if(RAW)
--    if(NOT ${LIBRAW_FOUND})
--        message(FATAL_ERROR "** Unable to locate LibRaw... is it installed?")
--    elseif(${LIBRAW_FOUND})
--        include_directories(${LIBRAW_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} "raw")
--        message("** LibRaw enabled")
--        add_definitions(-DRAW)
--    endif(NOT ${LIBRAW_FOUND})
--elseif(NOT RAW)
--    message("** LibRaw DISABLED")
--endif(RAW)
-+    include_directories(${LIBRAW_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} "raw")
-+    add_definitions(-DRAW)
-+endif()
- 
- if(EXIV2)
--    if(NOT ${EXIV2_FOUND})
--        message(FATAL_ERROR "** Unable to locate Exiv2... is it installed?")
--    elseif(${EXIV2_FOUND})
--        include_directories(${EXIV2_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} "exiv2")
-+    include_directories(${EXIV2_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} "exiv2")
-+    if(TESTING)
-+        target_link_libraries(${PROJECT_TEST_NAME} "exiv2")
-+    endif()
-+    if(WIN32)
-+        target_link_libraries(${PROJECT_NAME} "expat")
-+        target_link_libraries(${PROJECT_NAME} "ws2_32")
-+        target_link_libraries(${PROJECT_NAME} "wsock32")
-+        target_link_libraries(${PROJECT_NAME} "z")
-+        target_link_libraries(${PROJECT_NAME} "intl")
-+        target_link_libraries(${PROJECT_NAME} "iconv")
-+        target_link_libraries(${PROJECT_NAME} "psapi")
-         if(TESTING)
--            target_link_libraries(${PROJECT_TEST_NAME} "exiv2")
--        endif(TESTING)
--        if(WIN32)
--            target_link_libraries(${PROJECT_NAME} "expat")
--            target_link_libraries(${PROJECT_NAME} "ws2_32")
--            target_link_libraries(${PROJECT_NAME} "wsock32")
--            target_link_libraries(${PROJECT_NAME} "z")
--            target_link_libraries(${PROJECT_NAME} "intl")
--            target_link_libraries(${PROJECT_NAME} "iconv")
--            target_link_libraries(${PROJECT_NAME} "psapi")
--            if(TESTING)
--                target_link_libraries(${PROJECT_TEST_NAME} "expat")
--                target_link_libraries(${PROJECT_TEST_NAME} "ws2_32")
--                target_link_libraries(${PROJECT_TEST_NAME} "wsock32")
--                target_link_libraries(${PROJECT_TEST_NAME} "z")
--                target_link_libraries(${PROJECT_TEST_NAME} "intl")
--                target_link_libraries(${PROJECT_TEST_NAME} "iconv")
--                target_link_libraries(${PROJECT_TEST_NAME} "psapi")
--            endif(TESTING)
--        endif(WIN32)
--        add_definitions(-DEXIV2)
--        message("** Exiv2 enabled")
--    endif(NOT ${EXIV2_FOUND})
--elseif(NOT EXIV2)
--        message("** Exiv2 DISABLED")
--endif(EXIV2)
-+            target_link_libraries(${PROJECT_TEST_NAME} "expat")
-+            target_link_libraries(${PROJECT_TEST_NAME} "ws2_32")
-+            target_link_libraries(${PROJECT_TEST_NAME} "wsock32")
-+            target_link_libraries(${PROJECT_TEST_NAME} "z")
-+            target_link_libraries(${PROJECT_TEST_NAME} "intl")
-+            target_link_libraries(${PROJECT_TEST_NAME} "iconv")
-+            target_link_libraries(${PROJECT_TEST_NAME} "psapi")
-+        endif()
-+    endif()
-+    add_definitions(-DEXIV2)
-+endif()
- 
- if(GM)
--    if(NOT ${MAGICK++_FOUND})
--        message(FATAL_ERROR "** Unable to locate GraphicsMagick... is it installed?")
--    elseif(${MAGICK++_FOUND})
--        include_directories(${MAGICK++_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} "GraphicsMagick++")
--        add_definitions(-DGM)
--        message("** Graphicsmagick enabled")
--    endif(NOT ${MAGICK++_FOUND})
--elseif(NOT GM)
--    message("** Graphicsmagick DISABLED")
--endif(GM)
-+    include_directories(${MAGICK++_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} "GraphicsMagick++")
-+    add_definitions(-DGM)
-+endif()
- 
- 
- #######################
-@@ -339,6 +296,7 @@ if(UNIX)
-     )
- endif(UNIX)
- 
-+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
- 
- ##########################
--- 
-2.20.1
-
-
-From b58268b06eb62de70da3ac751870114b07cd79e3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 20 Jan 2019 17:49:09 +0100
-Subject: [PATCH 2/4] Switch to FindLibExiv2 from ECM 5.54.0
-
-Fixes detection of exiv2.
----
- CMake/FindLibExiv2.cmake | 115 +++++++++++++++++++++++++++++++++++++++
- CMakeLists.txt           |   7 +--
- create mode 100644 CMake/FindLibExiv2.cmake
-
-diff --git a/CMake/FindLibExiv2.cmake b/CMake/FindLibExiv2.cmake
-new file mode 100644
-index 00000000..935cee2c
---- /dev/null
-+++ b/CMake/FindLibExiv2.cmake
-@@ -0,0 +1,115 @@
-+#.rst:
-+# FindLibExiv2
-+# ------------
-+#
-+# Try to find the Exiv2 library.
-+#
-+# This will define the following variables:
-+#
-+# ``LibExiv2_FOUND``
-+#     System has LibExiv2.
-+#
-+# ``LibExiv2_VERSION``
-+#     The version of LibExiv2.
-+#
-+# ``LibExiv2_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if
-+#     the target is not used for linking.
-+#
-+# ``LibExiv2_LIBRARIES``
-+#     The LibExiv2 library.
-+#     This can be passed to target_link_libraries() instead of
-+#     the ``LibExiv2::LibExiv2`` target
-+#
-+# If ``LibExiv2_FOUND`` is TRUE, the following imported target
-+# will be available:
-+#
-+# ``LibExiv2::LibExiv2``
-+#     The Exiv2 library
-+#
-+# Since 5.53.0.
-+#
-+#=============================================================================
-+# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
-+# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
-+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_EXIV2 QUIET exiv2)
-+
-+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
-+    HINTS ${PC_EXIV2_INCLUDEDIR}
-+)
-+
-+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
-+    HINTS ${PC_EXIV2_LIBRARY_DIRS}
-+)
-+
-+set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
-+
-+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
-+    # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
-+    foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
-+        if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
-+            file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
-+            string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
-+            if(EXIV2_MAJOR_VERSION_MATCH)
-+                string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"  EXIV2_PATCH_VERSION  ${EXIV2_PATCH_VERSION_MATCH})
-+            endif()
-+        endif()
-+    endforeach()
-+
-+    set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibExiv2
-+    FOUND_VAR LibExiv2_FOUND
-+    REQUIRED_VARS  LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
-+    VERSION_VAR  LibExiv2_VERSION
-+)
-+
-+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
-+
-+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
-+    add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
-+    set_target_properties(LibExiv2::LibExiv2 PROPERTIES
-+        IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+include(FeatureSummary)
-+set_package_properties(LibExiv2 PROPERTIES
-+    URL "http://www.exiv2.org"
-+    DESCRIPTION "Image metadata support"
-+)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ffe7ff3..b96b21db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ if(GM)
-     find_package(Magick REQUIRED)
- endif()
- if(EXIV2)
--    find_package(Exiv2 REQUIRED)
-+    find_package(LibExiv2 REQUIRED)
- endif()
- if(RAW)
-     find_package(LibRaw REQUIRED)
-@@ -218,10 +218,9 @@ if(RAW)
- endif()
- 
- if(EXIV2)
--    include_directories(${EXIV2_INCLUDE_DIR})
--    target_link_libraries(${PROJECT_NAME} "exiv2")
-+    target_link_libraries(${PROJECT_NAME} LibExiv2::LibExiv2)
-     if(TESTING)
--        target_link_libraries(${PROJECT_TEST_NAME} "exiv2")
-+        target_link_libraries(${PROJECT_TEST_NAME} LibExiv2::LibExiv2)
-     endif()
-     if(WIN32)
-         target_link_libraries(${PROJECT_NAME} "expat")
--- 
-2.20.1
-
-
-From f2a675ea5496febae1daee229ad132086dec24bc Mon Sep 17 00:00:00 2001
+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 3/4] Fix build with exiv2-0.27
+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 ++--
@@ -538,4 +99,4 @@ index 1908ba0a..59686cc1 100644
  
  class ManagePeopleTags : public QObject {
 -- 
-2.20.1
+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
index cd6204862f01..101227968331 100644
--- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
@@ -41,7 +41,10 @@ DEPEND="${RDEPEND}
 	kde-frameworks/extra-cmake-modules:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-exiv2-0.27.patch" # bugs 675714, 676194
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 2d490194bbb1..f405c4bfd53a 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,5 +1,5 @@
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2946 BLAKE2B 8acbe36777e489a24c32b0dc888a9ff4389124f4b4b70491776ed0a67277a936ced52ae7ad0ec8387590e84d5418c1760a082658f1e4f00f34d10c1a1302af09 SHA512 83202a1804a380485ba77d5a1f0a755c215b1cec408bc81e83928a6b2984ede40f534abd100dc336371463df0e475464e265dabf06dffd344fbcc284b382a68d
+EBUILD transfig-3.2.5e.ebuild 2942 BLAKE2B 777fe80e5c4c44f77f8370fa24de1806e9116b6a175a508f0ac7abdd78de441c3298fdd0dc66d7824b2960288271767dfdc837a548d5ac32eec662c2c0bb8058 SHA512 22039fab37077d55f0a95219bd33b5bc3114f4dc959ead8e4e311d26e6d12b4f86136e58cdedcb70e23a27bf59885f9ff124aa2e90ea563b50f38f2039660aee
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index bb5ef251c063..ebfe9fd49a5a 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm