diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-02-13 00:53:28 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-02-13 00:53:28 +0000 |
| commit | 0e5d109a655a96105918466badc2d6ee5c848f43 (patch) | |
| tree | 0e41705347ba3b4144cf43000048bca09ed30d27 /eclass | |
| parent | Stable for HPPA too. (diff) | |
| download | gentoo-2-0e5d109a655a96105918466badc2d6ee5c848f43.tar.gz gentoo-2-0e5d109a655a96105918466badc2d6ee5c848f43.tar.bz2 gentoo-2-0e5d109a655a96105918466badc2d6ee5c848f43.zip | |
Finally remove ${S} fallback, it was deprecated 3 months ago.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-r2.eclass | 15 |
2 files changed, 5 insertions, 15 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 09277a0c1acd..442e6946534d 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.132 2012/02/13 00:32:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.133 2012/02/13 00:53:28 pesa Exp $ + + 13 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass: + Finally remove ${S} fallback, it was deprecated 3 months ago. 13 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass: eqmake4: make CONFIG manipulation more robust by using gsub in the awk diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass index 3406c62aa7e0..41e22486c25b 100644 --- a/eclass/qt4-r2.eclass +++ b/eclass/qt4-r2.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-r2.eclass,v 1.17 2012/02/13 00:32:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.18 2012/02/13 00:53:28 pesa Exp $ # @ECLASS: qt4-r2.eclass # @MAINTAINER: @@ -52,19 +52,6 @@ qt4-r2_src_unpack() { debug-print-function $FUNCNAME "$@" base_src_unpack "$@" - - # Fallback to ${WORKDIR}/${MY_P} when ${WORKDIR}/${P} doesn't exist. - # This is a hack that was never meant to be used by ebuilds in tree. - if [[ ${S} == "${WORKDIR}/${P}" && ! -d ${S} && -d ${WORKDIR}/${MY_P} ]]; then - echo - eqawarn "*** DEPRECATION NOTICE ***" - eqawarn - eqawarn "\${S} fallback is deprecated and will be removed on 12/12/2011." - eqawarn "Please set the correct value for \${S} variable inside the ebuild." - echo - einfo "Falling back to '${WORKDIR}/${MY_P}'" - S="${WORKDIR}/${MY_P}" - fi } # @ECLASS-VARIABLE: PATCHES |