Add patch to fix fnmode with kernel 2.6.28.

Package-Manager: portage-2.1.4.5

5 files changed, 161 insertions, 15 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index 3c328916a102..9104c2786401 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.75 2008/08/24 13:31:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.76 2008/12/28 02:14:12 josejx Exp $
+
+*pbbuttonsd-0.8.1-r3 (28 Dec 2008)
+
+  28 Dec 2008; Joseph Jezak <josejx@gentoo.org> +files/fnmode.patch,
+  pbbuttonsd-0.8.1-r2.ebuild, +pbbuttonsd-0.8.1-r3.ebuild:
+  Add patch to fix fnmode with kernel 2.6.28.
 
   24 Aug 2008; Markus Meier <maekke@gentoo.org> pbbuttonsd-0.8.1-r2.ebuild:
   add ~amd64, bug #167011
diff --git a/app-laptop/pbbuttonsd/Manifest b/app-laptop/pbbuttonsd/Manifest
index fadb3483d873..94368e98e21c 100644
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fnmode.patch 925 RMD160 88d0393b162c09f77a516246417acc5b175fc825 SHA1 e044576d2f6745a593d46ea9656a93b02d1c4bca SHA256 cc54c46607a5c0c28e42facd839bde657bfed8dc5a641f31d1fbe8e205cef825
 AUX g++.patch 500 RMD160 8b4ae9c627f1c156d6a3cf00533333367a2408bd SHA1 dd842e0026c7964fd43de7799dd16dc6c4c73164 SHA256 c9efa620b5c19473bb5ca8b17185c7e4e24f0b1db91f9ffb6c71747d68723b57
 AUX lm.patch 491 RMD160 d4b8981777ac45576d28f18e0e3645990692a7ec SHA1 76c7d2e2c7cd0582982c8baa104e9ed817ed6011 SHA256 11971e1c05a37398ee4dff3e0b5d956a1e78996bf6277ab7868c942c66c30192
 AUX lz.patch 992 RMD160 046a3671f70b0fb65928488634f884bd8b803b42 SHA1 5d19f2a699278c81b3cff984a986fe964be8f43c SHA256 5119e7e9a5f82ec16cf1d75990d75427babb638f38b3bf8b2502321bfebead6f
@@ -8,13 +6,7 @@ AUX pbbuttonsd.rc6 472 RMD160 6a531760a39c74e822f33d27866142a5fae1562d SHA1 b92c
 AUX pmcs.patch 764 RMD160 1336291d7ffac4e1b675baa8a50142a2e90c15c4 SHA1 b2d95406cf89eed58ddfa59a7a0e3b933ed957e2 SHA256 4bf4e711838636bfde3688d8574374dde746639352d533c9bbb532cbd62827f8
 AUX wireless 235 RMD160 592e730ede0f02e61c4562308fa3b212383def58 SHA1 e58e5ed804a2b7363677fcedcd06cd79a4f19f27 SHA256 0bc03fac1b17933200a3e6d3f50a1d2d2717857006aa06ddaf5d6650c902a978
 DIST pbbuttonsd-0.8.1.tar.gz 589630 RMD160 2f1dc0bc8b67cbb310f06df932a5dfcf26d35551 SHA1 e07db4c0429c80109ca736bdd68e0da408011804 SHA256 b391fd98ed263f355d7e7addc6566959e986627c87dcfdaa1da15310ad70bffa
