Added wireless resume script and cleaned up old ebuilds.

(Portage version: 2.1.3.7)

18 files changed, 41 insertions, 401 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index a29cc9ff7fa2..c588b6e3c9b2 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.69 2007/07/19 01:39:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.70 2007/09/09 01:58:39 josejx Exp $
+
+*pbbuttonsd-0.8.1-r2 (09 Sep 2007)
+
+  09 Sep 2007; Joseph Jezak <josejx@gentoo.org> -files/lm-fix.patch,
+  -files/pbbuttonsd-ibam-g++.patch,
+  -files/pbbuttonsd-laptopmode-noatime.patch, +files/wireless,
+  -files/x86-fix.patch, -pbbuttonsd-0.6.6.ebuild, -pbbuttonsd-0.7.4.ebuild,
+  -pbbuttonsd-0.7.8.ebuild, -pbbuttonsd-0.7.9.ebuild,
+  -pbbuttonsd-0.8.0.ebuild, pbbuttonsd-0.8.1-r1.ebuild,
+  +pbbuttonsd-0.8.1-r2.ebuild:
+  Added wireless resume script and cleaned up old ebuilds.
 
 *pbbuttonsd-0.8.1-r1 (19 Jul 2007)
 
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.6 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.6
deleted file mode 100644
index cf578cbecebb..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dd578afa5252206db0bdd3054064e9a9 pbbuttonsd-0.6.6.tar.gz 365132
-RMD160 bc010e0ab9971ff5f752349f9f4868f36686a61d pbbuttonsd-0.6.6.tar.gz 365132
-SHA256 6dac8c027ba68ecdab84859bf5c191989f518feda0c0e237bef723370ed4335c pbbuttonsd-0.6.6.tar.gz 365132
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.4 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.4
deleted file mode 100644
index 7af575c6a4f2..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c67669fe0d9ce4115265970094ad0b97 pbbuttonsd-0.7.4.tar.gz 446923
-RMD160 289d8cd61faed1fcccfa503bb33de0f07f90d393 pbbuttonsd-0.7.4.tar.gz 446923
-SHA256 fbfcb58274fded05d40acb23da2c7468c0b3042e953e9d60d285814f0854b0a3 pbbuttonsd-0.7.4.tar.gz 446923
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.8 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.8
deleted file mode 100644
index ed3d9a9f7efd..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 139f2f15028faabef30408f2db87c973 pbbuttonsd-0.7.8.tar.gz 425183
-RMD160 d8e9e792df8e6cd8a3867c3bdd4bcbb1955e90f1 pbbuttonsd-0.7.8.tar.gz 425183
-SHA256 a8e9d7722c05d7f4cc2137d1853411be7b1e42366c72b8bfe6c06ed81f92aee4 pbbuttonsd-0.7.8.tar.gz 425183
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.9 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.9
deleted file mode 100644
index ab719f14abad..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.7.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3d2447ed7425bd2a9155ca18ebf9d4c9 pbbuttonsd-0.7.9.tar.gz 432995
-RMD160 8570485273c1eb1fae12018f05be6710d349fef6 pbbuttonsd-0.7.9.tar.gz 432995
-SHA256 b27734a305eadf3b5617c235a7165fa7151f9b732bab4e3ddf8b11648a4e929e pbbuttonsd-0.7.9.tar.gz 432995
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.0 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.0
deleted file mode 100644
index f45dd6e51e01..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11c218e54ceb08deaf6111bd82538dbf pbbuttonsd-0.8.0.tar.gz 590755
-RMD160 f2dfeedb6e0316b1fd820202f9f4eb69f12a48ed pbbuttonsd-0.8.0.tar.gz 590755
-SHA256 7efa5efdc2e08b4ed650de32252fd54af0142b10ddaacd08f3bb92b264b484db pbbuttonsd-0.8.0.tar.gz 590755
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1-r2 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1-r2
new file mode 100644
index 000000000000..68208022e6dc
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.8.1-r2
@@ -0,0 +1,3 @@
+MD5 5addde05fe291bee974443b531a3a3e5 pbbuttonsd-0.8.1.tar.gz 589630
+RMD160 2f1dc0bc8b67cbb310f06df932a5dfcf26d35551 pbbuttonsd-0.8.1.tar.gz 589630
+SHA256 b391fd98ed263f355d7e7addc6566959e986627c87dcfdaa1da15310ad70bffa pbbuttonsd-0.8.1.tar.gz 589630
diff --git a/app-laptop/pbbuttonsd/files/lm-fix.patch b/app-laptop/pbbuttonsd/files/lm-fix.patch
deleted file mode 100644
index 1b767b8d47df..000000000000
--- a/app-laptop/pbbuttonsd/files/lm-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.old	2006-12-18 01:17:22.000000000 -0500
-+++ src/Makefile.in	2006-12-18 01:17:33.000000000 -0500
-@@ -132,7 +132,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = -lm @LIBS@
- pbbuttonsd_OBJECTS =  pbbuttonsd.o init.o input_manager.o support.o \
- config_manager.o module_pmac.o module_system.o module_powersave.o \
- module_display.o module_cdrom.o module_mixer.o module_ossmixer.o \
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch
deleted file mode 100644
index 60a9199a36e5..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-ibam-g++.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN pbbuttonsd-0.7.8.orig/configure.in pbbuttonsd-0.7.8/configure.in
---- pbbuttonsd-0.7.8.orig/configure.in	2006-09-06 01:57:19.000000000 +0200
-+++ pbbuttonsd-0.7.8/configure.in	2006-09-06 01:58:03.000000000 +0200
-@@ -87,6 +87,7 @@
- 
- dnl Conditionals
- AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes)
-+AM_CONDITIONAL(WITH_IBAM, test "$pbb_with_ibam" = yes)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-diff -urN pbbuttonsd-0.7.8.orig/src/Makefile.am pbbuttonsd-0.7.8/src/Makefile.am
---- pbbuttonsd-0.7.8.orig/src/Makefile.am	2006-09-06 01:57:20.000000000 +0200
-+++ pbbuttonsd-0.7.8/src/Makefile.am	2006-09-06 02:15:26.000000000 +0200
-@@ -4,6 +4,11 @@
- 
- bin_PROGRAMS = pbbuttonsd
- 
-+if WITH_IBAM
-+IBAM = ibam_stub.cpp ibam_stub.h ibam.hpp ibam.inl
-+IBAM_LIBS = -lstdc++
-+endif
-+
- pbbuttonsd_SOURCES = \
- 	pbbuttonsd.c \
- 	init.c init.h systems.h \
-@@ -20,10 +25,9 @@
- 	module_alsamixer.c module_alsamixer.h \
- 	module_peep.c module_peep.h \
- 	tcp.c tcp.h gettext_macros.h pbbinput.h \
--	debug.h \
--	ibam_stub.cpp ibam_stub.h ibam.hpp ibam.inl
-+	debug.h $(IBAM)
- 
--pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(ALSA_LIBS) @PACKAGE_LIBS@
-+pbbuttonsd_LDADD = -lpbb $(INTLLIBS) $(ALSA_LIBS) $(IBAM_LIBS) @PACKAGE_LIBS@
- pbbuttonsd_LDFLAGS = -L$(top_srcdir)/libpbbipc
- ##pbbuttonsd_DEPENDENCIES = $(top_srcdir)/libpbbipc/libpbb.a
- 
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-laptopmode-noatime.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-laptopmode-noatime.patch
deleted file mode 100644
index 8e02c71a65a7..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-laptopmode-noatime.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pbbuttonsd-0.7.8.orig/scripts/scripts.d/laptopmode.sh pbbuttonsd-0.7.8/scripts/scripts.d/laptopmode.sh
---- pbbuttonsd-0.7.8.orig/scripts/scripts.d/laptopmode.sh	2006-07-31 04:51:40.000000000 -0700
-+++ pbbuttonsd-0.7.8/scripts/scripts.d/laptopmode.sh	2006-08-25 18:48:40.000000000 -0700
-@@ -63,7 +63,7 @@
- 	PARSEDOPTS1="$(parse_nonumber_mount_opts $OPT $L_OPTS)"
- 	PARSEDOPTS1="$(parse_nonumber_mount_opts no$OPT $PARSEDOPTS1)"
- 	# Watch for a default atime in fstab
--	FSTAB_OPTS="$(cat /etc/fstab | sed 's/  / /g' | grep ^\ *"$L_DEV " | awk '{ print $4 }')"
-+	FSTAB_OPTS="$(cat /etc/fstab | tr -s "[:blank:]" " " | grep ^\ *"$L_DEV " | awk '{ print $4 }')"
- 	if [ -z "$(echo "$FSTAB_OPTS" | grep "$OPT")" ] ; then
- 		# option not specified in fstab -- choose the default.
- 		echo "$PARSEDOPTS1,$DEF_OPT"
diff --git a/app-laptop/pbbuttonsd/files/wireless b/app-laptop/pbbuttonsd/files/wireless
new file mode 100644
index 000000000000..b110b3819a68
--- /dev/null
+++ b/app-laptop/pbbuttonsd/files/wireless
@@ -0,0 +1,7 @@
+#!/bin/sh
+### Restart the wireless device on Gentoo
+### Useful for bcm43xx/b43 which doesn't reconnect on resume
+
+### Uncomment the line below and properly set the device variable
+WIRELESS="net.wlan0"
+# /etc/init.d/${WIRELESS} restart
diff --git a/app-laptop/pbbuttonsd/files/x86-fix.patch b/app-laptop/pbbuttonsd/files/x86-fix.patch
deleted file mode 100644
index eaa4ddba5085..000000000000
--- a/app-laptop/pbbuttonsd/files/x86-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- class_backlight.c	2006-10-01 04:06:51.000000000 -0400
-+++ /home/jjezak/pbbuttonsd-0.7.9/src/class_backlight.c	2006-10-03 22:04:34.000000000 -0400
-@@ -46,8 +46,9 @@
- 	struct class_backlight *base = &modbase_backlight;
- 
- 	if (!base->driver) base->driver = driver_backlight_sysfs_init (taglist);
-+#ifdef WITH_MODULE_PMAC
- 	if (!base->driver) base->driver = driver_backlight_pmu_init (taglist);
--
-+#endif
- 	if (base->driver)
- 		print_msg (PBB_INFO, _("Initialized: %s\n"), _(base->driver->name));
- 	else
---- driver_backlight_pmu.c	2006-10-01 04:04:25.000000000 -0400
-+++ /home/jjezak/pbbuttonsd-0.7.9/src/driver_backlight_pmu.c	2006-10-03 22:04:34.000000000 -0400
-@@ -15,6 +15,9 @@
- #  include <config.h>
- #endif
- 
-+#include "systems.h"
-+#ifdef WITH_MODULE_PMAC
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -123,3 +126,4 @@
- }
- 
- 
-+#endif
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
deleted file mode 100644
index ec1bc9b4a3b8..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild,v 1.9 2007/04/28 17:48:55 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="program to map special Powerbook/iBook keys"
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="debug"
-
-DEPEND="virtual/libc
-	>=sys-apps/baselayout-1.8.6.12-r1"
-RDEPEND=""
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "sorry, failed to configure pbbuttonsd"
-	emake || die "sorry, failed to compile pbbuttonsd"
-}
-
-src_install() {
-	dodir /etc/power
-	make DESTDIR=${D} install || die "failed to install"
-	newinitd ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-}
-
-pkg_postinst() {
-	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.conf to limit access."
-	elog
-	elog "This version of pbbuttonsd can replace PMUD functionality."
-	elog "If you want PMUD installed and running, you should set"
-	elog "replace_pmud=no in /etc/pbbuttonsd.conf. Otherwise you can"
-	elog "try setting replace_pmud=yes in /etc/pbbuttonsd.conf and"
-	elog "disabling PMUD"
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild
deleted file mode 100644
index dba1acf6fbac..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.4.ebuild,v 1.9 2007/06/20 20:52:58 corsair Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Handles power management and special keys on laptops."
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~x86"
-IUSE="acpi debug alsa oss ibam"
-
-DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
-		>=dev-libs/glib-2.6"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use x86; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_with debug) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-	emake || die "Sorry, failed to compile pbbuttonsd"
-}
-
-src_install() {
-	dodir /etc/power
-	make DESTDIR=${D} install || die "failed to install"
-	newinitd ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-}
-
-pkg_postinst() {
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work."
-	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.conf to limit access."
-	ewarn
-
-	if use ppc ; then
-		elog "It's recommended that you let pbbuttonsd act as the low level"
-		elog "power manager instead of using pmud."
-		elog
-	fi
-	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
-	ewarn "Warning: the NoTapTyping option is unstable, see bug #86768."
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
deleted file mode 100644
index 8bf24880ea21..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.8.ebuild,v 1.6 2007/06/20 20:52:58 corsair Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Handles power management and special keys on laptops."
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="acpi debug alsa oss ibam"
-
-DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
-		>=dev-libs/glib-2.6"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-laptopmode-noatime.patch
-	epatch ${FILESDIR}/${PN}-ibam-g++.patch
-	autoconf
-	automake
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use x86; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_with debug) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-	emake || die "Sorry, failed to compile pbbuttonsd"
-}
-
-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
-}
-
-pkg_postinst() {
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work."
-	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.conf to limit access."
-	ewarn
-
-	if use ppc ; then
-		elog "It's recommended that you let pbbuttonsd act as the low level"
-		elog "power manager instead of using pmud."
-		elog
-	fi
-	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
-	ewarn "Warning: the NoTapTyping option is unstable, see bug #86768."
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.9.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.7.9.ebuild
deleted file mode 100644
index e9d7becc869a..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.7.9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.7.9.ebuild,v 1.7 2007/06/20 20:52:58 corsair Exp $
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Handles power management and special keys on laptops."
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~x86"
-IUSE="acpi debug alsa oss ibam"
-
-DEPEND=">=sys-apps/baselayout-1.8.6.12-r1
-		>=dev-libs/glib-2.6"
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
-		 >=dev-libs/glib-2.6"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/x86-fix.patch"
-	epatch "${FILESDIR}/lm-fix.patch"
-	eautoconf
-}
-
-src_compile() {
-	# Fix crash bug on some systems
-	replace-flags -O? -O1
-
-	if use x86; then
-		if use acpi; then
-			laptop=acpi
-		else
-			laptop=i386
-		fi
-	else
-		laptop=powerbook
-	fi
-
-	econf laptop=$laptop \
-		$(use_with debug) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with ibam) \
-		|| die "Sorry, failed to configure pbbuttonsd"
-	emake || die "Sorry, failed to compile pbbuttonsd"
-}
-
-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
-}
-
-pkg_postinst() {
-	ewarn "Ensure that the evdev kernel module is loaded otherwise"
-	ewarn "pbbuttonsd won't work."
-	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.conf to limit access."
-	ewarn
-
-	if use ppc ; then
-		elog "It's recommended that you let pbbuttonsd act as the low level"
-		elog "power manager instead of using pmud."
-		elog
-	fi
-	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
-	ewarn "Warning: the NoTapTyping option is unstable, see bug #86768."
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild
index a1c9185a6791..8ae1dd025e6d 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/07/19 01:39:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r1.ebuild,v 1.2 2007/09/09 01:58:39 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="~ppc ~x86"
+KEYWORDS="ppc ~x86"
 IUSE="acpi alsa debug doc ibam macbook oss"
 
 DEPEND="macbook? ( sys-libs/libsmbios )
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.0.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
index 13460e6487ff..683910fac605 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.8.0.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.0.ebuild,v 1.7 2007/06/20 20:52:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.8.1-r2.ebuild,v 1.1 2007/09/09 01:58:39 josejx Exp $
 
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic eutils
 
 DESCRIPTION="Handles power management and special keys on laptops."
 HOMEPAGE="http://pbbuttons.berlios.de"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc ~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="acpi alsa debug doc ibam macbook oss"
 
 DEPEND="macbook? ( sys-libs/libsmbios )
@@ -22,6 +22,8 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0 )
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	epatch ${FILESDIR}/pmcs.patch
 	eautoconf
 }
 
@@ -66,6 +68,13 @@ src_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() {
@@ -96,4 +105,9 @@ pkg_postinst() {
 		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"
+
 }