Handle the edge cases better with VIDEO_CARDS/INPUT_DEVICES. Not set implies all, set but not matching any possibilities implies none. Fixes #206824 by peter.

Package-Manager: portage-2.1.4

3 files changed, 44 insertions, 31 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 2a9a5fe971f3..59b796e91f6c 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/DirectFB
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.68 2007/12/24 10:27:40 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.69 2008/01/21 06:06:28 vapier Exp $
+
+  21 Jan 2008; Mike Frysinger <vapier@gentoo.org> DirectFB-1.1.1.ebuild:
+  Handle the edge cases better with VIDEO_CARDS/INPUT_DEVICES. Not set implies
+  all, set but not matching any possibilities implies none. Fixes #206824 by
+  peter.
 
   24 Dec 2007; Mike Frysinger <vapier@gentoo.org> DirectFB-1.1.1.ebuild:
   Add support for USE=X #201970 by Alexis Ballier.
diff --git a/dev-libs/DirectFB/DirectFB-1.1.1.ebuild b/dev-libs/DirectFB/DirectFB-1.1.1.ebuild
index 815d7ea81387..c0ecfd5c8c03 100644
--- a/dev-libs/DirectFB/DirectFB-1.1.1.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.1.ebuild,v 1.3 2007/12/30 18:18:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.1.ebuild,v 1.4 2008/01/21 06:06:28 vapier Exp $
 
 inherit eutils toolchain-funcs
 
-IUSE_VIDEO_CARDS="ati128 cle266 cyber5k i810 i830 mach64 matrox neomagic nsc nvidia radeon savage sis315 tdfx unichrome"
+IUSE_VIDEO_CARDS="ati128 cle266 cyber5k i810 i830 mach64 matrox neomagic none nsc nvidia radeon savage sis315 tdfx unichrome"
 IUSE_INPUT_DEVICES="dbox2remote elo-input gunze h3600_ts joystick keyboard dreamboxremote linuxinput lirc mutouch none permount ps2mouse serialmouse sonypijogdial wm97xx"
 
 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
