diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
tree | c44943ee0563a3fa957716de909fed683117fcb9 /media-sound/kid3 | |
parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'media-sound/kid3')
-rw-r--r-- | media-sound/kid3/Manifest | 3 | ||||
-rw-r--r-- | media-sound/kid3/files/kid3-3.8.5-tests-optional.patch | 80 | ||||
-rw-r--r-- | media-sound/kid3/kid3-3.8.5.ebuild | 23 |
3 files changed, 100 insertions, 6 deletions
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index 42a536beddd8..76cef6664882 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,5 +1,6 @@ +AUX kid3-3.8.5-tests-optional.patch 2531 BLAKE2B 47764202cbfdeb7f4d55619f883a6aa5af1d0ef5034280a80cbf668eb0770cc80568e69d5e46b4ea20cf97eec217b4558082441fde0912325decfcda35ebce3c SHA512 d42e4a1e1a56ce3caef480a8fe08155d21d89b5e869f4411776b61373c6900f14073b8803001b1a70bd89532da48553bb8cca4bf45fd34ec589d695c434bb220 DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a DIST kid3-3.8.5.tar.gz 3181228 BLAKE2B 8e409c0697cc6045c0a1da4b19a8eae952bc63fa824e21aca19e6ad2130ef71a3fff2c25fa34078ea72e3cbd84459c77bbb616b1d1fb62d0f1023aa2fd6cfccd SHA512 d1f0bc91d50538c29807ddca2a039e758c58850d1224675a1674e3e1d89936bf80db34ffd3cf3678e1008eb600476ebb722ca78796eba2537defcc57664ff00c EBUILD kid3-3.8.4.ebuild 1782 BLAKE2B 6d0bab38a20dbd1c35869368f0f3ee9cc92489db759e2dd789cdd48ec176f06b3dcca310c7744c2c14fcbbe9992d21b815d34e99b8a57149207167e3068acb97 SHA512 2d5745d314c1977b4fa63e7211c68fb0960e6d51f9154eeac52796621c0bf1ed4a87c6f4d2a2b827b334167577f0d5641a6392d90df8b2ae4090ff7efcff4414 -EBUILD kid3-3.8.5.ebuild 1784 BLAKE2B 3456565643ec32ac8b80564798880042e3c367743beba6a67c8777b78845af91e5766afb17871a600df2261756591a61446a391bdff12ecbc583d13d1fff96d7 SHA512 e7c2337a91364ef23bbd879991a4e075d42e145e868ec7a1f4d38860cd9c3cdc1d8177ec5a1014e280e8c1f3885ad0b0ddb436eb9b87ef6c7df5b0253252e654 +EBUILD kid3-3.8.5.ebuild 2120 BLAKE2B 95486d3a308e69ccc39820cc07f3f0ddfdf97bffcdd2413c4456d56972d2b0ece0a7b04134121e8d32faf64e9d55fb58cddab90b603f56b293975800d45891a2 SHA512 c8071d090083209a70d461e7934ffa73cd3c3e5fdfe2275271df776ad989d068cea37ee1a1342f113ef63953b2d4ede33ba08711e1900ffd5c33f4c96c445ba1 MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8 diff --git a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch new file mode 100644 index 000000000000..44af299f13ce --- /dev/null +++ b/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch @@ -0,0 +1,80 @@ +From fe096c5d05c95bfdcfae6a5976e242e324f4152d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Fri, 5 Feb 2021 06:17:42 +0000 +Subject: [PATCH] Use include(CTest) and BUILD_TESTING to make tests optional + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 29 ++++++++++++++++++++--------- + src/CMakeLists.txt | 2 +- + 2 files changed, 21 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92d50265..ee476ac5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -211,8 +211,15 @@ endif() + set(CFG_QMLSRCDIR "${kid3_SOURCE_DIR}/src/qml") + + find_package(Threads) +-set(Python_ADDITIONAL_VERSIONS 3) +-find_package(PythonInterp REQUIRED) ++include(CTest) ++if(CMAKE_VERSION VERSION_LESS 3.12.0) ++ set(Python_ADDITIONAL_VERSIONS 3) ++ find_package(PythonInterp REQUIRED) ++ # PythonInterp sets PYTHON_EXECUTABLE ++else() ++ find_package(Python3 COMPONENTS Interpreter REQUIRED) ++ set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}") ++endif() + include (CheckCXXSourceCompiles) + include (CheckCXXCompilerFlag) + include (CheckLibraryExists) +@@ -256,7 +263,10 @@ else() + find_package(Qt5Core) + endif() + if(Qt5Core_FOUND) +- set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools Test) ++ set(_qtComponents Core Gui Widgets Network Xml Multimedia LinguistTools) ++ if(BUILD_TESTING) ++ set(_qtComponents ${_qtComponents} Test) ++ endif() + if(WITH_DBUS) + set(_qtComponents ${_qtComponents} DBus) + endif() +@@ -472,12 +482,13 @@ if(ANDROID) + endif() + + +-enable_testing() +-add_test(NAME test_cli_functions +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py) +-add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure) +-if(NOT CMAKE_VERSION VERSION_LESS "3.17") +- list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure) ++if(BUILD_TESTING) ++ add_test(NAME test_cli_functions ++ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/test/test_cli_functions.py) ++ add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure) ++ if(NOT CMAKE_VERSION VERSION_LESS "3.17") ++ list(APPEND CMAKE_CTEST_ARGUMENTS --output-on-failure) ++ endif() + endif() + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c6c703ac..db067265 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,6 +8,6 @@ if(WITH_QML) + add_subdirectory(qml) + endif() + +-if(BUILD_TEST_APP) ++if(BUILD_TESTING AND BUILD_TEST_APP) + add_subdirectory(test) + endif() +-- +GitLab + diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild index a047ed173a3d..8ed70dc49ede 100644 --- a/media-sound/kid3/kid3-3.8.5.ebuild +++ b/media-sound/kid3/kid3-3.8.5.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit kde.org cmake xdg +PYTHON_COMPAT=( python3_{7..9} ) +inherit cmake kde.org python-any-r1 xdg DESCRIPTION="Simple tag editor based on Qt" HOMEPAGE="https://kid3.kde.org/" @@ -15,15 +16,16 @@ fi LICENSE="GPL-2+" SLOT="5" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis" +IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis" REQUIRED_USE="flac? ( vorbis )" +RESTRICT+=" !test? ( test )" -BDEPEND=" +BDEPEND="${PYTHON_DEPS} dev-qt/linguist-tools:5 kde? ( kde-frameworks/extra-cmake-modules:5 ) " -DEPEND=" +COMMON_DEPEND=" dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 @@ -57,10 +59,19 @@ DEPEND=" media-libs/libvorbis ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} !media-sound/kid3:4 " +PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { # overengineered upstream build system cmake_src_prepare @@ -70,12 +81,14 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DPython3_EXECUTABLE="${PYTHON}" -DWITH_CHROMAPRINT=$(usex acoustid) -DWITH_DBUS=$(usex mpris) -DWITH_FLAC=$(usex flac) -DWITH_ID3LIB=$(usex mp3) -DWITH_MP4V2=$(usex mp4) -DWITH_TAGLIB=$(usex taglib) + -DBUILD_TESTING=$(usex test) -DWITH_VORBIS=$(usex vorbis) ) |