4 files changed, 67 insertions, 5 deletions
diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index 4ef1486e1ab3..0400a0122f4d 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/pbbuttonsd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.77 2010/01/14 02:02:32 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.78 2012/09/09 16:21:47 josejx Exp $
+
+*pbbuttonsd-0.8.1-r4 (09 Sep 2012)
+
+  09 Sep 2012; Joseph Jezak <josejx@gentoo.org> -pbbuttonsd-0.8.1-r2.ebuild,
+  +pbbuttonsd-0.8.1-r4.ebuild, +files/cpufreq.patch,
+  +files/laptopmode.sh.patch:
+  Removed old version, added patches from Massimo Burcheri (bug #429306).
 
   14 Jan 2010; Joseph Jezak <josejx@gentoo.org> pbbuttonsd-0.8.1-r3.ebuild:
   Marked ppc stable.
diff --git a/app-laptop/pbbuttonsd/files/cpufreq.patch b/app-laptop/pbbuttonsd/files/cpufreq.patch
new file mode 100644
index 000000000000..c5a9f963b632
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/cpufreq.patch
@@ -0,0 +1,20 @@
+--- scripts/scripts.d/cpufreq.bak	2012-09-09 12:17:29.842743727 -0400
++++ scripts/scripts.d/cpufreq	2012-09-09 12:18:08.709696894 -0400
+@@ -18,7 +18,7 @@
+ case "$1" in
+   powersave|custom)
+     case "$KVER" in
+-      2.6.*)
++      "2.6."*|"3."*)
+         if [ -d /sys ]; then
+           echo -n "userspace" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+           cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+@@ -41,7 +41,7 @@
+    ;;
+   performance)
+      case "$KVER" in
+-      2.6.*)
++      "2.6."*|"3."*)
+         if [ -d /sys ]; then
+           echo -n "userspace" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+           cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
diff --git a/app-laptop/pbbuttonsd/files/laptopmode.sh.patch b/app-laptop/pbbuttonsd/files/laptopmode.sh.patch
new file mode 100644
index 000000000000..b3eac6da0464
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/laptopmode.sh.patch
@@ -0,0 +1,29 @@
+--- scripts/scripts.d/laptopmode.sh.bak	2012-09-09 12:15:45.632869735 -0400
++++ scripts/scripts.d/laptopmode.sh	2012-09-09 12:16:23.157824284 -0400
+@@ -122,7 +122,7 @@
+ 	     )
+ 	 )
+ case "$KLEVEL" in
+-	"2.4"|"2.6")
++	"2.4"|"2.6"|"3."*)
+ 		true
+ 		;;
+ 	*)
+@@ -222,7 +222,7 @@
+ 				echo "1"				> /proc/sys/vm/laptop_mode
+ 				echo "30 500 0 0 $AGE $AGE 60 20 0"	> /proc/sys/vm/bdflush
+ 				;;
+-			"2.6")
++			"2.6"|"3."*)
+ 				echo "5"				> /proc/sys/vm/laptop_mode
+ 				echo "$AGE"				> /proc/sys/vm/dirty_writeback_centisecs
+ 				echo "$AGE"				> /proc/sys/vm/dirty_expire_centisecs
+@@ -268,7 +268,7 @@
+ 			"2.4")
+ 				echo "30 500 0 0 $U_AGE $B_AGE 60 20 0"	> /proc/sys/vm/bdflush
+ 				;;
+-			"2.6")
++			"2.6"|"3."*)
+ 				echo "$U_AGE"				> /proc/sys/vm/dirty_writeback_centisecs
+ 				echo "$B_AGE"				> /proc/sys/vm/dirty_expire_centisecs
+ 				echo "$DEF_DIRTY_RATIO"			> /proc/sys/vm/dirty_ratio
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r4.ebuild
index ff443ebfdf77..7c7f2aec4692 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild,v 1.6 2008/12/28 02:14:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r4.ebuild,v 1.1 2012/09/09 16:21:48 josejx Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="acpi alsa debug doc ibam macbook oss"
 
 DEPEND="macbook? (
@@ -34,6 +34,12 @@ src_unpack() {
 	### Fix macbook -lz issue
 	epatch "${FILESDIR}/lz.patch"
 	epatch "${FILESDIR}/lm.patch"
+	### Fix new apple hid fnmode issue
+	epatch "${FILESDIR}/fnmode.patch"
+	### Add kernel 2.6.x stuff for 3.x as well
+	epatch "${FILESDIR}/laptopmode.sh.patch"
+	epatch "${FILESDIR}/cpufreq.patch"
+
 	eautoconf
 }