Update base function calls to comply with currently in-review eclass.

5 files changed, 12 insertions, 12 deletions

diff --git a/eclass/go-mono.eclass b/eclass/go-mono.eclass
index 82d99f9fc830..38ab829960a6 100644
--- a/eclass/go-mono.eclass
+++ b/eclass/go-mono.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v 1.7 2009/05/05 12:59:13 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v 1.8 2010/01/03 19:10:49 scarabeus Exp $
 
 # @ECLASS: go-mono.eclass
 # @MAINTAINER:
@@ -86,10 +86,10 @@ go-mono_src_unpack() {
 go-mono_src_prepare() {
 	if [[ "${PV%.9999}" != "${PV}" ||  "${PV}" == "9999" ]]
 	then
-		base_src_util autopatch
+		base_src_prepare
 		[[ "$EAUTOBOOTSTRAP" != "no" ]] && eautoreconf
 	else
-		base_src_util autopatch
+		base_src_prepare
 	fi
 }
 
diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass
index ead9ffa4d304..d0a365080462 100644
--- a/eclass/gtk-sharp-module.eclass
+++ b/eclass/gtk-sharp-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.25 2009/08/23 00:14:31 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.26 2010/01/03 19:10:49 scarabeus Exp $
 
 # @ECLASS: gtk-sharp-module.eclass
 # @MAINTAINER:
@@ -452,7 +452,7 @@ gnome-sharp-tarball-post_src_prepare() {
 # phase_hook prefix trigger: ${TARBALL}-tarball-post
 # Is exported.
 gtk-sharp-module_src_prepare() {
-	base_src_util autopatch
+	base_src_prepare
 # @ECLASS-VARIABLE: EAUTORECONF
 # @DESCRIPTION:
 # If set, EAUTORECONF will be run during src_prepare.
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 2f7cfdb14d6a..31f4faaab818 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.224 2009/11/20 19:02:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.225 2010/01/03 19:10:49 scarabeus Exp $
 
 # @ECLASS: kde.eclass
 # @MAINTAINER:
@@ -82,7 +82,7 @@ kde_src_unpack() {
 		# Unpack first and deal with KDE patches after examing possible patch sets.
 		# To be picked up, patches need to be named $PN-$PV-*{diff,patch} and be
 		# placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches.
-		[[ -d "${KDE_S}" ]] || base_src_unpack unpack
+		[[ -d "${KDE_S}" ]] || base_src_unpack
 		if [[ -d "${PATCHDIR}" ]] ; then
 			local packages p f
 			if is-parent-package ${CATEGORY}/${PN} ; then
@@ -105,7 +105,7 @@ kde_src_unpack() {
 				fi
 			done
 		fi
-		[[ -n ${PATCHES[@]} ]] && base_src_unpack autopatch
+		[[ -n ${PATCHES[@]} ]] && base_src_prepare
 	else
 		# Call base_src_unpack, which has sections, to do unpacking and patching
 		# step by step transparently as defined in the ebuild.
diff --git a/eclass/poppler.eclass b/eclass/poppler.eclass
index 8e75459411d7..722ef7d3d64a 100644
--- a/eclass/poppler.eclass
+++ b/eclass/poppler.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/poppler.eclass,v 1.5 2009/09/16 12:58:13 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/poppler.eclass,v 1.6 2010/01/03 19:10:49 scarabeus Exp $
 
 # @ECLASS: poppler.eclass
 # @MAINTAINER:
@@ -123,7 +123,7 @@ poppler_src_unpack() {
 # Runs autopatch from base.eclass.
 # Uses sed to replace libpoppler.la references with -lpoppler
 poppler_src_prepare() {
-	base_src_util autopatch
+	base_src_prepare
 	sed -i  \
 		-e 's#$(top_builddir)/poppler/libpoppler.la#-lpoppler#' \
 		$(find . -type f -name 'Makefile.in') || die "Failed to sed proper lib into Makefile.am"
diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
index b6339e098836..246aba546531 100644
--- a/eclass/xfconf.eclass
+++ b/eclass/xfconf.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.3 2009/09/21 17:43:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.4 2010/01/03 19:10:49 scarabeus Exp $
 
 # @ECLASS: xfconf.eclass
 # @MAINTAINER:
@@ -75,7 +75,7 @@ xfconf_src_unpack() {
 # @DESCRIPTION:
 # Run base_src_util autopatch and eautoreconf or elibtoolize
 xfconf_src_prepare() {
-	base_src_util autopatch
+	base_src_prepare
 
 	if [[ "${EINTLTOOLIZE}" == "yes" ]]; then
 		intltoolize --force --copy --automake || die "intltoolize failed"