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 DC2FF138C48 for ; Sun, 12 Apr 2015 16:31:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24B47E0CFB; Sun, 12 Apr 2015 16:31:01 +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 C9A77E0CFB for ; Sun, 12 Apr 2015 16:31:00 +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 1618B340A78 for ; Sun, 12 Apr 2015 16:31:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEA8C15C5A for ; Sun, 12 Apr 2015 16:30:58 +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: <1428855452.6a666f95d25eb75c651033f50c27dbc6da343b53.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 6a666f95d25eb75c651033f50c27dbc6da343b53 X-VCS-Branch: master Date: Sun, 12 Apr 2015 16:30:58 +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: c898ac61-e855-4cae-ad53-cd897fca4cc6 X-Archives-Hash: 5aebef0456e8ade0b005ba3fa943846b commit: 6a666f95d25eb75c651033f50c27dbc6da343b53 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 12 16:17:32 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 12 16:17:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a666f95 [qt4-build-multilib.eclass] Remove sed that does not apply anymore. This expression doesn't match anything since at least Qt 4.7.0, so it is effectively dead code. Those platforms that still need such patching have been broken for years, and apparently nobody cares. eclass/qt4-build-multilib.eclass | 8 -------- 1 file changed, 8 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index c7e21cd..9a758e4 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -258,14 +258,6 @@ qt4-build-multilib_src_prepare() { fi fi - # This is needed for all systems with a separate -liconv, except - # Darwin, for which the sources already cater for -liconv - if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then - sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \ - config.tests/unix/iconv/iconv.pro \ - || die "sed iconv.pro failed" - fi - if [[ ${CHOST} == *-solaris* ]]; then sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ mkspecs/$(qt4_get_mkspec)/qmake.conf || die