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/clementine/, media-sound/clementine/files/
Date: Fri, 08 Dec 2017 18:32:34
Message-Id: 1512757840.d62fad681f5f95e386f11fe247df81b2ba3b7a19.asturm@gentoo
1 commit: d62fad681f5f95e386f11fe247df81b2ba3b7a19
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 8 16:58:07 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 8 18:30:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62fad68
7
8 media-sound/clementine: Drop old
9
10 Package-Manager: Portage-2.3.17, Repoman-2.3.6
11
12 media-sound/clementine/clementine-1.3.1-r6.ebuild | 180 ---------------------
13 ...ine-1.3.1-add-missing-functional-includes.patch | 51 ------
14 2 files changed, 231 deletions(-)
15
16 diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
17 deleted file mode 100644
18 index 13b223ccee9..00000000000
19 --- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
20 +++ /dev/null
21 @@ -1,180 +0,0 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=6
26 -
27 -EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
28 -
29 -LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
30 -
31 -inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
32 -[[ ${PV} == *9999* ]] && inherit git-r3
33 -
34 -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
35 -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
36 -[[ ${PV} == *9999* ]] || \
37 -SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
38 -
39 -LICENSE="GPL-3"
40 -SLOT="0"
41 -[[ ${PV} == *9999* ]] || \
42 -KEYWORDS="~amd64 ~x86"
43 -IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks wiimote"
44 -IUSE+="${LANGS// / linguas_}"
45 -
46 -REQUIRED_USE="
47 - udisks? ( dbus )
48 - wiimote? ( dbus )
49 -"
50 -
51 -COMMON_DEPEND="
52 - dev-db/sqlite:=
53 - >=dev-libs/glib-2.24.1-r1
54 - dev-libs/libxml2
55 - dev-libs/protobuf:=
56 - dev-libs/qjson
57 - >=dev-qt/qtcore-4.5:4[ssl]
58 - >=dev-qt/qtgui-4.5:4
59 - >=dev-qt/qtopengl-4.5:4
60 - >=dev-qt/qtsql-4.5:4
61 - >=media-libs/chromaprint-0.6
62 - media-libs/gstreamer:1.0
63 - media-libs/gst-plugins-base:1.0
64 - >=media-libs/libmygpo-qt-1.0.9[qt4(+)]
65 - >=media-libs/taglib-1.8[mp4(+)]
66 - sys-libs/zlib
67 - dev-libs/crypto++
68 - virtual/glu
69 - virtual/opengl
70 - x11-libs/libX11
71 - cdda? ( dev-libs/libcdio )
72 - dbus? ( >=dev-qt/qtdbus-4.5:4 )
73 - ipod? ( >=media-libs/libgpod-0.8.0 )
74 - lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
75 - mtp? ( >=media-libs/libmtp-1.0.0 )
76 - moodbar? ( sci-libs/fftw:3.0 )
77 - projectm? ( media-libs/glew:=
78 - >=media-libs/libprojectm-1.2.0 )
79 -"
80 -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
81 -# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
82 -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
83 -# Still possibly essential but not applied yet patches are:
84 -# 06-fix-numeric-locale.patch
85 -# 08-stdlib.h-for-rand.patch
86 -RDEPEND="${COMMON_DEPEND}
87 - dbus? ( udisks? ( sys-fs/udisks:0 ) )
88 - mms? ( media-plugins/gst-plugins-libmms:1.0 )
89 - mtp? ( gnome-base/gvfs[mtp] )
90 - media-plugins/gst-plugins-meta:1.0
91 - media-plugins/gst-plugins-soup:1.0
92 - media-plugins/gst-plugins-taglib:1.0
93 -"
94 -DEPEND="${COMMON_DEPEND}
95 - >=dev-libs/boost-1.39:=
96 - virtual/pkgconfig
97 - sys-devel/gettext
98 - dev-qt/qttest:4
99 - || (
100 - >=dev-cpp/gtest-1.8.0
101 - dev-cpp/gmock
102 - )
103 - amazoncloud? ( dev-cpp/sparsehash )
104 - box? ( dev-cpp/sparsehash )
105 - dropbox? ( dev-cpp/sparsehash )
106 - googledrive? ( dev-cpp/sparsehash )
107 - pulseaudio? ( media-sound/pulseaudio )
108 - skydrive? ( dev-cpp/sparsehash )
109 - test? ( gnome-base/gsettings-desktop-schemas )
110 -"
111 -DOCS=( Changelog README.md )
112 -
113 -MY_P="${P/_}"
114 -[[ ${PV} == *9999* ]] || \
115 -S="${WORKDIR}/${MY_P^}"
116 -
117 -PATCHES=(
118 - "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
119 - "${FILESDIR}"/${P}-fix-desktop-file.patch
120 - "${FILESDIR}"/${P}-chromaprint14.patch #603662
121 - "${FILESDIR}"/${P}-libechonest_removal.patch
122 - "${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
123 -)
124 -
125 -src_prepare() {
126 - cmake-utils_src_prepare
127 -
128 - # some tests fail or hang
129 - sed -i \
130 - -e '/add_test_file(translations_test.cpp/d' \
131 - tests/CMakeLists.txt || die
132 -}
133 -
134 -src_configure() {
135 - local langs x
136 - for x in ${LANGS}; do
137 - use linguas_${x} && langs+=" ${x}"
138 - done
139 -
140 - # spotify is not in portage
141 - local mycmakeargs=(
142 - -DBUILD_WERROR=OFF
143 - -DLINGUAS="${langs}"
144 - -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
145 - -DENABLE_AUDIOCD="$(usex cdda)"
146 - -DENABLE_DBUS="$(usex dbus)"
147 - -DENABLE_DEVICEKIT="$(usex udisks)"
148 - -DENABLE_LIBGPOD="$(usex ipod)"
149 - -DENABLE_LIBLASTFM="$(usex lastfm)"
150 - -DENABLE_LIBMTP="$(usex mtp)"
151 - -DENABLE_MOODBAR="$(usex moodbar)"
152 - -DENABLE_GIO=ON
153 - -DENABLE_WIIMOTEDEV="$(usex wiimote)"
154 - -DENABLE_VISUALISATIONS="$(usex projectm)"
155 - -DENABLE_BOX="$(usex box)"
156 - -DENABLE_DROPBOX="$(usex dropbox)"
157 - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
158 - -DENABLE_LIBPULSE="$(usex pulseaudio)"
159 - -DENABLE_SKYDRIVE="$(usex skydrive)"
160 - -DENABLE_SPOTIFY_BLOB=OFF
161 - -DENABLE_BREAKPAD=OFF #< disable crash reporting
162 - -DUSE_BUILTIN_TAGLIB=OFF
163 - -DUSE_SYSTEM_GMOCK=ON
164 - -DUSE_SYSTEM_PROJECTM=ON
165 - -DBUNDLE_PROJECTM_PRESETS=OFF
166 - # force to find crypto++ see bug #548544
167 - -DCRYPTOPP_LIBRARIES="crypto++"
168 - -DCRYPTOPP_FOUND=ON
169 - # avoid automagically enabling of ccache (bug #611010)
170 - -DCCACHE_EXECUTABLE=OFF
171 - # see https://github.com/clementine-player/Clementine/issues/5591
172 - -DENABLE_VK=OFF
173 - )
174 -
175 - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
176 -
177 - cmake-utils_src_configure
178 -}
179 -
180 -src_test() {
181 - cd "${CMAKE_BUILD_DIR}" || die
182 - virtx emake test
183 -}
184 -
185 -pkg_preinst() {
186 - gnome2_icon_savelist
187 -}
188 -
189 -pkg_postinst() {
190 - xdg_desktop_database_update
191 - gnome2_icon_cache_update
192 -
193 - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
194 - elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags "
195 - elog "depending on your preferences"
196 -}
197 -
198 -pkg_postrm() {
199 - xdg_desktop_database_update
200 - gnome2_icon_cache_update
201 -}
202
203 diff --git a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
204 deleted file mode 100644
205 index e480212b883..00000000000
206 --- a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
207 +++ /dev/null
208 @@ -1,51 +0,0 @@
209 -From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
210 -From: Morris Hafner <mmha@××××××××××××××××××××.com>
211 -Date: Mon, 13 Feb 2017 17:46:46 +0100
212 -Subject: [PATCH] Add missing <functional> includes (#5630)
213 -
214 ----
215 - src/core/mergedproxymodel.cpp | 1 +
216 - src/devices/giolister.cpp | 1 +
217 - src/library/groupbydialog.cpp | 2 ++
218 - 3 files changed, 4 insertions(+)
219 -
220 -diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
221 -index 56217f6..8c210d3 100644
222 ---- a/src/core/mergedproxymodel.cpp
223 -+++ b/src/core/mergedproxymodel.cpp
224 -@@ -23,6 +23,7 @@
225 -
226 - #include <QStringList>
227 -
228 -+#include <functional>
229 - #include <limits>
230 -
231 - // boost::multi_index still relies on these being in the global namespace.
232 -diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
233 -index aa3bddb..5f63ef2 100644
234 ---- a/src/devices/giolister.cpp
235 -+++ b/src/devices/giolister.cpp
236 -@@ -17,6 +17,7 @@
237 -
238 - #include "config.h"
239 -
240 -+#include <functional>
241 - #include <memory>
242 -
243 - #include <QFile>
244 -diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
245 -index 5efdc9f..e5f711b 100644
246 ---- a/src/library/groupbydialog.cpp
247 -+++ b/src/library/groupbydialog.cpp
248 -@@ -20,6 +20,8 @@
249 -
250 - #include <QPushButton>
251 -
252 -+#include <functional>
253 -+
254 - // boost::multi_index still relies on these being in the global namespace.
255 - using std::placeholders::_1;
256 - using std::placeholders::_2;
257 ---
258 -2.10.2
259 -