gentoo resync : 25.08.2020

4 files changed, 2 insertions, 165 deletions

diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 18f2584b5993..7459bf8a2c72 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,6 +1,3 @@
-AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
-DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
 DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
-EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1
-EBUILD exiv2-0.27.3.ebuild 2461 BLAKE2B 731b33b83bc92239f23803e278f91ff5c0a300732393394b8ed2c0705ad620f0d14e3ca165f98686781624bc0435725c4846952f42eee1337bb5f3ba35a67723 SHA512 81aab9d3d04d05be26023f247448b155283adbd2c05c1852841f2de4f3f2a00ac2c754d490ea9a41780f80199eadc49a9e9c31ef6d8bfe31546b07f8d4c70428
+EBUILD exiv2-0.27.3.ebuild 2454 BLAKE2B 629c18eba5dd9ec1d5a710dcc26dbbf795431fb7abee2f22f86eb4fecc7afdc073c04c6fcc71d924fba529abba5d7ad2a38af92ccae0b9654d04220c1408937d SHA512 8bc3713da3c83c56e619c22b39341026e2b1a19e564ea0ccfae3f295edeeb1d67566bcc5ba17a8075104e75a2cc4bf3bcecc69782e00773e7accc725e113f5f2
 MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
deleted file mode 100644
index fff1d66eeb26..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-IUSE="doc examples nls +png webready +xmp"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
-
-S="${S}-Source"
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	cmake_src_prepare
-
-	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && eninja doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.27.3.ebuild b/media-gfx/exiv2/exiv2-0.27.3.ebuild
index 273b13df3d38..e532ee4154f6 100644
--- a/media-gfx/exiv2/exiv2-0.27.3.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${P}-Source"
 fi
 
diff --git a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
deleted file mode 100644
index abf165b83f47..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c59eb810728572fde84492d43a932dcac89746d6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 14 Nov 2019 15:06:38 +0100
-Subject: [PATCH] EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2
-
-0.9.1 remains broken regardless and is beyond fixing in this place.
-
-Build-tested with both libssh 0.9.0 and 0.9.2.
-
-Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2
----
- cmake/findDependencies.cmake | 13 +++++++++++--
- src/CMakeLists.txt           |  3 +--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
-index a458a0c9..ec3a43f5 100644
---- a/cmake/findDependencies.cmake
-+++ b/cmake/findDependencies.cmake
-@@ -26,8 +26,17 @@ if( EXIV2_ENABLE_WEBREADY )
- 
-     if( EXIV2_ENABLE_SSH )
-         find_package(libssh CONFIG REQUIRED)
--    endif( )
--endif( )
-+        # Define an imported target to have compatibility with <=libssh-0.9.0
-+        # libssh-0.9.1 is broken regardless.
-+        if(NOT TARGET ssh)
-+            add_library(ssh SHARED IMPORTED)
-+            set_target_properties(ssh PROPERTIES
-+                IMPORTED_LOCATION "${LIBSSH_LIBRARIES}"
-+                INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}"
-+            )
-+        endif()
-+    endif()
-+endif()
- 
- if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP)
-     message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive.  You can only choose one of them")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 27f8dbb1..bdd83fa0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -173,8 +173,7 @@ target_include_directories(exiv2lib_int PUBLIC
- if (EXIV2_ENABLE_WEBREADY)
- 
-     if( EXIV2_ENABLE_SSH )
--        target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
--        target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
-+        target_link_libraries(exiv2lib PUBLIC ssh)
-     endif()
- 
-     if( EXIV2_ENABLE_CURL )
--- 
-2.24.0
-