[gentoo-commits] gentoo-x86 commit in media-libs/phonon: phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog

[Michal Gorny (mgorny)]

mgorny  15/06/02 07:41:48

  Modified: phonon-.ebuild ChangeLog
  Added:phonon-4.8.3-r1.ebuild
  Log:
  Enable multilib support and sync the live ebuild. 
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/114 by MJDSys with 
some minor changes.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.28 media-libs/phonon/phonon-.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-.ebuild?rev=1.28view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-.ebuild?rev=1.28content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-.ebuild?r1=1.27r2=1.28

Index: phonon-.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- phonon-.ebuild  31 May 2015 13:17:10 -  1.27
+++ phonon-.ebuild  2 Jun 2015 07:41:48 -   1.28
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-.ebuild,v 1.27 
2015/05/31 13:17:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-.ebuild,v 1.28 
2015/06/02 07:41:48 mgorny Exp $
 
 EAPI=5
 
 if [[ ${PV} != ** ]]; then
-   SRC_URI=mirror://kde/stable/phonon/${PV}/${P}.tar.xz
+   SRC_URI=mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 else
SCM_ECLASS=git-r3
@@ -13,7 +13,7 @@
KEYWORDS=
 fi
 
-inherit cmake-utils multibuild ${SCM_ECLASS}
+inherit multibuild qmake-utils cmake-multilib ${SCM_ECLASS}
 
 DESCRIPTION=KDE multimedia API
 HOMEPAGE=https://projects.kde.org/projects/kdesupport/phonon;
@@ -23,6 +23,7 @@
 IUSE=aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist
 
 REQUIRED_USE=
+   || ( aqua gstreamer vlc )
|| ( qt4 qt5 )
zeitgeist? ( qt4 )
 
@@ -30,10 +31,10 @@
 RDEPEND=
!!dev-qt/qtphonon:4
qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtdbus:4
-   dev-qt/qtgui:4
-   designer? ( dev-qt/designer:4 )
+   dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+   dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+   dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+   designer? ( dev-qt/designer:4[${MULTILIB_USEDEP}] )
)
qt5? (
dev-qt/qtcore:5
@@ -43,14 +44,14 @@
designer? ( dev-qt/designer:5 )
)
pulseaudio? (
-   dev-libs/glib:2
-   =media-sound/pulseaudio-0.9.21[glib]
+   dev-libs/glib:2[${MULTILIB_USEDEP}]
+   =media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
)
zeitgeist? ( dev-libs/libqzeitgeist )
 
 DEPEND=${RDEPEND}
qt4? ( =dev-util/automoc-0.9.87 )
-   virtual/pkgconfig
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
 
 PDEPEND=
aqua? ( media-libs/phonon-qt7 )
@@ -64,35 +65,66 @@
MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+   $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
+   $(cmake-utils_use_with pulseaudio GLIB2)
+   $(cmake-utils_use_with pulseaudio PulseAudio)
+   $(multilib_is_native_abi  cmake-utils_use_with zeitgeist 
QZeitgeist)
+   
-DQT_QMAKE_EXECUTABLE=$(${QT_MULTIBUILD_VARIANT}_get_bindir)/qmake
+   )
+   if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+   fi
+   if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
+   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+   fi
+   cmake-utils_src_configure
+}
+
 src_configure() {
myconfigure() {
-   local mycmakeargs=(
-   -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-   $(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
-   $(cmake-utils_use_with pulseaudio GLIB2)
-   $(cmake-utils_use_with pulseaudio PulseAudio)
-   $(cmake-utils_use_with zeitgeist QZeitgeist)
-   )
-   if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-   mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+   local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
+   if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
+   

[gentoo-commits] gentoo-x86 commit in media-libs/phonon: phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog

[Johannes Huber (johu)]

johu15/06/02 15:53:40

  Modified: phonon-.ebuild phonon-4.8.3-r1.ebuild ChangeLog
  Log:
  Fix gentoo-portage-rsync-mirror merge failure.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0xF3CFD2BD)

Revision  ChangesPath
1.29 media-libs/phonon/phonon-.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-.ebuild?rev=1.29view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-.ebuild?rev=1.29content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-.ebuild?r1=1.28r2=1.29

Index: phonon-.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- phonon-.ebuild  2 Jun 2015 07:41:48 -   1.28
+++ phonon-.ebuild  2 Jun 2015 15:53:40 -   1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-.ebuild,v 1.28 
2015/06/02 07:41:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-.ebuild,v 1.29 
2015/06/02 15:53:40 johu Exp $
 
 EAPI=5
 
@@ -23,7 +23,6 @@
 IUSE=aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist
 
 REQUIRED_USE=
-   || ( aqua gstreamer vlc )
|| ( qt4 qt5 )
zeitgeist? ( qt4 )
 



1.2  media-libs/phonon/phonon-4.8.3-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?r1=1.1r2=1.2

Index: phonon-4.8.3-r1.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- phonon-4.8.3-r1.ebuild  2 Jun 2015 07:41:48 -   1.1
+++ phonon-4.8.3-r1.ebuild  2 Jun 2015 15:53:40 -   1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 
1.2 2015/06/02 15:53:40 johu Exp $
 
 EAPI=5
 
@@ -23,7 +23,6 @@
 IUSE=aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist
 
 REQUIRED_USE=
-   || ( aqua gstreamer vlc )
|| ( qt4 qt5 )
zeitgeist? ( qt4 )
 



1.76 media-libs/phonon/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.75r2=1.76

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog   2 Jun 2015 07:41:48 -   1.75
+++ ChangeLog   2 Jun 2015 15:53:40 -   1.76
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.75 
2015/06/02 07:41:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.76 
2015/06/02 15:53:40 johu Exp $
+
+  02 Jun 2015; Johannes Huber j...@gentoo.org phonon-4.8.3-r1.ebuild,
+  phonon-.ebuild:
+  Fix gentoo-portage-rsync-mirror merge failure.
 
 *phonon-4.8.3-r1 (02 Jun 2015)