From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A81091393E9 for ; Tue, 27 May 2014 22:59:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBC65E08B8; Tue, 27 May 2014 22:59:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F36B8E08AF for ; Tue, 27 May 2014 22:59:33 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99FAD33FC3B for ; Tue, 27 May 2014 22:59:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 14A29181A9 for ; Tue, 27 May 2014 22:59:31 +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: <1401229588.7bdd7364dc646f9be951ecce490b5e9741add07d.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: 7bdd7364dc646f9be951ecce490b5e9741add07d X-VCS-Branch: master Date: Tue, 27 May 2014 22:59:31 +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: 85cf49ba-6380-4540-a7fb-b21df6ab1776 X-Archives-Hash: 085e2118ffb22d90f710045c28953a7c commit: 7bdd7364dc646f9be951ecce490b5e9741add07d Author: Davide Pesavento gentoo org> AuthorDate: Tue May 27 22:26:28 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue May 27 22:26:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7bdd7364 [dev-qt/qtdemo:4] Remove bogus dependency on qt3support. Thanks to Rafał Mużyło in bug 510042 comment #2. Package-Manager: portage-2.2.10 --- dev-qt/qtdemo/metadata.xml | 1 - dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 22 +++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml index a03d28e..5db131c 100644 --- a/dev-qt/qtdemo/metadata.xml +++ b/dev-qt/qtdemo/metadata.xml @@ -11,7 +11,6 @@ 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 7a57ed4..db57ecf 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild @@ -14,27 +14,26 @@ else KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos" fi -IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns" +IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns" DEPEND=" ~dev-qt/designer-${PV}[aqua=,debug=] - ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?] - ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?] + ~dev-qt/qtcore-${PV}[aqua=,debug=] + ~dev-qt/qtgui-${PV}[aqua=,debug=] ~dev-qt/qthelp-${PV}[aqua=,debug=] ~dev-qt/qtscript-${PV}[aqua=,debug=] - ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?] + ~dev-qt/qtsql-${PV}[aqua=,debug=] ~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?] ) + opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=] ) + openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] ) 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=] ) " @@ -84,11 +83,9 @@ src_prepare() { fi done - if ! use qt3support; then - einfo "Disabling qt3support examples" - sed -i -e '/QT_CONFIG, qt3support/d' \ - examples/graphicsview/graphicsview.pro || die - fi + # Remove bogus dependency on qt3support (bug 510042) + sed -i -e 's/contains(QT_CONFIG, qt3support)://' \ + examples/graphicsview/graphicsview.pro || die } src_configure() { @@ -99,7 +96,6 @@ src_configure() { $(qt_use opengl) $(qt_use openvg) $(qt_use phonon) -no-phonon-backend - $(qt_use qt3support) $(qt_use webkit) $(qt_use xmlpatterns)"