[gentoo-commits] dev/mgorny:master commit in: eclass/

["Michał Górny" <mgorny@gentoo.org>]

commit:     9f6763ac34770f484a8bbe1ae868094876d7df6c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 22:02:25 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 23:16:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=9f6763ac

Move autoreconf into separate func.

---
 eclass/autotools-utils.eclass |   79 ++++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 0f9cd26..035d1de 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -268,54 +268,59 @@ remove_libtool_files() {
 	fi
 }
 
-# @FUNCTION: autotools-utils_src_prepare
+# @FUNCTION: autotools-utils_autoreconf
 # @DESCRIPTION:
-# The src_prepare function.
-#
-# Supporting PATCHES array and user patches. See base.eclass(5) for reference.
-autotools-utils_src_prepare() {
+# Reconfigure the sources (like gnome-doc-autogen.sh or eautoreconf).
+autotools-utils_autoreconf() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-	epatch_user
+	# Support running additional tools like gnome-autogen.sh.
+	# Note: you need to add additional depends to the ebuild.
 
-	local want_autoreconf=${AUTOTOOLS_AUTORECONF}
+	# aclocal is required to localize the macros
+	# XXX: do not call it twice...
+	eaclocal
 
-	base_src_prepare
-	if [[ ${want_autoreconf} ]]; then
-		# 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
+	elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
+		eautopoint
+	fi
 
-		# aclocal is required to localize the macros
-		# XXX: do not call it twice...
-		eaclocal
+	# intltool
+	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]; then
+		autotools_run_tool intltoolize --copy --automake
+	fi
 
-		# gettext
-		if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
-			echo 'no' | autotools_run_tool glib-gettextize --copy
-		elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
-			eautopoint
-		fi
+	# gtk-doc
+	if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
+		autotools_run_tool gtkdocize --copy
+	fi
 
-		# intltool
-		if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]; then
-			autotools_run_tool intltoolize --copy --automake
-		fi
+	# gnome-doc
+	if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
+		autotools_run_tool gnome-doc-prepare --copy
+	fi
 
-		# gtk-doc
-		if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
-			autotools_run_tool gtkdocize --copy
-		fi
+	eautoreconf
+}
 
-		# gnome-doc
-		if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
-			autotools_run_tool gnome-doc-prepare --copy
-		fi
+# @FUNCTION: autotools-utils_src_prepare
+# @DESCRIPTION:
+# The src_prepare function.
+#
+# Supporting PATCHES array and user patches. See base.eclass(5) for reference.
+autotools-utils_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
 
-		eautoreconf
-	else
-		elibtoolize --patch-only
-	fi
+	local want_autoreconf=${AUTOTOOLS_AUTORECONF}
+
+	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+	epatch_user
+
+	[[ ${want_autoreconf} ]] && autotools-utils_autoreconf
+	elibtoolize --patch-only
 }
 
 # @FUNCTION: autotools-utils_src_configure