From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-541839-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 524C3138233
for <garchives@archives.gentoo.org>; Wed, 2 Jan 2013 00:02:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1623421C032;
Wed, 2 Jan 2013 00:02:35 +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 9D09C21C032
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Jan 2013 00:02:34 +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 B755633D90D
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Jan 2013 00:02:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 42844E5439
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Jan 2013 00:02:32 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1357083563.a158d72f278fe9bfc332cddc7454f09caccd07e6.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: a158d72f278fe9bfc332cddc7454f09caccd07e6
X-VCS-Branch: master
Date: Wed, 2 Jan 2013 00:02:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 97f5d035-f429-46be-8049-9d635401f97f
X-Archives-Hash: fabe094bcd49212e4e65e90d88a65eb0
commit: a158d72f278fe9bfc332cddc7454f09caccd07e6
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jan 1 23:39:23 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 23:39:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a158d72f
[qt5-build.eclass] Fix qconfig processing: don't assume that ${PN} starts with "qt-".
---
eclass/qt5-build.eclass | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8c1b6d3..7295c8f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -515,8 +515,9 @@ qt5_install_module_qconfigs() {
qt5_regenerate_global_qconfigs() {
einfo "Regenerating gentoo-qconfig.h"
- find "${ROOT}${QT5_HEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \
- -exec cat {} + > "${T}"/gentoo-qconfig.h
+ find "${ROOT}${QT5_HEADERDIR}"/Gentoo \
+ -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \
+ -execdir cat '{}' + > "${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 \
@@ -533,7 +534,7 @@ qt5_regenerate_global_qconfigs() {
# generate list of QT_CONFIG entries from the existing list,
# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
eshopts_push -s nullglob
- for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
+ for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
done