Move sed invocations to src_prepare

(Portage version: 2.1.10.65/cvs/Linux x86_64)

15 files changed, 193 insertions, 127 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 75c43b1518dc..187b7da7b1a4 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.333 2012/08/14 15:28:15 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.334 2012/08/14 15:56:50 ryao Exp $
+
+  14 Aug 2012; Richard Yao <ryao@gentoo.org> genkernel-3.4.26.ebuild,
+  genkernel-3.4.27.ebuild, genkernel-3.4.28.ebuild, genkernel-3.4.29.ebuild,
+  genkernel-3.4.32.ebuild, genkernel-3.4.33.1.ebuild, genkernel-3.4.34.ebuild,
+  genkernel-3.4.35.ebuild, genkernel-3.4.36.ebuild, genkernel-3.4.37.ebuild,
+  genkernel-3.4.38.ebuild, genkernel-3.4.40.ebuild, genkernel-3.4.41.ebuild,
+  genkernel-9999.ebuild:
+  Move sed invocations to src_prepare
 
 *genkernel-3.4.41 (14 Aug 2012)
 
diff --git a/sys-kernel/genkernel/genkernel-3.4.26.ebuild b/sys-kernel/genkernel/genkernel-3.4.26.ebuild
index 0972c7ec1b33..90e8489ba306 100644
--- a/sys-kernel/genkernel/genkernel-3.4.26.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.26.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.26.ebuild,v 1.3 2012/07/15 19:01:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.26.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
 
+EAPI="3"
+
 VERSION_BUSYBOX='1.19.3'
 VERSION_DMRAID='1.0.0.rc16-3'
 VERSION_MDADM='3.1.5'
@@ -76,17 +78,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -99,6 +96,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
diff --git a/sys-kernel/genkernel/genkernel-3.4.27.ebuild b/sys-kernel/genkernel/genkernel-3.4.27.ebuild
index ae607bd1905b..ebaeb6048ba0 100644
--- a/sys-kernel/genkernel/genkernel-3.4.27.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.27.ebuild,v 1.3 2012/07/15 19:01:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.27.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -79,17 +79,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -102,6 +97,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
diff --git a/sys-kernel/genkernel/genkernel-3.4.28.ebuild b/sys-kernel/genkernel/genkernel-3.4.28.ebuild
index 7c618ccf7094..1620015aa8d2 100644
--- a/sys-kernel/genkernel/genkernel-3.4.28.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.28.ebuild,v 1.3 2012/07/15 19:01:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.28.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -79,17 +79,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -102,6 +97,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
diff --git a/sys-kernel/genkernel/genkernel-3.4.29.ebuild b/sys-kernel/genkernel/genkernel-3.4.29.ebuild
index 377a956d07f4..15b7be4a7262 100644
--- a/sys-kernel/genkernel/genkernel-3.4.29.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.29.ebuild,v 1.3 2012/07/15 19:01:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.29.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -79,17 +79,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -102,6 +97,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
diff --git a/sys-kernel/genkernel/genkernel-3.4.32.ebuild b/sys-kernel/genkernel/genkernel-3.4.32.ebuild
index 22d4ab89340f..45ea83456646 100644
--- a/sys-kernel/genkernel/genkernel-3.4.32.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.32.ebuild,v 1.4 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.32.ebuild,v 1.5 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -79,17 +79,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -102,6 +97,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
diff --git a/sys-kernel/genkernel/genkernel-3.4.33.1.ebuild b/sys-kernel/genkernel/genkernel-3.4.33.1.ebuild
index 7d6c0cf7e708..fe72103f1de0 100644
--- a/sys-kernel/genkernel/genkernel-3.4.33.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.33.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.33.1.ebuild,v 1.3 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.33.1.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -77,17 +77,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -100,6 +95,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.34.ebuild b/sys-kernel/genkernel/genkernel-3.4.34.ebuild
index 8141a835e42c..c9430135cb99 100644
--- a/sys-kernel/genkernel/genkernel-3.4.34.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.34.ebuild,v 1.3 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.34.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -77,17 +77,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -100,6 +95,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.35.ebuild b/sys-kernel/genkernel/genkernel-3.4.35.ebuild
index 75fac74ae2be..dee7c04fca30 100644
--- a/sys-kernel/genkernel/genkernel-3.4.35.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.35.ebuild,v 1.3 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.35.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -77,17 +77,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -100,6 +95,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.36.ebuild b/sys-kernel/genkernel/genkernel-3.4.36.ebuild
index 3ad8d4be60c4..69c3fa156320 100644
--- a/sys-kernel/genkernel/genkernel-3.4.36.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.36.ebuild,v 1.4 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.36.ebuild,v 1.5 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -73,17 +73,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -96,6 +91,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.37.ebuild b/sys-kernel/genkernel/genkernel-3.4.37.ebuild
index 75872805290c..a350dcc554ea 100644
--- a/sys-kernel/genkernel/genkernel-3.4.37.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.37.ebuild,v 1.3 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.37.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -73,17 +73,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -96,6 +91,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.38.ebuild b/sys-kernel/genkernel/genkernel-3.4.38.ebuild
index 0913f76d073e..353b19c74e04 100644
--- a/sys-kernel/genkernel/genkernel-3.4.38.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.38.ebuild,v 1.3 2012/07/26 20:39:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.38.ebuild,v 1.4 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -73,17 +73,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -96,6 +91,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.40.ebuild b/sys-kernel/genkernel/genkernel-3.4.40.ebuild
index 8e0395cdb9a5..b47a13da41cf 100644
--- a/sys-kernel/genkernel/genkernel-3.4.40.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.40.ebuild,v 1.1 2012/07/27 23:41:01 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.40.ebuild,v 1.2 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -73,17 +73,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates genkernel.conf
+	# Update software.sh
 	sed \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -96,6 +91,15 @@ src_install() {
 		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
 		|| die "Could not adjust versions"
 	insinto /etc
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
diff --git a/sys-kernel/genkernel/genkernel-3.4.41.ebuild b/sys-kernel/genkernel/genkernel-3.4.41.ebuild
index 9d427f93df11..633fd2ad054c 100644
--- a/sys-kernel/genkernel/genkernel-3.4.41.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.41.ebuild,v 1.1 2012/08/14 15:28:15 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.41.ebuild,v 1.2 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -73,17 +73,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates software.sh
+	# Update software.sh
 	sed -i \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -95,6 +90,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/defaults/software.sh \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
 
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 9716be2247b9..0a63b4b903d4 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.41 2012/08/14 15:28:15 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.42 2012/08/14 15:56:50 ryao Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -73,17 +73,12 @@ src_unpack() {
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
+src_prepare() {
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 
-src_install() {
-	# This block updates software.sh
+	# Update software.sh
 	sed -i \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
@@ -95,6 +90,15 @@ src_install() {
 		-e "s:VERSION_GPG:$VERSION_GPG:" \
 		"${S}"/defaults/software.sh \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
 	doins "${S}"/genkernel.conf || die "doins genkernel.conf"