gentoo resync : 25.11.2020

4 files changed, 11 insertions, 242 deletions

diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 55df2878c57d..c7c18f904fba 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,5 +1,3 @@
-AUX krename-5.0.0-exiv2-0.27.patch 5106 BLAKE2B 756e29fe3bdc0d83d3612ec9af7fe0936d70eda023c64bafb198c9b0d29bb69e4978fd5c2eaa7606e41b2d730ae1566217983f7fb2dba72c996b11982beaef49 SHA512 98a917db7212f120f1cab3fdf89e9e09d05205da386df2f838b770ac378ec3b71d5a25bd022740569a34c39cb20b3ced0c489b7945c4ed3d85fd4442988b8f4f
-AUX krename-5.0.0-kf-5.72-findtaglib.patch 1158 BLAKE2B 16e1c23eb7000456cbf651e24e5bb5a9218671abc9fbe08b1b83e2640c3327b55b24cd197d42da391a4beb5024b5a4e658476dfdab8cfd4c29e50c622659eb4a SHA512 1a934e22bb149ab7be169192adff387bfd5326cd1b4782391ee54c13ada2ba8744ed4a0eb39da8ff07829efc56ea8692405d1e656eae69bfde4ccc7ac1702c9d
-DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597
-EBUILD krename-5.0.0-r1.ebuild 1579 BLAKE2B 006cdec76760504116f61487ce44f8714b14ceb0c5eda80d8e356e31de0e7bbf4b91d0d89e9271773772996a1184d9646ef774d8801825525efaed299d5325bf SHA512 3649a7b82124cc0b5c5e70b4643637b6b746f88533f9f19c3c0107d345686dacf1181b421d1b87ddf4d0b21488d7c9409e2a08d40911a8ec5e2f20c1765b69d8
+DIST krename-5.0.1.tar.xz 321556 BLAKE2B 38835e4f7ce97b4991419ac7676268701c0977feb32457c9dc5ddcea92f576012320eac06aadbe426a5e176aae6270606688afd377af4c9ea32d66bd75a74fdd SHA512 1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379
+EBUILD krename-5.0.1.ebuild 1486 BLAKE2B 4e284b7e2cec7a2d10973f03053b6ef29c00b5c7b6448b619548d2d80c5ba1c04b6bc52262ea0a3954fb68e1267d69a93ce88e6484a5564edd24024544db584f SHA512 0161c660fb891ea3453d5fa7de3acb154d6f332840c9e5580548583689d0f68de44caaa3a736719d8b80bf870b87d676f940de40b479aa42455abe72ec111231
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch b/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
deleted file mode 100644
index fdc13a1815e3..000000000000
--- a/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From ec90823494f5ec9bb2e8098f44209f383ef8c22a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Tue, 20 Nov 2018 18:24:29 +0100
-Subject: Use #cmakedefine01 instead of macro_bool_to_01
-
----
- CMakeLists.txt                    | 13 +++++--------
- config-krename.h.cmake            | 10 +++++-----
- 3 files changed, 10 insertions(+), 33 deletions(-)
- delete mode 100644 cmake/modules/MacroBoolTo01.cmake
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,13 +80,10 @@ set_package_properties(Freetype PROPERTIES
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
--
--# Update configuration
--include(MacroBoolTo01)
--macro_bool_to_01(TAGLIB_FOUND HAVE_TAGLIB)
--macro_bool_to_01(EXIV2_FOUND HAVE_EXIV2)
--macro_bool_to_01(PoDoFo_FOUND HAVE_PODOFO)
--macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE)
-+set(HAVE_TAGLIB ${TAGLIB_FOUND})
-+set(HAVE_EXIV2 ${LibExiv2_FOUND})
-+set(HAVE_PODOFO ${PoDoFo_FOUND})
-+set(HAVE_FREETYPE ${FREETYPE_FOUND})
- configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h)
- 
- # Directories
---- a/config-krename.h.cmake
-+++ b/config-krename.h.cmake
-@@ -1,15 +1,15 @@
- /* config.h. Generated by cmake from config.h.cmake */
- 
- /* have TagLib */
--#define HAVE_TAGLIB ${HAVE_TAGLIB}
-+#cmakedefine01 HAVE_TAGLIB
- 
- /* have Exiv2 */
--#define HAVE_EXIV2 ${HAVE_EXIV2}
-+#cmakedefine01 HAVE_EXIV2
- 
- /* have PoDoFo */
--#define HAVE_PODOFO ${HAVE_PODOFO}
-+#cmakedefine01 HAVE_PODOFO
- 
- /* have Freetype */
--#define HAVE_FREETYPE ${HAVE_FREETYPE}
-+#cmakedefine01 HAVE_FREETYPE
- 
--#define VERSION "${KRENAME_VERSION}"
-+#define VERSION "${krename_VERSION}"
--- 
-cgit v1.1
-
-From b22de9135ba2a5abdbd2b275a60933a50f074010 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Tue, 20 Nov 2018 18:26:47 +0100
-Subject: Fix building against exiv2-0.27
-
-One neeeded part is to copy over the new FindLibExiv2 module from
-ECM which has not appeared in a release yet (it will with 5.53.0).
-I'll probably add that version as a requirement and remove the copy
-again in the near future.
-The other part includes raising the cmake version requirement to
-3.7.0, which was released over 2 years ago. (The version comparison
-could be easily solved differently and less elegantly, but let's see
-if people with ancient cmakes complain).
----
- CMakeLists.txt                   |  15 ++---
- config-krename.h.cmake           |   3 +
- src/CMakeLists.txt               |   8 +--
- src/exiv2plugin.cpp              |   8 ++-
- 6 files changed, 137 insertions(+), 91 deletions(-)
- delete mode 100644 cmake/modules/FindExiv2.cmake
- create mode 100644 cmake/modules/FindLibExiv2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,5 @@
--project(krename)
- 
--cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.7)
-+
-+project(krename VERSION "5.0.0")
- 
-@@ -39,10 +40,6 @@ add_definitions(
-     -DQT_STRICT_ITERATORS
- )
- 
--set(KRENAME_VERSION "5.0.0")
--
--include(FindGettext)
--
- # Find taglib
- set(TAGLIB_MIN_VERSION "1.5")
- find_package(Taglib ${TAGLIB_MIN_VERSION})
-@@ -58,11 +55,12 @@ set_package_properties(Taglib PROPERTIES
-     TYPE OPTIONAL)
- 
- # Find exiv2
--find_package(Exiv2 0.13) # AccessMode was added in 0.13
--set_package_properties(Exiv2 PROPERTIES
--    DESCRIPTION "A library to access image metadata"
--    URL "http://www.exiv2.org"
--    TYPE OPTIONAL)
-+find_package(LibExiv2 0.13) # AccessMode was added in 0.13
-+set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL)
-+
-+if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
-+    set(HAVE_LIBEXIV2_0_27 TRUE)
-+endif()
- 
- # Find podofo
- find_package(PoDoFo)
---- a/config-krename.h.cmake
-+++ b/config-krename.h.cmake
-@@ -6,6 +6,9 @@
- /* have Exiv2 */
- #cmakedefine01 HAVE_EXIV2
- 
-+/* Defined if we have libexiv2 >= 0.27 */
-+#cmakedefine HAVE_LIBEXIV2_0_27
-+
- /* have PoDoFo */
- #cmakedefine01 HAVE_PODOFO
- 
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -23,7 +23,7 @@ if(FREETYPE_FOUND)
-     include_directories(${FREETYPE_INCLUDE_DIRS})
- endif()
- 
--add_definitions(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS})
-+add_definitions(${TAGLIB_CFLAGS})
- # Exiv2 needs exceptions
- kde_enable_exceptions()
- 
-@@ -67,7 +67,7 @@ set(krename_SRCS
-     snumplugin.cpp
- )
- 
--if(EXIV2_FOUND)
-+if(LibExiv2_FOUND)
-     set(krename_SRCS ${krename_SRCS}
-         exiv2plugin.cpp
-     )
-@@ -137,9 +137,9 @@ if(TAGLIB_FOUND)
-         ${TAGLIB_LIBRARIES}
-     )
- endif()
--if(EXIV2_FOUND)
-+if(LibExiv2_FOUND)
-     target_link_libraries(krename
--        ${EXIV2_LIBRARIES}
-+        LibExiv2::LibExiv2
-     )
- endif()
- if(PoDoFo_FOUND)
---- a/src/exiv2plugin.cpp
-+++ b/src/exiv2plugin.cpp
-@@ -17,13 +17,19 @@
- 
- #include "exiv2plugin.h"
- 
-+#include "../config-krename.h"
-+
- #include <KLocalizedString>
- 
- #include <exiv2/error.hpp>
- #include <exiv2/exif.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
-+#ifdef HAVE_LIBEXIV2_0_27
-+    #include <exiv2/xmp_exiv2.hpp>
-+#else
-+    #include <exiv2/xmp.hpp>
-+#endif
- #include <exiv2/tags.hpp>
- 
- #include "batchrenamer.h"
--- 
-cgit v1.1
diff --git a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
deleted file mode 100644
index 672d0c106818..000000000000
--- a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Fri, 19 Jun 2020 16:44:47 +0100
-Subject: [PATCH] use local cmake modules first, fixes build failure
-
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 602129b..4550621 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(krename)
- cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
- # search packages used by KDE
- find_package(ECM 0.0.11 REQUIRED NO_MODULE)
--set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
- 
- include(KDEInstallDirs)
- include(ECMInstallIcons)
-@@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS
-     XmlGui
- )
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
--                      ${CMAKE_SOURCE_DIR}/cmake/modules)
-+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
-+                      ${CMAKE_MODULE_PATH})
- 
- add_definitions(
-     -DQT_DEPRECATED_WARNINGS
--- 
-GitLab
-
diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.1.ebuild
index b650df235fa7..d1db403c8f9c 100644
--- a/kde-misc/krename/krename-5.0.0-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.1.ebuild
@@ -4,18 +4,20 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Powerful batch file renamer"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.krename
-https://userbase.kde.org/KRename"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+HOMEPAGE="https://apps.kde.org/en/krename https://userbase.kde.org/KRename"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
 IUSE="exif pdf taglib truetype"
 
 BDEPEND="sys-devel/gettext"
@@ -41,14 +43,7 @@ DEPEND="
 	taglib? ( media-libs/taglib )
 	truetype? ( media-libs/freetype:2 )
 "
-RDEPEND="${DEPEND}
-	!kde-misc/krename:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-exiv2-0.27.patch"
-	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
-)
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(