vapier 14/11/15 07:49:11 Modified: xfconf.eclass Log: set AUTOTOOLS_AUTO_DEPEND based on EAUTORECONF so that we do not clobber earlier settings #409611 by Michał Górny
Revision Changes Path 1.47 eclass/xfconf.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xfconf.eclass?r1=1.46&r2=1.47 Index: xfconf.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- xfconf.eclass 27 Feb 2014 17:12:01 -0000 1.46 +++ xfconf.eclass 15 Nov 2014 07:49:11 -0000 1.47 @@ -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/xfconf.eclass,v 1.46 2014/02/27 17:12:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.47 2014/11/15 07:49:11 vapier Exp $ # @ECLASS: xfconf.eclass # @MAINTAINER: @@ -13,12 +13,16 @@ # @DESCRIPTION: # Run eautoreconf instead of elibtoolize if the variable is set +if [[ -n ${EAUTORECONF} ]] ; then + AUTOTOOLS_AUTO_DEPEND=yes +else + : ${AUTOTOOLS_AUTO_DEPEND:=no} +fi + # @ECLASS-VARIABLE: XFCONF # @DESCRIPTION: # This should be an array defining arguments for econf -AUTOTOOLS_AUTO_DEPEND=no - unset _xfconf_live [[ $PV == *9999* ]] && _xfconf_live=git-2 @@ -28,7 +32,7 @@ EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}" _xfconf_deps="" -_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10 ${AUTOTOOLS_DEPEND}" +_xfconf_m4=">=dev-util/xfce4-dev-tools-4.10" [[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}" [[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"
