Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/, media-sound/amarok/files/
Date: Sun, 04 Jun 2017 12:47:10
Message-Id: 1496580416.8f0c6a1e8f9ebb1c92b0c025f7a5e16fa801ab85.kensington@gentoo
1 commit: 8f0c6a1e8f9ebb1c92b0c025f7a5e16fa801ab85
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 4 12:46:38 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 4 12:46:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0c6a1e
7
8 media-sound/amarok: revision bump disables qtwebkit:4 usage
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 media-sound/amarok/amarok-2.8.90-r3.ebuild | 140 +++++++++++++++++++++
13 .../amarok/files/amarok-2.8.90-no-webkit.patch | 39 ++++++
14 2 files changed, 179 insertions(+)
15
16 diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
17 new file mode 100644
18 index 00000000000..1f996a480a6
19 --- /dev/null
20 +++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
21 @@ -0,0 +1,140 @@
22 +# Copyright 1999-2017 Gentoo Foundation
23 +# Distributed under the terms of the GNU General Public License v2
24 +
25 +EAPI=6
26 +
27 +KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
28 +lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
29 +sv tr uk zh_CN zh_TW"
30 +KDE_REQUIRED="never"
31 +KDE_HANDBOOK="optional"
32 +VIRTUALX_REQUIRED="test"
33 +VIRTUALDBUS_TEST="true"
34 +inherit flag-o-matic kde4-base pax-utils
35 +
36 +DESCRIPTION="Advanced audio player based on KDE framework"
37 +HOMEPAGE="http://amarok.kde.org/"
38 +if [[ ${PV} != *9999* ]]; then
39 + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
40 + KEYWORDS="~amd64 ~x86"
41 +fi
42 +
43 +LICENSE="GPL-2"
44 +SLOT="4"
45 +IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
46 +
47 +if [[ ${KDE_BUILD_TYPE} == live ]]; then
48 + RESTRICT+=" test"
49 +fi
50 +
51 +# ipod requires gdk enabled and also gtk compiled in libgpod
52 +COMMONDEPEND="
53 + app-crypt/qca:2[qt4(+)]
54 + kde-frameworks/kdelibs:4[opengl?]
55 + $(add_kdeapps_dep kdebase-kioslaves)
56 + >=media-libs/taglib-1.7[asf(+),mp4(+)]
57 + >=media-libs/taglib-extras-1.0.1
58 + sys-libs/zlib
59 + >=virtual/mysql-5.1[embedded?]
60 + >=dev-qt/qtcore-4.8:4
61 + >=dev-qt/qtdbus-4.8:4
62 + >=dev-qt/qtscript-4.8:4
63 + >=x11-libs/qtscriptgenerator-0.1.0
64 + cdda? (
65 + $(add_kdeapps_dep libkcddb)
66 + $(add_kdeapps_dep libkcompactdisc)
67 + $(add_kdeapps_dep audiocd-kio)
68 + )
69 + ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
70 + lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
71 + mp3tunes? (
72 + dev-libs/glib:2
73 + dev-libs/libxml2
74 + dev-libs/openssl:0
75 + net-libs/loudmouth
76 + net-misc/curl
77 + >=dev-qt/qtcore-4.8.4:4[glib]
78 + )
79 + mtp? ( >=media-libs/libmtp-1.0.0 )
80 + ofa? ( >=media-libs/libofa-0.9.0 )
81 + opengl? ( virtual/opengl )
82 +"
83 +DEPEND="${COMMONDEPEND}
84 + dev-util/automoc
85 + virtual/pkgconfig
86 + test? ( dev-cpp/gmock )
87 +"
88 +RDEPEND="${COMMONDEPEND}
89 + !media-sound/amarok-utils
90 + $(add_kdeapps_dep phonon-kde)
91 +"
92 +
93 +PATCHES=(
94 + "${FILESDIR}/${PN}-2.8.0-taglib110.patch"
95 + "${FILESDIR}/${P}-mysql-embedded.patch"
96 + "${FILESDIR}/${P}-mysqld-rpath.patch"
97 + "${FILESDIR}/${P}-scriptconsole.patch"
98 + "${FILESDIR}/${P}-gcc6.patch"
99 + "${FILESDIR}/${P}-ffmpeg3.patch"
100 + "${FILESDIR}/${P}-no-webkit.patch"
101 +)
102 +
103 +src_prepare() {
104 + kde4-base_src_prepare
105 +
106 + # requires qtwebkit
107 + sed -i -e "s/wikipedia,//" data/amarok_homerc || die
108 +}
109 +
110 +src_configure() {
111 + # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
112 + use ppc64 && append-flags -mminimal-toc
113 +
114 + local mycmakeargs=(
115 + -DWITH_PLAYER=ON
116 + -DWITH_Libgcrypt=OFF
117 + -DWITH_SPECTRUM_ANALYZER=OFF
118 + -DWITH_NepomukCore=OFF
119 + -DWITH_Soprano=OFF
120 + -DWITH_MYSQL_EMBEDDED=$(usex embedded)
121 + -DWITH_IPOD=$(usex ipod)
122 + -DWITH_GDKPixBuf=$(usex ipod)
123 + -DWITH_LibLastFm=$(usex lastfm)
124 + -DWITH_MP3Tunes=$(usex mp3tunes)
125 + -DWITH_Mtp=$(usex mtp)
126 + -DWITH_LibOFA=$(usex ofa)
127 + -DWITH_UTILITIES=$(usex utils)
128 + )
129 +
130 + # bug 581554: add libmysqld location for rpath patch
131 + use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
132 +
133 + kde4-base_src_configure
134 +}
135 +
136 +src_install() {
137 + kde4-base_src_install
138 +
139 + # bug 481592
140 + pax-mark m "${ED}"/usr/bin/amarok
141 +}
142 +
143 +pkg_postinst() {
144 + kde4-base_pkg_postinst
145 +
146 + if ! use embedded; then
147 + echo
148 + elog "You've disabled the amarok support for embedded mysql DBs."
149 + elog "You'll have to configure amarok to use an external db server."
150 + echo
151 + elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
152 + elog "to configure the external db and migrate your data from the embedded database."
153 + echo
154 +
155 + if has_version "virtual/mysql[minimal]"; then
156 + elog "You built mysql with the minimal use flag, so it doesn't include the server."
157 + elog "You won't be able to use the local mysql installation to store your amarok collection."
158 + echo
159 + fi
160 + fi
161 +}
162
163 diff --git a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch
164 new file mode 100644
165 index 00000000000..91686b1f654
166 --- /dev/null
167 +++ b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch
168 @@ -0,0 +1,39 @@
169 +Borrowed from Arch Linux.
170 +
171 +--- a/CMakeLists.txt
172 ++++ b/CMakeLists.txt
173 +@@ -84,7 +84,7 @@ include_directories(
174 + ${CMAKE_CURRENT_BINARY_DIR}/shared
175 + )
176 +
177 +-find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
178 ++find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED )
179 + find_package( KDE4 4.8.4 REQUIRED )
180 +
181 + include( KDE4Defaults )
182 +diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
183 +index f4d5456d9f..cad9036681 100644
184 +--- a/src/context/applets/CMakeLists.txt
185 ++++ b/src/context/applets/CMakeLists.txt
186 +@@ -1,18 +1,18 @@
187 + add_subdirectory( albums )
188 + add_subdirectory( currenttrack )
189 +-add_subdirectory( info )
190 ++# add_subdirectory( info )
191 + add_subdirectory( labels )
192 + add_subdirectory( lyrics )
193 + add_subdirectory( photos )
194 + add_subdirectory( tabs )
195 +-add_subdirectory( wikipedia )
196 ++# add_subdirectory( wikipedia )
197 +
198 + if( QT_QTOPENGL_FOUND )
199 + add_subdirectory( analyzer )
200 + endif()
201 +
202 + if( LIBLASTFM_FOUND )
203 +- add_subdirectory( upcomingevents )
204 ++# add_subdirectory( upcomingevents )
205 + add_subdirectory( similarartists )
206 + endif()
207 +