gentoo resync : 30.06.2019

7 files changed, 355 insertions, 1 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 50996d572a13..23b7ffc9f0bf 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,8 +1,13 @@
 AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b2688e7b2fc575e6bc2cc18f79c23f5492f3486146cab639c90afd0ebedd53f9807d6db0ebfc77330df28425b SHA512 4e0ad52ecfc7c23ff59b97f165ec35d721a4395357983eaa7e7913387594cf6bae354e48e9b95652fb192b2d6044ecc931228cb2e6d225605adce5165fd81687
 AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
+AUX exiv2-0.27.1-private-libs.patch 2588 BLAKE2B 1e1ea40271eb79a21d385172783ee8261e46c514884afc38ec3554ae1df35ab5eb29a171fe5cc80a83a2452ed8297cc99e26b99a57959ed9efe8b6e3857a1844 SHA512 ad09ad26dc28c12e711226dee774105ab72e23d4a27e6437e96b1da89e7741ea4ab89a48f75421587b329ce04ab0cc7d7d9d87304a1e46f40b886bc046778460
+AUX exiv2-0.27.1-restore-0.25-behaviour.patch 5405 BLAKE2B 00f857ec133a9a1276a98912c2ed10b651ba124666bf775192e4cde2fcc956261c4c8472f9d90baf6559716b18213207dc3e4e782cce3498b95abc5c74db20e8 SHA512 6351198645a5d6e3abe31bc8da85609cec16549d125e6b649c36b2632c4321bc6236f694158e5bdb85c08681a54f5d99eb86a51182cf4da7c83583e3b0ba434e
+AUX exiv2-0.27.1-system-cmakemoduledir1.patch 1649 BLAKE2B 1700401c777ce591329a26b410228373638cc76221eb965123a502862cdf8161973692c0d35365e341dd8f7b6cafc710f6c0cc37996e65f64fd06f9a0d2e4e4e SHA512 8361c1f9ac569b7fdceaa292c6fc218169a70c92878afcde60a78a71864e663f7041b5658243d6b2c724ed07e42dd40741537244b20f4f79a0868aae1781dd9b
+AUX exiv2-0.27.1-system-cmakemoduledir2.patch 1084 BLAKE2B 94cda846a2bb13d185e8b8357727030d4bee694d4d0662b08569dee6e9544fafdcedd7ba1c4dea0d46684e7188ac1d95770a22def1a9439663024884ae6c034c SHA512 033b72113ddefcadd86412367c61244406e32a38d8aa93f98cdac6b10e7bfb05a551d5360a76ebcec310ff0e09a342c86d705f2310ebd008949dacf9fa4f9f3e
+AUX exiv2-0.27.1-system-libssh-config.patch 2923 BLAKE2B c4a57cb7c22cc477c7919606380743b19521161db8c85d046c68f8f4f8f62f79b4a6b253fe524f5bec09bfd53994efe5c7984d88ab8d750ba017209fad72fed9 SHA512 7b79f69d198017201a3034c5c1729dc61a3a8f569904576fd3b3d8527abf4147985c33b14b8cf4ae7a34c5a3513cf5165cf7d21b628084554bef9039d8e0edb1
 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
 DIST exiv2-0.27.1-Source.tar.gz 27210365 BLAKE2B 1ce9a0b26c0908b876e35b5488fc5680789eb864376b379d9bd57977d456a5c6dc5983c4a8ef3e3558ffc061c0b7cda1d1f89a1629af920de1747fd4afbdbb39 SHA512 038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529
 EBUILD exiv2-0.27.0-r2.ebuild 2540 BLAKE2B e7ff66cc180f3193b3544a80d22d3777f52c85c85d806a11aedbcedc91e9f9aa9bedada3b29da9a144fe82d48b5299c7c3c9e05af73b8b79cb648e2c19a58b9c SHA512 8446f72fe52c578742200d1ec9487b6d9981f32dce5f96ff17c0ca37b517e8f6d856b23c98d8c7f79816c697d57c5ee67d4a4f3ea087198573840f2d3a55fbc9
