Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/kid3/files/, media-sound/kid3/
Date: Mon, 27 Feb 2023 19:29:40
Message-Id: 1677526163.e77ce858041053e89f626994de3f6c239dbe9d73.asturm@gentoo
1 commit: e77ce858041053e89f626994de3f6c239dbe9d73
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 27 19:28:11 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 19:29:23 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77ce858
7
8 media-sound/kid3: drop 3.9.2-r1
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 media-sound/kid3/Manifest | 1 -
13 media-sound/kid3/files/kid3-3.9.2-musl.patch | 27 -------
14 media-sound/kid3/kid3-3.9.2-r1.ebuild | 102 ---------------------------
15 3 files changed, 130 deletions(-)
16
17 diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
18 index 7ed23cbdb72e..93466b386a18 100644
19 --- a/media-sound/kid3/Manifest
20 +++ b/media-sound/kid3/Manifest
21 @@ -1,2 +1 @@
22 -DIST kid3-3.9.2.tar.xz 1952344 BLAKE2B 5a44a05f614f97dc7ddab39694a1773e1e6c55af7a9dc4ac7b793a520e54a8892c2181903a58f150885b3b4e17ebf921db719863f7ac4fd540f711a444990df3 SHA512 fc0b9db33ea948a2345968ab5da65f959bea829130f4250604d68df778218173d49f92b015d9be4e43f57ba5ae3388b0e97f558774df590b5959aa6f6293acd3
23 DIST kid3-3.9.3.tar.xz 1820640 BLAKE2B ea030328d88f583e88959e7536f4e3e086354befc40395700fac8314a1e7c3da7a2f9a614ff9ad98491d9ec4d8b24ead05a2214b94f55786a5e493c1a585056c SHA512 f40c7eaa186eb7d3163635286a8ad89bf6b29dce851b4fadc0814eec7759ed7fbac37e4596365bac4df93c5b655a7e943f8414e7c8f661b29aea7bde5367ed73
24
25 diff --git a/media-sound/kid3/files/kid3-3.9.2-musl.patch b/media-sound/kid3/files/kid3-3.9.2-musl.patch
26 deleted file mode 100644
27 index 05eb15536386..000000000000
28 --- a/media-sound/kid3/files/kid3-3.9.2-musl.patch
29 +++ /dev/null
30 @@ -1,27 +0,0 @@
31 -From 15655cd3f19b95d5533bdfd52b0f38c51a4fdf88 Mon Sep 17 00:00:00 2001
32 -From: Bart Ribbers <bribbers@×××××××.org>
33 -Date: Sat, 24 Sep 2022 17:20:06 +0200
34 -Subject: [PATCH] Fix build on Musl libc
35 -
36 -malloc_trim is only implemented on glibc, so rather than checking if the
37 -OS is Linux and not Android, check if it's Linux and glibc.
38 ----
39 - src/core/model/kid3application.cpp | 2 +-
40 - 1 file changed, 1 insertion(+), 1 deletion(-)
41 -
42 -diff --git a/src/core/model/kid3application.cpp b/src/core/model/kid3application.cpp
43 -index d40bca83..03409d1b 100644
44 ---- a/src/core/model/kid3application.cpp
45 -+++ b/src/core/model/kid3application.cpp
46 -@@ -995,7 +995,7 @@ void Kid3Application::unloadAllTags()
47 - taggedFile->closeFileHandle();
48 - }
49 - }
50 --#if defined Q_OS_LINUX && !defined Q_OS_ANDROID
51 -+#if defined Q_OS_LINUX && defined __GLIBC__
52 - if (::malloc_trim(0)) {
53 - qDebug("Memory released by malloc_trim()");
54 - }
55 ---
56 -GitLab
57 -
58
59 diff --git a/media-sound/kid3/kid3-3.9.2-r1.ebuild b/media-sound/kid3/kid3-3.9.2-r1.ebuild
60 deleted file mode 100644
61 index 506b585726a8..000000000000
62 --- a/media-sound/kid3/kid3-3.9.2-r1.ebuild
63 +++ /dev/null
64 @@ -1,102 +0,0 @@
65 -# Copyright 1999-2023 Gentoo Authors
66 -# Distributed under the terms of the GNU General Public License v2
67 -
68 -EAPI=8
69 -
70 -PYTHON_COMPAT=( python3_{9..11} )
71 -inherit cmake kde.org python-any-r1 xdg
72 -
73 -DESCRIPTION="Simple tag editor based on Qt"
74 -HOMEPAGE="https://kid3.kde.org/"
75 -
76 -if [[ ${KDE_BUILD_TYPE} != live ]]; then
77 - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
78 - KEYWORDS="amd64 x86"
79 -fi
80 -
81 -LICENSE="GPL-2+"
82 -SLOT="5"
83 -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
84 -
85 -REQUIRED_USE="flac? ( vorbis )"
86 -RESTRICT="!test? ( test )"
87 -
88 -RDEPEND="
89 - dev-qt/qtcore:5
90 - dev-qt/qtdeclarative:5
91 - dev-qt/qtgui:5
92 - dev-qt/qtmultimedia:5
93 - dev-qt/qtnetwork:5
94 - dev-qt/qtwidgets:5
95 - dev-qt/qtxml:5
96 - sys-libs/readline:=
97 - acoustid? (
98 - media-libs/chromaprint:=
99 - media-video/ffmpeg:=
100 - )
101 - flac? (
102 - media-libs/flac:=[cxx]
103 - media-libs/libvorbis
104 - )
105 - kde? (
106 - kde-frameworks/kconfig:5
107 - kde-frameworks/kconfigwidgets:5
108 - kde-frameworks/kcoreaddons:5
109 - kde-frameworks/kio:5
110 - kde-frameworks/kwidgetsaddons:5
111 - kde-frameworks/kxmlgui:5
112 - )
113 - mp3? ( media-libs/id3lib )
114 - mp4? ( media-libs/libmp4v2 )
115 - mpris? ( dev-qt/qtdbus:5 )
116 - taglib? ( >=media-libs/taglib-1.9.1 )
117 - vorbis? (
118 - media-libs/libogg
119 - media-libs/libvorbis
120 - )
121 -"
122 -DEPEND="${RDEPEND}
123 - test? ( dev-qt/qttest:5 )
124 -"
125 -BDEPEND="${PYTHON_DEPS}
126 - dev-qt/linguist-tools:5
127 - kde? ( kde-frameworks/extra-cmake-modules:5 )
128 -"
129 -
130 -PATCHES=( "${FILESDIR}/${P}-musl.patch" )
131 -
132 -pkg_setup() {
133 - use test && python-any-r1_pkg_setup
134 -}
135 -
136 -src_prepare() {
137 - # overengineered upstream build system
138 - cmake_src_prepare
139 - # applies broken python hacks, bug #614950
140 - cmake_comment_add_subdirectory doc
141 -
142 - sed -e "/^find_package.*QT NAMES/s/Qt6 //" \
143 - -i CMakeLists.txt || die # ensure Qt5 build
144 -}
145 -
146 -src_configure() {
147 - local mycmakeargs=(
148 - -DPython3_EXECUTABLE="${PYTHON}"
149 - -DWITH_CHROMAPRINT=$(usex acoustid)
150 - -DWITH_DBUS=$(usex mpris)
151 - -DWITH_FLAC=$(usex flac)
152 - -DWITH_ID3LIB=$(usex mp3)
153 - -DWITH_MP4V2=$(usex mp4)
154 - -DWITH_TAGLIB=$(usex taglib)
155 - -DBUILD_TESTING=$(usex test)
156 - -DWITH_VORBIS=$(usex vorbis)
157 - )
158 -
159 - if use kde ; then
160 - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
161 - else
162 - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
163 - fi
164 -
165 - cmake_src_configure
166 -}