summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2021-04-26 17:33:59 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2021-04-26 17:35:54 +0200
commit2bb7e809267780778eb7bb9053dc1902d970f25e (patch)
treece20328f3bd093609a333f9d4838083bae56628c
parentmedia-radio/svxlink: Fix wrong position of CMAKE_MAKEFILE_GENERATOR (diff)
downloadgentoo-2bb7e809267780778eb7bb9053dc1902d970f25e.tar.gz
gentoo-2bb7e809267780778eb7bb9053dc1902d970f25e.tar.bz2
gentoo-2bb7e809267780778eb7bb9053dc1902d970f25e.zip
media-sound/kid3: removed obsolete 3.8.5
Bug: https://bugs.gentoo.org/785520 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--media-sound/kid3/Manifest1
-rw-r--r--media-sound/kid3/files/kid3-3.8.5-tests-optional.patch80
-rw-r--r--media-sound/kid3/kid3-3.8.5.ebuild102
3 files changed, 0 insertions, 183 deletions
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index e7089aae142d..a2c8c55eabce 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,2 +1 @@
-DIST kid3-3.8.5.tar.gz 3181228 BLAKE2B 8e409c0697cc6045c0a1da4b19a8eae952bc63fa824e21aca19e6ad2130ef71a3fff2c25fa34078ea72e3cbd84459c77bbb616b1d1fb62d0f1023aa2fd6cfccd SHA512 d1f0bc91d50538c29807ddca2a039e758c58850d1224675a1674e3e1d89936bf80db34ffd3cf3678e1008eb600476ebb722ca78796eba2537defcc57664ff00c
DIST kid3-3.8.6.tar.gz 3183673 BLAKE2B c862c1da05ed85ecce8b0c666ddb9e18bdcabafe569f62f3264ebf1e0b7b16c11d25a10e1b1e6cd395442500275f9ee73ef1f6225e049790a09eac68b811df06 SHA512 11613ea72b23a80473699c61141ae2eb9a76b47da87704cd673b70a65bb334bd8232d3a66a7ff2b7f552751145613dbcfb8dcf0746eebb9fa2bd45979f4ba5d4
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 <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
deleted file mode 100644
index 7ef800b5978f..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
-}