diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-07-10 21:43:19 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-07-10 21:43:19 +0000 |
| commit | 49794053cdeb613751bce3b5f8fd0675bf1cae0c (patch) | |
| tree | 5ec718c50d3a60bdd1e839612b800ebe95e05ebf | |
| parent | version bump (diff) | |
| download | historical-49794053cdeb613751bce3b5f8fd0675bf1cae0c.tar.gz historical-49794053cdeb613751bce3b5f8fd0675bf1cae0c.tar.bz2 historical-49794053cdeb613751bce3b5f8fd0675bf1cae0c.zip | |
Stop inheriting base.eclass
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9afc0d8e82d5..a82bca5edb24 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.339 2012/07/09 02:38:05 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.340 2012/07/10 21:43:19 pesa Exp $ + + 10 Jul 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Stop inheriting base.eclass 09 Jul 2012; Mike Gilbert <floppym@gentoo.org> base.eclass: Remove false statement from eclass description. diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index bf4aa5ca6863..3b75f4fc433e 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.133 2012/06/18 21:33:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.134 2012/07/10 21:43:19 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -14,7 +14,7 @@ case ${EAPI} in *) die "qt4-build.eclass requires EAPI 2, 3 or 4." ;; esac -inherit base eutils flag-o-matic multilib toolchain-funcs versionator +inherit eutils flag-o-matic multilib toolchain-funcs versionator if [[ ${PV} == *9999* ]]; then QT4_BUILD_TYPE="live" @@ -352,7 +352,9 @@ qt4-build_src_prepare() { sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ mkspecs/$(qt_mkspecs_dir)/qmake.conf || die - base_src_prepare + # apply patches + [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + epatch_user } # @FUNCTION: qt4-build_src_configure |