Add kernel-3.8 compatibity patch from upstream (#458508 by Philipp Leonhardt), drop old.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 77 insertions, 14 deletions

diff --git a/sys-power/bbswitch/ChangeLog b/sys-power/bbswitch/ChangeLog
index d2b48da35d16..9dcb2bdaba33 100644
--- a/sys-power/bbswitch/ChangeLog
+++ b/sys-power/bbswitch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/bbswitch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/bbswitch/ChangeLog,v 1.5 2012/10/27 11:56:44 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/bbswitch/ChangeLog,v 1.6 2013/02/26 20:10:45 pacho Exp $
+
+*bbswitch-0.5-r1 (26 Feb 2013)
+
+  26 Feb 2013; Pacho Ramos <pacho@gentoo.org> +bbswitch-0.5-r1.ebuild,
+  +files/bbswitch-0.5-kernel-3.8.patch, -bbswitch-0.4.2.ebuild:
+  Add kernel-3.8 compatibity patch from upstream (#458508 by Philipp Leonhardt),
+  drop old.
 
 *bbswitch-0.5 (27 Oct 2012)
 
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index d7573c16ba34..8efd8223008e 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bbswitch-0.5-kernel-3.8.patch 1729 SHA256 26532d89c6561ebbc291c6fd1e3512c675927a36e86a1a26cc8bb8a79a2ede54 SHA512 5469a592231d009027b859103eb1e136edeeabddf0bf3a8207b86ff1a7d15e68e4a842cf5291ba5b0d5652be94756c34e583abcb80aa1b28208ffc2fd695c8ae WHIRLPOOL 610493d7b1ec079c529d6ef28ab0a4d388223d174706743d649b333576ab46c36a9997072f17de34d09349be26f3734c1164a21d1b20377b890272cd262ae0ae
 AUX bbswitch.modprobe 46 SHA256 e87a481ce095be46efe970769b070d865cb26c91e3a672f61341421acb52e82f SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6 WHIRLPOOL 0b913611bcede225d408c9e4a59a3ec9b8044a58fe2613f3e5d4d85b349a7c84e028f7f398b9742787c11e93dcc080baade824d37f8126c8ef3409c6e90f1848
-DIST bbswitch-0.4.2.tar.gz 7546 SHA256 433d2a084ae547720463c52265f3ac3f4f2f637eaa8249ca5e8c8e994365431a SHA512 3a8c25f817c20e82682338393ac52cd54a718397d7d6abe3688d960b900d2f06e92aff57b717f8f169b56643021e4f72a6d54874e2d8de83dd6399c37fd3b1a3 WHIRLPOOL 3e7cb0647698227dc02c29e71b3039200ba9761e1357d38c656d48ab96188a683f8e69d1f9d7bec4614b95c6c776cf5095013a54a2e2b8cf657ed226154cca33
 DIST bbswitch-0.5.tar.gz 7862 SHA256 fb3621e9e6fa57d6201a24678985dcea2520a303237bb5b41eb438bd462ee7a4 SHA512 62326fd194e4b70b8b4c55ffab937336d1c7cfc332f4193ade0219c2e438a926177765214c2c968292b3fcfcf357ea3c9c06c2bf84cfbf0a33480f22ef1c5d5d WHIRLPOOL 3d1ac9c8cd10c6d32e64844ebfbf9d1ab25847f88d93c3d8464862fa17d99715f8b3e5166d389690bbbeb373691900c1fa3e0e52113acfd0c50bd21c24224958
-EBUILD bbswitch-0.4.2.ebuild 821 SHA256 bca258f49a59b9329a21b6088b2e0bb9b6bb3b0456aefc82382f583fda7ceebf SHA512 eda7a7aa9ad6ae1c43a2563eb9cca3543852c00741765a9d6b6111521681ee0f9533b7b52ec5fea8acd3642025fd13108c5f92c342e5af6b6d37568ec4802575 WHIRLPOOL 6b0b6899e1294cfcecffa2d64e8140852c5607c9266cffc7e894cc122dd38147fb2b382a2f326bb8144a0faa7ff90691ee02e67a234e4b50b5efe2e9f46fa6e6
+EBUILD bbswitch-0.5-r1.ebuild 933 SHA256 a9df6918ff19f6443efb26c09c6dd0c3d12813bf43c9137feb7ff93d2d671e75 SHA512 6f8e1bbc2ce5bde15691a26a0011b711cb633ed1202e7082536d3234624ba253487c2f47c61c67271c64805d6a4901302c67a6b6fbbbe237e46fbd804e0073ba WHIRLPOOL c3cf1ba5ebd32a2dbd21d6831a837cdbf32f9a96872013d3b3aefb3e1d638039d2ff5eba3f993abecbbc3736dd0ce430e8246526ae703ccfbd017361cd828d22
 EBUILD bbswitch-0.5.ebuild 817 SHA256 6a1972e8527fb63ef393adfcfa87282de6c0f3dcf612c6b101884398e1708fb3 SHA512 f587333ce631130f341349914c2db15ec689c3874f05fc57aea641be728f5419cb854a729de4706c714c1b20939a477c7eac1af7606bfef9d19ea56a4de907eb WHIRLPOOL 1638489de26f9b070b591b1c026a9786048a5bd123b73e4e5dfa7866a8cbfd7c5ce8e2d9a27de4668f1e7be922409b9bbc7e947d43829fe80faab6dd9e6fadfe
-MISC ChangeLog 969 SHA256 e4a6c2b6b22ea0ecba6d8fe8e0ba04b93524ca6581a53ab1c203fd032c67961f SHA512 d250211a6be2f46c5efe48fc4b1d19d857c508ca04007e089d15bdbe3ad08f46ee8bfa2e297511d275d8765c4de0ec9e42189b3179a661a7816ce171210511f3 WHIRLPOOL 1301d3970c8e311a5eb590b7afe6dca88a94194bc360656635d9cc530a2fcc0ea2df415eb582b9cfb11db1337be2294884c6ea6e19d2dade57ed9dad2e778cde
+MISC ChangeLog 1230 SHA256 1512de461db6362c325d28ab209077ee23b6a8d3b8741611a7f4d65cb8893059 SHA512 7e2c3e64c114e9857d8dffb11c9e7887e079b32dbfdce716d69c0b827f066c4f7a849ac9d27b9da449d567bdbda6e203d4a239d8150ac872f773f3186bdc1877 WHIRLPOOL 93fc51ec3c30af1e1e14a79e3c9b077a7212699df5b5ae019d86c778409638a1e9752a6592be7b3f60bd9443e4afdd45fc5d0075d0742587ce4441a4813114c0
 MISC metadata.xml 602 SHA256 eac7d56a783784635e3c74322fca8f3134d46fa331bf182cd4fcefbec16e93fe SHA512 edd98e8ae17251509f940836854357d9fd7118c33b7e5295f2d4702827cfe4406d40e4152b2ec5a5120e6f8131adee38f869c41b297027d67fb7d35d8bac0c89 WHIRLPOOL 0bf8b7b1cc722c842e44df2b861d4e8ee2b4607c58523f1decf9da795a4a5c65fb5e3d0b74cf13875af8261fc65316b505d981777839e1a8fb519ae0118a147d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCLy/0ACgkQCaWpQKGI+9QyPQCfXjHUqIngMY54XntTfrnOIvrV
-jMoAmwXQp+Epg+VumZCIyuUMVvboatOD
-=sKh0
+iEYEAREIAAYFAlEtFsYACgkQCaWpQKGI+9S2lQCcDuzHHdcdkKQTN1uq+wIxHdju
+ONAAnjleQQT9vtLSqVkEPp5F2L8/1I+2
+=EwDu
 -----END PGP SIGNATURE-----
diff --git a/sys-power/bbswitch/bbswitch-0.4.2.ebuild b/sys-power/bbswitch/bbswitch-0.5-r1.ebuild
index 3d19991d7caf..12f545d2651c 100644
--- a/sys-power/bbswitch/bbswitch-0.4.2.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.5-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/bbswitch/bbswitch-0.4.2.ebuild,v 1.1 2012/05/06 09:38:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/bbswitch/bbswitch-0.5-r1.ebuild,v 1.1 2013/02/26 20:10:45 pacho Exp $
 
-EAPI="4"
-
-inherit linux-mod
+EAPI=5
+inherit eutils linux-mod
 
 DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
 HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
@@ -17,7 +16,6 @@ IUSE=""
 
 DEPEND="virtual/linux-sources
 	sys-kernel/linux-headers"
-
 RDEPEND=""
 
 MODULE_NAMES="bbswitch(acpi)"
@@ -29,6 +27,11 @@ pkg_setup() {
 	BUILD_PARAMS="KVERSION=${KV_FULL}"
 }
 
+src_prepare() {
+	# Linux 3.8 compatibility hack, bug #458508
+	epatch "${FILESDIR}/${P}-kernel-3.8.patch"
+}
+
 src_install() {
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
diff --git a/sys-power/bbswitch/files/bbswitch-0.5-kernel-3.8.patch b/sys-power/bbswitch/files/bbswitch-0.5-kernel-3.8.patch
new file mode 100644
index 000000000000..6b47601ec40d
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-0.5-kernel-3.8.patch
@@ -0,0 +1,53 @@
+From 5593d9519364dc7f6f28c3dd8358afb907f39c0f Mon Sep 17 00:00:00 2001
+From: Peter Wu <lekensteyn@gmail.com>
+Date: Wed, 30 Jan 2013 18:57:56 +0100
+Subject: [PATCH] Linux 3.8 compatibility hack
+
+Since the following commit, the device would not turn off because the power
+state is unknown. Until a fix is released in Linux (or until I know what
+better to do), I just assume the power state D0.
+
+commit ddc150f7a33ae0c9cb16eaac3641abc00f56316f
+Author: Lv Zheng <lv.zheng@intel.com>
+Date:   Fri Nov 16 02:46:28 2012 +0100
+
+    ACPI / PM: Add check preventing transitioning to non-D0 state from D3.
+
+    No power transitioning from D3 state up to a non-D0 state is allowed
+    so make acpi_device_set_power() fail and complain if such a transition
+    is attempted.
+
+    Signed-off-by: Lv Zheng <lv.zheng@intel.com>
+    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ bbswitch.c |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/bbswitch.c b/bbswitch.c
+index d839fa7..2646f29 100644
+--- a/bbswitch.c
++++ b/bbswitch.c
+@@ -238,6 +238,20 @@ static void bbswitch_off(void) {
+     pci_save_state(dis_dev);
+     pci_clear_master(dis_dev);
+     pci_disable_device(dis_dev);
++    do {
++        struct acpi_device *ad = NULL;
++        int r;
++
++        r = acpi_bus_get_device(dis_handle, &ad);
++        if (r || !ad) {
++            pr_warn("Cannot get ACPI device for PCI device\n");
++            break;
++        }
++        if (ad->power.state == ACPI_STATE_UNKNOWN) {
++            pr_debug("ACPI power state is unknown, forcing D0\n");
++            ad->power.state = ACPI_STATE_D0;
++        }
++    } while (0);
+     pci_set_power_state(dis_dev, PCI_D3cold);
+ 
+     if (bbswitch_acpi_off())
+-- 
+1.7.10
+