Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/, media-sound/clementine/files/
Date: Wed, 27 Apr 2016 12:22:08
Message-Id: 1461759716.df9bc12fb6abbbb7b2c33a9b608e3859b4a063ad.polynomial-c@gentoo
1 commit: df9bc12fb6abbbb7b2c33a9b608e3859b4a063ad
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 12:21:40 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 12:21:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9bc12f
7
8 media-sound/clementine: Removed old.
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-sound/clementine/Manifest | 1 -
14 media-sound/clementine/clementine-1.2.2.ebuild | 167 ---------------------
15 .../files/clementine-1.2.2-fix-build.patch | 25 ---
16 .../files/clementine-1.2.2-fix-build2.patch | 38 -----
17 .../clementine/files/clementine-1.2.2-gcc49.patch | 17 ---
18 5 files changed, 248 deletions(-)
19
20 diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
21 index 624eb88..3839234 100644
22 --- a/media-sound/clementine/Manifest
23 +++ b/media-sound/clementine/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST clementine-1.2.2.tar.gz 9076752 SHA256 1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca WHIRLPOOL 13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
26 DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
27 DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
28 DIST clementine-1.3.tar.gz 8500723 SHA256 55e8d283ed02e3f2376a88b012cd2003e00fef95a98b6a919d67cb57e96b8617 SHA512 eccebb8a4d7e4abf39af7b75f40d38d184650932d2c40859cdfb3cfda24d2a35fea8518b03d9fb24f21c4dae6f11baffe2b00fe6989ec14fed99a4ccbb85ca54 WHIRLPOOL cbd6922fa586cce6be29ef0fd6151d6d89ce95aa6e237cf2716e7493ba6be2026d11a44012dc84be2e033c606c79c3e9e0338cbbd5927d7f16f358718c016895
29
30 diff --git a/media-sound/clementine/clementine-1.2.2.ebuild b/media-sound/clementine/clementine-1.2.2.ebuild
31 deleted file mode 100644
32 index 9e0a825..0000000
33 --- a/media-sound/clementine/clementine-1.2.2.ebuild
34 +++ /dev/null
35 @@ -1,167 +0,0 @@
36 -# Copyright 1999-2015 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI=5
41 -
42 -EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
43 -
44 -LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
45 -
46 -inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
47 -[[ ${PV} == *9999* ]] && inherit git-2
48 -
49 -DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
50 -HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
51 -[[ ${PV} == *9999* ]] || \
52 -SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV}.tar.gz -> ${P}.tar.gz"
53 -
54 -LICENSE="GPL-3"
55 -SLOT="0"
56 -[[ ${PV} == *9999* ]] || \
57 -KEYWORDS="amd64 x86"
58 -IUSE="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
59 -IUSE+="${LANGS// / linguas_}"
60 -
61 -REQUIRED_USE="
62 - udisks? ( dbus )
63 - wiimote? ( dbus )
64 -"
65 -
66 -# qca dep is temporary for bug #489850
67 -COMMON_DEPEND="
68 - app-crypt/qca:2[qt4(+)]
69 - >=dev-qt/qtgui-4.5:4
70 - dbus? ( >=dev-qt/qtdbus-4.5:4 )
71 - >=dev-qt/qtopengl-4.5:4
72 - >=dev-qt/qtsql-4.5:4[sqlite]
73 - system-sqlite? ( dev-db/sqlite[fts3(+)] )
74 - >=media-libs/taglib-1.8[mp4]
75 - >=dev-libs/glib-2.24.1-r1
76 - dev-libs/libxml2
77 - dev-libs/protobuf:=
78 - dev-libs/qjson
79 - media-libs/libechonest:=
80 - >=media-libs/libmygpo-qt-1.0.7
81 - >=media-libs/chromaprint-0.6
82 - media-libs/gstreamer:0.10
83 - media-libs/gst-plugins-base:0.10
84 - virtual/glu
85 - virtual/opengl
86 - ayatana? ( dev-libs/libindicate-qt )
87 - cdda? ( dev-libs/libcdio )
88 - ipod? ( >=media-libs/libgpod-0.8.0 )
89 - lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
90 - mtp? ( >=media-libs/libmtp-1.0.0 )
91 - moodbar? ( sci-libs/fftw:3.0 )
92 - projectm? ( media-libs/glew )
93 -"
94 -# now only presets are used, libprojectm is internal
95 -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
96 -# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
97 -RDEPEND="${COMMON_DEPEND}
98 - dbus? ( udisks? ( sys-fs/udisks:2 ) )
99 - mms? ( media-plugins/gst-plugins-libmms:0.10 )
100 - mtp? ( gnome-base/gvfs )
101 - projectm? ( >=media-libs/libprojectm-1.2.0 )
102 - media-plugins/gst-plugins-meta:0.10
103 - media-plugins/gst-plugins-gio:0.10
104 - media-plugins/gst-plugins-soup:0.10
105 - media-plugins/gst-plugins-taglib:0.10
106 -"
107 -DEPEND="${COMMON_DEPEND}
108 - >=dev-libs/boost-1.39
109 - virtual/pkgconfig
110 - sys-devel/gettext
111 - dev-qt/qttest:4
112 - dev-cpp/gmock
113 - box? ( dev-cpp/sparsehash )
114 - dropbox? ( dev-cpp/sparsehash )
115 - googledrive? ( dev-cpp/sparsehash )
116 - skydrive? ( dev-cpp/sparsehash )
117 - ubuntu-one? ( dev-cpp/sparsehash )
118 - test? ( gnome-base/gsettings-desktop-schemas )
119 -"
120 -DOCS="Changelog"
121 -
122 -# https://github.com/clementine-player/Clementine/issues/3935
123 -RESTRICT="test"
124 -
125 -# Switch to ^ when we switch to EAPI=6.
126 -[[ ${PV} == *9999* ]] || \
127 -S="${WORKDIR}/C${P:1}"
128 -
129 -PATCHES=(
130 - "${FILESDIR}"/${P}-fix-build.patch
131 - "${FILESDIR}"/${P}-fix-build2.patch
132 - "${FILESDIR}"/${P}-gcc49.patch
133 -)
134 -
135 -src_prepare() {
136 - cmake-utils_src_prepare
137 -
138 - # some tests fail or hang
139 - sed -i \
140 - -e '/add_test_file(translations_test.cpp/d' \
141 - tests/CMakeLists.txt || die
142 -}
143 -
144 -src_configure() {
145 - local langs x
146 - for x in ${LANGS}; do
147 - use linguas_${x} && langs+=" ${x}"
148 - done
149 -
150 - # spotify is not in portage
151 - local mycmakeargs=(
152 - -DBUILD_WERROR=OFF
153 - -DLINGUAS="${langs}"
154 - -DBUNDLE_PROJECTM_PRESETS=OFF
155 - $(cmake-utils_use cdda ENABLE_AUDIOCD)
156 - $(cmake-utils_use dbus ENABLE_DBUS)
157 - $(cmake-utils_use udisks ENABLE_DEVICEKIT)
158 - $(cmake-utils_use ipod ENABLE_LIBGPOD)
159 - $(cmake-utils_use lastfm ENABLE_LIBLASTFM)
160 - $(cmake-utils_use mtp ENABLE_LIBMTP)
161 - $(cmake-utils_use moodbar ENABLE_MOODBAR)
162 - -DENABLE_GIO=ON
163 - $(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
164 - $(cmake-utils_use projectm ENABLE_VISUALISATIONS)
165 - $(cmake-utils_use ayatana ENABLE_SOUNDMENU)
166 - $(cmake-utils_use box ENABLE_BOX)
167 - $(cmake-utils_use dropbox ENABLE_DROPBOX)
168 - $(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
169 - $(cmake-utils_use skydrive ENABLE_SKYDRIVE)
170 - $(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
171 - -DENABLE_SPOTIFY_BLOB=OFF
172 - -DENABLE_BREAKPAD=OFF
173 - $(cmake-utils_use !system-sqlite STATIC_SQLITE)
174 - $(cmake-utils_use system-sqlite I_HATE_MY_USERS)
175 - $(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
176 - -DUSE_BUILTIN_TAGLIB=OFF
177 - -DUSE_SYSTEM_GMOCK=ON
178 - )
179 -
180 - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
181 -
182 - cmake-utils_src_configure
183 -}
184 -
185 -src_test() {
186 - cd "${CMAKE_BUILD_DIR}" || die
187 - Xemake test
188 -}
189 -
190 -pkg_preinst() {
191 - gnome2_icon_savelist
192 -}
193 -
194 -pkg_postinst() {
195 - fdo-mime_desktop_database_update
196 - gnome2_icon_cache_update
197 -}
198 -
199 -pkg_postrm() {
200 - fdo-mime_desktop_database_update
201 - gnome2_icon_cache_update
202 -}
203
204 diff --git a/media-sound/clementine/files/clementine-1.2.2-fix-build.patch b/media-sound/clementine/files/clementine-1.2.2-fix-build.patch
205 deleted file mode 100644
206 index 7a83e31..0000000
207 --- a/media-sound/clementine/files/clementine-1.2.2-fix-build.patch
208 +++ /dev/null
209 @@ -1,25 +0,0 @@
210 -From 3df3a5b645737603af6bda844db04c431b9c8064 Mon Sep 17 00:00:00 2001
211 -From: John Maguire <john.maguire@×××××.com>
212 -Date: Thu, 6 Feb 2014 19:03:10 +0100
213 -Subject: [PATCH] Add missing header for syscall().
214 -
215 -This is cunningly not defined in syscall.h
216 ----
217 - src/core/utilities.cpp | 1 +
218 - 1 file changed, 1 insertion(+)
219 -
220 -diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
221 -index 6fce753..cb9a94d 100644
222 ---- a/src/core/utilities.cpp
223 -+++ b/src/core/utilities.cpp
224 -@@ -52,6 +52,7 @@
225 - #endif
226 -
227 - #ifdef Q_OS_LINUX
228 -+# include <unistd.h>
229 - # include <sys/syscall.h>
230 - #endif
231 - #ifdef Q_OS_DARWIN
232 ---
233 -1.8.5.5
234 -
235
236 diff --git a/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch b/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch
237 deleted file mode 100644
238 index 05ec92f..0000000
239 --- a/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch
240 +++ /dev/null
241 @@ -1,38 +0,0 @@
242 -From 7671108aa8d02658cd35cacf4337507cc80ea03a Mon Sep 17 00:00:00 2001
243 -From: John Maguire <john.maguire@×××××.com>
244 -Date: Thu, 6 Feb 2014 19:46:08 +0100
245 -Subject: [PATCH] Add missing include for symlink()
246 -
247 ----
248 - src/internet/spotifyblobdownloader.cpp | 7 ++++++-
249 - 1 file changed, 6 insertions(+), 1 deletion(-)
250 -
251 -diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp
252 -index 9827d65..5bd12a0 100644
253 ---- a/src/internet/spotifyblobdownloader.cpp
254 -+++ b/src/internet/spotifyblobdownloader.cpp
255 -@@ -15,8 +15,9 @@
256 - along with Clementine. If not, see <http://www.gnu.org/licenses/>.
257 - */
258 -
259 --#include "config.h"
260 - #include "spotifyblobdownloader.h"
261 -+
262 -+#include "config.h"
263 - #include "spotifyservice.h"
264 - #include "core/logging.h"
265 - #include "core/network.h"
266 -@@ -32,6 +33,10 @@
267 - #include <QtCrypto>
268 - #endif // HAVE_QCA
269 -
270 -+#ifdef Q_OS_UNIX
271 -+ #include <unistd.h>
272 -+#endif
273 -+
274 - const char* SpotifyBlobDownloader::kSignatureSuffix = ".sha1";
275 -
276 -
277 ---
278 -1.8.5.5
279 -
280
281 diff --git a/media-sound/clementine/files/clementine-1.2.2-gcc49.patch b/media-sound/clementine/files/clementine-1.2.2-gcc49.patch
282 deleted file mode 100644
283 index 1192987..0000000
284 --- a/media-sound/clementine/files/clementine-1.2.2-gcc49.patch
285 +++ /dev/null
286 @@ -1,17 +0,0 @@
287 -In file included from ../../Clementine-1.2.2/src/core/mergedproxymodel.cpp:18:0:
288 -../../Clementine-1.2.2/src/core/mergedproxymodel.h:23:12: error: 'std::placeholders' has not been declared
289 - using std::placeholders::_1;
290 -../../Clementine-1.2.2/src/core/mergedproxymodel.h:24:12: error: 'std::placeholders' has not been declared
291 - using std::placeholders::_2;
292 -
293 -
294 ---- a/src/core/mergedproxymodel.h
295 -+++ b/src/core/mergedproxymodel.h
296 -@@ -19,6 +19,7 @@
297 - #define MERGEDPROXYMODEL_H
298 -
299 - #include <QAbstractProxyModel>
300 -+#include <functional>
301 -
302 - using std::placeholders::_1;
303 - using std::placeholders::_2;