From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 873AB1381F3 for ; Thu, 25 Jul 2013 09:13:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20856E09AA; Thu, 25 Jul 2013 09:13:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91884E09AA for ; Thu, 25 Jul 2013 09:13:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB58733E8D5 for ; Thu, 25 Jul 2013 09:13:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D08BCE5458 for ; Thu, 25 Jul 2013 09:13:07 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1374743610.76db9f951057558d40a45f436f1b0ee054781c86.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdemo/metadata.xml dev-qt/qtdemo/qtdemo-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtdemo/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 76db9f951057558d40a45f436f1b0ee054781c86 X-VCS-Branch: master Date: Thu, 25 Jul 2013 09:13:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0afcb4c-3128-47cc-b21d-8f423f4f59e4 X-Archives-Hash: 87897bad89a5c95ad3879bd3679634f7 commit: 76db9f951057558d40a45f436f1b0ee054781c86 Author: Davide Pesavento gmail com> AuthorDate: Thu Jul 25 09:13:30 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jul 25 09:13:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76db9f95 [dev-qt/qtdemo] Fix bugs #477652 and #477862. Package-Manager: portage-2.2.0_alpha188 --- dev-qt/qtdemo/metadata.xml | 1 + dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 46 +++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml index 5038698..feb2119 100644 --- a/dev-qt/qtdemo/metadata.xml +++ b/dev-qt/qtdemo/metadata.xml @@ -11,6 +11,7 @@ Build QtMultimedia examples and demos Build QtOpenGL examples and demos Build QtOpenVG examples and demos + Build Phonon examples and demos Build Qt3Support examples and demos Build QtWebKit examples and demos Build QtXmlPatterns examples and demos diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild index 4085f64..2d892e5 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild @@ -13,29 +13,29 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then else KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos" fi -IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns" +IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns" DEPEND=" - ~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?] - ~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?] - ~dev-qt/qthelp-${PV}:4[aqua=,debug=] - ~dev-qt/qtscript-${PV}:4[aqua=,debug=] - ~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?] - ~dev-qt/qtsvg-${PV}:4[aqua=,debug=] - ~dev-qt/qttest-${PV}:4[aqua=,debug=] - dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] ) - declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] ) - kde? ( media-libs/phonon[aqua=] ) - !kde? ( || ( - ~dev-qt/qtphonon-${PV}:4[aqua=,debug=] - media-libs/phonon[aqua=] - ) ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] ) - opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] ) - openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] ) - qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] ) - webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] ) - xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] ) + ~dev-qt/designer-${PV}[aqua=,debug=] + ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?] + ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?] + ~dev-qt/qthelp-${PV}[aqua=,debug=] + ~dev-qt/qtscript-${PV}[aqua=,debug=] + ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?] + ~dev-qt/qtsvg-${PV}[aqua=,debug=] + ~dev-qt/qttest-${PV}[aqua=,debug=] + dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] ) + declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] ) + multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] ) + opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] ) + openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] ) + phonon? ( + kde? ( media-libs/phonon[aqua=] ) + !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) ) + ) + qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] ) + webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] ) + xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] ) " RDEPEND="${DEPEND}" @@ -49,8 +49,8 @@ pkg_setup() { examples" QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} doc/src/images - src include + src tools" qt4-build_pkg_setup @@ -66,6 +66,7 @@ src_prepare() { 'multimedia:spectrum' 'opengl:boxes|glhypnotizer' 'openvg' + 'phonon:mediaplayer' 'webkit:browser' 'xmlpatterns' ) @@ -99,6 +100,7 @@ src_configure() { $(qt_use multimedia) $(qt_use opengl) $(qt_use openvg) + $(qt_use phonon) $(qt_use qt3support) $(qt_use webkit) $(qt_use xmlpatterns)"