gentoo resync : 25.08.2020

5 files changed, 335 insertions, 14 deletions

diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 3eeddc6c6e6f..91eeead6ccab 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,6 +1,7 @@
-AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542
+AUX soundkonverter-3.0.1-deps.patch 1063 BLAKE2B 091119f745bd8732bdb307fec5a4860038a89f3607301c33463a278fd1ac83aca967722e338c5731652fa06e254019792fdf34cd584bc84e0ae72216117d9e70 SHA512 64bb6f590287692253f07520845c38d3de70b893e97337b5cb3c1419812be5653a34788e7e1dcfce6d692d8c12b4996e5783c31b2eb62044210fe0425a061b5b
 AUX soundkonverter-3.0.1-fix-add-dirs.patch 936 BLAKE2B 93d19df6f74c46b5b5755c85fd548cbd5e654be6b0fbc1459db90358ce129ecf6f1afbe7b15528551e227edd61ffc4f6156c311f30a0939968b1dad86f86f7aa SHA512 2d692e3c304706b0cb135299da6d31ab1fcac352b055725e577435d44321f04ece3309ddbb3f9568dc11a85528348522cdc637ed195e7ff1c5e0710e85b1d513
+AUX soundkonverter-3.0.1-kf-5.72-findtaglib.patch 10033 BLAKE2B 15e98cfd6a725e3665075345297cd1e6060fd978fc0fe2ed980af6d6c814baf856eaf46866a9faccdae867e38bb9dec910948bca70fff858219ea48141b28f37 SHA512 a52ce152369f2583d0d569ba3369c05978c58e7771958c7ad4dab2e91b86c54350df4d5e0c2afb9bdfb929ee4b002a312c6da7a37564a5f0d882f6e704303f37
 AUX soundkonverter-3.0.1-metainfodir.patch 1033 BLAKE2B d2c845bc2b5fc18ade9b7d689e291e088fa53c11d400fd1b598e74fd9da83e7082e406949722846013c413743ed672e40089ba0960086f3dcdeb2c8a2501f8b7 SHA512 d16314f12179a0caf9d09489c4dd838f814c468185f0c7bcb0eadc3078be4eedfa5ec0f76025216b3750cefe0b5a75039e645936e58a827ba10d6503442fec9f
 DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911
