diff options
author | Michał Górny <mgorny@gentoo.org> | 2013-10-08 10:34:45 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2013-10-08 10:34:45 +0000 |
commit | 76c26b70b7130d21287524bf516f50be65d68eb8 (patch) | |
tree | 3cfcd7abd922d56062ee51974eb905aedded077a /eclass | |
parent | Addd gpgsplit, gpg-zip, resolves bug#192151 (diff) | |
download | historical-76c26b70b7130d21287524bf516f50be65d68eb8.tar.gz historical-76c26b70b7130d21287524bf516f50be65d68eb8.tar.bz2 historical-76c26b70b7130d21287524bf516f50be65d68eb8.zip |
Remove deprecated autotools-utils_autoreconf.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/autotools-utils.eclass | 80 |
2 files changed, 5 insertions, 80 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 3041c0147f09..9b8ac7c3be18 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1012 2013/10/07 12:21:14 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1013 2013/10/08 10:34:45 mgorny Exp $ + + 08 Oct 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: + Remove deprecated autotools-utils_autoreconf. 07 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass: small modification on output from function dev_check diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 28acb3b4c20b..5d7549f3e26d 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.70 2013/06/29 08:17:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.71 2013/10/08 10:34:45 mgorny Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -292,84 +292,6 @@ remove_libtool_files() { done } -# @FUNCTION: autotools-utils_autoreconf -# @DESCRIPTION: -# Reconfigure the sources (like gnome-autogen.sh or eautoreconf). -autotools-utils_autoreconf() { - debug-print-function ${FUNCNAME} "$@" - - eqawarn "The autotools-utils_autoreconf() function was deprecated." - eqawarn "Please call autotools-utils_src_prepare()" - eqawarn "with AUTOTOOLS_AUTORECONF set instead." - - # Override this func to not require unnecessary eaclocal calls. - autotools_check_macro() { - local x - - # Add a few additional variants as we don't get expansions. - [[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" \ - AC_CONFIG_HEADER AM_CONFIG_HEADER - - for x; do - grep -h "^${x}" configure.{ac,in} 2>/dev/null - done - } - - einfo "Autoreconfiguring '${PWD}' ..." - - local auxdir=$(sed -n -e 's/^AC_CONFIG_AUX_DIR(\(.*\))$/\1/p' \ - configure.{ac,in} 2>/dev/null) - if [[ ${auxdir} ]]; then - auxdir=${auxdir%%]} - mkdir -p ${auxdir##[} - fi - - # Support running additional tools like gnome-autogen.sh. - # Note: you need to add additional depends to the ebuild. - - # gettext - if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then - echo 'no' | autotools_run_tool glib-gettextize --copy --force - elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then - eautopoint --force - fi - - # intltool - if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]] - then - autotools_run_tool intltoolize --copy --automake --force - fi - - # gtk-doc - if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then - autotools_run_tool gtkdocize --copy - fi - - # gnome-doc - if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then - autotools_run_tool gnome-doc-prepare --copy --force - fi - - if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]] - then - _elibtoolize --copy --force --install - fi - - eaclocal - eautoconf - eautoheader - FROM_EAUTORECONF=sure eautomake - - local x - for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do - if [[ -d ${x} ]] ; then - pushd "${x}" >/dev/null || die - autotools-utils_autoreconf - popd >/dev/null || die - fi - done -} - # @FUNCTION: autotools-utils_src_prepare # @DESCRIPTION: # The src_prepare function. |