change glibc to libc and clean up other horribly ugly ebuilds

34 files changed, 285 insertions, 340 deletions

diff --git a/app-laptop/gkrellm-pmu/gkrellm-pmu-2.0.ebuild b/app-laptop/gkrellm-pmu/gkrellm-pmu-2.0.ebuild
index a13f11d7c7f2..8b8164be4a9f 100644
--- a/app-laptop/gkrellm-pmu/gkrellm-pmu-2.0.ebuild
+++ b/app-laptop/gkrellm-pmu/gkrellm-pmu-2.0.ebuild
@@ -1,28 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/gkrellm-pmu/gkrellm-pmu-2.0.ebuild,v 1.3 2004/06/24 21:57:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/gkrellm-pmu/gkrellm-pmu-2.0.ebuild,v 1.4 2004/06/28 02:34:43 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GKrellM2 plugin for battery display on Apple machines"
-SRC_URI="http://www.cymes.de/members/joker/projects/gkrellm-pmu/${P}.tar.gz"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/gkrellm-pmu/gkrellm-pmu.html"
+SRC_URI="http://www.cymes.de/members/joker/projects/gkrellm-pmu/${P}.tar.gz"
 
-DEPEND="=app-admin/gkrellm-2*"
-
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~ppc"
 IUSE=""
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="=app-admin/gkrellm-2*"
 
 src_install() {
 	dodir /usr/lib/gkrellm2/plugins
-	einstall PLUGIN_INSTALL="${D}/usr/lib/gkrellm2/plugins" \
-	|| die
-
-	dodoc COPYING ChangeLog INSTALL README
+	einstall PLUGIN_INSTALL="${D}/usr/lib/gkrellm2/plugins" || die
+	dodoc ChangeLog INSTALL README
 }
diff --git a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
index c3770dc4dd84..b5b085e79019 100644
--- a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
+++ b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.4 2004/06/24 21:58:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.4.6b.ebuild,v 1.5 2004/06/28 02:35:07 vapier Exp $
 
-DESCRIPTION="PPC-only program to monitor special Powerbook/iBook keys in Linux"
+DESCRIPTION="program to monitor 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"
 
@@ -22,5 +22,5 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D} || die
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
index b067ebe42f85..6f21074471b9 100644
--- a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
+++ b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.4 2004/06/24 21:58:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.5.2.ebuild,v 1.5 2004/06/28 02:35:07 vapier Exp $
 
-DESCRIPTION="PPC-only program to monitor special Powerbook/iBook keys in Linux"
+DESCRIPTION="program to monitor 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"
 
@@ -22,5 +22,5 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D} || die
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.3.ebuild b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.3.ebuild
index 624f414e5273..aa3b652a702e 100644
--- a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.3.ebuild
+++ b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.3.ebuild,v 1.3 2004/06/24 21:58:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.3.ebuild,v 1.4 2004/06/28 02:35:07 vapier Exp $
 
-DESCRIPTION="PPC-only program to monitor special Powerbook/iBook keys in Linux"
+DESCRIPTION="program to monitor 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"
 
@@ -22,5 +22,5 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D} || die
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/i8kutils/i8kutils-1.17-r1.ebuild b/app-laptop/i8kutils/i8kutils-1.17-r1.ebuild
index 3b6eba11f6dc..1bb46327e5b4 100644
--- a/app-laptop/i8kutils/i8kutils-1.17-r1.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.17-r1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.17-r1.ebuild,v 1.2 2004/06/24 21:58:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.17-r1.ebuild,v 1.3 2004/06/28 02:35:29 vapier Exp $
 
-S=${WORKDIR}/${P}/
 DESCRIPTION="Dell Inspiron and Latitude utilities"
-SRC_URI="http://people.debian.org/~dz/i8k/${P}.tar.bz2"
 HOMEPAGE="http://people.debian.org/~dz/i8k/"
-DEPEND="virtual/glibc
-	virtual/x11
-	>=dev-lang/tk-8.3.3"
+SRC_URI="http://people.debian.org/~dz/i8k/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86 ~amd64"
 IUSE="tcltk"
-KEYWORDS="~x86 ~amd64 -mips"
 
