sys-kernel/genkernel: Call "make" for live ebuilds only (bug #352250)

(Portage version: 2.1.9.34/cvs/Linux x86_64)

4 files changed, 25 insertions, 5 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 229cfe65c307..5323aa1efd19 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.234 2011/01/20 15:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.235 2011/01/20 18:03:21 sping Exp $
+
+  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.11.1.ebuild,
+  genkernel-9999.ebuild, genkernel-99999.ebuild:
+  Call "make" for live ebuilds only (bug #352250). Then asciidoc is not a build
+  time dependency as the man page is shipped with genkernel. Therefore I
+  reverted zmedico's previous commit.
 
   20 Jan 2011; Zac Medico <zmedico@gentoo.org> genkernel-3.4.11.1.ebuild:
   3.4.11.1 calls a2x now, so app-text/asciidoc dep needs to be unconditional.
diff --git a/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild b/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild
index 24db3cdb9f5b..c00fe704297c 100644
--- a/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.2 2011/01/20 15:18:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.3 2011/01/20 18:03:21 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
@@ -64,7 +64,9 @@ DEPEND="sys-fs/e2fsprogs
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND} app-arch/cpio"
 
-DEPEND="${DEPEND} app-text/asciidoc"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
 
 src_unpack() {
 	if [[ ${PV} == 9999* ]] ; then
@@ -75,6 +77,10 @@ src_unpack() {
 	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
+src_compile() {
+	[[ ${PV} == 9999* ]] && emake || die
+}
+
 src_install() {
 	# This block updates genkernel.conf
 	sed \
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index d35a665478e0..27a8067bdaeb 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.21 2011/01/16 21:11:14 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.22 2011/01/20 18:03:21 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
@@ -77,6 +77,10 @@ src_unpack() {
 	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
+src_compile() {
+	[[ ${PV} == 9999* ]] && emake || die
+}
+
 src_install() {
 	# This block updates genkernel.conf
 	sed \
diff --git a/sys-kernel/genkernel/genkernel-99999.ebuild b/sys-kernel/genkernel/genkernel-99999.ebuild
index fb0fb1588670..7c5a8b868a9f 100644
--- a/sys-kernel/genkernel/genkernel-99999.ebuild
+++ b/sys-kernel/genkernel/genkernel-99999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v 1.6 2011/01/17 16:03:24 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v 1.7 2011/01/20 18:03:21 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
@@ -79,6 +79,10 @@ src_unpack() {
 	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
+src_compile() {
+	[[ ${PV} == 9999* ]] && emake || die
+}
+
 src_install() {
 	# This block updates genkernel.conf
 	sed \