Version bump.

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

3 files changed, 63 insertions, 50 deletions

diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index 363d8ea35631..c8a191e9f884 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2012/03/27 18:26:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.52 2012/03/29 22:12:21 pesa Exp $
+
+*qt-multimedia-4.8.1 (29 Mar 2012)
+
+  29 Mar 2012; Davide Pesavento <pesa@gentoo.org> +qt-multimedia-4.8.1.ebuild,
+  -qt-multimedia-4.8.0.ebuild:
+  Version bump.
 
   27 Mar 2012; Johannes Huber <johu@gentoo.org> -qt-multimedia-4.6.2.ebuild:
   Drop Qt-4.6.2
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.0.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.0.ebuild
deleted file mode 100644
index 229e89fef37f..000000000000
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.ebuild,v 1.1 2012/01/29 17:04:22 wired Exp $
-
-EAPI="3"
-inherit qt4-build
-
-DESCRIPTION="The Qt multimedia module"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="iconv"
-
-DEPEND="!aqua? ( 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}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/multimedia"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtGui/
-		include/QtMultimedia/
-		include/QtNetwork/
-		src/src.pro
-		src/3rdparty/
-		src/corelib/
-		src/gui/
-		src/network/
-		src/plugins/
-		src/tools/"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff  -no-accessibility
-		-no-fontconfig -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-		-no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle
-		-no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync
-		-no-xinput"
-
-	qt4-build_src_configure
-}
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.1.ebuild
new file mode 100644
index 000000000000..50ca6662d7ec
--- /dev/null
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.1.ebuild
@@ -0,0 +1,56 @@
+# 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.1.ebuild,v 1.1 2012/03/29 22:12:21 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-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"
+
+	QCONFIG_ADD="multimedia"
+	QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+	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
+}