johu        14/05/27 11:21:03

  Modified:             phonon-9999.ebuild ChangeLog
  Added:                phonon-4.7.1-r1.ebuild
  Removed:              phonon-4.7.1.ebuild
  Log:
  Revision bump fixes automagic dependency on dev-libs/libqzeitgeist.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
F3CFD2BD)

Revision  Changes    Path
1.22                 media-libs/phonon/phonon-9999.ebuild

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

Index: phonon-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- phonon-9999.ebuild  13 Mar 2014 10:52:48 -0000      1.21
+++ phonon-9999.ebuild  27 May 2014 11:21:03 -0000      1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.21 
2014/03/13 10:52:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.22 
2014/05/27 11:21:03 johu Exp $
 
 EAPI=5
 
@@ -81,6 +81,7 @@
                        $(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)



1.56                 media-libs/phonon/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog   13 Mar 2014 10:52:48 -0000      1.55
+++ ChangeLog   27 May 2014 11:21:03 -0000      1.56
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.55 
2014/03/13 10:52:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.56 
2014/05/27 11:21:03 johu Exp $
+
+*phonon-4.7.1-r1 (27 May 2014)
+
+  27 May 2014; Johannes Huber <j...@gentoo.org> +phonon-4.7.1-r1.ebuild,
+  -phonon-4.7.1.ebuild, phonon-9999.ebuild:
+  Revision bump fixes automagic dependency on dev-libs/libqzeitgeist.
 
   13 Mar 2014; Michael Palimaka <kensing...@gentoo.org> metadata.xml,
   phonon-4.7.1.ebuild, phonon-9999.ebuild:



1.1                  media-libs/phonon/phonon-4.7.1-r1.ebuild

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

Index: phonon-4.7.1-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.7.1-r1.ebuild,v 
1.1 2014/05/27 11:21:03 johu Exp $

EAPI=5

if [[ ${PV} != *9999* ]]; then
        SRC_URI="mirror://kde/stable/phonon/${PV}/${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"
        EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
        KEYWORDS=""
fi

inherit cmake-utils multibuild ${SCM_ECLASS}

DESCRIPTION="KDE multimedia API"
HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon";

LICENSE="LGPL-2.1"
SLOT="0"
IUSE="aqua debug designer +gstreamer pulseaudio +qt4 qt5 vlc zeitgeist"

COMMON_DEPEND="
        !!dev-qt/qtphonon:4
        qt4? (
                dev-qt/qtcore:4
                dev-qt/qtdbus:4
                dev-qt/qtgui:4
                designer? ( dev-qt/designer:4 )
        )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtdbus:5
                dev-qt/qtdeclarative:5
                dev-qt/qtgui:5
                dev-qt/qtopengl:5
                dev-qt/qtwidgets:5
                designer? ( dev-qt/designer:5 )
        )
        pulseaudio? (
                dev-libs/glib:2
                >=media-sound/pulseaudio-0.9.21[glib]
        )
        zeitgeist? ( dev-libs/libqzeitgeist )
"
PDEPEND="
        aqua? ( media-libs/phonon-qt7 )
        gstreamer? ( >=media-libs/phonon-gstreamer-4.7.0[qt4?,qt5?] )
        vlc? ( >=media-libs/phonon-vlc-0.7.0[qt4?,qt5?] )
"
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
        qt4? ( >=dev-util/automoc-0.9.87 )
        virtual/pkgconfig
"

REQUIRED_USE="
        || ( aqua gstreamer vlc )
        || ( qt4 qt5 )
        zeitgeist? ( qt4 )
"

PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )

pkg_setup() {
        MULTIBUILD_VARIANTS=()
        if use qt4; then
                MULTIBUILD_VARIANTS+=(qt4)
        fi
        if use qt5; then
                MULTIBUILD_VARIANTS+=(qt5)
        fi
}

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)
                fi
                if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
                        mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
                fi
                cmake-utils_src_configure
        }

        multibuild_foreach_variant myconfigure
}

src_compile() {
        multibuild_foreach_variant cmake-utils_src_compile
}

src_install() {
        multibuild_foreach_variant cmake-utils_src_install
}

src_test() {
        multibuild_foreach_variant cmake-utils_src_test
}




Reply via email to