1 |
commit: 87766f4f5741763d21be52b3cbb0ff48085c4a9f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 3 20:05:42 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 3 20:05:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87766f4f |
7 |
|
8 |
media-sound/cantata: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
media-sound/cantata/Manifest | 1 - |
13 |
media-sound/cantata/cantata-2.2.0-r2.ebuild | 125 --------------------- |
14 |
media-sound/cantata/cantata-2.3.1.ebuild | 124 -------------------- |
15 |
.../cantata/files/cantata-2.2.0-qtsql-5.10.patch | 23 ---- |
16 |
4 files changed, 273 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest |
19 |
index cef8831345c..3104e3b1882 100644 |
20 |
--- a/media-sound/cantata/Manifest |
21 |
+++ b/media-sound/cantata/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd |
24 |
-DIST cantata-2.3.1.tar.bz2 2414702 BLAKE2B c44f7e95091dd4f84e630236e7f681d2ea47cd90705cdeeb17d3e892d4e0b978f88d4cb648841543494670c5dbc1a00ba9e2377dfd684b2fdee9223d4b6b28e3 SHA512 8199b08b1f3d2111fc50fbc4e5b1edced6ac480fd213a11eee569deeebf3a3f1167c2b53c3117bb90b2b81b46792c56b99b65eae5d2b290c0f3b3f90736108e5 |
25 |
DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4 |
26 |
|
27 |
diff --git a/media-sound/cantata/cantata-2.2.0-r2.ebuild b/media-sound/cantata/cantata-2.2.0-r2.ebuild |
28 |
deleted file mode 100644 |
29 |
index c9cd47b8623..00000000000 |
30 |
--- a/media-sound/cantata/cantata-2.2.0-r2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,125 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN" |
39 |
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg |
40 |
- |
41 |
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" |
42 |
-HOMEPAGE="https://github.com/CDrummond/cantata" |
43 |
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2" |
44 |
- |
45 |
-LICENSE="GPL-2" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64 ~x86" |
48 |
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks" |
49 |
-REQUIRED_USE=" |
50 |
- ?? ( cdda cdio ) |
51 |
- cdda? ( udisks || ( cddb musicbrainz ) ) |
52 |
- cddb? ( || ( cdio cdda ) taglib ) |
53 |
- cdio? ( udisks || ( cddb musicbrainz ) ) |
54 |
- mtp? ( taglib udisks ) |
55 |
- musicbrainz? ( || ( cdio cdda ) taglib ) |
56 |
- replaygain? ( taglib ) |
57 |
-" |
58 |
- |
59 |
-COMMON_DEPEND=" |
60 |
- dev-qt/qtcore:5 |
61 |
- dev-qt/qtdbus:5 |
62 |
- dev-qt/qtgui:5 |
63 |
- dev-qt/qtnetwork:5 |
64 |
- dev-qt/qtsql:5[sqlite] |
65 |
- dev-qt/qtsvg:5 |
66 |
- dev-qt/qtwidgets:5 |
67 |
- dev-qt/qtxml:5 |
68 |
- || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) |
69 |
- sys-libs/zlib |
70 |
- virtual/libudev:= |
71 |
- cdda? ( media-sound/cdparanoia ) |
72 |
- cddb? ( media-libs/libcddb ) |
73 |
- cdio? ( dev-libs/libcdio-paranoia ) |
74 |
- mtp? ( media-libs/libmtp ) |
75 |
- musicbrainz? ( media-libs/musicbrainz:5= ) |
76 |
- replaygain? ( |
77 |
- media-libs/libebur128 |
78 |
- media-sound/mpg123 |
79 |
- virtual/ffmpeg |
80 |
- ) |
81 |
- streaming? ( media-video/vlc:0= ) |
82 |
- taglib? ( |
83 |
- media-libs/taglib[asf(+),mp4(+)] |
84 |
- media-libs/taglib-extras |
85 |
- udisks? ( sys-fs/udisks:2 ) |
86 |
- ) |
87 |
-" |
88 |
-RDEPEND="${COMMON_DEPEND} |
89 |
- dev-lang/perl[ithreads] |
90 |
-" |
91 |
-DEPEND="${COMMON_DEPEND} |
92 |
- dev-qt/qtconcurrent:5 |
93 |
- dev-qt/linguist-tools:5 |
94 |
-" |
95 |
- |
96 |
-# cantata has no tests |
97 |
-RESTRICT="test" |
98 |
- |
99 |
-PATCHES=( |
100 |
- "${FILESDIR}/${P}-headers.patch" |
101 |
- "${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196 |
102 |
-) |
103 |
- |
104 |
-src_prepare() { |
105 |
- remove_locale() { |
106 |
- rm "translations/${PN}_${1}".ts || die |
107 |
- } |
108 |
- |
109 |
- cmake-utils_src_prepare |
110 |
- |
111 |
- # Unbundle 3rd party libs |
112 |
- rm -r 3rdparty/{ebur128,qtsingleapplication} || die |
113 |
- |
114 |
- l10n_find_plocales_changes "translations" "${PN}_" ".ts" |
115 |
- l10n_for_each_disabled_locale_do remove_locale |
116 |
-} |
117 |
- |
118 |
-src_configure() { |
119 |
- local mycmakeargs=( |
120 |
- -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" |
121 |
- -DENABLE_CDPARANOIA=$(usex cdda) |
122 |
- -DENABLE_CDDB=$(usex cddb) |
123 |
- -DENABLE_CDIOPARANOIA=$(usex cdio) |
124 |
- -DENABLE_HTTP_SERVER=$(usex http-server) |
125 |
- -DENABLE_MTP=$(usex mtp) |
126 |
- -DENABLE_MUSICBRAINZ=$(usex musicbrainz) |
127 |
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" |
128 |
- -DENABLE_FFMPEG=$(usex replaygain) |
129 |
- -DENABLE_MPG123=$(usex replaygain) |
130 |
- -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) |
131 |
- -DENABLE_TAGLIB=$(usex taglib) |
132 |
- -DENABLE_TAGLIB_EXTRAS=$(usex taglib) |
133 |
- -DENABLE_DEVICES_SUPPORT=$(usex udisks) |
134 |
- -DENABLE_REMOTE_DEVICES=OFF |
135 |
- -DENABLE_UDISKS2=ON |
136 |
- ) |
137 |
- |
138 |
- cmake-utils_src_configure |
139 |
-} |
140 |
- |
141 |
-pkg_preinst() { |
142 |
- gnome2_icon_savelist |
143 |
- xdg_pkg_preinst |
144 |
-} |
145 |
- |
146 |
-pkg_postinst() { |
147 |
- gnome2_icon_cache_update |
148 |
- xdg_pkg_postinst |
149 |
- |
150 |
- has_version media-sound/mpd || \ |
151 |
- elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." |
152 |
-} |
153 |
- |
154 |
-pkg_postrm() { |
155 |
- gnome2_icon_cache_update |
156 |
- xdg_pkg_postrm |
157 |
-} |
158 |
|
159 |
diff --git a/media-sound/cantata/cantata-2.3.1.ebuild b/media-sound/cantata/cantata-2.3.1.ebuild |
160 |
deleted file mode 100644 |
161 |
index 4bc76c731c1..00000000000 |
162 |
--- a/media-sound/cantata/cantata-2.3.1.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,124 +0,0 @@ |
165 |
-# Copyright 1999-2018 Gentoo Foundation |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
- |
168 |
-EAPI=6 |
169 |
- |
170 |
-PLOCALES="cs da de en_GB es fr hu it ja ko pl ru zh_CN" |
171 |
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils |
172 |
- |
173 |
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" |
174 |
-HOMEPAGE="https://github.com/CDrummond/cantata" |
175 |
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2" |
176 |
- |
177 |
-LICENSE="GPL-2" |
178 |
-SLOT="0" |
179 |
-KEYWORDS="~amd64 ~x86" |
180 |
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf" |
181 |
-REQUIRED_USE=" |
182 |
- ?? ( cdda cdio ) |
183 |
- cdda? ( udisks || ( cddb musicbrainz ) ) |
184 |
- cddb? ( || ( cdio cdda ) taglib ) |
185 |
- cdio? ( udisks || ( cddb musicbrainz ) ) |
186 |
- mtp? ( taglib udisks ) |
187 |
- musicbrainz? ( || ( cdio cdda ) taglib ) |
188 |
- replaygain? ( taglib ) |
189 |
-" |
190 |
- |
191 |
-COMMON_DEPEND=" |
192 |
- dev-qt/qtcore:5 |
193 |
- dev-qt/qtdbus:5 |
194 |
- dev-qt/qtgui:5 |
195 |
- dev-qt/qtnetwork:5 |
196 |
- dev-qt/qtsql:5[sqlite] |
197 |
- dev-qt/qtsvg:5 |
198 |
- dev-qt/qtwidgets:5 |
199 |
- dev-qt/qtxml:5 |
200 |
- || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) |
201 |
- sys-libs/zlib |
202 |
- virtual/libudev:= |
203 |
- cdda? ( media-sound/cdparanoia ) |
204 |
- cddb? ( media-libs/libcddb ) |
205 |
- cdio? ( dev-libs/libcdio-paranoia ) |
206 |
- mtp? ( media-libs/libmtp ) |
207 |
- musicbrainz? ( media-libs/musicbrainz:5= ) |
208 |
- replaygain? ( |
209 |
- media-libs/libebur128 |
210 |
- media-sound/mpg123 |
211 |
- virtual/ffmpeg |
212 |
- ) |
213 |
- streaming? ( media-video/vlc:0= ) |
214 |
- taglib? ( |
215 |
- media-libs/taglib[asf(+),mp4(+)] |
216 |
- udisks? ( sys-fs/udisks:2 ) |
217 |
- ) |
218 |
- zeroconf? ( net-dns/avahi ) |
219 |
-" |
220 |
-RDEPEND="${COMMON_DEPEND} |
221 |
- dev-lang/perl[ithreads] |
222 |
-" |
223 |
-DEPEND="${COMMON_DEPEND} |
224 |
- dev-qt/qtconcurrent:5 |
225 |
- dev-qt/linguist-tools:5 |
226 |
-" |
227 |
- |
228 |
-# cantata has no tests |
229 |
-RESTRICT="test" |
230 |
- |
231 |
-PATCHES=( |
232 |
- "${FILESDIR}/${PN}-2.2.0-headers.patch" |
233 |
-) |
234 |
- |
235 |
-src_prepare() { |
236 |
- remove_locale() { |
237 |
- rm "translations/${PN}_${1}".ts || die |
238 |
- } |
239 |
- |
240 |
- cmake-utils_src_prepare |
241 |
- |
242 |
- # Unbundle 3rd party libs |
243 |
- rm -r 3rdparty/{ebur128,qtsingleapplication} || die |
244 |
- |
245 |
- l10n_find_plocales_changes "translations" "${PN}_" ".ts" |
246 |
- l10n_for_each_disabled_locale_do remove_locale |
247 |
-} |
248 |
- |
249 |
-src_configure() { |
250 |
- local mycmakeargs=( |
251 |
- -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" |
252 |
- -DENABLE_CDPARANOIA=$(usex cdda) |
253 |
- -DENABLE_CDDB=$(usex cddb) |
254 |
- -DENABLE_CDIOPARANOIA=$(usex cdio) |
255 |
- -DENABLE_HTTP_SERVER=$(usex http-server) |
256 |
- -DENABLE_MTP=$(usex mtp) |
257 |
- -DENABLE_MUSICBRAINZ=$(usex musicbrainz) |
258 |
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" |
259 |
- -DENABLE_FFMPEG=$(usex replaygain) |
260 |
- -DENABLE_MPG123=$(usex replaygain) |
261 |
- -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) |
262 |
- -DENABLE_TAGLIB=$(usex taglib) |
263 |
- -DENABLE_DEVICES_SUPPORT=$(usex udisks) |
264 |
- -DENABLE_AVAHI=$(usex zeroconf) |
265 |
- -DENABLE_REMOTE_DEVICES=OFF |
266 |
- -DENABLE_UDISKS2=ON |
267 |
- ) |
268 |
- |
269 |
- cmake-utils_src_configure |
270 |
-} |
271 |
- |
272 |
-pkg_postinst() { |
273 |
- gnome2_icon_cache_update |
274 |
- xdg_desktop_database_update |
275 |
- |
276 |
- has_version media-sound/mpd || \ |
277 |
- elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." |
278 |
- |
279 |
- if ! has_version app-misc/media-player-info; then |
280 |
- elog "Install app-misc/media-player-info to enable identification" |
281 |
- elog "and querying of portable media players" |
282 |
- fi |
283 |
-} |
284 |
- |
285 |
-pkg_postrm() { |
286 |
- gnome2_icon_cache_update |
287 |
- xdg_desktop_database_update |
288 |
-} |
289 |
|
290 |
diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch |
291 |
deleted file mode 100644 |
292 |
index 16cb6d8c2d1..00000000000 |
293 |
--- a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch |
294 |
+++ /dev/null |
295 |
@@ -1,23 +0,0 @@ |
296 |
-From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001 |
297 |
-From: Craig Drummond <craig.p.drummond@×××××.com> |
298 |
-Date: Tue, 28 Nov 2017 22:37:01 +0000 |
299 |
-Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130 |
300 |
- |
301 |
---- |
302 |
- db/librarydb.cpp | 3 ++- |
303 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
304 |
- |
305 |
-diff --git a/db/librarydb.cpp b/db/librarydb.cpp |
306 |
-index 603d8abc1..4f75dc28f 100644 |
307 |
---- a/db/librarydb.cpp |
308 |
-+++ b/db/librarydb.cpp |
309 |
-@@ -453,7 +453,8 @@ class SqlQuery |
310 |
- if (limit>0) { |
311 |
- sql+=" LIMIT "+QString::number(limit); |
312 |
- } |
313 |
-- query=QSqlQuery(sql, db); |
314 |
-+ query = QSqlQuery(db); |
315 |
-+ query.prepare(sql); |
316 |
- |
317 |
- for (const QVariant &value: boundValues) { |
318 |
- query.addBindValue(value); |