/[gentoo-x86]/eclass/qt4-build.eclass
Gentoo

Diff of /eclass/qt4-build.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.90 Revision 1.91
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.90 2011/03/10 23:45:51 wired Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.91 2011/07/08 11:35:01 ssuominen Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ben de Groot <yngwin@gentoo.org>, 7# Ben de Groot <yngwin@gentoo.org>,
8# Markos Chandras <hwoarang@gentoo.org>, 8# Markos Chandras <hwoarang@gentoo.org>,
172 die "visibility fixing sed failed" 172 die "visibility fixing sed failed"
173 fi 173 fi
174 # fix libx11 dependency on non X packages 174 # fix libx11 dependency on non X packages
175 if version_is_at_least "4.7.0_beta2"; then 175 if version_is_at_least "4.7.0_beta2"; then
176 local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 176 local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
177 hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 177 has ${PN} ${NOLIBX11PKG} && qt_nolibx11
178 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 178 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup
179 fi 179 fi
180 180
181 if use aqua; then 181 if use aqua; then
182 # provide a proper macx-g++-64 182 # provide a proper macx-g++-64
599 599
600 # generate list of QT_CONFIG entries from the existing list 600 # generate list of QT_CONFIG entries from the existing list
601 # including qconfig_add and excluding qconfig_remove 601 # including qconfig_add and excluding qconfig_remove
602 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 602 for x in $(sed -n 's/^QT_CONFIG +=//p' \
603 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 603 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
604 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}" 604 has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
605 done 605 done
606 606
607 # replace the existing QT_CONFIG list with qconfig_new 607 # replace the existing QT_CONFIG list with qconfig_new
608 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 608 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
609 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 609 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then

Legend:
Removed from v.1.90  
changed lines
  Added in v.1.91

  ViewVC Help
Powered by ViewVC 1.1.20