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 8BABE1388CB for ; Mon, 27 Oct 2014 00:53:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D773EE0908; Mon, 27 Oct 2014 00:53: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 604BAE0908 for ; Mon, 27 Oct 2014 00:53: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 0609A33FFF7 for ; Mon, 27 Oct 2014 00:53:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5F0C8D27 for ; Mon, 27 Oct 2014 00:53: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: <1414371202.f1c2941f8b40e41e3413f4465c2edec1bb1a78a8.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: f1c2941f8b40e41e3413f4465c2edec1bb1a78a8 X-VCS-Branch: master Date: Mon, 27 Oct 2014 00:53: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: 1ea2e25d-ad9f-45bd-806c-483257770b5f X-Archives-Hash: 6af758a61c07648ea42bc3b1a131a914 commit: f1c2941f8b40e41e3413f4465c2edec1bb1a78a8 Author: Davide Pesavento gentoo org> AuthorDate: Mon Oct 27 00:53:22 2014 +0000 Commit: Davide Pesavento gentoo 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 \n' \ - "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \ + sed -i -e '1i #include \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 \n' \ - "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \ - "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \ + sed -i -e '1i #include \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 \n' \ - "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \ + sed -i -e '1i #include \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 \n' \ - "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \ - "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \ + sed -i -e '1i #include \n' \ + "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \ || die "sed for qconfig.h failed" fi