Stable on ppc and clean out old versions.

(Portage version: 2.0.51-r14)

13 files changed, 14 insertions, 475 deletions

diff --git a/app-laptop/pbbuttonsd/ChangeLog b/app-laptop/pbbuttonsd/ChangeLog
index 46a3b792f303..100847aacff9 100644
--- a/app-laptop/pbbuttonsd/ChangeLog
+++ b/app-laptop/pbbuttonsd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-laptop/pbbuttonsd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.16 2005/01/01 14:47:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/ChangeLog,v 1.17 2005/01/21 19:52:49 pylon Exp $
+
+*pbbuttonsd-0.6.6 (21 Jan 2005)
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org>
+  -files/pbbuttonsd-0.5.11-compat.patch,
+  -files/pbbuttonsd-0.6.1-compat.patch,
+  -files/pbbuttonsd-0.6.5-backlight.patch,
+  -files/pbbuttonsd-0.6.5-compat.patch, -files/pbbuttonsd-compat.patch,
+  -pbbuttonsd-0.5.11.ebuild, -pbbuttonsd-0.6.1.ebuild,
+  -pbbuttonsd-0.6.5.ebuild, pbbuttonsd-0.6.6.ebuild:
+  Stable on ppc and clean out old versions.
 
   06 Oct 2004; Lars Weiler <pylon@gentoo.org>
   -files/pbbuttonsd-0.5.10-compat.patch,
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.5.11 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.5.11
deleted file mode 100644
index 5f3950fe3edd..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.5.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3aa9d096212f36304274e7d2e3e30457 pbbuttonsd-0.5.11.tar.gz 343929
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.1 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.1
deleted file mode 100644
index 100dfacdd6fc..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3336681551dd823ba939738487a4f3d7 pbbuttonsd-0.6.1.tar.gz 349104
diff --git a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.5 b/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.5
deleted file mode 100644
index f886cb59d3d6..000000000000
--- a/app-laptop/pbbuttonsd/files/digest-pbbuttonsd-0.6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e803496e15624382d4ce759db5957747 pbbuttonsd-0.6.5.tar.gz 364629
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.5.11-compat.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.5.11-compat.patch
deleted file mode 100644
index baf1e3b3b844..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.5.11-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN pbbuttonsd-0.5.11.orig/libpbbipc/pbbtags.h pbbuttonsd-0.5.11/libpbbipc/pbbtags.h
---- pbbuttonsd-0.5.11.orig/libpbbipc/pbbtags.h	2004-04-22 11:51:28.864160008 +0200
-+++ pbbuttonsd-0.5.11/libpbbipc/pbbtags.h	2004-04-22 11:53:31.577504744 +0200
-@@ -92,6 +92,20 @@
- #define TAG_BLANKFRAMEBUFFER	MOD_DISPLAY | 9
- #define TAG_DIMFULLYDARK	MOD_DISPLAY | 11
- 
-+/* Compatibility tags, needed by kmilo and possibly other programs */
-+#define TAG_BRIGHTNESSUPKEY    MOD_DISPLAY | 1
-+#define TAG_BRIGHTNESSUPMOD    MOD_DISPLAY | 2
-+#define TAG_BRIGHTNESSDOWNKEY  MOD_DISPLAY | 3
-+#define TAG_BRIGHTNESSDOWNMOD  MOD_DISPLAY | 4
-+#define TAG_BRIGHTNESS         MOD_DISPLAY | 5
-+#define TAG_BRIGHTNESSOP       MOD_DISPLAY | FLG_PRIVATE | 6
-+#define TAG_BRIGHTNESSMAX      MOD_DISPLAY | 7
-+#define TAG_FRAMEBUFFERDEVICE  MOD_DISPLAY | FLG_STRING | 8
-+#define TAG_BLANKFRAMEBUFFER   MOD_DISPLAY | 9
-+#define TAG_FADINGSPEED                MOD_DISPLAY | 10
-+#define TAG_DIMFULLYDARK       MOD_DISPLAY | 11
-+
-+
- #define MOD_MIXER		5 << 16
- #define TAG_MIXERDEVICE		MOD_MIXER | FLG_STRING | 1
- #define TAG_VOLUMEUPKEY		MOD_MIXER | 2
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.1-compat.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.1-compat.patch
deleted file mode 100644
index 18a109d2730f..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.1-compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- pbbuttonsd-0.6.1.orig/libpbbipc/pbbtags.h	2004-06-04 03:56:05.872155984 -0400
-+++ pbbuttonsd-0.6.1/libpbbipc/pbbtags.h	2004-06-04 03:58:14.793556952 -0400
-@@ -97,6 +97,14 @@
- #define TAG_BLANKFRAMEBUFFER	MOD_DISPLAY | 9
- #define TAG_DIMFULLYDARK	MOD_DISPLAY | 11
- 
-+/* Compatibility tags, needed by kmilo and possibly other programs */
-+#define TAG_BRIGHTNESSUPKEY    MOD_DISPLAY | 1
-+#define TAG_BRIGHTNESSUPMOD    MOD_DISPLAY | 2
-+#define TAG_BRIGHTNESSDOWNKEY  MOD_DISPLAY | 3
-+#define TAG_BRIGHTNESSDOWNMOD  MOD_DISPLAY | 4
-+#define TAG_BRIGHTNESSMAX      MOD_DISPLAY | 7
-+#define TAG_FADINGSPEED        MOD_DISPLAY | 10
-+
- #define MOD_MIXER		5 << 16
- #define TAG_MIXERDEVICE		MOD_MIXER | FLG_STRING | 1
- #define TAG_VOLUMEUPKEY		MOD_MIXER | 2
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.5-backlight.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.5-backlight.patch
deleted file mode 100644
index 6295f8282c77..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.5-backlight.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -Naur pbbuttonsd-0.6.5/src/input_manager.c pbbuttonsd-0.6.5-fixed/src/input_manager.c
---- pbbuttonsd-0.6.5/src/input_manager.c	Fri Jul 16 18:52:02 2004
-+++ pbbuttonsd-0.6.5-fixed/src/input_manager.c	Fri Sep 24 17:25:51 2004
-@@ -204,7 +204,7 @@
- 		sprintf(filename, "/dev/input/event%d", n);
- 		if ((fd = open(filename, O_RDONLY)) >= 0) {
- 			ioctl(fd, EVIOCGBIT(0, EV_MAX), bit);
--		    if (test_bit(EV_KEY, bit) && test_bit(EV_REP, bit)) {
-+			if (test_bit(EV_KEY, bit) && test_bit(EV_REP, bit)) {
- 				ioctl(fd, EVIOCGID, id);
- 				if (id[ID_PRODUCT] != base->evdevs[m].product ||
- 					id[ID_VENDOR]  != base->evdevs[m].vendor) {
-diff -Naur pbbuttonsd-0.6.5/src/module_pmac.c pbbuttonsd-0.6.5-fixed/src/module_pmac.c
---- pbbuttonsd-0.6.5/src/module_pmac.c	Wed Sep  8 22:01:41 2004
-+++ pbbuttonsd-0.6.5-fixed/src/module_pmac.c	Fri Sep 24 16:40:41 2004
-@@ -50,6 +50,7 @@
- 	int version;     /* PMU version */
- 	char *identity;  /* Identity string of this laptop */
- 	struct modflags_pmac flags;
-+	int flagschanged;        /* PMU flags that have changed recently */
- 	int oharevolbutton;      /* level of volume button on OHARE PBs scaled to 0..100 */
- 	int oharebrightbutton;   /* level of brightness button on OHARE PBs scaled to 0..15 */
- 
-@@ -144,8 +145,10 @@
- 	base->identity = identitystring;
- 	ioctl(base->fd_pmu, PMU_IOC_CAN_SLEEP, &val);
- 	base->flags.sleepsupported = val == 1 ? 1 : 0; /* check if sleep is supported on this system */
--	val = pmac_update_flags ();
--	pmac_update_batteryinfo (val);
-+
-+	pmac_update_flags ();
-+	pmac_update_batteryinfo ();
-+	base->flagschanged = 0;
- 
- 	/* Every frame buffer driver could register a backlight controller,
- 	 * but only the right one is accepted. Verification is done by checking
-@@ -228,7 +231,6 @@
- pmac_secure (struct tagitem *taglist)
- {
- 	struct moddata_pmac *base = &modbase_pmac;
--	int cf;
- 	
- 	if (base->flags.set_tpmode == 1) {
- 		base->flags.set_tpmode = 0;
-@@ -243,12 +245,12 @@
- 			process_queue_single (CONFIGQUEUE, TAG_PREPAREFORSLEEP, 0);
- #ifdef WITH_PMUD
- 			activate_sleepmode ();
--			cf = pmac_update_flags ();
-+			base->flagschanged = pmac_update_flags ();
- #else
- 			do {
- 			    activate_sleepmode ();
--			    cf = pmac_update_flags ();
--			} while (cf != -1 && base->flags.coveropen == 0);
-+			    base->flagschanged = pmac_update_flags ();
-+			} while (base->flags.coveropen == 0);
- #endif
- 			base->timeleft = 7200;       /* reset time value so that the */
- 				/* filter approximate the real value from top. Otherwise */
-@@ -257,7 +259,7 @@
- 				/* thresholds quick enough. This problem occours only  */
- 				/* after wakeup on battery after the battery had been */
- 				/* recharged during sleep.                           */
--			pmac_update_batteryinfo (cf);
-+			pmac_update_batteryinfo ();
- 			process_queue_single (CONFIGQUEUE, TAG_WAKEUPFROMSLEEP, 0);
- 			base->batlog_cycle = batlog_setup();
- 		}
-@@ -441,15 +443,16 @@
- {
- 	struct moddata_pmac *base = &modbase_pmac;
- 	struct tagitem args[6];
--	int val, cf;
-+	int val;
- 
- 	taglist_init (args);
- 
- 	val = base->timeleft;
--	cf = pmac_update_flags ();      /* ac power and cover status */
--	pmac_update_batteryinfo (cf);
-+	if (base->flagschanged == 0)     /* check if anybody else has already read the flags */
-+		base->flagschanged = pmac_update_flags (); /* if not, get ac power and cover status */
-+	pmac_update_batteryinfo ();
- 
--	if (cf & PMU_ENV_AC_POWER) {
-+	if (base->flagschanged & PMU_ENV_AC_POWER) {
- 		taglist_add (args, TAG_POWERCHANGED, base->flags.ac_power);
- 		if (!base->flags.ac_power)      /* running on Battery */
- 			base->batlog_cycle++;   /* then increase cycle */
-@@ -460,7 +463,7 @@
- 	}
- 
- #ifndef WITH_PMUD
--	if ((cf != -1) && (cf & PMU_ENV_LID_CLOSED))
-+	if (base->flagschanged & PMU_ENV_LID_CLOSED)
- 		taglist_add (args, TAG_COVERSTATUS, base->flags.coveropen);
- #endif
- 	if (base->version == OHARE_PMU) {         /* PowerBook 3400, etc */
-@@ -484,6 +487,7 @@
- 
- 	if (args[0].tag != TAG_END)
- 		process_queue (CONFIGQUEUE, args);  /* distribute changes to other modules */
-+	base->flagschanged = 0;
- }
- 
- 
-@@ -544,7 +548,7 @@
-  * ac_power, bat_present and charging.
-  */
- void
--pmac_update_batteryinfo (int cf)
-+pmac_update_batteryinfo ()
- {
- 	struct moddata_pmac *base = &modbase_pmac;
- 	FILE *fd;
-@@ -552,26 +556,6 @@
- 	int val, n, syscurrent, time_rem = 0;
- 	int charge, chargemax, current, voltage, timeleft[MAX_BATTERIES];
- 
--	/* use /proc/pmu/info as fallback, if PMU_GET_COVER did't work
--	 * As I know this has not happend yet and it is doubtable that
--	 * /proc/pmu/info will work correctly in this case. So this
--	 * routine may be removed in future versions.
--	 */
--	if (cf == -1) {
--		print_error(_("WARNING: Couldn't get AC plug status from hardware, use /proc/pmu/info as fallback.\n"));
--		print_error(_("         Please send a message to the author if this ever happens.\n"));
--		if ((fd = fopen ("/proc/pmu/info","r"))) {
--			while (fgets (buffer, sizeof (buffer), fd))
--				if ((token = strtok (buffer,":\n"))) {
--					if (!strncmp ("AC Power", token, 8))
--						base->flags.ac_power = atoi (strtok(0,":\n"));
--					else
--						strtok (0,":\n");
--				}
--			fclose(fd);
--		}
--	}
--
- 	syscurrent = 0;
- 	for (n=0; n < MAX_BATTERIES; n++) {
- 		charge = chargemax = current = voltage = timeleft[n] = 0;
-@@ -637,6 +621,38 @@
- 	}
- }
- 
-+/* use /proc/pmu/info as fallback, if PMU_GET_COVER did't work
-+ * As I know this has not happend yet and it is doubtable that
-+ * /proc/pmu/info will work correctly in this case. So this
-+ * routine may be removed in future versions.
-+ */	
-+int
-+pmac_get_procac ()
-+{
-+	FILE *fd;
-+	char buffer[100], *token;
-+	int ac = 0;  /* return battery if anything fails */
-+
-+	print_error(_("WARNING: Couldn't get AC plug status from hardware, use /proc/pmu/info as fallback.\n"));
-+	print_error(_("         Please send a message to the author if this ever happens.\n"));
-+	if ((fd = fopen ("/proc/pmu/info","r"))) {
-+		while (fgets (buffer, sizeof (buffer), fd))
-+			if ((token = strtok (buffer,":\n"))) {
-+				if (!strncmp ("AC Power", token, 8))
-+					ac = atoi (strtok(0,":\n"));
-+				else
-+					strtok (0,":\n");
-+			}
-+		fclose(fd);
-+	}
-+	return ac;
-+}
-+
-+/* This funtion gets some important flags from the PMU driver. If the
-+ * driver doesn't support the ioctl or reports an error, power source
-+ * will be read from /proc/pmu/info as fallback, so that power source
-+ * should always be set correctly.
-+ */
- int
- pmac_update_flags()
- {
-@@ -654,7 +670,8 @@
- 		envnew  = base->flags.ac_power ? PMU_ENV_AC_POWER : 0;
- 		envnew |= base->flags.coveropen ? PMU_ENV_LID_CLOSED : 0;
- 	} else
--		return -1;
-+		base->flags.ac_power = pmac_get_procac();
-+	
- 	return (envold ^ envnew);
- }
- 
-@@ -968,7 +985,11 @@
- 
- /* This function tries to find the I2C device that controls the keyboard
-  * illumination and the ambient light sensor used in alluminum PowerBooks
-- * It returns the device number on success, otherwise a negative error code
-+ * It returns the device number on success, otherwise a negative error code.
-+ * The loop starts with device 4 because that's the correct device on
-+ * 17" alluminum PowerBooks. Device 0 could be errornous detected because
-+ * the function uses only circumstantial evidence to detect the correct
-+ * device.
-  */
- int
- lmu_find_bus ()
-@@ -979,8 +1000,8 @@
- 	char i2cdevice[20], buf[4];
- 	int n, fd, rc = -E_NOCHAR;
- 
--	for(n=0; n < 256; n++) {
--		snprintf(i2cdevice, 19, "/dev/i2c-%d", n );
-+	for(n=4; n < 260; n++) {
-+		snprintf(i2cdevice, 19, "/dev/i2c-%d", (n & 255) );
- 		if ((fd = open (i2cdevice, O_RDWR)) >= 0 ) {
- 			if (ioctl (fd, I2C_SLAVE, LMU_ADDR) >= 0 ) {
- 				if (read (fd, buf, 4) == 4 ) {
-@@ -988,8 +1009,8 @@
- 					rc = n;
- 					break;
- 				}
--			} else
--				close (fd);
-+			}
-+			close (fd);
- 		} else if (errno == ENODEV) {
- 			rc = -E_NOCHAR;
- 			break;
-diff -Naur pbbuttonsd-0.6.5/src/module_pmac.h pbbuttonsd-0.6.5-fixed/src/module_pmac.h
---- pbbuttonsd-0.6.5/src/module_pmac.h	Fri Aug 27 08:49:31 2004
-+++ pbbuttonsd-0.6.5-fixed/src/module_pmac.h	Thu Sep 23 16:18:26 2004
-@@ -86,7 +86,8 @@
- void pmac_pmu_handler (int fd);
- void pmac_timer (struct tagitem *taglist);
- 
--void pmac_update_batteryinfo (int cf);
-+void pmac_update_batteryinfo ();
-+int pmac_get_procac ();
- int pmac_update_flags ();
- void activate_sleepmode ();
- int pmac_get_lcdbacklight();
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.5-compat.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.5-compat.patch
deleted file mode 100644
index 25f498320eca..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.6.5-compat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN pbbuttonsd-0.6.5.orig/libpbbipc/pbbtags.h pbbuttonsd-0.6.5/libpbbipc/pbbtags.h
---- pbbuttonsd-0.6.5.orig/libpbbipc/pbbtags.h	2004-08-28 21:10:07.000000000 +0200
-+++ pbbuttonsd-0.6.5/libpbbipc/pbbtags.h	2004-09-15 09:31:56.759094488 +0200
-@@ -101,6 +101,14 @@
- #define TAG_BLANKFRAMEBUFFER	MOD_DISPLAY | 9
- #define TAG_DIMFULLYDARK	MOD_DISPLAY | 11
- 
-+/* Compatibility tags, needed by kmilo and possibly other programs */
-+#define TAG_BRIGHTNESSUPKEY    MOD_DISPLAY | 1
-+#define TAG_BRIGHTNESSUPMOD    MOD_DISPLAY | 2
-+#define TAG_BRIGHTNESSDOWNKEY  MOD_DISPLAY | 3
-+#define TAG_BRIGHTNESSDOWNMOD  MOD_DISPLAY | 4
-+#define TAG_BRIGHTNESSMAX      MOD_DISPLAY | 7
-+#define TAG_FADINGSPEED        MOD_DISPLAY | 10
-+
- #define MOD_MIXER		5 << 16
- #define TAG_MIXERDEVICE		MOD_MIXER | FLG_STRING | 1
- #define TAG_VOLUMEUPKEY		MOD_MIXER | 2
diff --git a/app-laptop/pbbuttonsd/files/pbbuttonsd-compat.patch b/app-laptop/pbbuttonsd/files/pbbuttonsd-compat.patch
deleted file mode 100644
index bdb30420a8cb..000000000000
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN pbbuttonsd-0.5.9.orig/libpbbipc/pbbtags.h pbbuttonsd-0.5.9/libpbbipc/pbbtags.h
---- pbbuttonsd-0.5.9.orig/libpbbipc/pbbtags.h	2004-03-14 01:24:23.000000000 +0100
-+++ pbbuttonsd-0.5.9/libpbbipc/pbbtags.h	2004-03-14 02:55:42.533286776 +0100
-@@ -92,6 +92,20 @@
- #define TAG_BLANKFRAMEBUFFER	MOD_DISPLAY | 9
- #define TAG_DIMFULLYDARK	MOD_DISPLAY | 11
- 
-+/* Compatibility tags, needed by kmilo and possibly other programs */
-+#define TAG_BRIGHTNESSUPKEY	MOD_DISPLAY | 1
-+#define TAG_BRIGHTNESSUPMOD	MOD_DISPLAY | 2
-+#define TAG_BRIGHTNESSDOWNKEY	MOD_DISPLAY | 3
-+#define TAG_BRIGHTNESSDOWNMOD	MOD_DISPLAY | 4
-+#define TAG_BRIGHTNESS		MOD_DISPLAY | 5
-+#define TAG_BRIGHTNESSOP	MOD_DISPLAY | FLG_PRIVATE | 6
-+#define TAG_BRIGHTNESSMAX	MOD_DISPLAY | 7
-+#define TAG_FRAMEBUFFERDEVICE	MOD_DISPLAY | FLG_STRING | 8
-+#define TAG_BLANKFRAMEBUFFER	MOD_DISPLAY | 9
-+#define TAG_FADINGSPEED		MOD_DISPLAY | 10
-+#define TAG_DIMFULLYDARK	MOD_DISPLAY | 11
-+
-+
- #define MOD_MIXER		5 << 16
- #define TAG_MIXERDEVICE		MOD_MIXER | FLG_STRING | 1
- #define TAG_VOLUMEUPKEY		MOD_MIXER | 2
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild
deleted file mode 100644
index 5a0d224bd386..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild,v 1.5 2005/01/01 14:47:33 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="program to map special Powerbook/iBook keys"
-HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/baselayout-1.8.6.12-r1"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-compat.patch
-}
-
-src_compile() {
-	econf || die
-	make || die "compile failed"
-}
-
-src_install() {
-	local mydir=/var/lib
-	dodir /etc/power
-	make \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/${mydir} \
-		DESTDIR=${D} \
-		install \
-		|| die "failed to install"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-	#fix the symlink
-	rm ${D}/etc/pbbuttonsd.conf
-#	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
-#	dosym /etc/pbbuttonsd.conf /var/lib/pbbuttons/pbbuttonsd.conf
-	dosym ${mydir}/pbbuttons/pbbuttonsd.conf /etc/pbbuttonsd.conf
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
-}
-
-pkg_postinst() {
-	einfo "This version of pbbuttonsd can replace PMUD functionality."
-	einfo "If you want PMUD installed and running, you should set"
-	einfo "replace_pmud=no in /etc/pbbuttonsd.conf. Otherwise you can"
-	einfo "try setting replace_pmud=yes in /etc/pbbuttonsd.conf and"
-	einfo "disabling PMUD"
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild
deleted file mode 100644
index 1e18d8f062ae..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild,v 1.9 2005/01/01 14:47:33 eradicator 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=""
-
-DEPEND="virtual/libc
-	>=sys-apps/baselayout-1.8.6.12-r1"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-compat.patch
-}
-
-src_compile() {
-	econf || die "sorry, failed to configure pbbuttonsd"
-	make || die "sorry, failed to compile pbbuttonsd"
-}
-
-src_install() {
-	dodir /etc/power
-	make DESTDIR=${D} install || die "failed to install"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "This version of pbbuttonsd can replace PMUD functionality."
-	einfo "If you want PMUD installed and running, you should set"
-	einfo "replace_pmud=no in /etc/pbbuttonsd.conf. Otherwise you can"
-	einfo "try setting replace_pmud=yes in /etc/pbbuttonsd.conf and"
-	einfo "disabling PMUD"
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.5.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.5.ebuild
deleted file mode 100644
index 213cc4a6115e..000000000000
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.5.ebuild,v 1.3 2005/01/01 14:47:33 eradicator 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=""
-
-DEPEND="virtual/libc
-	>=sys-apps/baselayout-1.8.6.12-r1"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-compat.patch
-	epatch ${FILESDIR}/${P}-backlight.patch
-}
-
-src_compile() {
-	econf || die "sorry, failed to configure pbbuttonsd"
-	make || die "sorry, failed to compile pbbuttonsd"
-}
-
-src_install() {
-	dodir /etc/power
-	make DESTDIR=${D} install || die "failed to install"
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README
-}
-
-pkg_postinst() {
-	einfo "This version of pbbuttonsd can replace PMUD functionality."
-	einfo "If you want PMUD installed and running, you should set"
-	einfo "replace_pmud=no in /etc/pbbuttonsd.conf. Otherwise you can"
-	einfo "try setting replace_pmud=yes in /etc/pbbuttonsd.conf and"
-	einfo "disabling PMUD"
-}
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
index 0ef14af15c2b..fb0ecb483db9 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2 2005/01/01 14:47:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.6.ebuild,v 1.3 2005/01/21 19:52:49 pylon Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="ppc"
 IUSE=""
 
 DEPEND="virtual/libc