ulm 14/07/11 08:21:59 Modified: ChangeLog autotools.eclass base.eclass cdrom.eclass cmake-utils.eclass cvs.eclass enlightenment.eclass eutils.eclass fcaps.eclass fixheadtails.eclass flag-o-matic.eclass games.eclass kde4-base.eclass kde4-functions.eclass kde4-meta-pkg.eclass kde4-meta.eclass libtool.eclass multilib.eclass multiprocessing.eclass pam.eclass pax-utils.eclass portability.eclass qmake-utils.eclass readme.gentoo.eclass toolchain-funcs.eclass unpacker.eclass user.eclass versionator.eclass Log: Avoid reserved names for functions and variables, bug 516092.
Revision Changes Path 1.1319 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1319&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1319&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1318&r2=1.1319 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1318 retrieving revision 1.1319 diff -u -r1.1318 -r1.1319 --- ChangeLog 8 Jul 2014 08:49:10 -0000 1.1318 +++ ChangeLog 11 Jul 2014 08:21:58 -0000 1.1319 @@ -1,6 +1,16 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1318 2014/07/08 08:49:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1319 2014/07/11 08:21:58 ulm Exp $ + + 11 Jul 2014; Ulrich Müller <u...@gentoo.org> autotools.eclass, base.eclass, + cdrom.eclass, cmake-utils.eclass, cvs.eclass, enlightenment.eclass, + eutils.eclass, fcaps.eclass, fixheadtails.eclass, flag-o-matic.eclass, + games.eclass, kde4-base.eclass, kde4-functions.eclass, kde4-meta.eclass, + kde4-meta-pkg.eclass, libtool.eclass, multilib.eclass, + multiprocessing.eclass, pam.eclass, pax-utils.eclass, portability.eclass, + qmake-utils.eclass, readme.gentoo.eclass, toolchain-funcs.eclass, + unpacker.eclass, user.eclass, versionator.eclass: + Avoid reserved names for functions and variables, bug 516092. 08 Jul 2014; Michał Górny <mgo...@gentoo.org> distutils-r1.eclass: Support linking Python modules on aix, thanks to haubi. 1.162 eclass/autotools.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.162&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.162&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.161&r2=1.162 Index: autotools.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- autotools.eclass 1 Mar 2014 11:51:08 -0000 1.161 +++ autotools.eclass 11 Jul 2014 08:21:58 -0000 1.162 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.161 2014/03/01 11:51:08 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.162 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -13,8 +13,8 @@ # Note: We require GNU m4, as does autoconf. So feel free to use any features # from the GNU version of m4 without worrying about other variants (i.e. BSD). -if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank" +if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then +_AUTOTOOLS_ECLASS=1 inherit libtool multiprocessing 1.59 eclass/base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/base.eclass?rev=1.59&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/base.eclass?rev=1.59&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/base.eclass?r1=1.58&r2=1.59 Index: base.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- base.eclass 27 Sep 2012 16:35:41 -0000 1.58 +++ base.eclass 11 Jul 2014 08:21:58 -0000 1.59 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.58 2012/09/27 16:35:41 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.59 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: base.eclass # @MAINTAINER: @@ -11,8 +11,8 @@ # @DESCRIPTION: # The base eclass defines some default functions and variables. -if [[ ${___ECLASS_ONCE_BASE} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_BASE="recur -_+^+_- spank" +if [[ -z ${_BASE_ECLASS} ]]; then +_BASE_ECLASS=1 inherit eutils 1.6 eclass/cdrom.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cdrom.eclass?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cdrom.eclass?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cdrom.eclass?r1=1.5&r2=1.6 Index: cdrom.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cdrom.eclass 18 Jan 2012 12:42:06 -0000 1.5 +++ cdrom.eclass 11 Jul 2014 08:21:58 -0000 1.6 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v 1.5 2012/01/18 12:42:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v 1.6 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: cdrom.eclass # @MAINTAINER: @@ -15,8 +15,8 @@ # and when the function returns, you can assume that the cd has been # found at CDROM_ROOT. -if [[ -z ${___ECLASS_ONCE_CDROM} ]]; then -___ECLASS_ONCE_CDROM=1 +if [[ -z ${_CDROM_ECLASS} ]]; then +_CDROM_ECLASS=1 inherit portability 1.108 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.108&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.108&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.107&r2=1.108 Index: cmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- cmake-utils.eclass 6 May 2014 15:29:02 -0000 1.107 +++ cmake-utils.eclass 11 Jul 2014 08:21:58 -0000 1.108 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.107 2014/05/06 15:29:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.108 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -17,8 +17,8 @@ # builds (default), in-source builds and an implementation of the well-known use_enable # and use_with functions for CMake. -if [[ ${___ECLASS_ONCE_CMAKE_UTILS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_CMAKE_UTILS="recur -_+^+_- spank" +if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then +_CMAKE_UTILS_ECLASS=1 # @ECLASS-VARIABLE: WANT_CMAKE # @DESCRIPTION: 1.84 eclass/cvs.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cvs.eclass?rev=1.84&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cvs.eclass?rev=1.84&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cvs.eclass?r1=1.83&r2=1.84 Index: cvs.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- cvs.eclass 28 Sep 2013 16:22:29 -0000 1.83 +++ cvs.eclass 11 Jul 2014 08:21:58 -0000 1.84 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.83 2013/09/28 16:22:29 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.84 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: cvs.eclass # @MAINTAINER: @@ -13,8 +13,8 @@ # cvs_src_unpack. If you find that you need to call the cvs_* functions # directly, I'd be interested to hear about it. -if [[ ${___ECLASS_ONCE_CVS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_CVS="recur -_+^+_- spank" +if [[ -z ${_CVS_ECLASS} ]]; then +_CVS_ECLASS=1 inherit eutils 1.106 eclass/enlightenment.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?r1=1.105&r2=1.106 Index: enlightenment.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- enlightenment.eclass 12 Oct 2013 15:30:23 -0000 1.105 +++ enlightenment.eclass 11 Jul 2014 08:21:58 -0000 1.106 @@ -1,14 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.105 2013/10/12 15:30:23 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.106 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: enlightenment.eclass # @MAINTAINER: # enlightenm...@gentoo.org # @BLURB: simplify enlightenment package management -if [[ ${___ECLASS_ONCE_ENLIGHTENMENT} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_ENLIGHTENMENT="recur -_+^+_- spank" +if [[ -z ${_ENLIGHTENMENT_ECLASS} ]]; then +_ENLIGHTENMENT_ECLASS=1 inherit eutils libtool 1.436 eclass/eutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.436&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.436&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.435&r2=1.436 Index: eutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.435 retrieving revision 1.436 diff -u -r1.435 -r1.436 --- eutils.eclass 4 Jul 2014 08:01:51 -0000 1.435 +++ eutils.eclass 11 Jul 2014 08:21:58 -0000 1.436 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.435 2014/07/04 08:01:51 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.436 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -15,8 +15,8 @@ # Due to the nature of this eclass, some functions may have maintainers # different from the overall eclass! -if [[ ${___ECLASS_ONCE_EUTILS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_EUTILS="recur -_+^+_- spank" +if [[ -z ${_EUTILS_ECLASS} ]]; then +_EUTILS_ECLASS=1 inherit multilib toolchain-funcs @@ -114,7 +114,7 @@ # @CODE estack_push() { [[ $# -eq 0 ]] && die "estack_push: incorrect # of arguments" - local stack_name="__ESTACK_$1__" ; shift + local stack_name="_ESTACK_$1_" ; shift eval ${stack_name}+=\( \"\$@\" \) } @@ -127,23 +127,23 @@ estack_pop() { [[ $# -eq 0 || $# -gt 2 ]] && die "estack_pop: incorrect # of arguments" - # We use the fugly __estack_xxx var names to avoid collision with + # We use the fugly _estack_xxx var names to avoid collision with # passing back the return value. If we used "local i" and the # caller ran `estack_pop ... i`, we'd end up setting the local - # copy of "i" rather than the caller's copy. The __estack_xxx + # copy of "i" rather than the caller's copy. The _estack_xxx # garbage is preferable to using $1/$2 everywhere as that is a # bit harder to read. - local __estack_name="__ESTACK_$1__" ; shift - local __estack_retvar=$1 ; shift - eval local __estack_i=\${#${__estack_name}\[@\]} + local _estack_name="_ESTACK_$1_" ; shift + local _estack_retvar=$1 ; shift + eval local _estack_i=\${#${_estack_name}\[@\]} # Don't warn -- let the caller interpret this as a failure # or as normal behavior (akin to `shift`) - [[ $(( --__estack_i )) -eq -1 ]] && return 1 + [[ $(( --_estack_i )) -eq -1 ]] && return 1 - if [[ -n ${__estack_retvar} ]] ; then - eval ${__estack_retvar}=\"\${${__estack_name}\[${__estack_i}\]}\" + if [[ -n ${_estack_retvar} ]] ; then + eval ${_estack_retvar}=\"\${${_estack_name}\[${_estack_i}\]}\" fi - eval unset ${__estack_name}\[${__estack_i}\] + eval unset ${_estack_name}\[${_estack_i}\] } # @FUNCTION: evar_push @@ -174,7 +174,7 @@ for var ; do [[ ${!var+set} == "set" ]] \ && val=${!var} \ - || val="${___ECLASS_ONCE_EUTILS}" + || val="unset_76fc3c462065bb4ca959f939e6793f94" estack_push evar "${var}" "${val}" done } @@ -211,7 +211,7 @@ while (( cnt-- )) ; do estack_pop evar val || die "${FUNCNAME}: unbalanced push" estack_pop evar var || die "${FUNCNAME}: unbalanced push" - [[ ${val} == "${___ECLASS_ONCE_EUTILS}" ]] \ + [[ ${val} == "unset_76fc3c462065bb4ca959f939e6793f94" ]] \ && unset ${var} \ || printf -v "${var}" '%s' "${val}" done 1.9 eclass/fcaps.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fcaps.eclass?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fcaps.eclass?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fcaps.eclass?r1=1.8&r2=1.9 Index: fcaps.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fcaps.eclass 27 Jun 2013 01:18:57 -0000 1.8 +++ fcaps.eclass 11 Jul 2014 08:21:58 -0000 1.9 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.8 2013/06/27 01:18:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.9 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: fcaps.eclass # @MAINTAINER: @@ -28,8 +28,8 @@ # ) # @CODE -if [[ ${___ECLASS_ONCE_FCAPS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_FCAPS="recur -_+^+_- spank" +if [[ -z ${_FCAPS_ECLASS} ]]; then +_FCAPS_ECLASS=1 IUSE="+filecaps" @@ -182,8 +182,8 @@ continue 2 fi done - if [[ ${notfound} -eq 2 ]] && [[ -z ${__FCAPS_WARNED} ]] ; then - __FCAPS_WARNED="true" + if [[ ${notfound} -eq 2 ]] && [[ -z ${_FCAPS_WARNED} ]] ; then + _FCAPS_WARNED="true" ewarn "Could not find cap utils; make sure libcap or libcap-ng is available." fi fi 1.13 eclass/fixheadtails.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fixheadtails.eclass?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fixheadtails.eclass?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/fixheadtails.eclass?r1=1.12&r2=1.13 Index: fixheadtails.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fixheadtails.eclass 22 Aug 2011 04:46:31 -0000 1.12 +++ fixheadtails.eclass 11 Jul 2014 08:21:58 -0000 1.13 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.12 2011/08/22 04:46:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.13 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: fixheadtails.eclass # @MAINTAINER: @@ -11,7 +11,7 @@ DEPEND=">=sys-apps/sed-4" -__do_sed_fix() { +_do_sed_fix() { einfo " - fixed $1" sed -i \ -e 's/head \+-\([0-9]\)/head -n \1/g' \ @@ -28,7 +28,7 @@ local i einfo "Replacing obsolete head/tail with POSIX compliant ones" for i in "$@" ; do - __do_sed_fix "$i" + _do_sed_fix "$i" done } 1.201 eclass/flag-o-matic.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.201&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.201&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?r1=1.200&r2=1.201 Index: flag-o-matic.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- flag-o-matic.eclass 4 Jul 2014 08:01:51 -0000 1.200 +++ flag-o-matic.eclass 11 Jul 2014 08:21:58 -0000 1.201 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.200 2014/07/04 08:01:51 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.201 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -10,8 +10,8 @@ # This eclass contains a suite of functions to help developers sanely # and safely manage toolchain flags in their builds. -if [[ ${___ECLASS_ONCE_FLAG_O_MATIC} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_FLAG_O_MATIC="recur -_+^+_- spank" +if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then +_FLAG_O_MATIC_ECLASS=1 inherit eutils toolchain-funcs multilib 1.158 eclass/games.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.158&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.158&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.157&r2=1.158 Index: games.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- games.eclass 12 Mar 2014 18:54:12 -0000 1.157 +++ games.eclass 11 Jul 2014 08:21:58 -0000 1.158 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.157 2014/03/12 18:54:12 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.158 2014/07/11 08:21:58 ulm Exp $ # devlist: ga...@gentoo.org # @@ -8,8 +8,8 @@ # you better have a *good* reason why you're *not* using games.eclass # in a games-* ebuild -if [[ ${___ECLASS_ONCE_GAMES} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_GAMES="recur -_+^+_- spank" +if [[ -z ${_GAMES_ECLASS} ]]; then +_GAMES_ECLASS=1 inherit base multilib toolchain-funcs eutils user 1.138 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.138&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.138&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.137&r2=1.138 Index: kde4-base.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- kde4-base.eclass 4 Jul 2014 08:01:51 -0000 1.137 +++ kde4-base.eclass 11 Jul 2014 08:21:58 -0000 1.138 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.137 2014/07/04 08:01:51 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.138 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -13,8 +13,8 @@ # NOTE: KDE 4 ebuilds currently support EAPIs 4 and 5. This will be # reviewed over time as new EAPI versions are approved. -if [[ ${___ECLASS_ONCE_KDE4_BASE} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_BASE="recur -_+^+_- spank" +if [[ -z ${_KDE4_BASE_ECLASS} ]]; then +_KDE4_BASE_ECLASS=1 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE # @DESCRIPTION: 1.70 eclass/kde4-functions.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.70&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.70&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.69&r2=1.70 Index: kde4-functions.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- kde4-functions.eclass 4 Jul 2014 08:01:51 -0000 1.69 +++ kde4-functions.eclass 11 Jul 2014 08:21:58 -0000 1.70 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.69 2014/07/04 08:01:51 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.70 2014/07/11 08:21:58 ulm Exp $ inherit versionator @@ -12,8 +12,8 @@ # This eclass contains all functions shared by the different eclasses, # for KDE 4 ebuilds. -if [[ ${___ECLASS_ONCE_KDE4_FUNCTIONS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_FUNCTIONS="recur -_+^+_- spank" +if [[ -z ${_KDE4_FUNCTIONS_ECLASS} ]]; then +_KDE4_FUNCTIONS_ECLASS=1 # @ECLASS-VARIABLE: EAPI # @DESCRIPTION: 1.13 eclass/kde4-meta-pkg.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?r1=1.12&r2=1.13 Index: kde4-meta-pkg.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kde4-meta-pkg.eclass 7 Apr 2013 17:33:18 -0000 1.12 +++ kde4-meta-pkg.eclass 11 Jul 2014 08:21:58 -0000 1.13 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.12 2013/04/07 17:33:18 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.13 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: @@ -9,8 +9,8 @@ # @DESCRIPTION: # This eclass should only be used for defining meta packages for KDE4. -if [[ ${___ECLASS_ONCE_KDE4_META_PKG} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_META_PKG="recur -_+^+_- spank" +if [[ -z ${_KDE4_META_PKG_ECLASS} ]]; then +_KDE4_META_PKG_ECLASS=1 inherit kde4-functions 1.77 eclass/kde4-meta.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.77&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.77&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.76&r2=1.77 Index: kde4-meta.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- kde4-meta.eclass 17 Apr 2014 18:16:54 -0000 1.76 +++ kde4-meta.eclass 11 Jul 2014 08:21:58 -0000 1.77 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.76 2014/04/17 18:16:54 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.77 2014/07/11 08:21:58 ulm Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -12,8 +12,8 @@ # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional. # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY. -if [[ ${___ECLASS_ONCE_KDE4_META} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_KDE4_META="recur -_+^+_- spank" +if [[ -z ${_KDE4_META_ECLASS} ]]; then +_KDE4_META_ECLASS=1 [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" @@ -167,7 +167,7 @@ || die "${escm}: can't export cmake files to '${S}'." fi # Copy all subdirectories - for subdir in $(__list_needed_subdirectories); do + for subdir in $(_list_needed_subdirectories); do targetdir="" if [[ $subdir = doc/* && ! -e "$wc_path/$subdir" ]]; then continue @@ -196,7 +196,7 @@ tarfile="${DISTDIR}/${tarball}" # Detect real toplevel dir from tarball name - it will be used upon extraction - # and in __list_needed_subdirectories + # and in _list_needed_subdirectories topdir="${tarball%.tar.*}/" ebegin "Unpacking parts of ${tarball} to ${WORKDIR}" @@ -207,7 +207,7 @@ do extractlist+=" ${topdir}${f}" done - extractlist+=" $(__list_needed_subdirectories)" + extractlist+=" $(_list_needed_subdirectories)" pushd "${WORKDIR}" > /dev/null @@ -228,7 +228,7 @@ eend $? if [[ -n ${KDE4_STRICTER} ]]; then - for f in $(__list_needed_subdirectories fatal); do + for f in $(_list_needed_subdirectories fatal); do if [[ ! -e ${S}/${f#*/} ]]; then eerror "'${f#*/}' is missing" abort=true @@ -311,7 +311,7 @@ debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}" } -__list_needed_subdirectories() { +_list_needed_subdirectories() { local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist # We expand KMEXTRA by adding CMakeLists.txt files 1.112 eclass/libtool.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.112&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.112&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.111&r2=1.112 Index: libtool.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- libtool.eclass 12 Jun 2014 07:14:25 -0000 1.111 +++ libtool.eclass 11 Jul 2014 08:21:58 -0000 1.112 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.111 2014/06/12 07:14:25 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.112 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: libtool.eclass # @MAINTAINER: @@ -14,8 +14,8 @@ # generated libtool files. We do not run the libtoolize program because that # requires a regeneration of the main autotool files in order to work properly. -if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank" +if [[ -z ${_LIBTOOL_ECLASS} ]]; then +_LIBTOOL_ECLASS=1 # If an overlay has eclass overrides, but doesn't actually override the # libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's @@ -43,8 +43,8 @@ local disp="${src} patch" local log="${T}/elibtool.log" - if [[ -z ${__ELT_NOTED_TMP} ]] ; then - __ELT_NOTED_TMP=true + if [[ -z ${_ELT_NOTED_TMP} ]] ; then + _ELT_NOTED_TMP=true printf 'temp patch: %s\n' "${patch}" > "${log}" fi printf '\nTrying %s\n' "${disp}" >> "${log}" 1.106 eclass/multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.105&r2=1.106 Index: multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- multilib.eclass 17 Jan 2014 07:44:45 -0000 1.105 +++ multilib.eclass 11 Jul 2014 08:21:58 -0000 1.106 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.105 2014/01/17 07:44:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.106 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -10,8 +10,8 @@ # @DESCRIPTION: # This eclass is for all functions pertaining to handling multilib configurations. -if [[ ${___ECLASS_ONCE_MULTILIB} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_MULTILIB="recur -_+^+_- spank" +if [[ -z ${_MULTILIB_ECLASS} ]]; then +_MULTILIB_ECLASS=1 inherit toolchain-funcs @@ -414,13 +414,13 @@ export ABI=$1 # First restore any saved state we have laying around. - if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then + if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do - vv="__abi_saved_${v}" + vv="_abi_saved_${v}" [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} unset ${vv} done - unset __DEFAULT_ABI_SAVED + unset _DEFAULT_ABI_SAVED fi # We want to avoid the behind-the-back magic of gcc-config as it @@ -428,10 +428,10 @@ if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then # Back that multilib-ass up so we can restore it later for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do - vv="__abi_saved_${v}" + vv="_abi_saved_${v}" [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} done - export __DEFAULT_ABI_SAVED="true" + export _DEFAULT_ABI_SAVED="true" # Set the CHOST native first so that we pick up the native # toolchain and not a cross-compiler by accident #202811. 1.9 eclass/multiprocessing.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass?r1=1.8&r2=1.9 Index: multiprocessing.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- multiprocessing.eclass 21 Dec 2013 09:40:37 -0000 1.8 +++ multiprocessing.eclass 11 Jul 2014 08:21:58 -0000 1.9 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.8 2013/12/21 09:40:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.9 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: multiprocessing.eclass # @MAINTAINER: @@ -33,8 +33,8 @@ # multijob_finish # @CODE -if [[ ${___ECLASS_ONCE_MULTIPROCESSING} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_MULTIPROCESSING="recur -_+^+_- spank" +if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then +_MULTIPROCESSING_ECLASS=1 # @FUNCTION: bashpid # @DESCRIPTION: 1.24 eclass/pam.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pam.eclass?r1=1.23&r2=1.24 Index: pam.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pam.eclass 5 Aug 2012 15:34:20 -0000 1.23 +++ pam.eclass 11 Jul 2014 08:21:58 -0000 1.24 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.23 2012/08/05 15:34:20 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/pam.eclass,v 1.24 2014/07/11 08:21:58 ulm Exp $ # # @ECLASS: pam.eclass @@ -13,8 +13,8 @@ # This eclass contains functions to install pamd configuration files and # pam modules. -if [[ ${___ECLASS_ONCE_PAM} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_PAM="recur -_+^+_- spank" +if [[ -z ${_PAM_ECLASS} ]]; then +_PAM_ECLASS=1 inherit flag-o-matic multilib 1.22 eclass/pax-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pax-utils.eclass?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pax-utils.eclass?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pax-utils.eclass?r1=1.21&r2=1.22 Index: pax-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pax-utils.eclass 18 May 2013 13:43:20 -0000 1.21 +++ pax-utils.eclass 11 Jul 2014 08:21:58 -0000 1.22 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.21 2013/05/18 13:43:20 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.22 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: pax-utils.eclass # @MAINTAINER: @@ -22,8 +22,8 @@ # to contain either "PT", "XT" or "none". The default is to attempt both # PT_PAX and XATTR_PAX. -if [[ ${___ECLASS_ONCE_PAX_UTILS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_PAX_UTILS="recur -_+^+_- spank" +if [[ -z ${_PAX_UTILS_ECLASS} ]]; then +_PAX_UTILS_ECLASS=1 # @ECLASS-VARIABLE: PAX_MARKINGS # @DESCRIPTION: 1.26 eclass/portability.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/portability.eclass?rev=1.26&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/portability.eclass?rev=1.26&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/portability.eclass?r1=1.25&r2=1.26 Index: portability.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- portability.eclass 28 May 2014 09:48:01 -0000 1.25 +++ portability.eclass 11 Jul 2014 08:21:58 -0000 1.26 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.25 2014/05/28 09:48:01 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.26 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: portability.eclass # @MAINTAINER: @@ -9,8 +9,8 @@ # Diego Pettenò <flamee...@gentoo.org> # @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds -if [[ ${___ECLASS_ONCE_PORTABILITY} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_PORTABILITY="recur -_+^+_- spank" +if [[ -z ${_PORTABILITY_ECLASS} ]]; then +_PORTABILITY_ECLASS=1 # @FUNCTION: treecopy # @USAGE: <orig1> [orig2 orig3 ....] <dest> 1.2 eclass/qmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.1&r2=1.2 Index: qmake-utils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qmake-utils.eclass 2 Dec 2013 09:42:38 -0000 1.1 +++ qmake-utils.eclass 11 Jul 2014 08:21:58 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.1 2013/12/02 09:42:38 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.2 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -11,8 +11,8 @@ # @DESCRIPTION: # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake. -if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then -___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank" +if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then +_QMAKE_UTILS_ECLASS=1 inherit eutils multilib toolchain-funcs 1.12 eclass/readme.gentoo.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.11&r2=1.12 Index: readme.gentoo.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- readme.gentoo.eclass 2 Jul 2014 13:32:48 -0000 1.11 +++ readme.gentoo.eclass 11 Jul 2014 08:21:58 -0000 1.12 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.11 2014/07/02 13:32:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.12 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: readme.gentoo # @MAINTAINER: @@ -15,8 +15,8 @@ # shown at first package installation and a file for later reviewing will be # installed under /usr/share/doc/${PF} -if [[ ${___ECLASS_ONCE_README_GENTOO} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_README_GENTOO="recur -_+^+_- spank" +if [[ -z ${_README_GENTOO_ECLASS} ]]; then +_README_GENTOO_ECLASS=1 inherit eutils 1.127 eclass/toolchain-funcs.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.127&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.127&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-funcs.eclass?r1=1.126&r2=1.127 Index: toolchain-funcs.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- toolchain-funcs.eclass 17 Jan 2014 03:46:31 -0000 1.126 +++ toolchain-funcs.eclass 11 Jul 2014 08:21:58 -0000 1.127 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.126 2014/01/17 03:46:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.127 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: @@ -13,8 +13,8 @@ # in such a way that you can rely on the function always returning # something sane. -if [[ ${___ECLASS_ONCE_TOOLCHAIN_FUNCS} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_TOOLCHAIN_FUNCS="recur -_+^+_- spank" +if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then +_TOOLCHAIN_FUNCS_ECLASS=1 inherit multilib 1.18 eclass/unpacker.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/unpacker.eclass?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/unpacker.eclass?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/unpacker.eclass?r1=1.17&r2=1.18 Index: unpacker.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- unpacker.eclass 1 May 2014 19:27:14 -0000 1.17 +++ unpacker.eclass 11 Jul 2014 08:21:58 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.17 2014/05/01 19:27:14 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.18 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: unpacker.eclass # @MAINTAINER: @@ -15,8 +15,8 @@ # - merge rpm unpacking # - support partial unpacks? -if [[ ${___ECLASS_ONCE_UNPACKER} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_UNPACKER="recur -_+^+_- spank" +if [[ -z ${_UNPACKER_ECLASS} ]]; then +_UNPACKER_ECLASS=1 # @ECLASS-VARIABLE: UNPACKER_BZ2 # @DEFAULT_UNSET 1.24 eclass/user.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?r1=1.23&r2=1.24 Index: user.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/user.eclass,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- user.eclass 4 Jul 2014 08:01:51 -0000 1.23 +++ user.eclass 11 Jul 2014 08:21:58 -0000 1.24 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.23 2014/07/04 08:01:51 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.24 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: user.eclass # @MAINTAINER: @@ -13,8 +13,8 @@ # The user eclass contains a suite of functions that allow ebuilds # to quickly make sure users in the installed system are sane. -if [[ ${___ECLASS_ONCE_USER} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_USER="recur -_+^+_- spank" +if [[ -z ${_USER_ECLASS} ]]; then +_USER_ECLASS=1 # @FUNCTION: _assert_pkg_ebuild_phase # @INTERNAL 1.25 eclass/versionator.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.24&r2=1.25 Index: versionator.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- versionator.eclass 23 Nov 2013 04:35:16 -0000 1.24 +++ versionator.eclass 11 Jul 2014 08:21:58 -0000 1.25 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.24 2013/11/23 04:35:16 jcallen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.25 2014/07/11 08:21:58 ulm Exp $ # @ECLASS: versionator.eclass # @MAINTAINER: @@ -26,8 +26,8 @@ # version_is_at_least want have # which may be buggy, so use with caution. -if [[ ${___ECLASS_ONCE_VERSIONATOR} != "recur -_+^+_- spank" ]] ; then -___ECLASS_ONCE_VERSIONATOR="recur -_+^+_- spank" +if [[ -z ${_VERSIONATOR_ECLASS} ]]; then +_VERSIONATOR_ECLASS=1 inherit eutils