From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6E6061393E9 for ; Wed, 28 May 2014 00:31:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DB95E086B; Wed, 28 May 2014 00:31:57 +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 005C4E088F for ; Wed, 28 May 2014 00:31:56 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2AE433FD87 for ; Wed, 28 May 2014 00:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8F92B182D4 for ; Wed, 28 May 2014 00:31:54 +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: <1401236953.24dadd56fbe8e9ab185f2db7142482e16deeb4fa.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/qtgui-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 24dadd56fbe8e9ab185f2db7142482e16deeb4fa X-VCS-Branch: master Date: Wed, 28 May 2014 00:31:54 +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: 321a07f3-5def-4f9f-b97b-56fc6b86baf4 X-Archives-Hash: 9fb667b3d477a6852f580244b4832573 commit: 24dadd56fbe8e9ab185f2db7142482e16deeb4fa Author: Davide Pesavento gentoo org> AuthorDate: Wed May 28 00:29:13 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed May 28 00:29:13 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=24dadd56 [dev-qt/qtgui:4] Remove obsolete workaround. IIRC these paths are added by cairo.pc when cairo is built with USE=qt4. Since we've been depending on cairo[-qt4] for a while now, this hack should no longer be needed. Package-Manager: portage-2.2.10 --- dev-qt/qtgui/qtgui-4.8.9999.ebuild | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild index 5dadd5d..d6de878 100644 --- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild @@ -125,7 +125,7 @@ src_prepare() { qt4-build-multilib_src_prepare # Add -xvideo to the list of accepted configure options - sed -i -e 's:|-xinerama|:&-xvideo|:' configure + sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die } src_configure() { @@ -151,12 +151,6 @@ src_configure() { [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" qt4-build-multilib_src_configure - - if use gtkstyle; then - sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" - fi - - sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed" } src_install() {