kmod-11 deprecates --wait rmmod option, causing issues (#447014 by Philipp Leonhardt). See https://github.com/Bumblebee-Project/Bumblebee/issues/283 for reference. Remove old.

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

5 files changed, 50 insertions, 14 deletions

diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index 2cfa3c23655d..092fca36c6a4 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/bumblebee
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.9 2012/09/14 20:24:21 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.10 2013/01/03 20:37:21 pacho Exp $
+
+*bumblebee-3.0.1-r1 (03 Jan 2013)
+
+  03 Jan 2013; Pacho Ramos <pacho@gentoo.org> +bumblebee-3.0.1-r1.ebuild,
+  +files/99-remove-nvidia-dev.rules, +files/bumblebee-3.0.1-remove-wait.patch,
+  -bumblebee-3.0-r2.ebuild:
+  kmod-11 deprecates --wait rmmod option, causing issues (#447014 by Philipp
+  Leonhardt). See https://github.com/Bumblebee-Project/Bumblebee/issues/283 for
+  reference. Remove old.
 
 *bumblebee-3.0.1 (14 Sep 2012)
 
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 21d20d4111fe..9c4c00fbb670 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 99-remove-nvidia-dev.rules 215 SHA256 bd8d8ae490171a9302f85c07e7fc95522dc71615779304f05a01588ae96508cb SHA512 d5596d9acdbabc2f6aedd367a0a0a99548dc130a552d5bc730df1f0e0da57b5c2071a99b2c6c70cab0c9cabf75e36c3494ff286f43637a9799744f9611db98ec WHIRLPOOL 79fb113a7131dc426bec176013d9c235dcd065b608183eb040c9408754306a9136503f34bfb47aa70c9cd6c8bda944df465aaa0751e25d2142734cf48a8f06b0
+AUX bumblebee-3.0.1-remove-wait.patch 310 SHA256 fcf54d27c10c45d9810c23fecdbd1bf120b58a8e968c35702f00c7b6976854ac SHA512 f226773f28bacce98c4655444fce3e931355d68f0bbc0d85365b8ecc0ac8748894132cd74f90b05e5609269c80681b46bee17de841aa3387d81ccc608af8cdb8 WHIRLPOOL dd0b4703f4a05e6e34adf03014cfdb91571d0c48e49c89e178d031760a80988228c3d088132327a4a29c96090eea232622d43c1b8c1b4c6dc5ae3e45752af6ad
 AUX bumblebee.confd 60 SHA256 9e0287f542cff0fd3452a0c3d6d427a3404706c93ac9a00f4d99fe52ed596d75 SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251 WHIRLPOOL 53e0f7efcf8ceb1990feccabb2050a440ea5e279703c70c896ced4a0a042c191c4ef6c5096dd237af86ca2bcc8d61782cf057f56b6f21983dd642832f314bfbd
 AUX bumblebee.envd 127 SHA256 fd6c2719f8268a03fe01df6f9ead660faa3f7aa2a63230d5a7e923a190077437 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af WHIRLPOOL dc5d9dffd2b5219f7c6f11a917cbab004fa3ed89005357dbc1dd1eb3833d4243209c71ccc0b3abc6163c1c192e1a7de8dc1b7ce137ba43aa8f0157ecfd78857c
 AUX bumblebee.initd 598 SHA256 8dd0ea64c084a6e4daac3b8da043ff16d87ec2ba44c63e9965a2e8c9382dc639 SHA512 f39792f6711433f63adbb940f61e013bd8c8e72ea263e97a47bf470c3745ecfb0c28c04192f36dd6a133c5824d3830b1c9be8800da3b4510372518d2976bc350 WHIRLPOOL 008bd1451a1e5252e1a6d97a96bd9722fc43599aec596d1839136c645f9c135a2218942f1c7b58a0ee3ffd4cc05b9da33d427b0ea2340e753cd475386748124d
 DIST bumblebee-3.0.1.tar.gz 137534 SHA256 447eebbcfbc8877a7a15126b492f07b9186428e75c768b1eeb86ce71076f3e60 SHA512 4b1b37c4b6bef9ea2b91bcfdacf5a2dea18fc4ed245d9881f93454d5e23bb07d4048114ec79c143f82504e20526e7b55e5b8d3a1b83c08340c244ea93fbef150 WHIRLPOOL cf93188d39d2449a2410005649f26c5462a0610bd6c616052cbbb9e27f253cbc2ad394dd737fc963b956298ae6d706c0adf587aebd102a46e82bbe13a7549535
-DIST bumblebee-3.0.tar.gz 136935 SHA256 a27ddb77b282ac8b972857fdb0dc5061cf0a0982b7ac3e1cfa698b4f786e49a1
-EBUILD bumblebee-3.0-r2.ebuild 2058 SHA256 2d418474138e6bf1f50dcd74c0bc023f7efdded9add7f2e2ef28114f592e2a6a SHA512 0c261efb2c1fad80732f2a5b7ba946fb0d8efccf40c0c14e63a3c498d6540ccefcd101ce089d27d0599b2f8304d30c7c7382f03a5026bc8395c5f962b002d7e8 WHIRLPOOL bb35a6524687cd2bcd28960e1be5856424f3589723fa1562bbe06d7a7237b15f7e61687bfd356bd2a971f3922025a53044b3a94155f01ff3878b38fb7309ed6f
+EBUILD bumblebee-3.0.1-r1.ebuild 2425 SHA256 52b24af429d11bc27bad3e4d835eff9e92c6bc7289dca081d6bcb9b892954774 SHA512 4d2200c445aba682402154cc1c9379ba4b9d5e38047947d7c9f80dd1898b1b3b8017926c450812cf325724712b5b1079a9abe0fa9cffe3720d1ccff0b666a21b WHIRLPOOL 51904e4480ad67aea4a4dfac150975cf7d45bdc446bedd76f3b53e695e49c41f8c3ea92904cb97784946f046a8b4636a163192ccfd8fdd823c0709309e2e07cf
 EBUILD bumblebee-3.0.1.ebuild 2050 SHA256 2d8a23d485ce97cee1839dc46158585b231ba0ba2f5b302620dd7945a64d6bc4 SHA512 46a04a68992aa4ce03e7f39bda363bc9de67238ec72574759906391cb0a9521602ac17ca7cf7b5c2fe4213c1fe7bbf72079364d138cc2b413e539153a35947f0 WHIRLPOOL 9acb50877b420acc1880cf6f6b9bc298b39dc3c8926ebd1eaa17bd757288b4cbd49a8c985cabbb0d3d0502a631d4a04d0328d10b5824429123bef7b32c84e6e4
-MISC ChangeLog 1954 SHA256 06847b396cfb6be1946acf5c343f749377f85056d565fb9636841e750f757813 SHA512 06c1f5e6fb0c77301241869f02e307ed370882ea58ba33702d31b68303021bfd2fed13ab08ea01d11d6a5c9c3dbee95e2e62d0accda14cb41b8d64ed1d45d257 WHIRLPOOL 7aca4241f449c9d2bb471c140c4a83879d2902ffe3b3e6ed3c318e46ce5f4567e4d4f95f0d577abd9f2944db1c15e2d004dd6d0f344774e281b39b46408989d1
+MISC ChangeLog 2354 SHA256 ebb67359b5817817abf43c99d670595fe573637ff5881ff55eab2a12f2eb82a7 SHA512 01a5adec0910ee3641280cf70eb6bf167c67d7d9773d7c51ab11f680f278c760ce0393a67e5dd21876ced6e6e53eb7762ff7b96f664327056332ce4cadaa489c WHIRLPOOL d70a934bac44efcb745a861cfffc5b61d29dfdd8c5fd3e9ae8426f9be9201c60c4ec55625a9cbdc65bb99740b844c9454f3051a07134a01383c3d6e9718d75bc
 MISC metadata.xml 850 SHA256 402fc01c90d3969d01b8567a53a8af406087118382ef02f158b009b927014c14 SHA512 5d4fde7b767cc3cd27246ac19173d61f6cc0cea08dc6e810e0bfdc557d86b6286aa24bdf6e70fe488adbd4e866188d20182c07df39ad8731c24edb19657db387 WHIRLPOOL 7a7485591af12c10c7073deb8267d346c5efc2684df270c5a455de98302e0cdca8205c93d367c6058b8721de3a6fd307b875b052417c9a392db6b211a75a7d79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBTknsACgkQCaWpQKGI+9TrxgCeIOVnwDTeB9/9RuMzaT+JxK7e
-uHsAn3dFCCvS2n026KPwGfPjE8gU6dWP
-=d75b
+iEYEAREIAAYFAlDl7AIACgkQCaWpQKGI+9RwDQCfU8QzWu0ya1vtjNRrvPN5PdQl
+f+kAn3bxq1w4DufE0CcB74qdXsvVKqKz
+=FYdZ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.0.1-r1.ebuild
index 2ad0c5a3b4f1..bb151726d90c 100644
--- a/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.0.1-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/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild,v 1.3 2012/06/20 12:49:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0.1-r1.ebuild,v 1.1 2013/01/03 20:37:21 pacho Exp $
 
-EAPI="4"
-
-inherit multilib systemd user
+EAPI=5
+inherit eutils multilib systemd user
 
 DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
 HOMEPAGE="https://github.com/Bumblebee-Project/Bumblebee"
@@ -16,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
 
-RDEPEND="x11-misc/virtualgl
+RDEPEND="x11-misc/virtualgl:=
 	bbswitch? ( sys-power/bbswitch )
 	virtual/opengl
 	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]"
