Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Palimaka (kensington)" <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/phonon: phonon-9999.ebuild phonon-4.7.2.ebuild ChangeLog
Date: Sat, 21 Jun 2014 15:36:54
Message-Id: 20140621153648.C407B2004E@flycatcher.gentoo.org
1 kensington 14/06/21 15:36:48
2
3 Modified: phonon-9999.ebuild ChangeLog
4 Added: phonon-4.7.2.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
9
10 Revision Changes Path
11 1.23 media-libs/phonon/phonon-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.23&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.23&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.22&r2=1.23
16
17 Index: phonon-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v
20 retrieving revision 1.22
21 retrieving revision 1.23
22 diff -u -r1.22 -r1.23
23 --- phonon-9999.ebuild 27 May 2014 11:21:03 -0000 1.22
24 +++ phonon-9999.ebuild 21 Jun 2014 15:36:48 -0000 1.23
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.22 2014/05/27 11:21:03 johu Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.23 2014/06/21 15:36:48 kensington Exp $
30
31 EAPI=5
32
33 @@ -22,7 +22,13 @@
34 SLOT="0"
35 IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
36
37 -COMMON_DEPEND="
38 +REQUIRED_USE="
39 + || ( aqua gstreamer vlc )
40 + || ( qt4 qt5 )
41 + zeitgeist? ( qt4 )
42 +"
43 +
44 +RDEPEND="
45 !!dev-qt/qtphonon:4
46 qt4? (
47 dev-qt/qtcore:4
48 @@ -33,9 +39,7 @@
49 qt5? (
50 dev-qt/qtcore:5
51 dev-qt/qtdbus:5
52 - dev-qt/qtdeclarative:5
53 dev-qt/qtgui:5
54 - dev-qt/qtopengl:5
55 dev-qt/qtwidgets:5
56 designer? ( dev-qt/designer:5 )
57 )
58 @@ -45,22 +49,15 @@
59 )
60 zeitgeist? ( dev-libs/libqzeitgeist )
61 "
62 +DEPEND="${RDEPEND}
63 + qt4? ( >=dev-util/automoc-0.9.87 )
64 + virtual/pkgconfig
65 +"
66 PDEPEND="
67 aqua? ( media-libs/phonon-qt7 )
68 gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?] )
69 vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?] )
70 "
71 -RDEPEND="${COMMON_DEPEND}"
72 -DEPEND="${COMMON_DEPEND}
73 - qt4? ( >=dev-util/automoc-0.9.87 )
74 - virtual/pkgconfig
75 -"
76 -
77 -REQUIRED_USE="
78 - || ( aqua gstreamer vlc )
79 - || ( qt4 qt5 )
80 - zeitgeist? ( qt4 )
81 -"
82
83 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
84
85
86
87
88 1.57 media-libs/phonon/ChangeLog
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.57&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.57&content-type=text/plain
92 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.56&r2=1.57
93
94 Index: ChangeLog
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
97 retrieving revision 1.56
98 retrieving revision 1.57
99 diff -u -r1.56 -r1.57
100 --- ChangeLog 27 May 2014 11:21:03 -0000 1.56
101 +++ ChangeLog 21 Jun 2014 15:36:48 -0000 1.57
102 @@ -1,6 +1,12 @@
103 # ChangeLog for media-libs/phonon
104 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
105 -# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.56 2014/05/27 11:21:03 johu Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.57 2014/06/21 15:36:48 kensington Exp $
107 +
108 +*phonon-4.7.2 (21 Jun 2014)
109 +
110 + 21 Jun 2014; Michael Palimaka <kensington@g.o> +phonon-4.7.2.ebuild,
111 + phonon-9999.ebuild:
112 + Version bump.
113
114 *phonon-4.7.1-r1 (27 May 2014)
115
116
117
118
119 1.1 media-libs/phonon/phonon-4.7.2.ebuild
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.7.2.ebuild?rev=1.1&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.7.2.ebuild?rev=1.1&content-type=text/plain
123
124 Index: phonon-4.7.2.ebuild
125 ===================================================================
126 # Copyright 1999-2014 Gentoo Foundation
127 # Distributed under the terms of the GNU General Public License v2
128 # $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.2.ebuild,v 1.1 2014/06/21 15:36:48 kensington Exp $
129
130 EAPI=5
131
132 if [[ ${PV} != *9999* ]]; then
133 SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
134 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
135 else
136 SCM_ECLASS="git-r3"
137 EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
138 KEYWORDS=""
139 fi
140
141 inherit cmake-utils multibuild ${SCM_ECLASS}
142
143 DESCRIPTION="KDE multimedia API"
144 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
145
146 LICENSE="LGPL-2.1"
147 SLOT="0"
148 IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"
149
150 REQUIRED_USE="
151 || ( aqua gstreamer vlc )
152 || ( qt4 qt5 )
153 zeitgeist? ( qt4 )
154 "
155
156 RDEPEND="
157 !!dev-qt/qtphonon:4
158 qt4? (
159 dev-qt/qtcore:4
160 dev-qt/qtdbus:4
161 dev-qt/qtgui:4
162 designer? ( dev-qt/designer:4 )
163 )
164 qt5? (
165 dev-qt/qtcore:5
166 dev-qt/qtdbus:5
167 dev-qt/qtgui:5
168 dev-qt/qtwidgets:5
169 designer? ( dev-qt/designer:5 )
170 )
171 pulseaudio? (
172 dev-libs/glib:2
173 >=media-sound/pulseaudio-0.9.21[glib]
174 )
175 zeitgeist? ( dev-libs/libqzeitgeist )
176 "
177 DEPEND="${RDEPEND}
178 qt4? ( >=dev-util/automoc-0.9.87 )
179 virtual/pkgconfig
180 "
181 PDEPEND="
182 aqua? ( media-libs/phonon-qt7 )
183 gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?] )
184 vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?] )
185 "
186
187 PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
188
189 pkg_setup() {
190 MULTIBUILD_VARIANTS=()
191 if use qt4; then
192 MULTIBUILD_VARIANTS+=(qt4)
193 fi
194 if use qt5; then
195 MULTIBUILD_VARIANTS+=(qt5)
196 fi
197 }
198
199 src_configure() {
200 myconfigure() {
201 local mycmakeargs=(
202 -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
203 $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
204 $(cmake-utils_use_with pulseaudio GLIB2)
205 $(cmake-utils_use_with pulseaudio PulseAudio)
206 $(cmake-utils_use_with zeitgeist QZeitgeist)
207 )
208 if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
209 mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
210 fi
211 if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
212 mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
213 fi
214 cmake-utils_src_configure
215 }
216
217 multibuild_foreach_variant myconfigure
218 }
219
220 src_compile() {
221 multibuild_foreach_variant cmake-utils_src_compile
222 }
223
224 src_install() {
225 multibuild_foreach_variant cmake-utils_src_install
226 }
227
228 src_test() {
229 multibuild_foreach_variant cmake-utils_src_test
230 }
Report Message
Find on MARC Find on Google Groups