-EBUILD exiv2-0.27.1.ebuild 2377 BLAKE2B 12e939213b09d4ce072f9dbc299c00d8e1123c0ef1042d66804bf288f60f0bca0ef789a7e6383ad187ab180fd217f034d49fdbcd79133cd12afd7fa1de8b773c SHA512 f0c9b3f4858de436900db4850f71eaf1bdee5d121bc54db5211b48cdb0786b218d0665bb08d2d4d0250e5c2b663b2f837848d63179ac474adc493933be13d644
+EBUILD exiv2-0.27.1-r1.ebuild 2651 BLAKE2B 4160e44705636e43a586f4c21c9903086078f8177485c37fd9701ed021c5cbacf6401f1b31ea59b9b0b810eac5a242ab0976427e28c2a025f3cbdef2b0247695 SHA512 fb6b22d9e6df2d759bb3da65e1dc9c0b7dea33a14a74608f033071cbb5a01639643f4437c4c312a974093a62df119622cdf53b3f6a225d46f2b464e1e28c40b1
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.1.ebuild b/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild
index cec021ce43bc..8ffcb2c29e98 100644
--- a/media-gfx/exiv2/exiv2-0.27.1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild
@@ -47,6 +47,13 @@ DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
 S="${S}-Source"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-system-cmakemoduledir{1,2}.patch
