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

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 103 insertions, 7 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/Manifest b/x11-libs/qt-multimedia/Manifest
index af9943991e93..164117141467 100644
--- a/x11-libs/qt-multimedia/Manifest
+++ b/x11-libs/qt-multimedia/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX qt-multimedia-4.8.0-alsa.patch 2155 RMD160 917b16d3b0d872d74e3419932da7e637b7d46948 SHA1 71a201a8c4062122d52d905115a81a8ef3586e09 SHA256 49a54bd39627b1070b106519cdff1fe33aec6a5755658c20270204b2ba850f7a
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
@@ -10,13 +11,24 @@ EBUILD qt-multimedia-4.6.2.ebuild 1469 RMD160 ebca9cbe76e436a2fe1273e7a8977a7576
 EBUILD qt-multimedia-4.6.3.ebuild 1480 RMD160 e9f5c31dca3a0b935ecb828f3cd349877c8cc679 SHA1 f0094ffbf3cb0a654245df8e54a6c66c7e8f921a SHA256 5974f061805c4f0ad8c05b5e7ae012dbf38cbbbbb85e47a875fc44dca3488ce9
 EBUILD qt-multimedia-4.7.2.ebuild 1501 RMD160 cee3b762a4fdc7b2cc4bc50c9765e4709616c61c SHA1 143ace1a014af399e32c04a1089ee39154d8c31d SHA256 45e2df6f51ad9d9bf44705fec969a9a50a9253daae2d7325c413740d38787619
 EBUILD qt-multimedia-4.7.4.ebuild 1497 RMD160 499e44c5212536695fd2f2243cd82e65f03d75cb SHA1 b11e2b09037400977bdca5a185d35dbb4198ecff SHA256 d379ba4e4f30a6d13451c705a2860d71d10f8a30e570b4ec1e42b65c872aea14
+EBUILD qt-multimedia-4.8.0-r1.ebuild 1437 RMD160 e9bede28cad9f7d34e9d3a67847c1446360b60e6 SHA1 51eadb575acf9a87aadff7ee2ef1531a744e95a1 SHA256 67a3bd32ac73fb70809fc267eda6a4fa311a70fb71de8944c0af4a0e880a9a64
 EBUILD qt-multimedia-4.8.0.ebuild 1524 RMD160 7339a4ab91e919857ace6df0188a398da7b4f808 SHA1 a5d5263778740b298cc3d0af9972251aa23b3c2b SHA256 fc32b4f802b4b35ab35763695f03b3c815217c3e8af266b729d4a305d4ac75dd
-MISC ChangeLog 6478 RMD160 0732b759e744134dac7922b39dcb87b3208733d2 SHA1 ccbfb69a7ff0a99ccd9c406c70c7dd01a109e37f SHA256 76edf40187127b7bf8aef6d1f1ec19778505634e111e1265ceeb476663d0d9f6
+MISC ChangeLog 6739 RMD160 b8b52418fbbae97e0f8ffe5c42a71c59dc436ae2 SHA1 2ef983e96c046565caf942c249c457164cc5295b SHA256 711be98c4f751da0c1730047ff0cc9aa4f3f9173ac70929f4d42f75aacf1f385
 MISC metadata.xml 441 RMD160 f7143926e647f97392fcb495efa2fe81b6c54e09 SHA1 7fdde4585cdf940bf0d2ee85d1ad78700dd2f0eb SHA256 7a0f88519cf918727cd6de5bc790da0484ddc45eea342c7ec241915c0d4927ca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8l1jcACgkQcsIHjyDViGSkPgCbBQJGK/mWOw04e54+711NRyCE
-iW4AoMMaxMo6o+3Ifp8EYAoNxaqVdib3
-=a9Nr
+iQIcBAEBCgAGBQJPXo9SAAoJENXLsxwXqFxydosQAIgIjP9X/sIlZ2pPy03e8/Zo
+mtxL4+pdKdCvxXB9mrIY/FV1l4M25ORmoOVOfd8E/Wtivd7BGj4Ch6GbV8B7sXNT
+H+bOkkRekLfvZZpKk2ajtb8VwrlkqpCXa0C4dmNTcflHdwJsZeLL4sT3FV2ul+y6
+hk8jXWsCMFkKKWNTWbDIt6KkrsN0848V4hYXVcEfW0uijy5sV93BzsqGxKtPTevm
+2tG6ewWRF79dcjK4qj7YdqVtMMr1jJKebAKovEV23b5XeqpkRHvOh+72KJZ1S1S1
+nUySZ4H9o17gkEqMj31vz73adDHo+//KjXbuxG8GSW8QSZPv9nWfntZ6Rir5R+yE
+ULR7iQoYGlS7gVkyVilNTonkIXutcSM5oBDqrydODFDJ70co/ZOojbBnO6y5LRT2
+i0eKEAlbolnnGpkWb5zjhYwWHuDGmpLuffqGYqrdhgtSTH7VEqb3A5NasRnEnQ4e
+6OP2xGHzv8Ito42gg6jk1s0RVSG6oKdr13Ral310Tzkyxct/+e+/DK+mqbIgOgPl
+4lZhadx73FVVaOfcpxUUbD6n2JsQF2GtD+dHXzfTOW6dgETm+ohwgoRjUG2+AbMH
+CRotPVbNOFMUwdRnVsiXy5m0qWLrxOXqXCG8T7oPg5nWbBWvNO621cBQ+wMjoDrS
+ia7pSc9cp3IQy7wJpPag
+=NhYG
 -----END PGP SIGNATURE-----
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
+}