Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/, media-sound/kid3/files/
Date: Fri, 22 Feb 2019 13:06:37
Message-Id: 1550840732.93ec353bfa748645d721e3e54b16cebfcedd22f4.asturm@gentoo
1 commit: 93ec353bfa748645d721e3e54b16cebfcedd22f4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 22 13:05:32 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 22 13:05:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ec353b
7
8 media-sound/kid3: Drop <3.7.0
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 media-sound/kid3/Manifest | 2 -
14 media-sound/kid3/files/kid3-3.3.2-libdir.patch | 44 ------------
15 media-sound/kid3/files/kid3-3.4.4-deps.patch | 40 -----------
16 media-sound/kid3/kid3-3.6.1.ebuild | 97 --------------------------
17 media-sound/kid3/kid3-3.6.2.ebuild | 96 -------------------------
18 5 files changed, 279 deletions(-)
19
20 diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
21 index 592a5aab90a..b38ce572d3d 100644
22 --- a/media-sound/kid3/Manifest
23 +++ b/media-sound/kid3/Manifest
24 @@ -1,3 +1 @@
25 -DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
26 -DIST kid3-3.6.2.tar.gz 1430880 BLAKE2B f27d8e332639b72ccc0ace8afe05391c3edc0b470430477407138a90a2b3b0a6cefe0e740b0862d29cc61c866503b5df9b1333f26cd1f7f67797007d6117ce58 SHA512 96e9686d5af8c06867bc4d3b2ca51ddf89b6ba9a622236f79de53bef6b3ef518ef64fef3ab9af4e63ac9161bea8dc1c79d0417fe1ac433a9dfe36331089ab548
27 DIST kid3-3.7.0.tar.gz 1466849 BLAKE2B 39bdab9afb187754914ef77326d9c323e5dd4ab13a6f603deca3dfe97acb0d7a81d58a8eb569397c1a094ebaa7449997b729ce008614c8fc9f04d2b9e7995e03 SHA512 3112addba1e0697ae8874bf12336e54c744165a692dc81a99d97194df8511aa540a53085e2be84b3557cd9a2c9d3d887046c06550cef11406b28e6f6e6b507a6
28
29 diff --git a/media-sound/kid3/files/kid3-3.3.2-libdir.patch b/media-sound/kid3/files/kid3-3.3.2-libdir.patch
30 deleted file mode 100644
31 index b54bf129693..00000000000
32 --- a/media-sound/kid3/files/kid3-3.3.2-libdir.patch
33 +++ /dev/null
34 @@ -1,44 +0,0 @@
35 -Install libraries to the correct directory.
36 -
37 -Gentoo-bug: 562624
38 -Gentoo-bug: 570976
39 -Gentoo-bug: 576946
40 -
41 ---- a/CMakeLists.txt
42 -+++ b/CMakeLists.txt
43 -@@ -159,7 +159,7 @@
44 - endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS)
45 - set(WITH_QMLDIR_DEFAULT "share/kid3/qml")
46 - set(WITH_BINDIR_DEFAULT "bin")
47 -- set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3")
48 -+ set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}")
49 - set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins")
50 - endif (APPLE)
51 -
52 -@@ -189,6 +189,10 @@
53 - set(CMAKE_INSTALL_PREFIX_SLASH "")
54 - endif (CMAKE_INSTALL_PREFIX)
55 -
56 -+if (NOT APPLE AND NOT WIN32)
57 -+ set(WITH_PLUGINSDIR "${WITH_LIBDIR_DEFAULT}/${QTVER}/plugins/kid3")
58 -+endif ()
59 -+
60 - if (APPLE)
61 - file(RELATIVE_PATH CFG_DATAROOTDIR "/kid3.app/Contents/MacOS" /${WITH_DATAROOTDIR})
62 - file(RELATIVE_PATH CFG_DOCDIR "/kid3.app/Contents/MacOS" /${WITH_DOCDIR})
63 -@@ -241,6 +245,7 @@
64 - find_package(Qt4 COMPONENTS ${_QT4_COMPONENTS})
65 - if (Qt4_FOUND OR QT4_FOUND)
66 - include (${QT_USE_FILE})
67 -+ set(QTVER "qt4")
68 - if (NOT WITH_QT4)
69 - message(STATUS "Qt4 found, explicitly set WITH_QT5 or QT_QMAKE_EXECUTABLE to use a different version.")
70 - endif (NOT WITH_QT4)
71 -@@ -276,6 +281,7 @@
72 - endif (_qt5Dir)
73 - if (Qt5Core_FOUND)
74 - set(HAVE_QT5 1)
75 -+ set(QTVER "qt5")
76 - set(WITH_PHONON OFF)
77 - set(QT_INCLUDES)
78 - set(QT_DEFINITIONS)
79
80 diff --git a/media-sound/kid3/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch
81 deleted file mode 100644
82 index 333645d11b3..00000000000
83 --- a/media-sound/kid3/files/kid3-3.4.4-deps.patch
84 +++ /dev/null
85 @@ -1,40 +0,0 @@
86 -From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001
87 -From: Michael Palimaka <kensington@g.o>
88 -Date: Sun, 27 Nov 2016 20:00:37 +1100
89 -Subject: [PATCH] Improve KF5 dependencies.
90 -
91 -This list was compiled from a cusory include and NEEDED inspection.
92 ----
93 - src/app/CMakeLists.txt | 2 +-
94 - src/app/kde/CMakeLists.txt | 2 +-
95 - 2 files changed, 2 insertions(+), 2 deletions(-)
96 -
97 -diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
98 -index 516e3f9..7790fde 100644
99 ---- a/src/app/CMakeLists.txt
100 -+++ b/src/app/CMakeLists.txt
101 -@@ -33,7 +33,7 @@ if (BUILD_KDE_APP)
102 - include(KDECMakeSettings)
103 - include(FeatureSummary)
104 -
105 -- find_package(KF5 REQUIRED COMPONENTS KIO)
106 -+ find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui)
107 -
108 - if (BUILD_SHARED_LIBS)
109 - # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is
110 -diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt
111 -index 2f2867a..8a25b43 100644
112 ---- a/src/app/kde/CMakeLists.txt
113 -+++ b/src/app/kde/CMakeLists.txt
114 -@@ -13,7 +13,7 @@ if (HAVE_QT5)
115 -
116 - add_executable(kid3 ${kde_SRCS})
117 -
118 -- target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++)
119 -+ target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++)
120 -
121 - install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR})
122 - install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
123 ---
124 -2.10.2
125 -
126
127 diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
128 deleted file mode 100644
129 index a187a6615d0..00000000000
130 --- a/media-sound/kid3/kid3-3.6.1.ebuild
131 +++ /dev/null
132 @@ -1,97 +0,0 @@
133 -# Copyright 1999-2018 Gentoo Foundation
134 -# Distributed under the terms of the GNU General Public License v2
135 -
136 -EAPI=6
137 -
138 -ECM_KDEINSTALLDIRS="false"
139 -KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
140 -inherit kde5
141 -
142 -DESCRIPTION="Simple tag editor based on Qt"
143 -HOMEPAGE="https://kid3.sourceforge.io/"
144 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
145 -
146 -LICENSE="GPL-2+"
147 -SLOT="5"
148 -KEYWORDS="amd64 x86"
149 -IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
150 -
151 -REQUIRED_USE="flac? ( vorbis )"
152 -
153 -COMMON_DEPEND="
154 - $(add_qt_dep qtdbus)
155 - $(add_qt_dep qtdeclarative)
156 - $(add_qt_dep qtgui)
157 - $(add_qt_dep qtmultimedia)
158 - $(add_qt_dep qtnetwork)
159 - $(add_qt_dep qtwidgets)
160 - $(add_qt_dep qtxml)
161 - sys-libs/readline:0=
162 - acoustid? (
163 - media-libs/chromaprint
164 - virtual/ffmpeg
165 - )
166 - flac? (
167 - media-libs/flac[cxx]
168 - media-libs/libvorbis
169 - )
170 - kde? (
171 - $(add_frameworks_dep kconfig)
172 - $(add_frameworks_dep kconfigwidgets)
173 - $(add_frameworks_dep kcoreaddons)
174 - $(add_frameworks_dep kwidgetsaddons)
175 - $(add_frameworks_dep kxmlgui)
176 - )
177 - mp3? ( media-libs/id3lib )
178 - mp4? ( media-libs/libmp4v2:0 )
179 - taglib? ( >=media-libs/taglib-1.9.1 )
180 - vorbis? (
181 - media-libs/libogg
182 - media-libs/libvorbis
183 - )
184 -"
185 -RDEPEND="${COMMON_DEPEND}
186 - !media-sound/kid3:4
187 -"
188 -DEPEND="${COMMON_DEPEND}
189 - $(add_qt_dep linguist-tools)
190 -"
191 -
192 -PATCHES=(
193 - "${FILESDIR}/${PN}-3.3.2-libdir.patch"
194 - "${FILESDIR}/${PN}-3.4.4-deps.patch"
195 -)
196 -
197 -src_prepare() {
198 - # overengineered upstream build system
199 - # kde5 eclass src_prepare leads to compile failure
200 -
201 - # only enable handbook when required
202 - if ! use_if_iuse handbook ; then
203 - cmake_comment_add_subdirectory ${KDE_DOC_DIR}
204 - fi
205 -
206 - cmake-utils_src_prepare
207 -}
208 -
209 -src_configure() {
210 - local mycmakeargs=(
211 - -DWITH_PHONON=OFF
212 - -DWITH_QT4=OFF
213 - -DWITH_QT5=ON
214 - -DWITH_CHROMAPRINT=$(usex acoustid)
215 - -DWITH_FLAC=$(usex flac)
216 - -DWITH_ID3LIB=$(usex mp3)
217 - -DWITH_MP4V2=$(usex mp4)
218 - -DWITH_TAGLIB=$(usex taglib)
219 - -DWITH_VORBIS=$(usex vorbis)
220 - )
221 -
222 - if use kde ; then
223 - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
224 - else
225 - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
226 - fi
227 -
228 - kde5_src_configure
229 -}
230
231 diff --git a/media-sound/kid3/kid3-3.6.2.ebuild b/media-sound/kid3/kid3-3.6.2.ebuild
232 deleted file mode 100644
233 index 59ad6ac1081..00000000000
234 --- a/media-sound/kid3/kid3-3.6.2.ebuild
235 +++ /dev/null
236 @@ -1,96 +0,0 @@
237 -# Copyright 1999-2018 Gentoo Foundation
238 -# Distributed under the terms of the GNU General Public License v2
239 -
240 -EAPI=6
241 -
242 -ECM_KDEINSTALLDIRS="false"
243 -KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
244 -inherit kde5
245 -
246 -DESCRIPTION="Simple tag editor based on Qt"
247 -HOMEPAGE="https://kid3.sourceforge.io/"
248 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
249 -
250 -LICENSE="GPL-2+"
251 -SLOT="5"
252 -KEYWORDS="~amd64 ~x86"
253 -IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
254 -
255 -REQUIRED_USE="flac? ( vorbis )"
256 -
257 -COMMON_DEPEND="
258 - $(add_qt_dep qtdbus)
259 - $(add_qt_dep qtdeclarative)
260 - $(add_qt_dep qtgui)
261 - $(add_qt_dep qtmultimedia)
262 - $(add_qt_dep qtnetwork)
263 - $(add_qt_dep qtwidgets)
264 - $(add_qt_dep qtxml)
265 - sys-libs/readline:0=
266 - acoustid? (
267 - media-libs/chromaprint
268 - virtual/ffmpeg
269 - )
270 - flac? (
271 - media-libs/flac[cxx]
272 - media-libs/libvorbis
273 - )
274 - kde? (
275 - $(add_frameworks_dep kconfig)
276 - $(add_frameworks_dep kconfigwidgets)
277 - $(add_frameworks_dep kcoreaddons)
278 - $(add_frameworks_dep kwidgetsaddons)
279 - $(add_frameworks_dep kxmlgui)
280 - )
281 - mp3? ( media-libs/id3lib )
282 - mp4? ( media-libs/libmp4v2:0 )
283 - taglib? ( >=media-libs/taglib-1.9.1 )
284 - vorbis? (
285 - media-libs/libogg
286 - media-libs/libvorbis
287 - )
288 -"
289 -RDEPEND="${COMMON_DEPEND}
290 - !media-sound/kid3:4
291 -"
292 -DEPEND="${COMMON_DEPEND}
293 - $(add_qt_dep linguist-tools)
294 -"
295 -
296 -PATCHES=(
297 - "${FILESDIR}/${PN}-3.3.2-libdir.patch"
298 -)
299 -
300 -src_prepare() {
301 - # overengineered upstream build system
302 - # kde5 eclass src_prepare leads to compile failure
303 -
304 - # only enable handbook when required
305 - if ! use_if_iuse handbook ; then
306 - cmake_comment_add_subdirectory ${KDE_DOC_DIR}
307 - fi
308 -
309 - cmake-utils_src_prepare
310 -}
311 -
312 -src_configure() {
313 - local mycmakeargs=(
314 - -DWITH_PHONON=OFF
315 - -DWITH_QT4=OFF
316 - -DWITH_QT5=ON
317 - -DWITH_CHROMAPRINT=$(usex acoustid)
318 - -DWITH_FLAC=$(usex flac)
319 - -DWITH_ID3LIB=$(usex mp3)
320 - -DWITH_MP4V2=$(usex mp4)
321 - -DWITH_TAGLIB=$(usex taglib)
322 - -DWITH_VORBIS=$(usex vorbis)
323 - )
324 -
325 - if use kde ; then
326 - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
327 - else
328 - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
329 - fi
330 -
331 - kde5_src_configure
332 -}
Report Message
Find on MARC Find on Google Groups