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/cantata/files/, media-sound/cantata/
Date: Thu, 21 Feb 2019 10:29:55
Message-Id: 1550744948.fa83b63af8f2c35c1fb318ab7c664f2ddaadd557.asturm@gentoo
1 commit: fa83b63af8f2c35c1fb318ab7c664f2ddaadd557
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 20 19:02:11 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 21 10:29:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa83b63a
7
8 media-sound/cantata: Drop 2.3.2
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-sound/cantata/Manifest | 1 -
14 media-sound/cantata/cantata-2.3.2.ebuild | 126 ---------------------
15 .../cantata/files/cantata-2.3.2-opusfile.patch | 22 ----
16 3 files changed, 149 deletions(-)
17
18 diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
19 index 7fa872f1377..a36a1c3c6c0 100644
20 --- a/media-sound/cantata/Manifest
21 +++ b/media-sound/cantata/Manifest
22 @@ -1,2 +1 @@
23 -DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
24 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
25
26 diff --git a/media-sound/cantata/cantata-2.3.2.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
27 deleted file mode 100644
28 index e65a73704d8..00000000000
29 --- a/media-sound/cantata/cantata-2.3.2.ebuild
30 +++ /dev/null
31 @@ -1,126 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
38 -inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
39 -
40 -DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
41 -HOMEPAGE="https://github.com/CDrummond/cantata"
42 -SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="amd64 x86"
47 -IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
48 -REQUIRED_USE="
49 - ?? ( cdda cdio )
50 - cdda? ( udisks || ( cddb musicbrainz ) )
51 - cddb? ( || ( cdio cdda ) taglib )
52 - cdio? ( udisks || ( cddb musicbrainz ) )
53 - mtp? ( taglib udisks )
54 - musicbrainz? ( || ( cdio cdda ) taglib )
55 - replaygain? ( taglib )
56 -"
57 -
58 -COMMON_DEPEND="
59 - dev-qt/qtcore:5
60 - dev-qt/qtdbus:5
61 - dev-qt/qtgui:5
62 - dev-qt/qtnetwork:5
63 - dev-qt/qtsql:5[sqlite]
64 - dev-qt/qtsvg:5
65 - dev-qt/qtwidgets:5
66 - dev-qt/qtxml:5
67 - || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
68 - sys-libs/zlib
69 - virtual/libudev:=
70 - cdda? ( media-sound/cdparanoia )
71 - cddb? ( media-libs/libcddb )
72 - cdio? ( dev-libs/libcdio-paranoia )
73 - mtp? ( media-libs/libmtp )
74 - musicbrainz? ( media-libs/musicbrainz:5= )
75 - replaygain? (
76 - media-libs/libebur128
77 - media-sound/mpg123
78 - libav? ( media-video/libav:= )
79 - !libav? ( media-video/ffmpeg:0= )
80 - )
81 - streaming? ( dev-qt/qtmultimedia:5 )
82 - taglib? (
83 - media-libs/taglib[asf(+),mp4(+)]
84 - udisks? ( sys-fs/udisks:2 )
85 - )
86 - zeroconf? ( net-dns/avahi )
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}/${PN}-2.2.0-headers.patch"
101 - "${FILESDIR}/${P}-opusfile.patch"
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_DEVICES_SUPPORT=$(usex udisks)
133 - -DENABLE_AVAHI=$(usex zeroconf)
134 - -DENABLE_REMOTE_DEVICES=OFF
135 - -DENABLE_UDISKS2=ON
136 - )
137 -
138 - cmake-utils_src_configure
139 -}
140 -
141 -pkg_postinst() {
142 - gnome2_icon_cache_update
143 - xdg_desktop_database_update
144 -
145 - has_version media-sound/mpd || \
146 - elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
147 -
148 - if ! has_version app-misc/media-player-info; then
149 - elog "Install app-misc/media-player-info to enable identification"
150 - elog "and querying of portable media players"
151 - fi
152 -}
153 -
154 -pkg_postrm() {
155 - gnome2_icon_cache_update
156 - xdg_desktop_database_update
157 -}
158
159 diff --git a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
160 deleted file mode 100644
161 index 956edf1d513..00000000000
162 --- a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
163 +++ /dev/null
164 @@ -1,22 +0,0 @@
165 -From cdf4363df91475b091ad20000078ca8ef21ce91f Mon Sep 17 00:00:00 2001
166 -From: Craig Drummond <craig.p.drummond@×××××.com>
167 -Date: Sat, 11 Aug 2018 08:31:40 +0100
168 -Subject: [PATCH] Add '.opus' to list of recognised extensions for local files.
169 -
170 ----
171 - models/playqueuemodel.cpp | 2 +-
172 - 1 file changed, 1 insertions(+), 1 deletion(-)
173 -
174 -diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
175 -index deaaa78f3..c6c4c4130 100644
176 ---- a/models/playqueuemodel.cpp
177 -+++ b/models/playqueuemodel.cpp
178 -@@ -89,7 +89,7 @@ QSet<QString> PlayQueueModel::constFileExtensions = QSet<QString>()
179 - << QLatin1String("m4b") << QLatin1String("mp4") << QLatin1String("m4p") << QLatin1String("wav") << QLatin1String("wv")
180 - << QLatin1String("wvp") << QLatin1String("aiff") << QLatin1String("aif") << QLatin1String("aifc") << QLatin1String("ape")
181 - << QLatin1String("spx") << QLatin1String("tta") << QLatin1String("mpc") << QLatin1String("mpp") << QLatin1String("mp+")
182 -- << QLatin1String("dff") << QLatin1String("dsf")
183 -+ << QLatin1String("dff") << QLatin1String("dsf") << QLatin1String("opus")
184 - // And playlists...
185 - << QLatin1String("m3u") << QLatin1String("m3u8") << constPlsPlaylist << constXspfPlaylist;
186 -