change glibc to libc and clean up other horribly ugly ebuilds

5 files changed, 69 insertions, 64 deletions

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