-EBUILD soundkonverter-3.0.1-r2.ebuild 1670 BLAKE2B 8aea75224a197407269360dfb98ca23be9cc9ab8694772d150e46b96977fc8fcb436cd266f817147281dbc41e9321b4f40fe910c8e9deaf2acc387e49e87c8d2 SHA512 e27248b788dec7b2e866c9e51769cf1d6e9c499f26ea602137813ac6dc28987b878ab4674c9ba18d761a5b62bf309bb45552ed6ec63f508f65655b57c9d84683
+EBUILD soundkonverter-3.0.1-r2.ebuild 1746 BLAKE2B 299e58978b3e185c0c419d3aa8f4f39ec9acb2b9a6a7aa59daa9acdb69e91f2e5c5c898ace80c02754b92b3fb564bd19884dd71eb94f7d0cfd6d8b037669138b SHA512 fd6ab63a5bcd1b64ef0f4902fbe966ae9226ccf7039512ef263516c92b3d50eb7bfcdf1127ebe7d82653429f69e3541882e8861ec381653bfd92e7cc414189af
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
deleted file mode 100644
index aa5f68af9394..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2017-09-12 23:39:15.648029711 +0200
-+++ b/CMakeLists.txt	2017-09-12 23:44:47.944469934 +0200
-@@ -30,7 +30,7 @@
- include(ECMInstallIcons)
- include(FeatureSummary)
- 
--find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
-+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
- find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
- find_package(KF5Cddb)
- find_package(Phonon4Qt5 REQUIRED)
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
new file mode 100644
index 000000000000..b7009d33125d
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch
@@ -0,0 +1,30 @@
+From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 19 Jul 2020 11:43:30 +0200
+Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt
+
+- Drop unused Qt5Network
+- Search for Qt5Xml once instead of in most plugins
+- KF5WidgetsAddons and KF5KIO were already being searched for
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                                             | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521d0da..7e578f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers)
+ include(ECMInstallIcons)
+ include(FeatureSummary)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
++find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
+ find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
+ find_package(KF5Cddb)
+ find_package(Phonon4Qt5 REQUIRED)
+-- 
+2.27.0
+
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch
new file mode 100644
index 000000000000..8439e7a83df9
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch
@@ -0,0 +1,300 @@
+From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 19 Jul 2020 12:06:28 +0200
+Subject: [PATCH 1/2] FindTaglib.cmake: Update local copy with ECM 5.72.0
+ version and adapt cmake
+
+ECM 5.72.0 ships an incompatible FindTaglib.cmake module.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                 |   6 +-
+ cmake/modules/FindTaglib.cmake | 209 +++++++++++------------------
+ 2 files changed, 85 insertions(+), 130 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521d0da..c9d9bee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED)
+ find_package(Cdparanoia REQUIRED)
+ 
+ set(TAGLIB_MIN_VERSION "1.10")
+-find_package(Taglib REQUIRED)
++find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED)
+ 
+ 
+ # plugins 
+@@ -48,7 +48,7 @@ add_subdirectory(plugins)
+ 
+ 
+ # include directories
+-include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR})
++include_directories(${CDPARANOIA_INCLUDE_DIR})
+ 
+ 
+ # translation
+@@ -120,7 +120,7 @@ set(soundkonverter_SRCS
+ )
+ 
+ add_executable(soundkonverter ${soundkonverter_SRCS})
+-target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
++target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore)
+ 
+ install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR})
+ 
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 5a985f9..40c5ca2 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -1,135 +1,90 @@
+-# - Try to find the Taglib library
+-# Once done this will define
++#.rst:
++# FindTaglib
++# ----------
+ #
+-#  TAGLIB_FOUND - system has the taglib library
+-#  TAGLIB_CFLAGS - the taglib cflags
+-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
+-
+-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
++# Try to find the Taglib library.
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(NOT TAGLIB_MIN_VERSION)
+-  set(TAGLIB_MIN_VERSION "1.6")
+-endif(NOT TAGLIB_MIN_VERSION)
+-
+-if(NOT WIN32)
+-    find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
+-       ${BIN_INSTALL_DIR}
+-    )
+-endif(NOT WIN32)
+-
+-#reset vars
+-set(TAGLIB_LIBRARIES)
+-set(TAGLIB_CFLAGS)
+-
+-# if taglib-config has been found
+-if(TAGLIBCONFIG_EXECUTABLE)
+-
+-  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+-
+-  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-     message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+-     set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+-
+-     exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
++# This will define the following variables:
++#
++# ``Taglib_FOUND``
++#       True if the system has the taglib library of at least the minimum
++#       version specified by the version parameter to find_package()
++# ``Taglib_INCLUDE_DIRS``
++#       The taglib include dirs for use with target_include_directories
++# ``Taglib_LIBRARIES``
++#       The taglib libraries for use with target_link_libraries()
++# ``Taglib_VERSION``
++#       The version of taglib that was found
++#
++# If ``Taglib_FOUND is TRUE, it will also define the following imported
++# target:
++#
++# ``Taglib::Taglib``
++#       The Taglib library
++#
++# Since 5.72.0
++#
++# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
++# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
++# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
++# SPDX-License-Identifier: BSD-3-Clause
+ 
+-     if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-        set(TAGLIB_FOUND TRUE)
+-     endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-     string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+-  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
++find_package(PkgConfig QUIET)
+ 
+-else(TAGLIBCONFIG_EXECUTABLE)
++pkg_search_module(PC_TAGLIB QUIET taglib)
+ 
+-  find_path(TAGLIB_INCLUDES
+-    NAMES
+-    tag.h
++find_path(Taglib_INCLUDE_DIRS
++    NAMES tag.h
+     PATH_SUFFIXES taglib
+-    PATHS
+-    ${KDE4_INCLUDE_DIR}
+-    ${INCLUDE_INSTALL_DIR}
+-  )
+-
+-    IF(NOT WIN32)
+-      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
+-
+-      FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+-
+-    ELSE(NOT WIN32)
+-
+-      # 1. get all possible libnames
+-      SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})             
+-      SET(newargs "")               
+-      SET(libnames_release "")      
+-      SET(libnames_debug "")        
+-
+-      LIST(LENGTH args listCount)
+-
+-        # just one name
+-        LIST(APPEND libnames_release "tag")
+-        LIST(APPEND libnames_debug   "tagd")
+-
+-        SET(newargs ${args})
+-
+-      # search the release lib
+-      FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE
+-                   NAMES ${libnames_release}
+-                   ${newargs}
+-      )
+-
+-      # search the debug lib
+-      FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG
+-                   NAMES ${libnames_debug}
+-                   ${newargs}
+-      )
+-
+-      IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
+-
+-        # both libs found
+-        SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE}
+-                        debug     ${TAGLIB_LIBRARIES_DEBUG})
+-
+-      ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
+-
+-        IF(TAGLIB_LIBRARIES_RELEASE)
+-
+-          # only release found
+-          SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE})
+-
+-        ELSE(TAGLIB_LIBRARIES_RELEASE)
+-
+-          # only debug (or nothing) found
+-          SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG})
+-
+-        ENDIF(TAGLIB_LIBRARIES_RELEASE)
+-
+-      ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG)
+-
+-      MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE)
+-      MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG)
+-
+-    ENDIF(NOT WIN32)
+-  
+-  INCLUDE(FindPackageMessage)
+-  INCLUDE(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
+-
+-endif(TAGLIBCONFIG_EXECUTABLE)
+-
++    HINTS ${PC_TAGLIB_INCLUDEDIR}
++)
++
++find_library(Taglib_LIBRARIES
++    NAMES tag
++    HINTS ${PC_TAGLIB_LIBDIR}
++)
++
++set(Taglib_VERSION ${PC_TAGLIB_VERSION})
++
++if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
++    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
++        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)
++
++        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
++        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})
++
++        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
++        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")
++
++        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
++    endif()
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Taglib
++    FOUND_VAR
++        Taglib_FOUND
++    REQUIRED_VARS
++        Taglib_LIBRARIES
++        Taglib_INCLUDE_DIRS
++    VERSION_VAR
++        Taglib_VERSION
++)
++
++if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
++    add_library(Taglib::Taglib UNKNOWN IMPORTED)
++    set_target_properties(Taglib::Taglib PROPERTIES
++        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
++        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
++    )
++endif()
+ 
+-if(TAGLIB_FOUND)
+-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-    message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}")
+-  endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-else(TAGLIB_FOUND)
+-  if(Taglib_FIND_REQUIRED)
+-    message(FATAL_ERROR "Could not find Taglib")
+-  endif(Taglib_FIND_REQUIRED)
+-endif(TAGLIB_FOUND)
++mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)
+ 
++include(FeatureSummary)
++set_package_properties(Taglib PROPERTIES
++    URL "https://taglib.org/"
++    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
++)
+-- 
+2.27.0
+
+
+From ff943d9cb19aa46b555826a053642ac2e84d392d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 19 Jul 2020 13:02:33 +0200
+Subject: [PATCH 2/2] Use local cmake modules first
+
+Although FindTaglib.cmake was fixed in previous commit, local cmake modules
+should not be overriden by system versions anyway.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c9d9bee..7a92898 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+ 
+ # kde libs
+ find_package(ECM REQUIRED NO_MODULE)
+-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
+ 
+ add_definitions(-DSOUNDKONVERTER_KF5_BUILD)
+ 
+-- 
+2.27.0
+
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
index 0beceea2e00e..98e141c9a710 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
@@ -45,7 +45,8 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-deps.patch"
+	"${FILESDIR}/${P}-deps.patch" # pending upstream
+	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch" # pending upstream
 	"${FILESDIR}/${P}-fix-add-dirs.patch"
 	"${FILESDIR}/${P}-metainfodir.patch"
 )