| 1 |
mgorny 15/06/02 07:41:48 |
| 2 |
|
| 3 |
Modified: phonon-9999.ebuild ChangeLog |
| 4 |
Added: phonon-4.8.3-r1.ebuild |
| 5 |
Log: |
| 6 |
Enable multilib support and sync the live ebuild. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/114 by MJDSys with some minor changes. |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.28 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.28&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.28&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.27&r2=1.28 |
| 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.27 |
| 21 |
retrieving revision 1.28 |
| 22 |
diff -u -r1.27 -r1.28 |
| 23 |
--- phonon-9999.ebuild 31 May 2015 13:17:10 -0000 1.27 |
| 24 |
+++ phonon-9999.ebuild 2 Jun 2015 07:41:48 -0000 1.28 |
| 25 |
@@ -1,11 +1,11 @@ |
| 26 |
# Copyright 1999-2015 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.27 2015/05/31 13:17:10 johu Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.28 2015/06/02 07:41:48 mgorny Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
|
| 33 |
if [[ ${PV} != *9999* ]]; then |
| 34 |
- SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" |
| 35 |
+ SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz" |
| 36 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 37 |
else |
| 38 |
SCM_ECLASS="git-r3" |
| 39 |
@@ -13,7 +13,7 @@ |
| 40 |
KEYWORDS="" |
| 41 |
fi |
| 42 |
|
| 43 |
-inherit cmake-utils multibuild ${SCM_ECLASS} |
| 44 |
+inherit multibuild qmake-utils cmake-multilib ${SCM_ECLASS} |
| 45 |
|
| 46 |
DESCRIPTION="KDE multimedia API" |
| 47 |
HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon" |
| 48 |
@@ -23,6 +23,7 @@ |
| 49 |
IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist" |
| 50 |
|
| 51 |
REQUIRED_USE=" |
| 52 |
+ || ( aqua gstreamer vlc ) |
| 53 |
|| ( qt4 qt5 ) |
| 54 |
zeitgeist? ( qt4 ) |
| 55 |
" |
| 56 |
@@ -30,10 +31,10 @@ |
| 57 |
RDEPEND=" |
| 58 |
!!dev-qt/qtphonon:4 |
| 59 |
qt4? ( |
| 60 |
- dev-qt/qtcore:4 |
| 61 |
- dev-qt/qtdbus:4 |
| 62 |
- dev-qt/qtgui:4 |
| 63 |
- designer? ( dev-qt/designer:4 ) |
| 64 |
+ dev-qt/qtcore:4[${MULTILIB_USEDEP}] |
| 65 |
+ dev-qt/qtdbus:4[${MULTILIB_USEDEP}] |
| 66 |
+ dev-qt/qtgui:4[${MULTILIB_USEDEP}] |
| 67 |
+ designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] ) |
| 68 |
) |
| 69 |
qt5? ( |
| 70 |
dev-qt/qtcore:5 |
| 71 |
@@ -43,14 +44,14 @@ |
| 72 |
designer? ( dev-qt/designer:5 ) |
| 73 |
) |
| 74 |
pulseaudio? ( |
| 75 |
- dev-libs/glib:2 |
| 76 |
- >=media-sound/pulseaudio-0.9.21[glib] |
| 77 |
+ dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 78 |
+ >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}] |
| 79 |
) |
| 80 |
zeitgeist? ( dev-libs/libqzeitgeist ) |
| 81 |
" |
| 82 |
DEPEND="${RDEPEND} |
| 83 |
qt4? ( >=dev-util/automoc-0.9.87 ) |
| 84 |
- virtual/pkgconfig |
| 85 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 86 |
" |
| 87 |
PDEPEND=" |
| 88 |
aqua? ( media-libs/phonon-qt7 ) |
| 89 |
@@ -64,35 +65,66 @@ |
| 90 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 91 |
} |
| 92 |
|
| 93 |
+multilib_src_configure() { |
| 94 |
+ local mycmakeargs=( |
| 95 |
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE |
| 96 |
+ $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN) |
| 97 |
+ $(cmake-utils_use_with pulseaudio GLIB2) |
| 98 |
+ $(cmake-utils_use_with pulseaudio PulseAudio) |
| 99 |
+ $(multilib_is_native_abi && cmake-utils_use_with zeitgeist QZeitgeist) |
| 100 |
+ -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake |
| 101 |
+ ) |
| 102 |
+ if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 103 |
+ mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF) |
| 104 |
+ fi |
| 105 |
+ if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then |
| 106 |
+ mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON) |
| 107 |
+ fi |
| 108 |
+ cmake-utils_src_configure |
| 109 |
+} |
| 110 |
+ |
| 111 |
src_configure() { |
| 112 |
myconfigure() { |
| 113 |
- local mycmakeargs=( |
| 114 |
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE |
| 115 |
- $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN) |
| 116 |
- $(cmake-utils_use_with pulseaudio GLIB2) |
| 117 |
- $(cmake-utils_use_with pulseaudio PulseAudio) |
| 118 |
- $(cmake-utils_use_with zeitgeist QZeitgeist) |
| 119 |
- ) |
| 120 |
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 121 |
- mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF) |
| 122 |
+ local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT} |
| 123 |
+ if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 124 |
+ cmake-multilib_src_configure |
| 125 |
+ elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then |
| 126 |
+ multilib_src_configure |
| 127 |
fi |
| 128 |
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 129 |
- mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON) |
| 130 |
- fi |
| 131 |
- cmake-utils_src_configure |
| 132 |
} |
| 133 |
|
| 134 |
multibuild_foreach_variant myconfigure |
| 135 |
} |
| 136 |
|
| 137 |
src_compile() { |
| 138 |
- multibuild_foreach_variant cmake-utils_src_compile |
| 139 |
+ mycompile() { |
| 140 |
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 141 |
+ cmake-multilib_src_compile |
| 142 |
+ elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 143 |
+ cmake-utils_src_compile |
| 144 |
+ fi |
| 145 |
+ } |
| 146 |
+ multibuild_foreach_variant mycompile |
| 147 |
} |
| 148 |
|
| 149 |
src_test() { |
| 150 |
- multibuild_foreach_variant cmake-utils_src_test |
| 151 |
+ mytest() { |
| 152 |
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 153 |
+ cmake-multilib_src_test |
| 154 |
+ elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 155 |
+ cmake-utils_src_test |
| 156 |
+ fi |
| 157 |
+ } |
| 158 |
+ multibuild_foreach_variant mytest |
| 159 |
} |
| 160 |
|
| 161 |
src_install() { |
| 162 |
- multibuild_foreach_variant cmake-utils_src_install |
| 163 |
+ myinstall() { |
| 164 |
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 165 |
+ cmake-multilib_src_install |
| 166 |
+ elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 167 |
+ cmake-utils_src_install |
| 168 |
+ fi |
| 169 |
+ } |
| 170 |
+ multibuild_foreach_variant myinstall |
| 171 |
} |
| 172 |
|
| 173 |
|
| 174 |
|
| 175 |
1.75 media-libs/phonon/ChangeLog |
| 176 |
|
| 177 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.75&view=markup |
| 178 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.75&content-type=text/plain |
| 179 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.74&r2=1.75 |
| 180 |
|
| 181 |
Index: ChangeLog |
| 182 |
=================================================================== |
| 183 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v |
| 184 |
retrieving revision 1.74 |
| 185 |
retrieving revision 1.75 |
| 186 |
diff -u -r1.74 -r1.75 |
| 187 |
--- ChangeLog 31 May 2015 13:17:10 -0000 1.74 |
| 188 |
+++ ChangeLog 2 Jun 2015 07:41:48 -0000 1.75 |
| 189 |
@@ -1,6 +1,13 @@ |
| 190 |
# ChangeLog for media-libs/phonon |
| 191 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 192 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.74 2015/05/31 13:17:10 johu Exp $ |
| 193 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.75 2015/06/02 07:41:48 mgorny Exp $ |
| 194 |
+ |
| 195 |
+*phonon-4.8.3-r1 (02 Jun 2015) |
| 196 |
+ |
| 197 |
+ 02 Jun 2015; Michał Górny <mgorny@g.o> +phonon-4.8.3-r1.ebuild, |
| 198 |
+ phonon-9999.ebuild: |
| 199 |
+ Enable multilib support and sync the live ebuild. https://github.com/gentoo |
| 200 |
+ /gentoo-portage-rsync-mirror/pull/114 by MJDSys with some minor changes. |
| 201 |
|
| 202 |
31 May 2015; Johannes Huber <johu@g.o> phonon-4.7.2.ebuild, |
| 203 |
phonon-4.8.3.ebuild, phonon-9999.ebuild: |
| 204 |
|
| 205 |
|
| 206 |
|
| 207 |
1.1 media-libs/phonon/phonon-4.8.3-r1.ebuild |
| 208 |
|
| 209 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.1&view=markup |
| 210 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.1&content-type=text/plain |
| 211 |
|
| 212 |
Index: phonon-4.8.3-r1.ebuild |
| 213 |
=================================================================== |
| 214 |
# Copyright 1999-2015 Gentoo Foundation |
| 215 |
# Distributed under the terms of the GNU General Public License v2 |
| 216 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.1 2015/06/02 07:41:48 mgorny Exp $ |
| 217 |
|
| 218 |
EAPI=5 |
| 219 |
|
| 220 |
if [[ ${PV} != *9999* ]]; then |
| 221 |
SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz" |
| 222 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 223 |
else |
| 224 |
SCM_ECLASS="git-r3" |
| 225 |
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" ) |
| 226 |
KEYWORDS="" |
| 227 |
fi |
| 228 |
|
| 229 |
inherit multibuild qmake-utils cmake-multilib ${SCM_ECLASS} |
| 230 |
|
| 231 |
DESCRIPTION="KDE multimedia API" |
| 232 |
HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon" |
| 233 |
|
| 234 |
LICENSE="LGPL-2.1" |
| 235 |
SLOT="0" |
| 236 |
IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist" |
| 237 |
|
| 238 |
REQUIRED_USE=" |
| 239 |
|| ( aqua gstreamer vlc ) |
| 240 |
|| ( qt4 qt5 ) |
| 241 |
zeitgeist? ( qt4 ) |
| 242 |
" |
| 243 |
|
| 244 |
RDEPEND=" |
| 245 |
!!dev-qt/qtphonon:4 |
| 246 |
qt4? ( |
| 247 |
dev-qt/qtcore:4[${MULTILIB_USEDEP}] |
| 248 |
dev-qt/qtdbus:4[${MULTILIB_USEDEP}] |
| 249 |
dev-qt/qtgui:4[${MULTILIB_USEDEP}] |
| 250 |
designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] ) |
| 251 |
) |
| 252 |
qt5? ( |
| 253 |
dev-qt/qtcore:5 |
| 254 |
dev-qt/qtdbus:5 |
| 255 |
dev-qt/qtgui:5 |
| 256 |
dev-qt/qtwidgets:5 |
| 257 |
designer? ( dev-qt/designer:5 ) |
| 258 |
) |
| 259 |
pulseaudio? ( |
| 260 |
dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 261 |
>=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}] |
| 262 |
) |
| 263 |
zeitgeist? ( dev-libs/libqzeitgeist ) |
| 264 |
" |
| 265 |
DEPEND="${RDEPEND} |
| 266 |
qt4? ( >=dev-util/automoc-0.9.87 ) |
| 267 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 268 |
" |
| 269 |
PDEPEND=" |
| 270 |
aqua? ( media-libs/phonon-qt7 ) |
| 271 |
gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] ) |
| 272 |
vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] ) |
| 273 |
" |
| 274 |
|
| 275 |
PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" ) |
| 276 |
|
| 277 |
pkg_setup() { |
| 278 |
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) |
| 279 |
} |
| 280 |
|
| 281 |
multilib_src_configure() { |
| 282 |
local mycmakeargs=( |
| 283 |
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE |
| 284 |
$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN) |
| 285 |
$(cmake-utils_use_with pulseaudio GLIB2) |
| 286 |
$(cmake-utils_use_with pulseaudio PulseAudio) |
| 287 |
$(multilib_is_native_abi && cmake-utils_use_with zeitgeist QZeitgeist) |
| 288 |
-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake |
| 289 |
) |
| 290 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 291 |
mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF) |
| 292 |
fi |
| 293 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then |
| 294 |
mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON) |
| 295 |
fi |
| 296 |
cmake-utils_src_configure |
| 297 |
} |
| 298 |
|
| 299 |
src_configure() { |
| 300 |
myconfigure() { |
| 301 |
local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT} |
| 302 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 303 |
cmake-multilib_src_configure |
| 304 |
elif [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then |
| 305 |
multilib_src_configure |
| 306 |
fi |
| 307 |
} |
| 308 |
|
| 309 |
multibuild_foreach_variant myconfigure |
| 310 |
} |
| 311 |
|
| 312 |
src_compile() { |
| 313 |
mycompile() { |
| 314 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 315 |
cmake-multilib_src_compile |
| 316 |
elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 317 |
cmake-utils_src_compile |
| 318 |
fi |
| 319 |
} |
| 320 |
multibuild_foreach_variant mycompile |
| 321 |
} |
| 322 |
|
| 323 |
src_test() { |
| 324 |
mytest() { |
| 325 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 326 |
cmake-multilib_src_test |
| 327 |
elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 328 |
cmake-utils_src_test |
| 329 |
fi |
| 330 |
} |
| 331 |
multibuild_foreach_variant mytest |
| 332 |
} |
| 333 |
|
| 334 |
src_install() { |
| 335 |
myinstall() { |
| 336 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
| 337 |
cmake-multilib_src_install |
| 338 |
elif [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then |
| 339 |
cmake-utils_src_install |
| 340 |
fi |
| 341 |
} |
| 342 |
multibuild_foreach_variant myinstall |
| 343 |
} |
Archives