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

Package-Manager: portage-2.1.9.34/cvs/Linux x86_64

5 files changed, 29 insertions, 19 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/Manifest b/sys-kernel/genkernel/Manifest
index 225f3a7bfa33..e11ed32e8d62 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX busybox-1.7.4-make-3.82.patch 1287 RMD160 c75fc032e11ed780bc949bedb89a230f253faa66 SHA1 a6053a3d8ae1ed5dc3808f4aab8807ea6c483c12 SHA256 3ac639a80426018c77e7c1fe0ab9df4aa771332d3673ceb61fad0c26d8c4184f
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
 DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
@@ -28,15 +25,8 @@ EBUILD genkernel-3.4.10.906.ebuild 4618 RMD160 67df63ffca231d2c1f66c0cf37b94e5f3
 EBUILD genkernel-3.4.10.907-r1.ebuild 5045 RMD160 303cbb92c3e98b29fed9b9ea5016a3e1028da235 SHA1 6c4bedf63b6e1f4291967fb45e2f58c88aa68c31 SHA256 16171f5f55c96c178179bdaac48518f0af158ebd464fa0f48014085157882ee7
 EBUILD genkernel-3.4.10.907.ebuild 4830 RMD160 2f031f6e3e76a5fd907dfc76ba04eab3fb5bdac1 SHA1 4c4cb2358e3e391428e4e42460e3057b14c80e6b SHA256 530c4b62a8f4527a1d9742af3daafd65ef84ca44924002626535b4591793df4f
 EBUILD genkernel-3.4.10.908.ebuild 4822 RMD160 d8a0a273999bbd027d6aebf05aba54e1b76117d9 SHA1 519db4f2861a6cb76ed840d0e1e61093a204b2ef SHA256 f7b400bf55b1cfec29daefd8e0f026526b6470e34e4e4dde2edc9d3623862949
-EBUILD genkernel-3.4.11.1.ebuild 4946 RMD160 0b18a48645154c8e01c22af8577ceac2ab2a5021 SHA1 934363701b19cdd8c749f176db3856320de37451 SHA256 54b1032a9c0e44bb19a4971237eeca531ff4bdd894c74a6f19e003a3f760bae9
-EBUILD genkernel-9999.ebuild 4975 RMD160 d2be437f78e65f98955c1d30e9081074fc4bcbb5 SHA1 d11c25672e9623f24f350a8c21838de989e705da SHA256 01f740c34c2d67c8bbef060bca668375c02e0ed298f8c77f5ce5e89cfce4e570
-EBUILD genkernel-99999.ebuild 5158 RMD160 19c57c7c6cbe061ecd7dde49a8ca83d91dd6e27f SHA1 a4c00351869be03e0345f4b2493c85c65d43da65 SHA256 8d592a05987a38be3f2b572c173d7c45776da06d569fc68d4b33156e0ec372d6
-MISC ChangeLog 44552 RMD160 1e7f5b9bf0be57d586ec18e7336128e592b17adc SHA1 429fe88b95f922a13790b5e807bb345117e1490b SHA256 1980e8a53301cf00d370f7abed7f7bdc1624560f1d3886038c1b3066ca64f06f
+EBUILD genkernel-3.4.11.1.ebuild 5035 RMD160 86bd462337730b48183c25e4dafba3ab8f072fc2 SHA1 34e6952fcffc8e9608517a1c79832f8f0541b888 SHA256 328cff518e2a4fd352391737e7a6e86dc853f0c42909bade66f8a9481ac62125
+EBUILD genkernel-9999.ebuild 5032 RMD160 1e97c987d8f9610495a374512485fa1771e004e3 SHA1 7615a2824e41527e38d70aefb5b3e011fdeebd3e SHA256 b3cebf14ba3eda6e20008585f4e840090e9c2403ed529a77d0b4318a26a28242
+EBUILD genkernel-99999.ebuild 5215 RMD160 2e59abc63ebe0864711e1097262994cc26a351b3 SHA1 1ae8c9f5a09e302ede83c04a720aae6993ab3318 SHA256 1604a6ab5ae6a220daf6872c68166648a20ac467266996c5f596526414b8c905
+MISC ChangeLog 44870 RMD160 155fa684013459acc48a2cc4d0c9abeef96385a5 SHA1 9c439f64b31f29ca63df7760e900a9acbd49005a SHA256 83e7386b59a16f5002c24145856db5c5c9ffe3971597e536a6c4e7ded0447bbc
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk04UlcACgkQ/ejvha5XGaNWEQCeNJUfYVQG9C0vatWWeo0nn6V1
-k5kAn1azF3xM9C/FFjRxPbdxxmp/jKt1
-=hTZp
------END PGP SIGNATURE-----
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 \