+	"${FILESDIR}"/${P}-private-libs.patch
+	"${FILESDIR}"/${P}-restore-0.25-behaviour.patch
+	"${FILESDIR}"/${P}-system-libssh-config.patch
+)
+
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
@@ -58,6 +65,8 @@ src_prepare() {
 	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
 
 	cmake-utils_src_prepare
+
+	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
 }
 
 multilib_src_configure() {
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch b/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch
new file mode 100644
index 000000000000..c99a19098ae5
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch
@@ -0,0 +1,59 @@
+From f05d100579effd7459fd0715b26239d4cd2c9bcc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Sat, 4 May 2019 16:14:15 +0200
+Subject: [PATCH] CURL lib and include directories private for exiv2lib
+
+(cherry picked from commit 5d64a0b11c5a45dd9d58c56e946301f3f98942a7)
+---
+ samples/CMakeLists.txt | 14 ++++++++++++++
+ src/CMakeLists.txt     | 10 +++++-----
+ 2 files changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
+index a82403e3b..c3f4722df 100644
+--- a/samples/CMakeLists.txt
++++ b/samples/CMakeLists.txt
+@@ -96,6 +96,20 @@ endif()
+ add_executable(conntest conntest.cpp)
+ list(APPEND APPLICATIONS conntest)
+ 
++if (EXIV2_ENABLE_WEBREADY)
++    if( EXIV2_ENABLE_CURL )
++        target_include_directories(conntest SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
++        target_link_libraries(conntest PRIVATE ${CURL_LIBRARIES})
++        if (USING_CONAN)
++            target_compile_definitions(conntest PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
++            target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
++            if (NOT APPLE)
++                target_link_libraries(conntest PRIVATE CONAN_PKG::OpenSSL)
++            endif()
++        endif()
++    endif()
++endif()
++
+ # ******************************************************************************
+ # remotetest application
+ add_executable(remotetest remotetest.cpp)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 976327775..d0e989d26 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -179,13 +179,13 @@ if (EXIV2_ENABLE_WEBREADY)
+     endif()
+ 
+     if( EXIV2_ENABLE_CURL )
+-        target_include_directories(exiv2lib SYSTEM PUBLIC ${CURL_INCLUDE_DIR} )
+-        target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES})
++        target_include_directories(exiv2lib SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
++        target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES})
+         if (USING_CONAN)
+-            target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
+-            target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
++            target_compile_definitions(exiv2lib PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
++            target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
+             if (NOT APPLE)
+-                target_link_libraries(exiv2lib PUBLIC CONAN_PKG::OpenSSL)
++                target_link_libraries(exiv2lib PRIVATE CONAN_PKG::OpenSSL)
+             endif()
+         endif()
+     endif()
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch b/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch
new file mode 100644
index 000000000000..2aa4d3a826f3
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch
@@ -0,0 +1,119 @@
+From db870755b928cca7411a092ce12292afe9c4fa36 Mon Sep 17 00:00:00 2001
+From: clanmills <robin@clanmills.com>
+Date: Thu, 9 May 2019 11:26:29 +0100
+Subject: [PATCH] fix #818.  Restore 0.25 behaviour of `$ exiv2 -g image ...`
+ to apply grep to keys.
+
+---
+ src/actions.cpp                         |  2 +-
+ src/exiv2.1                             | 50 +++++++++++++++++--------
+ tests/bugfixes/github/test_issue_818.py | 32 ++++++++++++++++
+ 3 files changed, 67 insertions(+), 17 deletions(-)
+ create mode 100644 tests/bugfixes/github/test_issue_818.py
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index 34a7a80d5..68260186d 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -243,7 +243,7 @@ namespace Action {
+             int rc = 0;
+             Exiv2::PrintStructureOption option = Exiv2::kpsNone ;
+             switch (Params::instance().printMode_) {
+-                case Params::pmSummary:   rc = printSummary();     break;
++                case Params::pmSummary:   rc = Params::instance().greps_.empty() ? printSummary() : printList(); break;
+                 case Params::pmList:      rc = printList();        break;
+                 case Params::pmComment:   rc = printComment();     break;
+                 case Params::pmPreview:   rc = printPreviewList(); break;
+diff --git a/src/exiv2.1 b/src/exiv2.1
+index 4f6f3b51b..048f09af7 100644
+--- a/src/exiv2.1
++++ b/src/exiv2.1
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH EXIV2 1 "Apr 25, 2019"
++.TH EXIV2 1 "May 8, 2019"
+ .\" Please adjust this date whenever revising the manpage.
+ .\"
+ .\" Some roff macros, for reference:
+@@ -222,19 +222,30 @@ Show unknown tags (default is to suppress tags which don't have a name).
+ Only keys which match the given key (grep).
+ .br
+ Multiple \fB\-g\fP options
+-can be used to grep info for several keys. Example:
++can be used to filter info to less keys. Example:
+ exiv2 -v -V -g webready -g time.
++The default exiv2 command prints a "summary report" which is quite short.  When you use -g without a -pmod option, you do not get a summary report and in effect you get -g pattern -pa image ...
+ 
+ .nf
+-exiv2 \-g Date \-pt R.jpg
+-Exif.Image.DateTime           Ascii      20  2012:08:07 16:01:05
+-Exif.Photo.DateTimeOriginal   Ascii      20  2011:09:18 16:25:48
+-Exif.Photo.DateTimeDigitized  Ascii      20  2011:09:18 16:25:48
++$ bin/exiv2 -g Date http://clanmills.com/Stonehenge.jpg
++Exif.Image.DateTime                 Ascii    20  2015:07:16 20:25:28
++Exif.Photo.DateTimeOriginal         Ascii    20  2015:07:16 15:38:54
++Exif.Photo.DateTimeDigitized        Ascii    20  2015:07:16 15:38:54
++Exif.NikonWt.DateDisplayFormat      Byte      1  Y/M/D
++Exif.GPSInfo.GPSDateStamp           Ascii    11  2015:07:16
++Xmp.xmp.ModifyDate                  XmpText  25  2015-07-16T20:25:28+01:00
+ 
+ .fi
+--g (--grep) is only applied to keys.  It is not generally applied to all output such as the default -ps report.
++You may use -pmod filters to further filter output.  For example:
++.nf
++
++$ bin/exiv2 -px -g Date http://clanmills.com/Stonehenge.jpg
++Xmp.xmp.ModifyDate                           XmpText    25  2015-07-16T20:25:28+01:00
+ 
+-The key may finish with the optional modifier /i to indicated case insensitive.
++.fi
++The option -g (--grep) applies to keys and not values.
++
++The key may finish with the optional modifier /i to indicate case insensitive.
+ .TP
+ .B \-K \fIkey\fP
+ Only report data for given key.
+@@ -243,8 +254,8 @@ Multiple \fB\-K\fP options can be used to report more than a single key.
+ 
+ .nf
+ exiv2 \-K Exif.Photo.DateTimeDigitized -K Exif.Photo.DateTimeOriginal \-pt R.jpg
+-Exif.Photo.DateTimeOriginal   Ascii      20  2011:09:18 16:25:48
+-Exif.Photo.DateTimeDigitized  Ascii      20  2011:09:18 16:25:48
++Exif.Photo.DateTimeOriginal   Ascii    20  2011:09:18 16:25:48
++Exif.Photo.DateTimeDigitized  Ascii    20  2011:09:18 16:25:48
+ .fi
+ .TP
+ .B \-n \fIenc\fP
+@@ -594,17 +605,24 @@ You obtain the lensID for your camera with the command:
+ .nf
+ .sp 1
+ $ exiv2 -pv --grep lens/i http://clanmills.com/Stonehenge.jpg
+-0x0083 Nikon3       LensType                    Byte        1  14
+-0x0084 Nikon3       Lens                        Rational    4  180/10 2500/10 35/10 63/10
+-0x008b Nikon3       LensFStops                  Undefined   4  55 1 12 0
+-0x000c NikonLd3     LensIDNumber                Byte        1  146 <--- This number
+-0x000d NikonLd3     LensFStops                  Byte        1  55
++0x0083 Nikon3       LensType           Byte       1  14
++0x0084 Nikon3       Lens               Rational   4  180/10 2500/10 35/10 63/10
++0x008b Nikon3       LensFStops         Undefined  4  55 1 12 0
++0x000c NikonLd3     LensIDNumber       Byte       1  146 <--- This number
++0x000d NikonLd3     LensFStops         Byte       1  55
+ .br
+ .ne 40
+ .SH EXAMPLES
+ .TP
+ exiv2 *.jpg
+-Prints a summary of the Exif information for all JPEG files in the directory.
++Prints a summary of the Exif information for all JPEG files in the directory.  The summary report is rather brief and presentation does not use the Family.Group.Tag convention.
++
++If you use --grep pattern, the default becomes -pa.  See -g/grep above.
++
++.nf
++$ exiv2 -g Date http://clanmills.com/Stonehenge.jpg
++
++.fi
+ .TP
+ exiv2 \-pi image.jpg
+ Prints the IPTC metadata of the image.
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch
new file mode 100644
index 000000000000..77a68437502e
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch
@@ -0,0 +1,41 @@
+From 78676b2a025023ab3de2d094e0798ed64ef7df97 Mon Sep 17 00:00:00 2001
+From: Robin Mills <robin@clanmills.com>
+Date: Sat, 27 Apr 2019 11:18:22 +0100
+Subject: [PATCH] Fix #798
+
+---
+ README.md                      |  2 +-
+ releasenotes/CYGWIN/ReadMe.txt | 17 +----------------
+ releasenotes/Darwin/ReadMe.txt |  6 ++----
+ releasenotes/Linux/ReadMe.txt  |  2 +-
+ releasenotes/MinGW/ReadMe.txt  |  2 +-
+ releasenotes/msvc/ReadMe.txt   |  2 +-
+ src/CMakeLists.txt             |  2 +-
+ 7 files changed, 8 insertions(+), 25 deletions(-)
+
+diff --git a/README.md b/README.md
+index 6e9f50a94..92cca39e6 100644
+--- a/README.md
++++ b/README.md
+@@ -189,7 +189,7 @@ project(exifprint VERSION 0.0.1 LANGUAGES CXX)
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+-find_package(exiv2 REQUIRED CONFIG NAMES exiv2)    # search ${CMAKE_INSTALL_PREFIX}/lib/exiv2/cmake/
++find_package(exiv2 REQUIRED CONFIG NAMES exiv2)    # search ${CMAKE_INSTALL_PREFIX}/lib/cmake/exiv2
+ add_executable(exifprint ../samples/exifprint.cpp) # compile this
+ target_link_libraries(exifprint exiv2lib)          # link exiv2lib
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 340870048..976327775 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -239,7 +239,7 @@ install(FILES
+     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
+ 
+-install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
++install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
+ 
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch
new file mode 100644
index 000000000000..1770449564a2
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch
@@ -0,0 +1,28 @@
+From 6819f2ac456c57291f94cc1f4db13ce134eed468 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 23 Jun 2019 19:32:29 +0200
+Subject: [PATCH] Fix install path of exiv2ConfigVersion.cmake
+
+This seems to have been caused by duplicate work between master branch
+and 0.27-maintenance branch, as commit 3b48249eeb350301dfb3efa3ba6f7d7b162455be
+had already got that right.
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1d0ccee4..05ce4e14 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -245,7 +245,7 @@ install(FILES
+ 
+ install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+ # ******************************************************************************
+ # exiv2 application
+-- 
+2.22.0
+
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch
new file mode 100644
index 000000000000..555314ae9329
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch
@@ -0,0 +1,93 @@
+From e85ce17fc91e11eff26c6f5a89125505b7db5fd3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 23 Jun 2019 19:50:01 +0200
+Subject: [PATCH 1/2] Switch to libssh's own libssh-config.cmake
+
+This is provided by libssh since 2013.
+---
+ cmake/findDependencies.cmake | 2 +-
+ src/CMakeLists.txt           | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
+index 12d47525..52760185 100644
+--- a/cmake/findDependencies.cmake
++++ b/cmake/findDependencies.cmake
+@@ -20,7 +20,7 @@ if( EXIV2_ENABLE_WEBREADY )
+     endif()
+ 
+     if( EXIV2_ENABLE_SSH )
+-        find_package( SSH REQUIRED)
++        find_package(libssh CONFIG REQUIRED)
+     endif( )
+ endif( )
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1d0ccee4..b532fc7b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -174,8 +174,8 @@ target_include_directories(exiv2lib_int PUBLIC
+ if (EXIV2_ENABLE_WEBREADY)
+ 
+     if( EXIV2_ENABLE_SSH )
+-        target_include_directories(exiv2lib SYSTEM PUBLIC ${SSH_INCLUDE_DIR} )
+-        target_link_libraries( exiv2lib PUBLIC ${SSH_LIBRARIES})
++        target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
++        target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
+     endif()
+ 
+     if( EXIV2_ENABLE_CURL )
+-- 
+2.22.0
+
+
+From 89d8160a410c2c526ad021fd456accc709cae520 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 23 Jun 2019 19:50:44 +0200
+Subject: [PATCH 2/2] Drop now obsolete FindSSH.cmake
+
+---
+ cmake/FindSSH.cmake | 31 -------------------------------
+ 1 file changed, 31 deletions(-)
+ delete mode 100644 cmake/FindSSH.cmake
+
+diff --git a/cmake/FindSSH.cmake b/cmake/FindSSH.cmake
+deleted file mode 100644
+index 2a6fa378..00000000
+--- a/cmake/FindSSH.cmake
++++ /dev/null
+@@ -1,31 +0,0 @@
+-# - Find libssh
+-# Find the native SSH headers and libraries.
+-#
+-#  SSH_INCLUDE_DIRS - where to find libssh.h, etc.
+-#  SSH_LIBRARIES    - List of libraries when using libssh.
+-#  SSH_FOUND        - True if libssh found.
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-# Look for the header file.
+-FIND_PATH(SSH_INCLUDE_DIR NAMES libssh/libssh.h)
+-
+-# Look for the library.
+-FIND_LIBRARY(SSH_LIBRARY NAMES ssh libssh)
+-
+-# handle the QUIETLY and REQUIRED arguments and set SSH_FOUND to TRUE if 
+-# all listed variables are TRUE
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SSH DEFAULT_MSG SSH_LIBRARY SSH_INCLUDE_DIR)
+-
+-# Copy the results to the output variables.
+-IF(SSH_FOUND)
+-  SET(SSH_LIBRARIES ${SSH_LIBRARY})
+-  SET(SSH_INCLUDE_DIRS ${SSH_INCLUDE_DIR})
+-ELSE(SSH_FOUND)
+-  SET(SSH_LIBRARIES)
+-  SET(SSH_INCLUDE_DIRS)
+-ENDIF(SSH_FOUND)
+-
+-MARK_AS_ADVANCED(SSH_INCLUDE_DIR SSH_LIBRARY)
+-- 
+2.22.0
+