From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- media-sound/kid3/Manifest | 7 +- .../kid3/files/kid3-3.8.5-tests-optional.patch | 80 ---------------- media-sound/kid3/kid3-3.8.4.ebuild | 89 ------------------ media-sound/kid3/kid3-3.8.5.ebuild | 102 --------------------- media-sound/kid3/kid3-3.8.6.ebuild | 2 +- 5 files changed, 2 insertions(+), 278 deletions(-) delete mode 100644 media-sound/kid3/files/kid3-3.8.5-tests-optional.patch delete mode 100644 media-sound/kid3/kid3-3.8.4.ebuild delete mode 100644 media-sound/kid3/kid3-3.8.5.ebuild (limited to 'media-sound/kid3') diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index 5149b422420d..dd4e0a018b9f 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,8 +1,3 @@ -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 DIST kid3-3.8.6.tar.gz 3183673 BLAKE2B c862c1da05ed85ecce8b0c666ddb9e18bdcabafe569f62f3264ebf1e0b7b16c11d25a10e1b1e6cd395442500275f9ee73ef1f6225e049790a09eac68b811df06 SHA512 11613ea72b23a80473699c61141ae2eb9a76b47da87704cd673b70a65bb334bd8232d3a66a7ff2b7f552751145613dbcfb8dcf0746eebb9fa2bd45979f4ba5d4 -EBUILD kid3-3.8.4.ebuild 1782 BLAKE2B 6d0bab38a20dbd1c35869368f0f3ee9cc92489db759e2dd789cdd48ec176f06b3dcca310c7744c2c14fcbbe9992d21b815d34e99b8a57149207167e3068acb97 SHA512 2d5745d314c1977b4fa63e7211c68fb0960e6d51f9154eeac52796621c0bf1ed4a87c6f4d2a2b827b334167577f0d5641a6392d90df8b2ae4090ff7efcff4414 -EBUILD kid3-3.8.5.ebuild 2120 BLAKE2B 95486d3a308e69ccc39820cc07f3f0ddfdf97bffcdd2413c4456d56972d2b0ece0a7b04134121e8d32faf64e9d55fb58cddab90b603f56b293975800d45891a2 SHA512 c8071d090083209a70d461e7934ffa73cd3c3e5fdfe2275271df776ad989d068cea37ee1a1342f113ef63953b2d4ede33ba08711e1900ffd5c33f4c96c445ba1 -EBUILD kid3-3.8.6.ebuild 2006 BLAKE2B e62ef6dad5abb717ce4afb25b0d32f9414115d236bb7d39b0ff164f94a87fb87a0acf30ea9a5a7586a4817881d505bf07e5f4b2731217fb84aa679b23f41cd62 SHA512 c9d344709c60c736b0621fb1e248229d9a7844a4b4207ab804255ee03126e85c255f607bb5c05dfabcbd2848de9600709be6d7a4160f30228c51c5bf838af879 +EBUILD kid3-3.8.6.ebuild 2004 BLAKE2B 74400619f98177629513157b8daae32eed7eb73969dbc5bd6142e7403866cc75c881dd95a035fa9bbb2ca970ccd52150f57b72ed0146552a78f3fe2b92be2055 SHA512 7d7e8c90105b77b4ff7f5aa5b7c732be150e4bdadc9dac4d2aa7b423949e3bdcedb89e01545b371051c37a8979c34d85e3e470caf7161d4d9d4245d234bff4ee 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 deleted file mode 100644 index 44af299f13ce..000000000000 --- a/media-sound/kid3/files/kid3-3.8.5-tests-optional.patch +++ /dev/null @@ -1,80 +0,0 @@ -From fe096c5d05c95bfdcfae6a5976e242e324f4152d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 ---- - 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.4.ebuild b/media-sound/kid3/kid3-3.8.4.ebuild deleted file mode 100644 index ff949e076256..000000000000 --- a/media-sound/kid3/kid3-3.8.4.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde.org cmake xdg - -DESCRIPTION="Simple tag editor based on Qt" -HOMEPAGE="https://kid3.kde.org/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+" -SLOT="5" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis" - -REQUIRED_USE="flac? ( vorbis )" - -BDEPEND=" - dev-qt/linguist-tools:5 - kde? ( kde-frameworks/extra-cmake-modules:5 ) -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/readline:0= - acoustid? ( - media-libs/chromaprint - media-video/ffmpeg - ) - flac? ( - media-libs/flac[cxx] - media-libs/libvorbis - ) - kde? ( - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2:0 ) - mpris? ( dev-qt/qtdbus:5 ) - taglib? ( >=media-libs/taglib-1.9.1 ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -RDEPEND="${DEPEND} - !media-sound/kid3:4 -" - -src_prepare() { - # overengineered upstream build system - cmake_src_prepare - # applies broken python hacks, bug #614950 - cmake_comment_add_subdirectory doc -} - -src_configure() { - local mycmakeargs=( - -DWITH_CHROMAPRINT=$(usex acoustid) - -DWITH_DBUS=$(usex mpris) - -DWITH_FLAC=$(usex flac) - -DWITH_ID3LIB=$(usex mp3) - -DWITH_MP4V2=$(usex mp4) - -DWITH_TAGLIB=$(usex taglib) - -DWITH_VORBIS=$(usex vorbis) - ) - - if use kde ; then - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) - else - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) - fi - - cmake_src_configure -} diff --git a/media-sound/kid3/kid3-3.8.5.ebuild b/media-sound/kid3/kid3-3.8.5.ebuild deleted file mode 100644 index 8ed70dc49ede..000000000000 --- a/media-sound/kid3/kid3-3.8.5.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="5" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis" - -REQUIRED_USE="flac? ( vorbis )" -RESTRICT+=" !test? ( test )" - -BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 - kde? ( kde-frameworks/extra-cmake-modules:5 ) -" -COMMON_DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/readline:0= - acoustid? ( - media-libs/chromaprint - media-video/ffmpeg - ) - flac? ( - media-libs/flac[cxx] - media-libs/libvorbis - ) - kde? ( - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2:0 ) - mpris? ( dev-qt/qtdbus:5 ) - taglib? ( >=media-libs/taglib-1.9.1 ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -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 - # applies broken python hacks, bug #614950 - cmake_comment_add_subdirectory doc -} - -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) - ) - - if use kde ; then - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) - else - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) - fi - - cmake_src_configure -} diff --git a/media-sound/kid3/kid3-3.8.6.ebuild b/media-sound/kid3/kid3-3.8.6.ebuild index d68ab97e4739..d91a129de142 100644 --- a/media-sound/kid3/kid3-3.8.6.ebuild +++ b/media-sound/kid3/kid3-3.8.6.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://kid3.kde.org/" if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2+" -- cgit v1.2.3