-EBUILD pbbuttonsd-0.8.1-r2.ebuild 3419 RMD160 46e3d58f2374ac5cb7fb028e8f00ebbfa2ecb340 SHA1 ed80b3ee2b583abfda2c41cc54fc44554af91558 SHA256 eb820fb0142fecfb9b29fd349d9bd148115a467196dde6f901d4e5131a9ab311
-MISC ChangeLog 16374 RMD160 8b8b10fd10a24ed7b500bd425a4220d2563e58ae SHA1 cc2c5536cde7e501036b8f71681f1de803c3ea8b SHA256 52dd466f3dd57b014fc5516f41d502bd434b6c8ea3179dc275b3f4d7b0b8b607
+EBUILD pbbuttonsd-0.8.1-r2.ebuild 3417 RMD160 8354bb12cd945777735d8409bb717a12bc1c2c61 SHA1 4777ff6513a6f037b5b23df299b17763084ad69b SHA256 4790e439e4b387d5a955b95707ae1adfb69af8edc2e4b3b969f1474ceba6d2ea
+EBUILD pbbuttonsd-0.8.1-r3.ebuild 3489 RMD160 c7de3e1c2909f139bfffc77b4781068f70e4bfff SHA1 2b000c0cef71ac8c742daaeb3989bd5ede0a13be SHA256 22d3e6ba6eb2cf02987e2595e7ecfae981d3ffc130be2ec2c2345eacbe91ed26
+MISC ChangeLog 16585 RMD160 3b5bcb4418ff13db8d763ebbc849faf15e24d3c0 SHA1 af067ec45d171820b907f3bcb3a57fa3e2c6bd5d SHA256 d6699958123e2bfc20b60df37a9b8164dba54d30cfb18fdae8494ddac60e812d
 MISC metadata.xml 323 RMD160 dda75140d84779f99217c460e500ba3d14f51755 SHA1 a89436a3358a83eddc3a15b48f95e71bbbd06262 SHA256 211a3818387155dad15d88ed72ba1c3ead76e2a7ba0d45529295ee81a09b76a2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkixYw8ACgkQkKaRLQcq0GLfOQCeKq6kVYblmhWx6yfzCqHWmqK+
