Added 'alsa' USE flag (bug #341593), removed useless 'iconv'. Major cleanup of src_configure().

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 85 insertions, 1 deletions

diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index d0eb0d351e8e..f8a3fd6dc3ed 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-multimedia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.49 2012/01/29 23:28:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.50 2012/03/13 00:05:32 pesa Exp $
+
+*qt-multimedia-4.8.0-r1 (13 Mar 2012)
+
+  13 Mar 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qt-multimedia-4.8.0-alsa.patch, +qt-multimedia-4.8.0-r1.ebuild:
+  Added 'alsa' USE flag (bug #341593), removed useless 'iconv'. Major cleanup of
+  src_configure().
 
   29 Jan 2012; Joseph Jezak <josejx@gentoo.org> qt-multimedia-4.7.4.ebuild:
   Marked ppc ppc64 stable for bug #390963.
diff --git a/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch b/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch
new file mode 100644
index 000000000000..8bd40edb1e80
--- /dev/null
+++ b/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch
@@ -0,0 +1,25 @@
+--- qt-everywhere-opensource-src-4.8.0.orig/configure	2012-03-13 00:45:02.502205702 +0100
++++ qt-everywhere-opensource-src-4.8.0/configure	2012-03-13 00:47:40.386231881 +0100
+@@ -1049,7 +1049,7 @@
+         VAL=no
+         ;;
+     #Qt style yes options
+-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
++    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         VAL=yes
+         ;;
+@@ -2399,6 +2399,13 @@
+         else
+             UNKNOWN_OPT=yes
+         fi
++        ;;
++    alsa)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_ALSA="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
+         ;;
+     *)
+         UNKNOWN_OPT=yes
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild
new file mode 100644
index 000000000000..88462dc8113c
--- /dev/null
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.8.0-r1.ebuild,v 1.1 2012/03/13 00:05:32 pesa Exp $
+
+EAPI="3"
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib )
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-alsa.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/multimedia"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtGui
+		include/QtMultimedia
+		src/src.pro
+		src/corelib
+		src/gui"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-multimedia -audio-backend
+		$(qt_use alsa)
+		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+	qt4-build_src_configure
+}