+DEPEND="virtual/libc
+	virtual/x11
+	>=dev-lang/tk-8.3.3"
 
 src_compile() {
-	local target="all"
-	make ${target} || die
+	make all || die
 }
 
 src_install() {
@@ -27,7 +26,6 @@ src_install() {
 	use tcltk && doman i8kmon.1
 	use tcltk && dosym /usr/bin/i8kctl /usr/bin/i8kfan
 	dodoc README.i8kutils
-	dodoc COPYING
 	dodoc i8kmon.conf
 	dodoc Configure.help.i8k
 	docinto examples/
diff --git a/app-laptop/i8kutils/i8kutils-1.17.ebuild b/app-laptop/i8kutils/i8kutils-1.17.ebuild
index 16dee470bb17..29bb8b6bfa4d 100644
--- a/app-laptop/i8kutils/i8kutils-1.17.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.17.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.17.ebuild,v 1.2 2004/06/24 21:58:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/i8kutils-1.17.ebuild,v 1.3 2004/06/28 02:35:29 vapier Exp $
 
-S=${WORKDIR}/${P}/
 DESCRIPTION="Dell Inspiron and Latitude utilities"
-SRC_URI="http://people.debian.org/~dz/i8k/${P}.tar.bz2"
 HOMEPAGE="http://people.debian.org/~dz/i8k/"
-DEPEND="virtual/glibc
-	virtual/x11
-	>=dev-lang/tk-8.3.3"
+SRC_URI="http://people.debian.org/~dz/i8k/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE="tcltk"
-KEYWORDS="x86 amd64 -mips"
 
+DEPEND="virtual/libc
+	virtual/x11
+	>=dev-lang/tk-8.3.3"
 
 src_compile() {
-	local target="all"
-	make ${target} || die
+	make all || die
 }
 
 src_install() {
@@ -27,7 +26,6 @@ src_install() {
 	use tcltk && doman i8kmon.1
 	use tcltk && dosym /usr/bin/i8kctl /usr/bin/i8kfan
 	dodoc README.i8kutils
-	dodoc COPYING
 	dodoc i8kmon.conf
 	dodoc Configure.help.i8k
 	docinto examples/
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
index 27664c617f20..ce92c77556d7 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild
@@ -1,36 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.4 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.4.10a.ebuild,v 1.5 2004/06/28 02:35:55 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="PBButtons is a PPC-only program to map special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to map special Powerbook/iBook keys"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
-KEYWORDS="ppc -x86 -amd64 -alpha -hppa -mips -sparc"
-IUSE=""
-DEPEND="virtual/glibc"
-RDEPEND=""
-SLOT=0
+SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ppc"
+IUSE=""
 
-pkg_setup() {
-	if [ ${ARCH} != "ppc" ] ; then
-		eerror "Sorry, this is a PPC only package."
-		die "Sorry, this as a PPC only pacakge."
-	fi
-}
+DEPEND="virtual/libc"
+RDEPEND=""
 
 src_compile() {
 	./configure \
 		--prefix=/usr \
-		--sysconfdir=/etc || die "sorry, ppc-only package"
+		--sysconfdir=/etc \
+		|| die "sorry, ppc-only package"
 	make || die "sorry, failed to compile pbbuttons"
 }
 
 src_install() {
-
 	make sysconfdir=${D}/etc DESTDIR=${D} install || die "failed to install"
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pbbuttonsd.rc5 pbbuttonsd
-	dodoc README COPYING
-
+	dodoc README
 }
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild
index fb46abe5be3d..b39e02284114 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild,v 1.4 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10-r1.ebuild,v 1.5 2004/06/28 02:35:55 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+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"
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
@@ -38,7 +38,7 @@ src_install() {
 		|| die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
 #	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
@@ -48,7 +48,7 @@ src_install() {
 	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10.ebuild
index 31a6b0ab3ae8..6000d77352d1 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10.ebuild,v 1.3 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.10.ebuild,v 1.4 2004/06/28 02:35:55 vapier Exp $
 
 inherit eutils
-DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+
+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"
 
@@ -12,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
@@ -36,7 +37,7 @@ src_install() {
 		|| die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
 #	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
@@ -46,7 +47,7 @@ src_install() {
 	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild
index 36ad0ea16ab4..3bb5473ad2e4 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 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.3 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.11.ebuild,v 1.4 2004/06/28 02:35:55 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+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"
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
@@ -38,7 +38,7 @@ src_install() {
 		|| die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
 #	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
@@ -48,7 +48,7 @@ src_install() {
 	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
index 14d166e2fe96..9898e1b77832 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
@@ -1,46 +1,43 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.4 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.5 2004/06/28 02:35:55 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+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/glibc"
+
+DEPEND="virtual/libc"
 RDEPEND=""
-SLOT=0
-LICENSE="GPL-2"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
-	einfo "Patching in fix to enable replace_pmud support"
-	epatch ${FILESDIR}/pbbuttons-0.5.2-replace_pmud.patch
-
+	epatch ${FILESDIR}/${P}-replace_pmud.patch
 }
 
 src_compile() {
 	./configure \
 		--prefix=/usr \
-		--sysconfdir=/etc || die "sorry, pbbuttons configure failed"
+		--sysconfdir=/etc \
+		|| die "sorry, pbbuttons configure failed"
 	make || die "sorry, failed to compile pbbuttons"
 }
 
 src_install() {
-
 	dodir /etc/power
 	make sysconfdir=${D}/etc DESTDIR=${D} install || die "failed to install"
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pbbuttonsd.rc5 pbbuttonsd
-	dodoc README COPYING
-
+	dodoc README
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.8.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.8.ebuild
index ae74d18ef0b5..1269343e6bd7 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.8.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.8.ebuild,v 1.3 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.8.ebuild,v 1.4 2004/06/28 02:35:55 vapier Exp $
 
-DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+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"
 
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="-* ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
@@ -31,7 +31,7 @@ src_install() {
 		|| die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
 #	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
@@ -41,7 +41,7 @@ src_install() {
 	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9-r1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9-r1.ebuild
index cf21653ca593..49c31f21d7c2 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9-r1.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9-r1.ebuild,v 1.3 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9-r1.ebuild,v 1.4 2004/06/28 02:35:55 vapier Exp $
 
 inherit eutils
-DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+
+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"
 
@@ -12,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
@@ -37,7 +38,7 @@ src_install() {
 		|| die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
 #	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
@@ -47,7 +48,7 @@ src_install() {
 	echo "CONFIG_PROTECT=${mydir}/pbbuttons" > ${D}/etc/env.d/10pbbuttonsd
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9.ebuild
index 18727fe4d62a..02a1af31b784 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9.ebuild,v 1.3 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.5.9.ebuild,v 1.4 2004/06/28 02:35:55 vapier Exp $
 
-DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
+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"
 
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="-* ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
@@ -31,7 +31,7 @@ src_install() {
 		|| die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
 #	mv ${D}/var/lib/pbbuttons/pbbuttonsd.conf ${D}/etc/pbbuttonsd.conf
@@ -41,7 +41,7 @@ src_install() {
 	echo "CONFIG_PROTECT=${mydir}/pbbuttonsd" > ${D}/etc/env.d/10pbbuttonsd
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild
index cab871dd2962..4234e4700f9b 100644
--- a/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild
+++ b/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 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.4 2004/06/24 21:58:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pbbuttonsd/pbbuttonsd-0.6.1.ebuild,v 1.5 2004/06/28 02:35:55 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+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/glibc
 	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
-SLOT=0
-LICENSE="GPL-2"
 
 src_unpack() {
 	unpack ${A}
@@ -30,10 +32,10 @@ src_install() {
 	make DESTDIR=${D} install || die "failed to install"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
-	dodoc README COPYING
+	dodoc README
 }
 
-pkg_postinst(){
+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"
diff --git a/app-laptop/powerprefs/powerprefs-0.2.1.ebuild b/app-laptop/powerprefs/powerprefs-0.2.1.ebuild
index 9d09d798dcd2..24299201fea8 100644
--- a/app-laptop/powerprefs/powerprefs-0.2.1.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.2.1.ebuild
@@ -1,39 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.2.1.ebuild,v 1.4 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.2.1.ebuild,v 1.5 2004/06/28 02:36:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="powerprefs is a PPC-only program to interface with special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with 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=""
-SLOT="0"
-LICENSE="GPL-2"
+
 DEPEND="x11-libs/gtk+"
 RDEPEND="app-laptop/pbbuttonsd"
 
-pkg_setup() {
-	if [ ${ARCH} != "ppc" ] ; then
-		eerror "Sorry, this is a PPC only package."
-		die "Sorry, this as a PPC only pacakge."
-	fi
-}
-
 src_compile() {
-
 	./configure --prefix=/usr || die "sorry, ppc-only package"
 	make || die "sorry, powerprefs compile failed"
 }
 
 src_install() {
-
 	make \
 		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-
-	dodoc README COPYING
-
+	dodoc README
 }
diff --git a/app-laptop/powerprefs/powerprefs-0.2.ebuild b/app-laptop/powerprefs/powerprefs-0.2.ebuild
index 6b17af68a78a..f36c3c7dd095 100644
--- a/app-laptop/powerprefs/powerprefs-0.2.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.2.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.2.ebuild,v 1.4 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.2.ebuild,v 1.5 2004/06/28 02:36:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="powerprefs is a PPC-only program to interface with special Powerbook/iBook keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with 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=""
-SLOT="0"
-LICENSE="GPL-2"
 
-DEPEND="x11-libs/gtk+ app-laptop/pbbuttonsd"
+DEPEND="x11-libs/gtk+
+	app-laptop/pbbuttonsd"
 
 src_compile() {
 	./configure --prefix=/usr || die "sorry, ppc-only package"
@@ -21,9 +22,8 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/powerprefs/powerprefs-0.3.1.ebuild b/app-laptop/powerprefs/powerprefs-0.3.1.ebuild
index 90edca7c724a..7da95afa3fed 100644
--- a/app-laptop/powerprefs/powerprefs-0.3.1.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.3.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.3.1.ebuild,v 1.4 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.3.1.ebuild,v 1.5 2004/06/28 02:36:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with pbbuttonsd (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=""
-SLOT="0"
-LICENSE="GPL-2"
 
 DEPEND="=x11-libs/gtk+-1.2*
-		>=app-laptop/pbbuttonsd-0.5"
+	>=app-laptop/pbbuttonsd-0.5"
 
 src_compile() {
 	./configure --prefix=/usr || die "sorry, powerprefs configure failed"
@@ -22,9 +22,8 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/powerprefs/powerprefs-0.4.2.ebuild b/app-laptop/powerprefs/powerprefs-0.4.2.ebuild
index 0d1b8ee11c7a..7e926e5eeb75 100644
--- a/app-laptop/powerprefs/powerprefs-0.4.2.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.4.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.2.ebuild,v 1.4 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.2.ebuild,v 1.5 2004/06/28 02:36:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with pbbuttonsd (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=""
-SLOT="0"
-LICENSE="GPL-2"
 
 DEPEND=">=x11-libs/gtk+-2.0
-		>=app-laptop/pbbuttonsd-0.5"
+	>=app-laptop/pbbuttonsd-0.5"
 
 src_compile() {
 	./configure --prefix=/usr || die "sorry, powerprefs configure failed"
@@ -22,9 +22,8 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/powerprefs/powerprefs-0.4.3.ebuild b/app-laptop/powerprefs/powerprefs-0.4.3.ebuild
index 7d5924018bb1..f48f29340e50 100644
--- a/app-laptop/powerprefs/powerprefs-0.4.3.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.4.3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.3.ebuild,v 1.3 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.3.ebuild,v 1.4 2004/06/28 02:36:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with pbbuttonsd (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=""
-SLOT="0"
-LICENSE="GPL-2"
 
 DEPEND=">=x11-libs/gtk+-2.0
-		>=app-laptop/pbbuttonsd-0.5"
+	>=app-laptop/pbbuttonsd-0.5"
 
 src_compile() {
 	./configure --prefix=/usr || die "sorry, powerprefs configure failed"
@@ -22,9 +22,8 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/powerprefs/powerprefs-0.4.4.ebuild b/app-laptop/powerprefs/powerprefs-0.4.4.ebuild
index 99d837e10ef3..5e4b89b4317b 100644
--- a/app-laptop/powerprefs/powerprefs-0.4.4.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.4.4.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.4.ebuild,v 1.3 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.4.ebuild,v 1.4 2004/06/28 02:36:29 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with pbbuttonsd (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=""
-SLOT="0"
-LICENSE="GPL-2"
 
 DEPEND=">=x11-libs/gtk+-2.0
-		>=app-laptop/pbbuttonsd-0.5"
+	>=app-laptop/pbbuttonsd-0.5"
 
 src_compile() {
 	./configure --prefix=/usr || die "sorry, powerprefs configure failed"
@@ -22,9 +22,8 @@ src_compile() {
 src_install() {
 	make \
 		prefix=${D}/usr \
-		mandir={D}/usr/share/man \
-		infodir={D}/usr/share/info \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/powerprefs/powerprefs-0.4.5.ebuild b/app-laptop/powerprefs/powerprefs-0.4.5.ebuild
index df15e846fc75..cb8441a9459c 100644
--- a/app-laptop/powerprefs/powerprefs-0.4.5.ebuild
+++ b/app-laptop/powerprefs/powerprefs-0.4.5.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.5.ebuild,v 1.5 2004/06/24 21:59:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/powerprefs/powerprefs-0.4.5.ebuild,v 1.6 2004/06/28 02:36:29 vapier Exp $
 
-DESCRIPTION="powerprefs is a program to interface with pbbuttonsd (Powerbook/iBook) keys in Linux"
-SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
+DESCRIPTION="program to interface with pbbuttonsd (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=""
-SLOT="0"
-LICENSE="GPL-2"
 
 DEPEND=">=x11-libs/gtk+-2.0
-		>=app-laptop/pbbuttonsd-0.6.0"
+	>=app-laptop/pbbuttonsd-0.6.0"
 
 src_compile() {
 	econf --prefix=/usr || die "powerprefs configure failed"
@@ -25,5 +26,5 @@ src_install() {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die "sorry, failed to install powerprefs"
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-laptop/spicctrl/spicctrl-1.6.ebuild b/app-laptop/spicctrl/spicctrl-1.6.ebuild
index 98d9e172769a..8baa6a8a969f 100644
--- a/app-laptop/spicctrl/spicctrl-1.6.ebuild
+++ b/app-laptop/spicctrl/spicctrl-1.6.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/spicctrl/spicctrl-1.6.ebuild,v 1.3 2004/06/24 21:59:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/spicctrl/spicctrl-1.6.ebuild,v 1.4 2004/06/28 02:36:57 vapier Exp $
 
-DESCRIPTION="spicctrl - tool for the sonypi-Device (found in Sony Vaio Notebooks)"
+DESCRIPTION="tool for the sonypi-Device (found in Sony Vaio Notebooks)"
 HOMEPAGE="http://spop.free.fr/sonypi/"
 SRC_URI="http://spop.free.fr/sonypi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
diff --git a/app-laptop/thinkpad/thinkpad-3.2.ebuild b/app-laptop/thinkpad/thinkpad-3.2.ebuild
index 2323f2c8027d..e44268c3f800 100644
--- a/app-laptop/thinkpad/thinkpad-3.2.ebuild
+++ b/app-laptop/thinkpad/thinkpad-3.2.ebuild
@@ -1,33 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-3.2.ebuild,v 1.3 2004/06/24 22:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-3.2.ebuild,v 1.4 2004/06/28 02:37:18 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 KV=""
 DESCRIPTION="Thinkpad system control kernel modules"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 amd64 -ppc -mips"
-IUSE=""
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
 
-#virtual/glibc should depend on specific kernel headers
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 pkg_setup() {
-	#thinkpad will compile modules for the kernel pointed to by /usr/src/linux
-	KV=`readlink /usr/src/linux`
-	if [ $? -ne 0 ] ; then
-		echo
-		echo "/usr/src/linux symlink does not exist; cannot continue."
-		echo
-		die
-	else
-		KV=${KV/linux-/}
-	fi
+	check_KV
 }
 
 src_compile() {
@@ -35,7 +26,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TECHNOTES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
 	dodir /lib/modules/${KV}/thinkpad
 	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
 		${D}/lib/modules/${KV}/thinkpad
@@ -47,9 +38,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	/usr/sbin/update-modules || return 0
-}
-
-pkg_prerm() {
-	/sbin/modprobe -r smapi superion rtcmosram thinkpadpm thinkpad
+	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
 }
diff --git a/app-laptop/thinkpad/thinkpad-4.1.ebuild b/app-laptop/thinkpad/thinkpad-4.1.ebuild
index 874c9bc37df8..8cc3a8e7287b 100644
--- a/app-laptop/thinkpad/thinkpad-4.1.ebuild
+++ b/app-laptop/thinkpad/thinkpad-4.1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.1.ebuild,v 1.3 2004/06/24 22:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.1.ebuild,v 1.4 2004/06/28 02:37:18 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 DESCRIPTION="Thinkpad system control kernel modules"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 amd64 -ppc -mips"
-IUSE=""
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
 
-#virtual/glibc should depend on specific kernel headers
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A} || die
@@ -34,7 +34,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TECHNOTES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
 	dodir /lib/modules/${KV}/thinkpad
 	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
 		${D}/lib/modules/${KV}/thinkpad
@@ -46,9 +46,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	/usr/sbin/update-modules || return 0
-}
-
-pkg_prerm() {
-	/sbin/modprobe -r smapi superion rtcmosram thinkpadpm thinkpad
+	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
 }
diff --git a/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild b/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild
index 32604dae23f8..99f72bfbd080 100644
--- a/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild
+++ b/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild,v 1.3 2004/06/24 22:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild,v 1.4 2004/06/28 02:37:18 vapier Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="-* x86 amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 pkg_setup() {
 	enewgroup thinkpad
@@ -46,7 +46,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TECHNOTES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
 	dodir /lib/modules/${KV}/thinkpad
 	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
 		${D}/lib/modules/${KV}/thinkpad
@@ -59,7 +59,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	/usr/sbin/update-modules || return 0
+	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
 	if ! grep -q '^ *INCLUDE.*devfs\.d' /etc/devfsd.conf; then
 		ewarn 'Your /etc/devfsd.conf is missing the include for'
 		ewarn '/etc/devfs.d/! Please fix this by adding'
@@ -72,7 +72,3 @@ pkg_postinst() {
 		ewarn '/etc/devfsd.conf if you like.'
 	fi
 }
-
-pkg_prerm() {
-	/sbin/modprobe -r smapi superion rtcmosram thinkpadpm thinkpad
-}
diff --git a/app-laptop/thinkpad/thinkpad-4.3.ebuild b/app-laptop/thinkpad/thinkpad-4.3.ebuild
index ddf3e6e86862..49c397a4db14 100644
--- a/app-laptop/thinkpad/thinkpad-4.3.ebuild
+++ b/app-laptop/thinkpad/thinkpad-4.3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.3.ebuild,v 1.3 2004/06/24 22:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.3.ebuild,v 1.4 2004/06/28 02:37:18 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 DESCRIPTION="Thinkpad system control kernel modules"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="x86 amd64 -ppc -mips -sparc"
-IUSE=""
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
 
-#virtual/glibc should depend on specific kernel headers
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	check_KV
@@ -37,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TECHNOTES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
 	dodir /lib/modules/${KV}/thinkpad
 	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
 		${D}/lib/modules/${KV}/thinkpad
@@ -50,7 +50,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	/usr/sbin/update-modules || return 0
+	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
 	if ! grep -q '^ *INCLUDE.*devfs\.d' /etc/devfsd.conf; then
 		ewarn 'Your /etc/devfsd.conf is missing the include for'
 		ewarn '/etc/devfs.d/! Please fix this by adding'
@@ -63,7 +63,3 @@ pkg_postinst() {
 		ewarn '/etc/devfsd.conf if you like.'
 	fi
 }
-
-pkg_prerm() {
-	/sbin/modprobe -r smapi superion rtcmosram thinkpadpm thinkpad
-}
diff --git a/app-laptop/thinkpad/thinkpad-4.8.ebuild b/app-laptop/thinkpad/thinkpad-4.8.ebuild
index ac86a2aabc08..77319a515951 100644
--- a/app-laptop/thinkpad/thinkpad-4.8.ebuild
+++ b/app-laptop/thinkpad/thinkpad-4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.8.ebuild,v 1.3 2004/06/24 22:00:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.8.ebuild,v 1.4 2004/06/28 02:37:18 vapier Exp $
 
 inherit eutils
 
@@ -46,7 +46,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TECHNOTES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
 	dodir /lib/modules/${KV}/thinkpad
 	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
 		${D}/lib/modules/${KV}/thinkpad
@@ -59,7 +59,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	/usr/sbin/update-modules || return 0
+	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
 	if ! grep -q '^ *INCLUDE.*devfs\.d' /etc/devfsd.conf; then
 		ewarn 'Your /etc/devfsd.conf is missing the include for'
 		ewarn '/etc/devfs.d/! Please fix this by adding'
@@ -72,7 +72,3 @@ pkg_postinst() {
 		ewarn '/etc/devfsd.conf if you like.'
 	fi
 }
-
-pkg_prerm() {
-	/sbin/modprobe -r smapi superion rtcmosram thinkpadpm thinkpad
-}
diff --git a/app-laptop/tpctl/tpctl-3.2.ebuild b/app-laptop/tpctl/tpctl-3.2.ebuild
index e62f375b125d..c7eab6f2357d 100644
--- a/app-laptop/tpctl/tpctl-3.2.ebuild
+++ b/app-laptop/tpctl/tpctl-3.2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-3.2.ebuild,v 1.2 2004/06/24 22:00:48 agriffis Exp $
-
-IUSE="ncurses tpctlir perl"
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-3.2.ebuild,v 1.3 2004/06/28 02:37:53 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
@@ -10,42 +8,45 @@ MYP="${PN}_${MYPV}"
 KV=""
 
 DESCRIPTION="Thinkpad system control user space programs"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="-* x86"
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE="ncurses tpctlir perl"
 
-DEPEND="$DEPEND app-laptop/thinkpad ncurses? ( sys-libs/ncurses )"
-RDEPEND="$RDEPEND app-laptop/thinkpad ncurses? ( sys-libs/ncurses ) perl? ( dev-lang/perl )"
+DEPEND="app-laptop/thinkpad
+	ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}
+	perl? ( dev-lang/perl )"
 
 src_compile() {
 	emake -C lib || die "lib make failed"
 	emake -C tpctl || die "tpctl make failed"
-	if use ncurses > /dev/null; then
+	if use ncurses ; then
 		emake -C ntpctl || die "ntpctl make failed"
 	fi
 
 	# Only for thinkpad models 760 and 765
 	# build with:
 	# $ USE=tpctlir emerge tpctl
-	if use tpctlir > /dev/null; then
+	if use tpctlir ; then
 		emake -C tpctlir || die "tpctlir make failed"
 	fi
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING \
-		VGA-MODES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
 	dolib lib/libsmapidev.so.1.0
 	dobin tpctl/tpctl
 	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir > /dev/null &&  [ -e tpctlir/tpctlir ]; then
+	if use tpctlir &&  [ -e tpctlir/tpctlir ]; then
 		mv tpctlir/README README.tpctlir
 		dodoc README.tpctlir
 		dobin tpctlir/tpctlir
 	fi
-	if use perl > /dev/null; then
+	if use perl ; then
 		mv apmiser/README README.apmiser
 		dodoc README.apmiser
 		dosbin apmiser/apmiser
diff --git a/app-laptop/tpctl/tpctl-4.2.ebuild b/app-laptop/tpctl/tpctl-4.2.ebuild
index c58d599a1460..c2aa7b155d75 100644
--- a/app-laptop/tpctl/tpctl-4.2.ebuild
+++ b/app-laptop/tpctl/tpctl-4.2.ebuild
@@ -1,50 +1,51 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.2.ebuild,v 1.2 2004/06/24 22:00:48 agriffis Exp $
-
-IUSE="ncurses tpctlir perl"
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.2.ebuild,v 1.3 2004/06/28 02:37:53 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 
 DESCRIPTION="Thinkpad system control user space programs"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="-* x86"
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE="ncurses tpctlir perl"
 
-DEPEND="$DEPEND >=app-laptop/thinkpad-4.1 ncurses? ( sys-libs/ncurses )"
-RDEPEND="$RDEPEND app-laptop/thinkpad ncurses? ( sys-libs/ncurses ) perl? ( dev-lang/perl )"
+DEPEND=">=app-laptop/thinkpad-4.1
+	ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}
+	perl? ( dev-lang/perl )"
 
 src_compile() {
 	emake -C lib || die "lib make failed"
 	emake -C tpctl || die "tpctl make failed"
-	if use ncurses > /dev/null; then
+	if use ncurses ; then
 		emake -C ntpctl || die "ntpctl make failed"
 	fi
 
 	# Only for thinkpad models 760 and 765
 	# build with:
 	# $ USE=tpctlir emerge tpctl
-	if use tpctlir > /dev/null; then
+	if use tpctlir ; then
 		emake -C tpctlir || die "tpctlir make failed"
 	fi
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING \
-		VGA-MODES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
 	dolib lib/libsmapidev.so.2.0
 	dobin tpctl/tpctl
 	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
-	if use tpctlir > /dev/null &&  [ -e tpctlir/tpctlir ]; then
+	if use tpctlir &&  [ -e tpctlir/tpctlir ]; then
 		mv tpctlir/README README.tpctlir
 		dodoc README.tpctlir
 		dobin tpctlir/tpctlir
 	fi
-	if use perl > /dev/null; then
+	if use perl ; then
 		mv apmiser/README README.apmiser
 		dodoc README.apmiser
 		dosbin apmiser/apmiser
diff --git a/app-laptop/tpctl/tpctl-4.4-r1.ebuild b/app-laptop/tpctl/tpctl-4.4-r1.ebuild
index b7d6cf731c00..332553a98357 100644
--- a/app-laptop/tpctl/tpctl-4.4-r1.ebuild
+++ b/app-laptop/tpctl/tpctl-4.4-r1.ebuild
@@ -1,35 +1,37 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.4-r1.ebuild,v 1.2 2004/06/24 22:00:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.4-r1.ebuild,v 1.3 2004/06/28 02:37:53 vapier Exp $
 
-IUSE="ncurses tpctlir perl"
+inherit eutils
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 
 DESCRIPTION="Thinkpad system control user space programs"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="-* x86 amd64"
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+IUSE="ncurses tpctlir perl"
 
-DEPEND=">=app-laptop/thinkpad-4.3 ncurses? ( sys-libs/ncurses )"
-RDEPEND=">=app-laptop/thinkpad-4.3 ncurses? ( sys-libs/ncurses )
+DEPEND=">=app-laptop/thinkpad-4.3
+	ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}
 	perl? ( dev-lang/perl )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/tpctlir-cli-4.4-r1.diff
+	epatch ${FILESDIR}/tpctlir-cli-4.4-r1.diff
 }
 
 src_compile() {
-
 	emake -C lib || die "lib make failed"
 	emake -C tpctl || die "tpctl make failed"
-	if use ncurses > /dev/null; then
+	if use ncurses ; then
 		emake -C ntpctl || die "ntpctl make failed"
 	fi
 
@@ -42,8 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING \
-		VGA-MODES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
 	dolib lib/libsmapidev.so.2.0
 	dobin tpctl/tpctl
 	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
@@ -52,7 +53,7 @@ src_install() {
 		dodoc README.tpctlir
 		dobin tpctlir/tpctlir
 	fi
-	if use perl > /dev/null; then
+	if use perl ; then
 		mv apmiser/README README.apmiser
 		dodoc README.apmiser
 		dosbin apmiser/apmiser
diff --git a/app-laptop/tpctl/tpctl-4.4.ebuild b/app-laptop/tpctl/tpctl-4.4.ebuild
index 39998f63f043..c5c9cf2a7a63 100644
--- a/app-laptop/tpctl/tpctl-4.4.ebuild
+++ b/app-laptop/tpctl/tpctl-4.4.ebuild
@@ -1,27 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.4.ebuild,v 1.2 2004/06/24 22:00:48 agriffis Exp $
-
-IUSE="ncurses tpctlir perl"
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.4.ebuild,v 1.3 2004/06/28 02:37:53 vapier Exp $
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 
 DESCRIPTION="Thinkpad system control user space programs"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="-* x86"
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE="ncurses tpctlir perl"
 
-DEPEND="$DEPEND >=app-laptop/thinkpad-4.3 ncurses? ( sys-libs/ncurses )"
-RDEPEND="$RDEPEND >=app-laptop/thinkpad-4.3 ncurses? ( sys-libs/ncurses ) perl? ( dev-lang/perl )"
+DEPEND=">=app-laptop/thinkpad-4.3
+	ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}
+	perl? ( dev-lang/perl )"
 
 src_compile() {
 	emake -C lib || die "lib make failed"
 	emake -C tpctl || die "tpctl make failed"
-	if use ncurses > /dev/null; then
+	if use ncurses ; then
 		emake -C ntpctl || die "ntpctl make failed"
 	fi
 
@@ -34,8 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING \
-		VGA-MODES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
 	dolib lib/libsmapidev.so.2.0
 	dobin tpctl/tpctl
 	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
@@ -44,7 +45,7 @@ src_install() {
 		dodoc README.tpctlir
 		dobin tpctlir/tpctlir
 	fi
-	if use perl > /dev/null; then
+	if use perl ; then
 		mv apmiser/README README.apmiser
 		dodoc README.apmiser
 		dosbin apmiser/apmiser
diff --git a/app-laptop/tpctl/tpctl-4.8.ebuild b/app-laptop/tpctl/tpctl-4.8.ebuild
index a86ced457e14..821a6fb54479 100644
--- a/app-laptop/tpctl/tpctl-4.8.ebuild
+++ b/app-laptop/tpctl/tpctl-4.8.ebuild
@@ -1,32 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.8.ebuild,v 1.2 2004/06/24 22:00:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/tpctl/tpctl-4.8.ebuild,v 1.3 2004/06/28 02:37:53 vapier Exp $
 
-IUSE="ncurses tpctlir perl"
+inherit eutils
 
 #transform P to match tarball versioning
 MYPV=${PV/_beta/beta}
 MYP="${PN}_${MYPV}"
 
 DESCRIPTION="Thinkpad system control user space programs"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
 HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-KEYWORDS="-* ~x86"
-SLOT="0"
+SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="ncurses tpctlir perl"
 
-DEPEND=">=app-laptop/thinkpad-4.8 ncurses? ( sys-libs/ncurses )"
-RDEPEND=">=app-laptop/thinkpad-4.8 ncurses? ( sys-libs/ncurses )
+DEPEND=">=app-laptop/thinkpad-4.8
+	ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}
 	perl? ( dev-lang/perl )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/tpctlir-cli-4.4-r1.diff
+	epatch ${FILESDIR}/tpctlir-cli-4.4-r1.diff
 }
 
 src_compile() {
-
 	emake -C lib || die "lib make failed"
 	emake -C tpctl || die "tpctl make failed"
 	if use ncurses; then
@@ -42,8 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS COPYING ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING \
-		VGA-MODES
+	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TROUBLESHOOTING VGA-MODES
 	dolib lib/libsmapidev.so.2.0
 	dobin tpctl/tpctl
 	[ -e ntpctl/ntpctl ] && dobin ntpctl/ntpctl
diff --git a/app-laptop/wmbatppc/wmbatppc-1.0-r1.ebuild b/app-laptop/wmbatppc/wmbatppc-1.0-r1.ebuild
index ebdb1ac9c21f..606cd1bc3777 100644
--- a/app-laptop/wmbatppc/wmbatppc-1.0-r1.ebuild
+++ b/app-laptop/wmbatppc/wmbatppc-1.0-r1.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.3 2004/06/24 22:00:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/wmbatppc/wmbatppc-1.0-r1.ebuild,v 1.4 2004/06/28 02:38:16 vapier Exp $
 
-S=${WORKDIR}/wmbatppc
-DESCRIPTION="wmbatppc is a small battery-monitoring dockapp. It works on G3/G4 Powerbooks and iBooks."
-SRC_URI="http://titelou.free.fr/wmbatppc/${P}.tar.gz"
+DESCRIPTION="small battery-monitoring dockapp for G3/G4 laptops"
 HOMEPAGE="http://titelou.free.fr/wmbatppc/"
+SRC_URI="http://titelou.free.fr/wmbatppc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="-* ppc"
+IUSE=""
 
 DEPEND="virtual/x11
 	app-laptop/pmud"
 
-SLOT="1"
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="ppc -amd64"
+S=${WORKDIR}/wmbatppc
 
 src_compile() {
 	make || die
 }
 
-src_install () {
-	dodir /usr/bin/
-	dobin wmbatppc
+src_install() {
+	dobin wmbatppc || die
 	doman wmbatppc.1
 }