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 05D531381F3 for ; Sun, 28 Jul 2013 00:01:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFDD4E0933; Sun, 28 Jul 2013 00:01:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B7BFE0933 for ; Sun, 28 Jul 2013 00:01:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CE3033E95A for ; Sun, 28 Jul 2013 00:01:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A2A89E468F for ; Sun, 28 Jul 2013 00:01:14 +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: <1374969664.fe762c420faf977896ef80d1aa026a90b47541c0.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: fe762c420faf977896ef80d1aa026a90b47541c0 X-VCS-Branch: master Date: Sun, 28 Jul 2013 00:01:14 +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: 79c447c6-bd12-40d6-bf4e-064af3e4b7c2 X-Archives-Hash: ef311ea764a1e0401c36b04e6a6bc923 commit: fe762c420faf977896ef80d1aa026a90b47541c0 Author: Davide Pesavento gmail com> AuthorDate: Sun Jul 28 00:01:04 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Jul 28 00:01:04 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe762c42 [qt4-build.eclass] Fix bug 478018. --- eclass/qt4-build.eclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 0ca15d7..ba0ed38 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -804,10 +804,9 @@ qt_mkspecs_dir() { # @FUNCTION: qt_nolibx11 # @INTERNAL # @DESCRIPTION: -# Ignore X11 tests for packages that don't need X libraries installed. +# Skip X11 tests for packages that don't need X libraries installed. qt_nolibx11() { - sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || - die "x11 check sed failed" + sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die } EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst