Bug #300337: the CONFIG_INPUT_UINPUT needs to be safe when no detection of config options is possible. Just display the warning if we cannot in that case. Also be non-fatal if the option can be tested and is not set.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 23 insertions, 16 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index be831e983b3c..94c547bfc965 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/g15daemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.27 2010/03/06 20:17:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.28 2010/03/06 20:23:15 robbat2 Exp $
+
+  06 Mar 2010; Robin H. Johnson <robbat2@gentoo.org>
+  g15daemon-1.2.7-r1.ebuild, g15daemon-1.9.5.3-r2.ebuild:
+  Bug #300337: the CONFIG_INPUT_UINPUT needs to be safe when no detection of
+  config options is possible. Just display the warning if we cannot in that
+  case. Also be non-fatal if the option can be tested and is not set.
 
   06 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Changing maintainer per emails of Jan 18th.
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 3f4a0188e8df..dcef5891bf3c 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -10,7 +10,8 @@ AUX g15daemon-hotplug 187 RMD160 df076cb3c47e976085e362fa1b6c7b1429857684 SHA1 6
 AUX g15daemon.conf 516 RMD160 50e8da6e93ae52960519c00d0f76ca6ba636f33a SHA1 db3b0b119c1f77dc91a7a9222c45ed3bd65f73df SHA256 94a79cea3ac0fa566cd6515e32eec22bb6a26e353c83608767dc65d1a2404037
 DIST g15daemon-1.2.7.tar.bz2 275938 RMD160 e6490c9b3200c89cf88c574459eef7562a500161 SHA1 17ab942a389501c0b7b8a0ffdbf4397882d24daa SHA256 2f8cfa386c88e72dbb07c7112cbd943dbda4f56dd55d08a01c7bf9efd47d164f
 DIST g15daemon-1.9.5.3.tar.gz 414603 RMD160 937362cd75d578e1b992868aeacefa928390ab4d SHA1 bc10775494ff38e78ecb62074869332d96c5cb55 SHA256 40ff07a4186c1fd01ea23d1753a2cb3bef25f92cc496ddddc6abde6a574cd60a
-EBUILD g15daemon-1.2.7-r1.ebuild 3442 RMD160 b09517a83548c319e42277b7a42cf88e4b077ed8 SHA1 bf1ae2814682bc3c41bf47d514f3ea00b88495c5 SHA256 9a2c0da631d2e9cd1d925a1343aa2a76bcd1498cae710088c8c29e96499699ba
-EBUILD g15daemon-1.9.5.3-r2.ebuild 3650 RMD160 98343d87593e3fa2fd6a761fc7c59bb6c3df4b62 SHA1 a3303acb6359df214db4c547d10e3a9e6add9484 SHA256 ae30a096890112780bfff2f59f1c6749da4646ad35b18a722436088c8b21e0ab
-MISC ChangeLog 5841 RMD160 49737f1d396fa4270e5f87b35e616b1f18f301bc SHA1 b00426c791dadcc00f58e8f6ca4ce630006c5341 SHA256 e599f6acf0dc1b5961affea4be79638678b3c5916fd1e8c3708b8235a80fbd18
+EBUILD g15daemon-1.2.7-r1.ebuild 3433 RMD160 c785aa3dfaf73766726ec4120c74eb3f0765cec6 SHA1 40ff46e24939fc13e18a8752ca74fa9a8cbfefc7 SHA256 0471847a00e16be75d358314a8b58adb04d071682f1e51575d0193270153a8ff
+EBUILD g15daemon-1.9.5.3-r2.ebuild 3641 RMD160 a3d3b1bdfa0290c0de3956d7089bd9ede2f170f1 SHA1 f91df1a95048603290843d218ea6c45a5ab45ff0 SHA256 8c40b0d6af3d6e125db91b9a751cab1e3bca0da683d02e0843dce56d6df4c41d
+MISC ChangeLog 6176 RMD160 26aee13b75b829dbff98df449e21c384a3375efa SHA1 368845e56a98436eb05f2ecb93dd2fae770871bf SHA256 c5f1d0782f82e496cb7251ca9b785edd72831bdf60a5cf7e7b4921ceb2f06d36
+MISC g15daemon-1.9.5.3-r2.ebuild.orig 3650 RMD160 98343d87593e3fa2fd6a761fc7c59bb6c3df4b62 SHA1 a3303acb6359df214db4c547d10e3a9e6add9484 SHA256 ae30a096890112780bfff2f59f1c6749da4646ad35b18a722436088c8b21e0ab
 MISC metadata.xml 222 RMD160 f3b76907c0789c67d2e3d9d4073a5911aa8ae42f SHA1 792ac055d4a27ee4d9120df34d5390ac3732ab94 SHA256 edd5f0f934fb8e9338e5a0ce8caaae6f6232dfb8cb4e0c0cfbac0363eb42b7c9
diff --git a/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild b/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild
index a728860c8fe7..6e916cc0c98e 100644
--- a/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild,v 1.4 2009/05/16 09:16:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.2.7-r1.ebuild,v 1.5 2010/03/06 20:23:15 robbat2 Exp $
 
 inherit eutils linux-info perl-module python multilib
 
@@ -24,10 +24,11 @@ RDEPEND="${DEPEND}
 
 uinput_check() {
 	ebegin "Checking for uinput support"
-	linux_chkconfig_present INPUT_UINPUT
-	eend $?
+	local rc=1
+	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+	rc=$?
 
-	if [[ $? -ne 0 ]] ; then
+	if [[ $rc -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
@@ -35,7 +36,6 @@ uinput_check() {
 		eerror
 		eerror "Once enabled, you should have the /dev/input/uinput device."
 		eerror "g15daemon will not work without the uinput device."
-		die "INPUT_UINPUT support not detected!"
 	fi
 }
 
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild
index 7a850ae391e2..75c3f89efd2e 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild,v 1.4 2009/05/16 09:16:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r2.ebuild,v 1.5 2010/03/06 20:23:15 robbat2 Exp $
 
 EAPI=2
 
@@ -27,10 +27,11 @@ RDEPEND="${DEPEND}
 PATCHES=( "${FILESDIR}/${P}-forgotten-open-mode.patch" )
 uinput_check() {
 	ebegin "Checking for uinput support"
-	linux_chkconfig_present INPUT_UINPUT
-	eend $?
+	local rc=1
+	linux_config_exists && linux_chkconfig_present INPUT_UINPUT
+	rc=$?
 
-	if [[ $? -ne 0 ]] ; then
+	if [[ $rc -ne 0 ]] ; then
 		eerror "To use g15daemon, you need to compile your kernel with uinput support."
 		eerror "Please enable uinput support in your kernel config, found at:"
 		eerror
@@ -38,7 +39,6 @@ uinput_check() {
 		eerror
 		eerror "Once enabled, you should have the /dev/input/uinput device."
 		eerror "g15daemon will not work without the uinput device."
-		die "INPUT_UINPUT support not detected!"
 	fi
 }