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

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    11/10/28 13:36:15

  Modified:             phonon-9999.ebuild ChangeLog
  Added:                phonon-4.5.1.ebuild
  Log:
  [media-libs/phonon] Version bump to 4.5.1.
  Synced 4.5.1 and 9999 ebuilds.
  
  (Portage version: 2.2.0_alpha69/cvs/Linux x86_64)

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

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

Index: phonon-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phonon-9999.ebuild	20 Oct 2011 20:23:37 -0000	1.10
+++ phonon-9999.ebuild	28 Oct 2011 13:36:15 -0000	1.11
@@ -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: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.11 2011/10/28 13:36:15 jmbsvicetto Exp $
 
 EAPI=4
 
-inherit cmake-utils git-2
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	SCM_ECLASS="git-2"
+else
+	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${SCM_ECLASS}
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 
 LICENSE="LGPL-2.1"
-KEYWORDS=""
 SLOT="0"
 IUSE="aqua debug +gstreamer pulseaudio vlc xine"
 
 COMMON_DEPEND="
+	!x11-libs/qt-phonon:4
 	>=x11-libs/qt-core-4.6.0:4
 	>=x11-libs/qt-dbus-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4
@@ -24,7 +32,6 @@
 		dev-libs/glib:2
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
-	!x11-libs/qt-phonon:4
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )



1.20                 media-libs/phonon/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	20 Oct 2011 20:23:37 -0000	1.19
+++ ChangeLog	28 Oct 2011 13:36:15 -0000	1.20
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.19 2011/10/20 20:23:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.20 2011/10/28 13:36:15 jmbsvicetto Exp $
+
+*phonon-4.5.1 (28 Oct 2011)
+
+  28 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phonon-4.5.1.ebuild, phonon-9999.ebuild:
+  [media-libs/phonon] Version bump to 4.5.1. Synced 4.5.1 and 9999 ebuilds.
 
   20 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-9999.ebuild:
   Move qt-phonon blocker to COMMONDEPEND, bug 374111



1.1                  media-libs/phonon/phonon-4.5.1.ebuild

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

Index: phonon-4.5.1.ebuild
===================================================================
# 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-4.5.1.ebuild,v 1.1 2011/10/28 13:36:15 jmbsvicetto Exp $

EAPI=4

if [[ ${PV} != *9999* ]]; then
	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
	SCM_ECLASS="git-2"
else
	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
	KEYWORDS=""
fi

inherit cmake-utils ${SCM_ECLASS}

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

LICENSE="LGPL-2.1"
SLOT="0"
IUSE="aqua debug +gstreamer pulseaudio vlc xine"

COMMON_DEPEND="
	!x11-libs/qt-phonon:4
	>=x11-libs/qt-core-4.6.0:4
	>=x11-libs/qt-dbus-4.6.0:4
	>=x11-libs/qt-gui-4.6.0:4
	>=x11-libs/qt-test-4.6.0:4
	pulseaudio? (
		dev-libs/glib:2
		>=media-sound/pulseaudio-0.9.21[glib]
	)
"
# directshow? ( media-sound/phonon-directshow )
# mmf? ( media-sound/phonon-mmf )
# mplayer? ( media-sound/phonon-mplayer )
# waveout? ( media-sound/phonon-waveout )
PDEPEND="
	aqua? ( media-libs/phonon-qt7 )
	gstreamer? ( media-libs/phonon-gstreamer )
	vlc? ( >=media-libs/phonon-vlc-0.3.2 )
	xine? ( >=media-libs/phonon-xine-0.4.4 )
"
RDEPEND="${COMMON_DEPEND}
	!kde-base/phonon-xine
"
DEPEND="${COMMON_DEPEND}
	>=dev-util/automoc-0.9.87
	dev-util/pkgconfig
"

REQUIRED_USE="|| ( aqua gstreamer vlc xine )"

src_configure() {
	local mycmakeargs=(
		$(cmake-utils_use_with pulseaudio GLIB2)
		$(cmake-utils_use_with pulseaudio PulseAudio)
	)
	cmake-utils_src_configure
}