gentoo resync : 25.08.2020

3 files changed, 254 insertions, 8 deletions

diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 7e04b031da1c..5e025182e54a 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,6 +1,7 @@
 AUX tomahawk-0.9.0_pre20181030-cmakepolicy.patch 926 BLAKE2B 8af469b6186e57db674dc5acaec6032bf43c15d91b5db9a9bf30f617c47b74486149a50774c76eb69bf89157e1ee8eed0d449b9d107e4f8e7e376f9d9d4f9d29 SHA512 7d0c98a6f1708d156ab643439faf3f469fa21a106f618dc1b8b7c569a2f65a9c929670bc1aa679eebf1116e615fd832593116f84e3abe5fff3d91450e1455f21
+AUX tomahawk-0.9.0_pre20181030-findtaglib.patch 8972 BLAKE2B 939a01eadce7709ed499bee56c6d3b9b1327cedda4d803024ca52ac11eacf798c62ccdc01e1fc6f8477545207ca9e17e85f3d000ce6b7d09379aad33677edf03 SHA512 8225e6b03c4b747f9179bb434c7ab3e1eb3708a8c62e95db87e918cb254d8717a2bc7fcee587ada70a954e73da2d85cac708121fe1884536450a8e7c2cfe185b
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
 AUX tomahawk-0.9.0_pre20181030-qt-5.15.patch 4668 BLAKE2B 40c40daa9079f1695234dff83102087ab3eaa26ef6b084df36fc2040e9f23d69296a452e3d263a6e7fd902c78f62f2ae12a15ae181b8ff8848e4db0542df3462 SHA512 e5dbef2b9cf042576565ca16fd278778847af1657bf22d9c27cb177b5ba20fbc492f6769cc661657dbfc23bbfde66399f42a657c2fbea2c91d87216b921da8bd
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20181030.ebuild 1835 BLAKE2B 077307ceebcaeb6c3db3c5b1b2534528435dd6a5f58e94fdd4777546cec9bcebd095fe659d3096ee380ee7539faa5f06ba1fd227fbb56f5bbc0a24f9e72380b0 SHA512 780432d7b50209b140281db8329b4cdfa9409e87285fbbb57e66c1881f5816e498579713abbc29c6864538945a05abcbd2e55971c2b1a70429424e4219c27b35
+EBUILD tomahawk-0.9.0_pre20181030.ebuild 1885 BLAKE2B 6ba75ba004d9b7137fba269c6853567ed278c0a5daa025f69a77dc959a07f6e97890f2a000fd4f4f245d527127ad0a2e54f768c50556d250fbc1748528790039 SHA512 b83c1fd7ff15d1431a28f3716ea43b07e405015b350a8e1d31a0491315a300ef8c7c93755573b614e8c942c99cac4290f0fd9cee38e9eb03d15684881f018263
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
new file mode 100644
index 000000000000..9a53e0d69020
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-findtaglib.patch
@@ -0,0 +1,244 @@
+From 7c7b57e295aebcca9b09d8c5798e172cb8fd179c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 13 Jul 2020 02:11:06 +0200
+Subject: [PATCH] Import FindTaglib.cmake from ECM 5.72.0
+
+This version of ECM gained a module that is overriding Tomahawk's own, but
+variables are incompatible. Use the updated ECM module until we can depend
+on the necessary ECM version itself.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                         |   2 +-
+ CMakeModules/CheckTagLibFileName.cmake |   5 +-
+ CMakeModules/FindTaglib.cmake          | 173 +++++++++++++------------
+ src/libtomahawk/CMakeLists.txt         |   4 +-
+ 4 files changed, 93 insertions(+), 91 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9422a808e..2f1e72238 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -213,7 +213,7 @@ macro_optional_find_package(Lucene++ 3.0.0)
+ macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
+ 
+ macro_optional_find_package(Taglib 1.8.0)
+-macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
++macro_log_feature(Taglib_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
+ include( CheckTagLibFileName )
+ check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+ 
+diff --git a/CMakeModules/CheckTagLibFileName.cmake b/CMakeModules/CheckTagLibFileName.cmake
+index e5b3706c9..7828dcf34 100644
+--- a/CMakeModules/CheckTagLibFileName.cmake
++++ b/CMakeModules/CheckTagLibFileName.cmake
+@@ -1,9 +1,8 @@
+ # taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
+ macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX)
+ 	include (CheckCXXSourceCompiles)
+-	set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS})
+-	set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES})
+-	set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES})
++	set (CMAKE_REQUIRED_INCLUDES ${Taglib_INCLUDE_DIRS})
++	set (CMAKE_REQUIRED_LIBRARIES ${Taglib_LIBRARIES})
+ 	check_cxx_source_compiles(
+ 	"#include <tfile.h>
+ 	int main()
+diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
+index d4ada2592..ad14c79cd 100644
+--- a/CMakeModules/FindTaglib.cmake
++++ b/CMakeModules/FindTaglib.cmake
+@@ -1,87 +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(TAGLIB_FOUND)
+-	MESSAGE(STATUS "Using manually specified taglib locations")
+-ELSE()
+-
+-	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)
+-
+-#	MESSAGE( STATUS "PATHS: ${PATHS}")
+-	# 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 not found: 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)
+-
+-		 if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+-			set(TAGLIB_FOUND TRUE)
+-#			message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+-		 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)
+-
+-	else(TAGLIBCONFIG_EXECUTABLE)
+-
+-	  include(FindLibraryWithDebug)
+-	  include(FindPackageHandleStandardArgs)
+-
+-	  find_path(TAGLIB_INCLUDES
+-		NAMES
+-		tag.h
+-		PATH_SUFFIXES taglib
+-		PATHS
+-		${INCLUDE_INSTALL_DIR}
+-	  )
+-
+-	  find_library_with_debug(TAGLIB_LIBRARIES
+-		WIN32_DEBUG_POSTFIX d
+-		NAMES tag
+-		PATHS
+-		${LIB_INSTALL_DIR}
+-	  )
+-	  
+-	  find_package_handle_standard_args(Taglib DEFAULT_MSG 
+-										TAGLIB_INCLUDES TAGLIB_LIBRARIES)
+-	endif(TAGLIBCONFIG_EXECUTABLE)
+-ENDIF()
+-
+-if(TAGLIB_FOUND)
+-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
+-    message(STATUS "Found TagLib: ${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)
++# 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
++
++find_package(PkgConfig QUIET)
++
++pkg_search_module(PC_TAGLIB QUIET taglib)
++
++find_path(Taglib_INCLUDE_DIRS
++    NAMES tag.h
++    PATH_SUFFIXES taglib
++    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()
++
++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"
++)
+diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
+index 348d6b1dd..e0a342f0e 100644
+--- a/src/libtomahawk/CMakeLists.txt
++++ b/src/libtomahawk/CMakeLists.txt
+@@ -533,8 +533,8 @@ TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} PRIVATE
+ )
+ 
+ # TagLib
+-TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${TAGLIB_LIBRARIES})
+-TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${TAGLIB_INCLUDES})
++TARGET_LINK_LIBRARIES(${TOMAHAWK_LIBRARY} LINK_PUBLIC ${Taglib_LIBRARIES})
++TARGET_INCLUDE_DIRECTORIES(${TOMAHAWK_LIBRARY} PUBLIC ${Taglib_INCLUDE_DIRS})
+ 
+ INSTALL( TARGETS ${TOMAHAWK_LIBRARY}
+     EXPORT TomahawkLibraryDepends
+-- 
+2.27.0
+
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
index e3e201984d00..442d0f525b7b 100644
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
@@ -19,6 +19,12 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-cpp/lucene++
+	dev-cpp/sparsehash
+	dev-libs/boost:=
+	dev-libs/qtkeychain:=[qt5(+)]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -29,12 +35,6 @@ COMMON_DEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
-	app-crypt/qca:2[qt5(+)]
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
 	kde-frameworks/extra-cmake-modules:5
 	kde-frameworks/attica:5
 	>=media-libs/liblastfm-1.1.0_pre20150206
@@ -58,7 +58,8 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-warning.patch"
 	"${FILESDIR}/${P}-cmakepolicy.patch" # bug 674826
-	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream
+	"${FILESDIR}/${P}-qt-5.15.patch" # git master
+	"${FILESDIR}/${P}-findtaglib.patch" # pending upstream
 )
 
 src_configure() {