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 53DDD13877A for ; Thu, 24 Jul 2014 22:50:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 456DDE101C; Thu, 24 Jul 2014 22:33:52 +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 E0E89E0FC1 for ; Thu, 24 Jul 2014 22:31:13 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [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 9284D340D18 for ; Thu, 24 Jul 2014 01:05:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9A5B3193E7 for ; Thu, 24 Jul 2014 01:05:04 +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: <1406160926.74bdf65d1644777a05093efeba5d584c4e91a718.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 74bdf65d1644777a05093efeba5d584c4e91a718 X-VCS-Branch: master Date: Thu, 24 Jul 2014 01:05:04 +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: b1d38e48-efd3-4055-bba3-9e72a0a3899c X-Archives-Hash: a21a91e5ba5fd08d90d1e20828be458c commit: 74bdf65d1644777a05093efeba5d584c4e91a718 Author: Davide Pesavento gentoo org> AuthorDate: Thu Jul 24 00:15:26 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jul 24 00:15:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=74bdf65d [qt5-build.eclass] Sort and uniquify macros in gentoo-qconfig.h --- eclass/qt5-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 206aa31..84d1ceb 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -650,7 +650,7 @@ qt5_regenerate_global_qconfigs() { find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \ -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \ - -execdir cat '{}' + > "${T}"/gentoo-qconfig.h + -execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h [[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty" mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \