commit: 55e47da74f04b8f6dcafbc735e68f2066d7bfd25 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Jan 15 16:27:05 2017 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 16:44:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e47da7
gnome2.eclass: Allow to decide more easily if we can run eautoreconf OR only elibtoolize, this will prevent elibtoolize from being run two times and also allow the honoring of eapply_user patches (#591584), apart of also allowing us to use PATCHES array in more situations. eclass/gnome2.eclass | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index de7a636..d64b31b 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -10,7 +10,19 @@ # Exports portage base functions used by ebuilds written for packages using the # GNOME framework. For additional functions, see gnome2-utils.eclass. -inherit eutils libtool gnome.org gnome2-utils xdg +# @ECLASS-VARIABLE: GNOME2_EAUTORECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Run eautoreconf instead of only elibtoolize +GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} + +if [[ ${GNOME2_EAUTORECONF} == 'yes' ]] ; then + AUTOTOOLS_AUTO_DEPEND=yes +else + : ${AUTOTOOLS_AUTO_DEPEND:=no} +fi + +inherit autotools eutils libtool gnome.org gnome2-utils xdg case "${EAPI:-0}" in 4|5) @@ -113,9 +125,13 @@ gnome2_src_prepare() { # Disable all deprecation warnings gnome2_disable_deprecation_warning - # Run libtoolize + # Run libtoolize or eautoreconf, bug #591584 # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - elibtoolize ${ELTCONF} + if [[ ${GNOME2_EAUTORECONF} == 'yes' ]]; then + eautoreconf + else + elibtoolize ${ELTCONF} + fi } # @FUNCTION: gnome2_src_configure