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 C6AAE138247 for ; Mon, 13 Oct 2014 19:35:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B343AE09E1; Mon, 13 Oct 2014 19:35:42 +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 5B4D1E09E1 for ; Mon, 13 Oct 2014 19:35:42 +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 7A999340426 for ; Mon, 13 Oct 2014 19:35:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8D447C26 for ; Mon, 13 Oct 2014 19:35:39 +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: <1413211298.e6a119eb59b3b67e2587a285a57db4037f4ab907.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/qtcore-4.8.6.ebuild dev-qt/qtcore/qtcore-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: e6a119eb59b3b67e2587a285a57db4037f4ab907 X-VCS-Branch: master Date: Mon, 13 Oct 2014 19:35:39 +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: d977d6de-e9d8-4349-8eb9-03d8607357dc X-Archives-Hash: 17041f7993f353f391dfaae292cb7bba commit: e6a119eb59b3b67e2587a285a57db4037f4ab907 Author: Michał Górny gentoo org> AuthorDate: Mon Oct 13 14:41:38 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Oct 13 14:41:38 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e6a119eb [dev-qt/qtcore] Enable multilib header wrapping Package-Manager: portage-2.2.14_rc1 --- dev-qt/qtcore/qtcore-4.8.6.ebuild | 5 +++++ dev-qt/qtcore/qtcore-4.8.9999.ebuild | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild index 24a95a6..7089648 100644 --- a/dev-qt/qtcore/qtcore-4.8.6.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild @@ -28,6 +28,11 @@ PDEPEND=" qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] ) " +MULTILIB_WRAPPED_HEADERS=( + /usr/include/qt4/Qt/qconfig.h + /usr/include/qt4/QtCore/qconfig.h +) + PATCHES=( "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch" "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968 diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild index 24a95a6..7089648 100644 --- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild +++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild @@ -28,6 +28,11 @@ PDEPEND=" qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] ) " +MULTILIB_WRAPPED_HEADERS=( + /usr/include/qt4/Qt/qconfig.h + /usr/include/qt4/QtCore/qconfig.h +) + PATCHES=( "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch" "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968