sys-kernel/genkernel: Fix broken Bash logic (still bug #352250 in a way)

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

5 files changed, 27 insertions, 11 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 5323aa1efd19..c25d2ef24187 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,16 @@
 # 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.235 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.236 2011/01/20 20:21:05 sping Exp $
+
+  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.11.1.ebuild,
+  genkernel-9999.ebuild, genkernel-99999.ebuild:
+  Fix broken Bash logic (still bug #352250 in a way)
+
+  A: false && true || echo die
+  B: { false && true ; } || echo die
+  C: false && { true || echo die ; }
+
+  Despite basic testing, I wrongly assumed A=C. In contrast, A=B is true.
 
   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.11.1.ebuild,
   genkernel-9999.ebuild, genkernel-99999.ebuild:
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index e11ed32e8d62..77a78e7ef821 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -25,8 +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 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
+EBUILD genkernel-3.4.11.1.ebuild 5047 RMD160 3423c88bfa31c5f818a6342551ed01a8d095ce58 SHA1 4762f4c93c3f692f6f3a369a72649c54d565bb1a SHA256 b69d451796c4e571caf3ed06518c986ba0ef6621080607163862b3f8eeb76945
+EBUILD genkernel-9999.ebuild 5044 RMD160 edcb3774ba5e39337e155eadc9446fa884728994 SHA1 4732497c1b8130618c836e14615d7a6768dd59ae SHA256 aac1d53c4bcbeb21d49d82c8f2239702d8acd85e7b9e91142d9123546cd2b0c6
+EBUILD genkernel-99999.ebuild 5227 RMD160 8dc00705cf8edd7f8ee1c51efc843c5a53c486c0 SHA1 f6a3cad1ec00f4a672173f5c13d10d6ab0f4e244 SHA256 49a3df125446cd6dd4a0239d6b720160b3ddcfa4fa677dec121a49bc5121a84c
+MISC ChangeLog 45233 RMD160 feb48da3e91c1a81e9863488e99ab2ac3858db1b SHA1 de3f5b59d2573e622c13ac552025944b97fb180b SHA256 10580016a07e5091894a9712b8e106364d4d802e34466ca28a17fddc874762a1
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
diff --git a/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild b/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild
index c00fe704297c..56865f32a133 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.3 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.11.1.ebuild,v 1.4 2011/01/20 20:21:05 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
@@ -78,7 +78,9 @@ src_unpack() {
 }
 
 src_compile() {
-	[[ ${PV} == 9999* ]] && emake || die
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
 }
 
 src_install() {
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 27a8067bdaeb..4b1a0f9a8170 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.22 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.23 2011/01/20 20:21:05 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
@@ -78,7 +78,9 @@ src_unpack() {
 }
 
 src_compile() {
-	[[ ${PV} == 9999* ]] && emake || die
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
 }
 
 src_install() {
diff --git a/sys-kernel/genkernel/genkernel-99999.ebuild b/sys-kernel/genkernel/genkernel-99999.ebuild
index 7c5a8b868a9f..698df2751287 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.7 2011/01/20 18:03:21 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-99999.ebuild,v 1.8 2011/01/20 20:21:05 sping Exp $
 
 # genkernel-9999        -> latest Git master
 # genkernel-99999       -> latest Git experimental
@@ -80,7 +80,9 @@ src_unpack() {
 }
 
 src_compile() {
-	[[ ${PV} == 9999* ]] && emake || die
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
 }
 
 src_install() {