-CkwAoJBDZ+WOuE4GuDLaQSwugJmGztU1
-=1xXo
------END PGP SIGNATURE-----
diff --git a/app-laptop/pbbuttonsd/files/fnmode.patch b/app-laptop/pbbuttonsd/files/fnmode.patch
new file mode 100644
index 000000000000..e33019a43694
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/fnmode.patch
@@ -0,0 +1,23 @@
+--- src/module_pmac.c	2007-07-01 07:05:17.000000000 -0400
++++ src/module_pmac.kbdfix.c	2008-12-27 11:46:36.000000000 -0500
+@@ -990,7 +990,9 @@
+ 		}
+ 	} else {
+ 		if ((fd = open ("/sys/module/usbhid/parameters/pb_fnmode", O_RDONLY)) < 0)
+-			fd = open ("/sys/module/hid/parameters/pb_fnmode", O_RDONLY);
++			if ((fd = open ("/sys/module/hid/parameters/pb_fnmode", O_RDONLY)) < 0)
++				fd = open("/sys/module/hid_apple/parameters/fnmode", O_RDONLY);
++
+ 		
+ 		if (fd >= 0) {
+ 			if ((n = read (fd, ADBBuffer, ADB_BUFSIZE-1)) > 0) {
+@@ -1025,7 +1027,8 @@
+ 		}
+ 	} else {
+ 		if ((fd = open ("/sys/module/usbhid/parameters/pb_fnmode", O_WRONLY)) < 0)
+-			fd = open ("/sys/module/hid/parameters/pb_fnmode", O_WRONLY);
++			if ((fd = open ("/sys/module/hid/parameters/pb_fnmode", O_WRONLY)) < 0)
++				fd = open ("/sys/module/hid_apple/parameters/fnmode", O_WRONLY);
+ 		
+ 		if (fd >= 0) {
+ 			sprintf ((char*)ADBBuffer, "%d", config);
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
index 2ce04ddbff87..ff443ebfdf77 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.5 2008/08/24 13:31:37 maekke Exp $
+# $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 $
 
 inherit autotools flag-o-matic eutils
 
@@ -23,7 +23,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 		 >=dev-libs/glib-2.6"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/pmcs.patch"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r3.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r3.ebuild
new file mode 100644
index 000000000000..d23ac202b3d5
--- /dev/null
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/12/28 02:14:12 josejx Exp $
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Handles power management and special keys on laptops."
+HOMEPAGE="http://pbbuttons.berlios.de"
+SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="acpi alsa debug doc ibam macbook oss"
+
+DEPEND="macbook? (
+			sys-libs/libsmbios
+			sys-apps/pciutils
+		)
+		>=dev-libs/glib-2.6
+		doc? ( app-doc/doxygen )"
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
+		 >=dev-libs/glib-2.6"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/pmcs.patch"
+	### Don't link with g++ if we don't use ibam
+	if ! use ibam; then
+		epatch "${FILESDIR}/g++.patch"
+	fi
+	### Fix macbook -lz issue
+	epatch "${FILESDIR}/lz.patch"
+	epatch "${FILESDIR}/lm.patch"
+	### Fix new apple hid fnmode issue
+	epatch "${FILESDIR}/fnmode.patch"
+	eautoconf
+}
+
+src_compile() {
+	# Fix crash bug on some systems
+	replace-flags -O? -O1
+
+	if use macbook; then
+		laptop=macbook
+	elif use x86 || use amd64; then
+		if use acpi; then
+			laptop=acpi
+		else
+			laptop=i386
+		fi
+	# Default to PowerBook
+	else
+		laptop=powerbook
+	fi
+
+	econf laptop=$laptop \
+		$(use_enable debug) \
+		$(use_with doc doxygen_docs) \
+		$(use_with alsa) \
+		$(use_with oss) \
+		$(use_with ibam) \
+		|| die "Sorry, failed to configure pbbuttonsd"
+
+	# Thanks to Stefan Bruda for this workaround
+	# Using -j1 fixes a parallel build issue with the docs
+	if use doc; then
+		emake -j1 || die "Sorry, failed to compile pbbuttonsd"
+	else
+		emake || die "Sorry, failed to compile pbbuttonsd"
+	fi
+}
+
+src_install() {
+	dodir /etc/power
+	use ibam && dodir /var/lib/ibam
+	make DESTDIR="${D}" install || die "failed to install"
+	newinitd "${FILESDIR}/pbbuttonsd.rc6" pbbuttonsd
+	dodoc README
+	use doc && dohtml -r doc/*
+
+	dodir /etc/power/resume.d
+	dodir /etc/power/suspend.d
+	dodir /etc/power/scripts.d
+	exeinto "/etc/power/scripts.d"
+	doexe "${FILESDIR}/wireless"
+	ln -s "${D}/etc/power/scripts.d/wireless" "${D}/etc/power/resume.d/wireless"
+}
+
+pkg_postinst() {
+	if [ -e /etc/pbbuttonsd.conf ]; then
+		ewarn "The pbbuttonsd.cnf file replaces /etc/pbuttonsd.conf with a new"
+		ewarn "file (/etc/pbbuttonsd.conf) and a new format.  Please check the"
+		ewarn "manual page with 'man pbbuttonsd.cnf' for details."
+		ewarn
+	fi
+
+	if use macbook; then
+		ewarn "Macbook and Macbook Pro users should make sure to have applesmc"
+		ewarn "loaded before starting pbbuttonsdm otherwise auto-adjustments"
+		ewarn "will not work and pbbuttonsd may segfault."
+	fi
+
+	ewarn "Ensure that the evdev kernel module is loaded otherwise"
+	ewarn "pbbuttonsd won't work.  SysV IPC is also required."
+	ewarn
+	ewarn "If you need extra security, you can tell pbbuttonsd to only accept"
+	ewarn "input from one user.  You can set the userallowed option in"
+	ewarn "/etc/pbbuttonsd.cnf to limit access."
+	ewarn
+
+	if use ibam; then
+		elog "To properly initialize the IBaM battery database, you will"
+		elog "need to perform a full discharge/charge cycle.  For more"
+		elog "details, please see the pbbuttonsd man page."
+		elog
+	fi
+
+	elog "A script is now available to reset your wirless connection on resume."
+	elog "Simply uncomment the commented command and set the correct device to"
+	elog "use it.  You can find the script in /etc/power/resume.d/wireless"
+
+}