summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2010-01-16 17:35:32 +0000
committerBen de Groot <yngwin@gentoo.org>2010-01-16 17:35:32 +0000
commit5062aaa84931cb122a247be99543a764bbff2c0a (patch)
tree6d7710cae934349d1308cf0423aa126155f70eb4 /x11-libs
parentstable x86, bug 287110 (diff)
downloadhistorical-5062aaa84931cb122a247be99543a764bbff2c0a.tar.gz
historical-5062aaa84931cb122a247be99543a764bbff2c0a.tar.bz2
historical-5062aaa84931cb122a247be99543a764bbff2c0a.zip
Adding alsa-lib dependency, adding iconv useflag, dropping non-linux keywords (bug 293671).
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-multimedia/ChangeLog9
-rw-r--r--x11-libs/qt-multimedia/Manifest4
-rw-r--r--x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild14
3 files changed, 16 insertions, 11 deletions
diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index ad26abe2f4c3..bf83a166b454 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/qt-multimedia
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.5 2009/12/25 15:41:27 abcd Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.6 2010/01/16 17:35:32 yngwin Exp $
+
+ 16 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+ qt-multimedia-4.6.0-r1.ebuild:
+ Adding alsa-lib dependency, adding iconv useflag, dropping non-linux
+ keywords (bug 293671).
*qt-multimedia-4.6.0-r1 (25 Dec 2009)
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
index 61d04b14671c..ce96cf5b7775 100644
--- a/x11-libs/qt-multimedia/Manifest
+++ b/x11-libs/qt-multimedia/Manifest
@@ -1,4 +1,4 @@
DIST qt-everywhere-opensource-src-4.6.0.tar.gz 155679111 RMD160 7842b9f4a5364016677fc2162dfd31f1440bb05d SHA1 c2cbbde83f1ebac3b8dd13a112fcad757d395041 SHA256 55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
-EBUILD qt-multimedia-4.6.0-r1.ebuild 1361 RMD160 87bf5fda20ba2764b317f898586e2e37ea5c0e7a SHA1 f4de539b88238a565b58f99a58f289c964905bd2 SHA256 ed317802675ac5925a0d5195a66f7e1ebf923a0d18aa7805fb35f3a497589c06
-MISC ChangeLog 1068 RMD160 70a7271e3fdeed953eba910038db3887a643cd4e SHA1 db66246f9574d92495a226016979e976bb4853b9 SHA256 336965df039379116bd5bf3189a5a8d26aa016103f8622fdfd775dc8504f1439
+EBUILD qt-multimedia-4.6.0-r1.ebuild 1340 RMD160 3ddba69be2f7ef5e9b8f621e555da097a5ab4603 SHA1 9b49143b97a608cd54dae5a7c8027f647a08eb12 SHA256 abf2ca1b73c2ab4c4dccf580ea3f813653cfd4986c68bff31e039be932ee1fbb
+MISC ChangeLog 1248 RMD160 cb637e95e57c676c9903bb5024f0b8ead94aa38e SHA1 cdbc6f8cb2d35a6ef89fa5b820f129a53ecab2c1 SHA256 841181c6a037eb172dda621c36b946aec0b68d57c960430fdad058e96b307788
MISC metadata.xml 157 RMD160 26da5ad9d79f9c34cb5dc38bf9a9e194fcc14e67 SHA1 51a9aef22dbfaef0f17aed42fa2c7dc895d2a3b5 SHA256 8417491ad7d39dff202c22d0df65ca1a7675a670193ed7056c234fa83478dc31
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
index 543b2834dfae..025c3e872ae9 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.6.0-r1.ebuild,v 1.1 2009/12/25 15:41:27 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild,v 1.2 2010/01/16 17:35:32 yngwin Exp $
EAPI="2"
inherit qt4-build
DESCRIPTION="The Qt multimedia module"
SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="iconv"
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
- ~x11-libs/qt-gui-${PV}[aqua=,debug=]
-"
+DEPEND="media-libs/alsa-lib
+ ~x11-libs/qt-core-${PV}[aqua=,debug=]
+ ~x11-libs/qt-gui-${PV}[aqua=,debug=]"
RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="src/multimedia"