@@ -66,20 +66,28 @@ src_unpack() {
 
 src_compile() {
 	local vidcards card input inputdrivers
-	for card in ${VIDEO_CARDS} ; do
-		has ${card} ${IUSE_VIDEO_CARDS} && vidcards="${vidcards},${card}"
-		#use video_cards_${card} && vidcards="${vidcards},${card}"
-	done
-	[[ -z ${vidcards} ]] \
-		&& vidcards="all" \
-		|| vidcards=${vidcards:1}
-	for input in ${INPUT_DEVICES} ; do
-		has ${input} ${IUSE_INPUT_DEVICES} && inputdrivers="${inputdrivers},${input}"
-		#use input_devics_${input} && inputdrivers="${inputdrivers},${input}"
-	done
-	[[ -z ${inputdrivers} ]] \
-		&& inputdrivers="all" \
-		|| inputdrivers=${inputdrivers:1}
+	if [[ ${VIDEO_CARDS+set} == "set" ]] ; then
+		for card in ${VIDEO_CARDS} ; do
+			has ${card} ${IUSE_VIDEO_CARDS} && vidcards="${vidcards},${card}"
+			#use video_cards_${card} && vidcards="${vidcards},${card}"
+		done
+		[[ -z ${vidcards} ]] \
+			&& vidcards="none" \
+			|| vidcards=${vidcards:1}
+	else
+		vidcards="all"
+	fi
+	if [[ ${INPUT_DEVICES+set} == "set" ]] ; then
+		for input in ${INPUT_DEVICES} ; do
+			has ${input} ${IUSE_INPUT_DEVICES} && inputdrivers="${inputdrivers},${input}"
+			#use input_devics_${input} && inputdrivers="${inputdrivers},${input}"
+		done
+		[[ -z ${inputdrivers} ]] \
+			&& inputdrivers="none" \
+			|| inputdrivers=${inputdrivers:1}
+	else
+		inputdrivers="all"
+	fi
 
 	local sdlconf="--disable-sdl"
 	if use sdl ; then
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index f6b070d8be81..d7e0bf77f427 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -37,14 +37,14 @@ EBUILD DirectFB-1.0.0.ebuild 3841 RMD160 a9d8a856027efb2fdd13bd6d34d5b7ca1186d3f
 MD5 97522c69bfe54e73d1a48c01b45b252d DirectFB-1.0.0.ebuild 3841
 RMD160 a9d8a856027efb2fdd13bd6d34d5b7ca1186d3ff DirectFB-1.0.0.ebuild 3841
 SHA256 30c51a8afd8b9b29273f94aa1688beafe47aeaad11e3a643f06361d938f32379 DirectFB-1.0.0.ebuild 3841
-EBUILD DirectFB-1.1.1.ebuild 4564 RMD160 587263de4d40d600074c48c67fd6adc9e1fd9dc8 SHA1 b32aa9b9e661831df9d5659a99a2c1cd3ff5d5d4 SHA256 c2d6d1df3f65685bf79cba68bd005ea57be20271647da04d47d09d13fe1e8745
-MD5 a0545e92db974cc234a52d82d099b00d DirectFB-1.1.1.ebuild 4564
-RMD160 587263de4d40d600074c48c67fd6adc9e1fd9dc8 DirectFB-1.1.1.ebuild 4564
-SHA256 c2d6d1df3f65685bf79cba68bd005ea57be20271647da04d47d09d13fe1e8745 DirectFB-1.1.1.ebuild 4564
-MISC ChangeLog 10311 RMD160 3c28532bcc4a5ebd50d619f2c379b19f6404d101 SHA1 e3dbb8dd41041705919f07146e59b37a669626eb SHA256 a06bf31f2e713f3ef57dcd872a4efbc5b3568617c8be185e19eef1401eb2c8be
-MD5 f18242ccc62273848a76e79098ddb5c2 ChangeLog 10311
-RMD160 3c28532bcc4a5ebd50d619f2c379b19f6404d101 ChangeLog 10311
-SHA256 a06bf31f2e713f3ef57dcd872a4efbc5b3568617c8be185e19eef1401eb2c8be ChangeLog 10311
+EBUILD DirectFB-1.1.1.ebuild 4735 RMD160 5a4dcaf3569c038edb9c792be1d5162318801b3b SHA1 d6d9de2f480ede684a796266e9d104eca530f10b SHA256 41ede7d7671c745c22239c8de5c7ec9cca05a25875a1cf4ae326e754aa825d05
+MD5 0fa870becf2645d2bc43dd9fb23400d8 DirectFB-1.1.1.ebuild 4735
+RMD160 5a4dcaf3569c038edb9c792be1d5162318801b3b DirectFB-1.1.1.ebuild 4735
+SHA256 41ede7d7671c745c22239c8de5c7ec9cca05a25875a1cf4ae326e754aa825d05 DirectFB-1.1.1.ebuild 4735
+MISC ChangeLog 10550 RMD160 eeba93532c68866e1cf3129cdfdd9d94e26d0727 SHA1 f52cf461463a025c6108e21ec181197fcd0eb78b SHA256 a365f4967942b23571a0cf1954e34577f342bcaff0399bc09e7135593a4b70eb
+MD5 1307abaed92ff08677a8042354734992 ChangeLog 10550
+RMD160 eeba93532c68866e1cf3129cdfdd9d94e26d0727 ChangeLog 10550
+SHA256 a365f4967942b23571a0cf1954e34577f342bcaff0399bc09e7135593a4b70eb ChangeLog 10550
 MISC metadata.xml 754 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 SHA1 d5238147a8dc90d5171dae8675f243fe5e6a8d10 SHA256 13a9cd8be775e849708c9377176d52f107a2eed78ef2ba3917188ae9cf2aeffc
 MD5 b798773c0060701f402cec4cddc05f5d metadata.xml 754
 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 metadata.xml 754
@@ -62,9 +62,9 @@ MD5 e654844caa52a2990f7fb73bc17981f6 files/digest-DirectFB-1.1.1 247
 RMD160 9becf2e3541c47dc84e9bff692c40eeac4be0994 files/digest-DirectFB-1.1.1 247
 SHA256 af0a4a99445049a8b5077a3f8dee0509337e1a51a28b3e904a3068b6f7eda2f4 files/digest-DirectFB-1.1.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkd34PQACgkQj9hvisErhMJgygCgoqGq/MuvyftUQZscrpiCdD6f
-i3kAnAwnqGbyUQWHoL7usiJQlX1oTL2r
-=EgqA
+iD8DBQFHlDZtj9hvisErhMIRArI6AKCtXZ75ZzGhMU4aaLW9VN7FQ+3VwQCgqh9j
+abOF7U8WSMDC0xqtgLw9wOw=
+=nyzF
 -----END PGP SIGNATURE-----