@@ -31,6 +30,12 @@ DEPEND=">=sys-devel/autoconf-2.68
 
 REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
 
+src_prepare() {
+	# --wait option for rmmod is deprecated:
+	# https://github.com/Bumblebee-Project/Bumblebee/issues/283
+	epatch "${FILESDIR}/${P}-remove-wait.patch"
+}
+
 src_configure() {
 	if use video_cards_nvidia ; then
 		# Get paths to GL libs for all ABIs
@@ -54,6 +59,12 @@ src_install() {
 	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
 	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
 	systemd_dounit scripts/systemd/bumblebeed.service
+
+	# Install udev rule to handle nvidia card switching,
+	# https://github.com/Bumblebee-Project/Bumblebee/issues/283
+	insinto /usr/lib/udev/rules.d
+	doins "${FILESDIR}"/99-remove-nvidia-dev.rules
+
 	default
 }
 
diff --git a/x11-misc/bumblebee/files/99-remove-nvidia-dev.rules b/x11-misc/bumblebee/files/99-remove-nvidia-dev.rules
new file mode 100644
index 000000000000..3f7f67f48c5b
--- /dev/null
+++ b/x11-misc/bumblebee/files/99-remove-nvidia-dev.rules
@@ -0,0 +1,3 @@
+# Put this file in /lib/udev/rules.d or /etc/udev/rules.d
+# Prevent the nvidia card from "randomly" turning on
+DEVPATH=="/module/nvidia", ACTION=="remove", RUN+="/bin/rm -f /dev/nvidiactl /dev/nvidia0 /dev/nvidia1"
diff --git a/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch b/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch
new file mode 100644
index 000000000000..06adda989458
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch
@@ -0,0 +1,12 @@
+diff --git a/src/module.c b/src/module.c
+index 06f8872..55fa70e 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -96,7 +96,6 @@ int module_unload(char *driver) {
+     bb_log(LOG_INFO, "Unloading %s driver\n", driver);
+     char *mod_argv[] = {
+       "rmmod",
+-      "--wait",
+       driver,
+       NULL
+     };
\ No newline at end of file