commit: f1c2941f8b40e41e3413f4465c2edec1bb1a78a8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 27 00:53:22 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 27 00:53:22 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f1c2941f
[dev-qt/qtcore:4] Adjust sed expression to work with multilib-wrapped headers.
Package-Manager: portage-2.2.14
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 11 +++++------
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 7089648..841e740 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -107,18 +107,17 @@ multilib_src_install_all() {
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
- # Framework hacking
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+ # Framework hacking
# TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed"
dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
- "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \
+ sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
|| die "sed for qconfig.h failed"
fi
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 7089648..841e740 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -107,18 +107,17 @@ multilib_src_install_all() {
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
- # Framework hacking
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+ # Framework hacking
# TODO: do this better
- sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed"
dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
- "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \
+ sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
|| die "sed for qconfig.h failed"
fi
