diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2011-11-19 20:00:35 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2011-11-19 20:00:35 +0000 |
| commit | 510c3fdc4c413bc8dca292cf728457518ba8dbeb (patch) | |
| tree | cb549fcaac55c061fa0315a118223ff31574d003 /eclass | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #386309 (diff) | |
| download | historical-510c3fdc4c413bc8dca292cf728457518ba8dbeb.tar.gz historical-510c3fdc4c413bc8dca292cf728457518ba8dbeb.tar.bz2 historical-510c3fdc4c413bc8dca292cf728457518ba8dbeb.zip | |
Make qt_assistant_cleanup() a no-op for Qt 4.7.4 and later (bug #386709).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0d50f226e4e2..f9b8e8d72be8 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.17 2011/11/18 20:51:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.18 2011/11/19 20:00:35 pesa Exp $ + + 19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Make qt_assistant_cleanup() a no-op for Qt 4.7.4 and later (bug #386709). 18 Nov 2011; Michał Górny <mgorny@gentoo.org> scons-utils.eclass: Add DESTDIR-like variable to the example. diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 8f7fd5e3d50e..65ac13eafb19 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.98 2011/11/12 19:01:56 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.99 2011/11/19 20:00:35 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -185,11 +185,12 @@ qt4-build_src_prepare() { die "visibility fixing sed failed" fi - # fix libX11 dependency on non X packages - if version_is_at_least "4.7.0_beta2"; then + if version_is_at_least "4.7"; then + # fix libX11 dependency on non X packages local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" has ${PN} ${nolibx11_pkgs} && qt_nolibx11 - [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup + + qt_assistant_cleanup fi if use aqua; then @@ -823,9 +824,16 @@ qt_mkspecs_dir() { # @FUNCTION: qt_assistant_cleanup # @RETURN: nothing # @DESCRIPTION: -# Tries to clean up tools.pro for qt-assistant ebuilds -# Meant to be called in src_prepare +# Tries to clean up tools.pro for qt-assistant ebuilds. +# Meant to be called in src_prepare(). +# Since Qt 4.7.4 this function is a no-op. qt_assistant_cleanup() { + # apply patching to qt-assistant ebuilds only + [[ ${PN} != "qt-assistant" ]] && return + + # no longer needed for 4.7.4 and later + version_is_at_least "4.7.4" && return + # different versions (and branches...) may need different handling, # add a case if you need special handling case "${MY_PV_EXTRA}" in |