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-libs/phonon-gstreamer/, media-libs/phonon/
Date: Sun, 30 Jul 2017 22:45:46
Message-Id: 1501454726.1b73bf6fb3cde8877484e6cf718adb8fda901463.asturm@gentoo
1 commit: 1b73bf6fb3cde8877484e6cf718adb8fda901463
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 30 21:38:17 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 30 22:45:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b73bf6f
7
8 media-libs/phonon: Dekeyword hppa
9
10 Stabilisation timeout. No reverse-dependencies left.
11
12 Gentoo-bug: 620368
13
14 Package-Manager: Portage-2.3.6, Repoman-2.3.1
15
16 .../phonon-gstreamer-4.9.0-r1.ebuild | 2 +-
17 .../phonon-gstreamer/phonon-gstreamer-9999.ebuild | 2 +-
18 media-libs/phonon/Manifest | 1 -
19 media-libs/phonon/phonon-4.9.0.ebuild | 132 ---------------------
20 media-libs/phonon/phonon-4.9.1-r1.ebuild | 2 +-
21 media-libs/phonon/phonon-9999.ebuild | 2 +-
22 6 files changed, 4 insertions(+), 137 deletions(-)
23
24 diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
25 index 6ca20f5c075..c24ca2f0c16 100644
26 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
27 +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
28 @@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
29
30 if [[ ${PV} != *9999* ]]; then
31 SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
32 - KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
33 + KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
34 else
35 EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
36 inherit git-r3
37
38 diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
39 index a0a206d0d0c..c8d4bbe9240 100644
40 --- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
41 +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
42 @@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
43
44 if [[ ${PV} != *9999* ]]; then
45 SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
46 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
47 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
48 else
49 EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
50 inherit git-r3
51
52 diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
53 index 6c3e9305ede..a02bb5c128a 100644
54 --- a/media-libs/phonon/Manifest
55 +++ b/media-libs/phonon/Manifest
56 @@ -1,2 +1 @@
57 -DIST phonon-4.9.0.tar.xz 321860 SHA256 bb74b40f18ade1d9ab89ffcd7aeb7555be797ca395f1224c488b394da6deb0e0 SHA512 6201b0fa8620cf2640f1488d2ea9605ddd9894af077be247bdcc1ee20f4f7352f6b42fa834bcc074ec3ede1281fdbc3bf137961591f8d954d02a29186ff17a5c WHIRLPOOL ac89bc5a01222662b28d48a8a8ce6db86dae76d200981761ec3de004c96c853944c40409716e4e9bcefb389e60c32981d6b5e2e7dee8fafd0662c1ae91e56ac3
58 DIST phonon-4.9.1.tar.xz 321872 SHA256 67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 WHIRLPOOL bcc7c372c8f9c51c33cc4fa4ae9b33c8d1aaf5750f51f7fbfcc491781629b449ae0ce38adba48af45c58fefa5da359b4d7d121ba7ba1fa08c6777aad4a179173
59
60 diff --git a/media-libs/phonon/phonon-4.9.0.ebuild b/media-libs/phonon/phonon-4.9.0.ebuild
61 deleted file mode 100644
62 index 75338c64ff4..00000000000
63 --- a/media-libs/phonon/phonon-4.9.0.ebuild
64 +++ /dev/null
65 @@ -1,132 +0,0 @@
66 -# Copyright 1999-2017 Gentoo Foundation
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=6
70 -
71 -if [[ ${PV} != *9999* ]]; then
72 - SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
73 - KEYWORDS="hppa"
74 -else
75 - EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
76 - inherit git-r3
77 -fi
78 -
79 -inherit cmake-multilib multibuild qmake-utils
80 -
81 -DESCRIPTION="KDE multimedia API"
82 -HOMEPAGE="https://phonon.kde.org/"
83 -
84 -LICENSE="|| ( LGPL-2.1 LGPL-3 )"
85 -SLOT="0"
86 -IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
87 -
88 -REQUIRED_USE="
89 - || ( qt4 qt5 )
90 - zeitgeist? ( qt4 )
91 -"
92 -
93 -RDEPEND="
94 - !!dev-qt/qtphonon:4
95 - qt4? (
96 - dev-qt/qtcore:4[${MULTILIB_USEDEP}]
97 - dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
98 - dev-qt/qtgui:4[${MULTILIB_USEDEP}]
99 - designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
100 - )
101 - qt5? (
102 - dev-qt/qtcore:5
103 - dev-qt/qtdbus:5
104 - dev-qt/qtgui:5
105 - dev-qt/qtwidgets:5
106 - designer? ( dev-qt/designer:5 )
107 - )
108 - pulseaudio? (
109 - dev-libs/glib:2[${MULTILIB_USEDEP}]
110 - >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
111 - )
112 - zeitgeist? ( dev-libs/libqzeitgeist )
113 -"
114 -DEPEND="${RDEPEND}
115 - virtual/pkgconfig[${MULTILIB_USEDEP}]
116 - qt5? ( kde-frameworks/extra-cmake-modules:5 )
117 -"
118 -PDEPEND="
119 - aqua? ( media-libs/phonon-qt7 )
120 - gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] )
121 - vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
122 -"
123 -
124 -PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
125 -
126 -pkg_setup() {
127 - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
128 -}
129 -
130 -multilib_src_configure() {
131 - local mycmakeargs=(
132 - -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
133 - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
134 - -DWITH_GLIB2=$(usex pulseaudio)
135 - -DWITH_PulseAudio=$(usex pulseaudio)
136 - $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
137 - -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
138 - )
139 -
140 - if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
141 - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
142 - fi
143 - if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
144 - mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
145 - fi
146 -
147 - cmake-utils_src_configure
148 -}
149 -
150 -src_configure() {
151 - myconfigure() {
152 - local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
153 - if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
154 - cmake-multilib_src_configure
155 - elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
156 - multilib_src_configure
157 - fi
158 - }
159 -
160 - multibuild_foreach_variant myconfigure
161 -}
162 -
163 -src_compile() {
164 - mycompile() {
165 - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
166 - cmake-multilib_src_compile
167 - elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
168 - cmake-utils_src_compile
169 - fi
170 - }
171 -
172 - multibuild_foreach_variant mycompile
173 -}
174 -
175 -src_test() {
176 - mytest() {
177 - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
178 - cmake-multilib_src_test
179 - elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
180 - cmake-utils_src_test
181 - fi
182 - }
183 -
184 - multibuild_foreach_variant mytest
185 -}
186 -
187 -src_install() {
188 - myinstall() {
189 - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
190 - cmake-multilib_src_install
191 - elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
192 - cmake-utils_src_install
193 - fi
194 - }
195 -
196 - multibuild_foreach_variant myinstall
197 -}
198
199 diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
200 index edd7cb18530..4e09c9e960b 100644
201 --- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
202 +++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
203 @@ -5,7 +5,7 @@ EAPI=6
204
205 if [[ ${PV} != *9999* ]]; then
206 SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
207 - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
208 + KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
209 else
210 EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
211 inherit git-r3
212
213 diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
214 index 51643b2dff1..771827319c8 100644
215 --- a/media-libs/phonon/phonon-9999.ebuild
216 +++ b/media-libs/phonon/phonon-9999.ebuild
217 @@ -5,7 +5,7 @@ EAPI=6
218
219 if [[ ${PV} != *9999* ]]; then
220 SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
221 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
222 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
223 else
224 EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
225 inherit git-r3