Version bump.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

2 files changed, 70 insertions, 1 deletions

diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog
index 3c977e44fa19..4ec32f77c60e 100644
--- a/dev-qt/qtmultimedia/ChangeLog
+++ b/dev-qt/qtmultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtmultimedia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.16 2014/11/15 02:37:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.17 2014/12/12 14:30:04 kensington Exp $
+
+*qtmultimedia-5.4.0 (12 Dec 2014)
+
+  12 Dec 2014; Michael Palimaka <kensington@gentoo.org>
+  +qtmultimedia-5.4.0.ebuild:
+  Version bump.
 
 *qtmultimedia-4.8.6-r1 (15 Nov 2014)
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild
new file mode 100644
index 000000000000..c684fdb39cc2
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-5.4.0.ebuild,v 1.1 2014/12/12 14:30:04 kensington Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-bad:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
+		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
+		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+	)
+"
+DEPEND="${RDEPEND}
+	x11-proto/videoproto
+"
+
+src_prepare() {
+	qt_use_compile_test alsa
+	qt_use_compile_test gstreamer
+	qt_use_compile_test openal
+	qt_use_compile_test pulseaudio
+
+	qt_use_disable_mod opengl opengl \
+		src/multimediawidgets/multimediawidgets.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}