From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-723693-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 6027713877A
for <garchives@archives.gentoo.org>; Tue, 19 Aug 2014 01:26:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F01BEE09C3;
Tue, 19 Aug 2014 01:26:50 +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 5A468E09C2
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Aug 2014 01:26:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3B8D433FE13
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Aug 2014 01:26:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 78D713B7F
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Aug 2014 01:07:18 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1408188315.ea04ace482dc579e72e7aa74ecb412390fe19911.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
X-VCS-Repository: proj/qt
X-VCS-Files: dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
X-VCS-Directories: dev-qt/qtmultimedia/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: ea04ace482dc579e72e7aa74ecb412390fe19911
X-VCS-Branch: master
Date: Tue, 19 Aug 2014 01:07:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 86a5dd8d-4686-4caa-86c9-36167e7f9a6b
X-Archives-Hash: 134d01871bac90035340d0ab159e0b1f
Message-ID: <20140819010718.g75ZsaZ7QfftSXnDB23xjjYB_B_fVIek6Cl3g6rV2Rw@z>
commit: ea04ace482dc579e72e7aa74ecb412390fe19911
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 16 11:25:15 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 11:25:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ea04ace4
[dev-qt/qtmultimedia:5] Workaround opengl headers inclusion issue.
See bug 518542 for details.
Package-Manager: portage-2.2.12
---
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild | 2 ++
dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild | 2 ++
dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild | 2 ++
dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -17,6 +17,7 @@ fi
IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
REQUIRED_USE="?? ( alsa pulseaudio )"
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
openal? ( media-libs/openal )
)
widgets? (
+ >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
)