[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/

[Davide Pesavento]

commit:     e6a119eb59b3b67e2587a285a57db4037f4ab907
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 14:41:38 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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