From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Re50W-0006Xq-PI for garchives@archives.gentoo.org; Fri, 23 Dec 2011 13:17:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D254521C10C; Fri, 23 Dec 2011 13:17:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A79B121C10C for ; Fri, 23 Dec 2011 13:17:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 323F21B4051 for ; Fri, 23 Dec 2011 13:17:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6657580042 for ; Fri, 23 Dec 2011 13:17:48 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <8fa5aa52e8ae441c43b41e5ba573f478d0297b27.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-libs/phonon/ X-VCS-Repository: proj/kde X-VCS-Files: media-libs/phonon/phonon-9999.ebuild X-VCS-Directories: media-libs/phonon/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 8fa5aa52e8ae441c43b41e5ba573f478d0297b27 Date: Fri, 23 Dec 2011 13:17:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 53b0f4e6-ef55-4fe1-98d8-59d9d03a1a99 X-Archives-Hash: 7c14db6451d9e7483f8d8c93541a473f commit: 8fa5aa52e8ae441c43b41e5ba573f478d0297b27 Author: Johannes Huber gentoo org> AuthorDate: Fri Dec 23 00:04:02 2011 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Dec 23 12:21:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D8fa5aa52 [media-libs/phonon] Sync with tree (Portage version: 2.2.0_alpha81/git/Linux i686, unsigned Manifest commit) --- media-libs/phonon/phonon-9999.ebuild | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/pho= non-9999.ebuild index 32c2c4f..42416e2 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -1,21 +1,29 @@ # Copyright 1999-2011 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.10 2011/10/20 20:23:37 dilfridge Exp $ +# $Header: $ =20 EAPI=3D4 =20 -inherit cmake-utils git-2 +if [[ ${PV} !=3D *9999* ]]; then + SRC_URI=3D"mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz" + KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +else + SCM_ECLASS=3D"git-2" + EGIT_REPO_URI=3D"git://anongit.kde.org/${PN}" + KEYWORDS=3D"" +fi + +inherit cmake-utils ${SCM_ECLASS} =20 DESCRIPTION=3D"KDE multimedia API" HOMEPAGE=3D"https://projects.kde.org/projects/kdesupport/phonon" -EGIT_REPO_URI=3D"git://anongit.kde.org/${PN}" =20 LICENSE=3D"LGPL-2.1" -KEYWORDS=3D"" SLOT=3D"0" IUSE=3D"aqua debug +gstreamer pulseaudio vlc xine zeitgeist" =20 COMMON_DEPEND=3D" + !!x11-libs/qt-phonon:4 >=3Dx11-libs/qt-core-4.6.0:4 >=3Dx11-libs/qt-dbus-4.6.0:4 >=3Dx11-libs/qt-gui-4.6.0:4 @@ -25,7 +33,6 @@ COMMON_DEPEND=3D" >=3Dmedia-sound/pulseaudio-0.9.21[glib] ) zeitgeist? ( dev-libs/libqzeitgeist ) - !x11-libs/qt-phonon:4 " # directshow? ( media-sound/phonon-directshow ) # mmf? ( media-sound/phonon-mmf )