From 38edb3dd92826c2f6ba59b3745a3b264c8570276 Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Fri, 29 Feb 2008 15:57:27 +0000
Subject: [PATCH] Change remaining instances of run_emerge to run_merge

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1344 d1e1f19c-881f-0410-ab34-b69fee027534
---
 ChangeLog                 | 4 ++++
 targets/support/kmerge.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5bb0a52..343f2d49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  29 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/kmerge.sh:
+  Change remaining instances of run_emerge to run_merge
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh, targets/support/create-iso.sh:
   Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match,
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 70c3b5c6..4a17e020 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -190,11 +190,11 @@ fi
 if [ -n "${clst_KERNCACHE}" ]
 then
 mkdir -p /tmp/kerncache/${clst_kname}
-   	ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_emerge --nodeps -uqkb  "${clst_ksource}" || exit 1
+   	ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb  "${clst_ksource}" || exit 1
 	[ -l /usr/src/linux ] && rm -f /usr/src/linux
 	ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
 else
-	run_emerge "${clst_ksource}" || exit 1
+	run_merge "${clst_ksource}" || exit 1
 fi
 sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf
 
-- 
2.26.2