glibc -> libc

68 files changed, 258 insertions, 469 deletions

diff --git a/sys-apps/gpart/gpart-0.1h.ebuild b/sys-apps/gpart/gpart-0.1h.ebuild
index 647e939ae8a6..531f9a6f7a54 100644
--- a/sys-apps/gpart/gpart-0.1h.ebuild
+++ b/sys-apps/gpart/gpart-0.1h.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/gpart-0.1h.ebuild,v 1.5 2004/06/24 22:08:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/gpart-0.1h.ebuild,v 1.6 2004/06/30 02:36:52 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Partition table rescue/guessing tool"
-SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz"
 HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/"
+SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
+IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +26,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/gpart
+	dobin src/gpart || die
 	doman man/gpart.8
-	dodoc README CHANGES COPYING INSTALL LSM
+	dodoc README CHANGES INSTALL LSM
 }
diff --git a/sys-apps/gradm/gradm-1.9.14.ebuild b/sys-apps/gradm/gradm-1.9.14.ebuild
index 38376b3df367..c775043bba83 100644
--- a/sys-apps/gradm/gradm-1.9.14.ebuild
+++ b/sys-apps/gradm/gradm-1.9.14.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.14.ebuild,v 1.3 2004/06/24 22:08:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-1.9.14.ebuild,v 1.4 2004/06/30 02:36:33 vapier Exp $
 
 inherit gcc flag-o-matic eutils
 
 DESCRIPTION="Administrative interface for grsecurity ${PV} access control lists"
-SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
 HOMEPAGE="http://www.grsecurity.net/"
+SRC_URI="http://www.grsecurity.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa"
 SLOT="0"
-
+KEYWORDS="~x86 ~sparc ~ppc ~hppa ~amd64"
 IUSE=""
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
 	sys-apps/chpax"
diff --git a/sys-apps/gradm/gradm-2.0-r1.ebuild b/sys-apps/gradm/gradm-2.0-r1.ebuild
index d05bff9acfa7..d6b9a3cee1ea 100644
--- a/sys-apps/gradm/gradm-2.0-r1.ebuild
+++ b/sys-apps/gradm/gradm-2.0-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/sys-apps/gradm/gradm-2.0-r1.ebuild,v 1.2 2004/06/24 22:08:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0-r1.ebuild,v 1.3 2004/06/30 02:36:33 vapier Exp $
 
 inherit flag-o-matic gcc
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
 	sys-apps/chpax"
diff --git a/sys-apps/gradm/gradm-2.0.ebuild b/sys-apps/gradm/gradm-2.0.ebuild
index d55342d28b37..10f4021a4832 100644
--- a/sys-apps/gradm/gradm-2.0.ebuild
+++ b/sys-apps/gradm/gradm-2.0.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/sys-apps/gradm/gradm-2.0.ebuild,v 1.5 2004/06/24 22:08:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gradm/gradm-2.0.ebuild,v 1.6 2004/06/30 02:36:33 vapier Exp $
 
 inherit flag-o-matic gcc
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~arm ~amd64" ; # ~alpha"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-devel/bison
 	sys-devel/flex
 	sys-apps/chpax"
diff --git a/sys-apps/grep/grep-2.5.1-r1.ebuild b/sys-apps/grep/grep-2.5.1-r1.ebuild
index 690a41f0f3af..663bb31e1e30 100644
--- a/sys-apps/grep/grep-2.5.1-r1.ebuild
+++ b/sys-apps/grep/grep-2.5.1-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/sys-apps/grep/grep-2.5.1-r1.ebuild,v 1.23 2004/06/24 22:08:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r1.ebuild,v 1.24 2004/06/30 02:37:18 vapier Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -15,9 +15,9 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE="nls build uclibc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/grep/grep-2.5.1-r4.ebuild b/sys-apps/grep/grep-2.5.1-r4.ebuild
index 6f5ea3c7006a..35909e1c3d66 100644
--- a/sys-apps/grep/grep-2.5.1-r4.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r4.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/sys-apps/grep/grep-2.5.1-r4.ebuild,v 1.2 2004/06/24 22:08:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r4.ebuild,v 1.3 2004/06/30 02:37:18 vapier Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
 IUSE="build nls pcre static"
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	pcre? (
 		>=sys-apps/sed-4
diff --git a/sys-apps/hdparm/hdparm-5.3-r2.ebuild b/sys-apps/hdparm/hdparm-5.3-r2.ebuild
index bc1279107c3b..6bc7b5239365 100644
--- a/sys-apps/hdparm/hdparm-5.3-r2.ebuild
+++ b/sys-apps/hdparm/hdparm-5.3-r2.ebuild
@@ -1,30 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.3-r2.ebuild,v 1.13 2004/06/24 22:09:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.3-r2.ebuild,v 1.14 2004/06/30 02:39:08 vapier Exp $
 
 DESCRIPTION="Utility to change hard drive performance parameters"
-SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
 HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-	einfo ""
-	einfo "The rc-script for hdparm has been updated, so make sure "
-	einfo "that you etc-update.  The script is much more configurable"
-	einfo "for details please see /etc/conf.d/hdparm"
-	einfo ""
 	emake || die "compile error"
 }
 
 src_install() {
 	into /
-	dosbin hdparm contrib/idectl
+	dosbin hdparm contrib/idectl || die
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/hdparm-new-init hdparm
@@ -35,3 +30,9 @@ src_install() {
 	doman hdparm.8
 	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
 }
+
+pkg_postinst() {
+	einfo "The rc-script for hdparm has been updated, so make sure "
+	einfo "that you etc-update.  The script is much more configurable"
+	einfo "for details please see /etc/conf.d/hdparm"
+}
diff --git a/sys-apps/hdparm/hdparm-5.4.ebuild b/sys-apps/hdparm/hdparm-5.4.ebuild
index 9456b4db2b97..ff5ea4ee7980 100644
--- a/sys-apps/hdparm/hdparm-5.4.ebuild
+++ b/sys-apps/hdparm/hdparm-5.4.ebuild
@@ -1,33 +1,33 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.4.ebuild,v 1.13 2004/06/24 22:09:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.4.ebuild,v 1.14 2004/06/30 02:39:08 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Utility to change hard drive performance parameters"
-SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
 HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/hardware/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/system/hardware/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ppc sparc alpha hppa ia64 ~mips ppc64"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa ~amd64 ia64 ppc64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-src_compile() {
-	einfo ""
-	einfo "The rc-script for hdparm has been updated, so make sure "
-	einfo "that you etc-update.  The script is much more configurable"
-	einfo "for details please see /etc/conf.d/hdparm"
-	einfo ""
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${P}-readahead_rename.patch
+}
+
+src_compile() {
 	emake || die "compile error"
 }
 
 src_install() {
 	into /
-	dosbin hdparm contrib/idectl
+	dosbin hdparm contrib/idectl || die
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/hdparm-new-init hdparm
@@ -38,3 +38,9 @@ src_install() {
 	doman hdparm.8
 	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
 }
+
+pkg_postinst() {
+	einfo "The rc-script for hdparm has been updated, so make sure "
+	einfo "that you etc-update.  The script is much more configurable"
+	einfo "for details please see /etc/conf.d/hdparm"
+}
diff --git a/sys-apps/hdparm/hdparm-5.5.ebuild b/sys-apps/hdparm/hdparm-5.5.ebuild
index ff419f0ec498..2d54c5cc312e 100644
--- a/sys-apps/hdparm/hdparm-5.5.ebuild
+++ b/sys-apps/hdparm/hdparm-5.5.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/sys-apps/hdparm/hdparm-5.5.ebuild,v 1.7 2004/06/24 22:09:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.5.ebuild,v 1.8 2004/06/30 02:39:08 vapier Exp $
 
 inherit gcc eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc mips ~alpha arm ~hppa amd64 ~ia64 ~ppc64 s390"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -44,9 +44,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
 	einfo "The rc-script for hdparm has been updated, so make sure "
 	einfo "that you etc-update.  The script is much more configurable"
 	einfo "for details please see /etc/conf.d/hdparm"
-	einfo ""
 }
diff --git a/sys-apps/hwsetup/files/digest-hwsetup-1.0 b/sys-apps/hwsetup/files/digest-hwsetup-1.0
deleted file mode 100644
index 8d0d23055381..000000000000
--- a/sys-apps/hwsetup/files/digest-hwsetup-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90d62b7f99ea916541708e8a690f63d3 hwsetup_1.0-9.tar.gz 7879
diff --git a/sys-apps/hwsetup/hwsetup-1.0-r1.ebuild b/sys-apps/hwsetup/hwsetup-1.0-r1.ebuild
index 4468aab44c66..d07bbb1de908 100644
--- a/sys-apps/hwsetup/hwsetup-1.0-r1.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.0-r1.ebuild
@@ -1,23 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0-r1.ebuild,v 1.6 2004/06/25 23:45:26 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0-r1.ebuild,v 1.7 2004/06/30 02:42:11 vapier Exp $
 
 MY_PV=${PV}-14
 DESCRIPTION="Hardware setup program"
+HOMEPAGE="http://www.knopper.net/"
 SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
-HOMEPAGE="http://www.knopper.net"
 
-KEYWORDS="x86 amd64 ~ppc -sparc ~alpha -mips"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc -sparc -mips alpha amd64"
 IUSE=""
 
 DEPEND=">=sys-apps/kudzu-knoppix-1.0"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-}
+RDEPEND="virtual/libc"
 
 src_compile() {
 	emake  || die
diff --git a/sys-apps/hwsetup/hwsetup-1.0.ebuild b/sys-apps/hwsetup/hwsetup-1.0.ebuild
deleted file mode 100644
index 96bee7f6e94b..000000000000
--- a/sys-apps/hwsetup/hwsetup-1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0.ebuild,v 1.12 2004/06/24 22:11:06 agriffis Exp $
-
-DESCRIPTION="Hardware setup program"
-SRC_URI="mirror://gentoo/hwsetup_1.0-9.tar.gz"
-HOMEPAGE="http://www.knopper.net"
-
-KEYWORDS="x86 amd64 -ppc -sparc alpha -mips"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="<=sys-apps/kudzu-1.0"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	emake  || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-}
diff --git a/sys-apps/iproute2/iproute2-2.4.7.20010824-r5.ebuild b/sys-apps/iproute2/iproute2-2.4.7.20010824-r5.ebuild
index 7808ee917610..854dbe78764a 100644
--- a/sys-apps/iproute2/iproute2-2.4.7.20010824-r5.ebuild
+++ b/sys-apps/iproute2/iproute2-2.4.7.20010824-r5.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/sys-apps/iproute2/iproute2-2.4.7.20010824-r5.ebuild,v 1.2 2004/06/25 03:08:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.4.7.20010824-r5.ebuild,v 1.3 2004/06/30 02:43:13 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,7 +20,7 @@ IUSE="doc"
 DEPEND=">=virtual/os-headers-2.4.21
 	>=sys-apps/sed-4
 	doc? ( virtual/tetex )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 S=${WORKDIR}/iproute2
 
diff --git a/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild b/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild
index d1fbe613ea97..b2daaed7a365 100644
--- a/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild
+++ b/sys-apps/iproute2/iproute2-2.4.7.20020116.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/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild,v 1.7 2004/06/25 23:31:02 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.4.7.20020116.ebuild,v 1.8 2004/06/30 02:43:13 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips ~alpha arm hppa amd64 ia64"
 IUSE="atm doc"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	=sys-libs/db-1*
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild b/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
index bbf93ab85797..d478be758e5b 100644
--- a/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.7.20040608.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/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild,v 1.4 2004/06/25 03:08:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.7.20040608.ebuild,v 1.5 2004/06/30 02:43:13 vapier Exp $
 
 inherit eutils gcc
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
 IUSE="atm"
 
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	sys-libs/db
 	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/irda-utils/irda-utils-0.9.13.ebuild b/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
index c0cbebc33623..db596efaf3b4 100644
--- a/sys-apps/irda-utils/irda-utils-0.9.13.ebuild
+++ b/sys-apps/irda-utils/irda-utils-0.9.13.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/sys-apps/irda-utils/irda-utils-0.9.13.ebuild,v 1.17 2004/06/24 22:12:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.13.ebuild,v 1.18 2004/06/30 02:44:11 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IrDA Utilities, tools for IrDA communication"
-SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
-RESTRICT="nomirror"
 HOMEPAGE="http://irda.sourceforge.net/"
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
+SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc >=dev-libs/glib-1.2"
+DEPEND="virtual/libc
+	>=dev-libs/glib-1.2"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/irda-utils/irda-utils-0.9.15.ebuild b/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
index 6580cd437884..643471b86ab8 100644
--- a/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
+++ b/sys-apps/irda-utils/irda-utils-0.9.15.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Maintainer: Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.12 2004/06/27 11:11:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irda-utils/irda-utils-0.9.15.ebuild,v 1.13 2004/06/30 02:44:11 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IrDA Utilities, tools for IrDA communication"
+HOMEPAGE="http://irda.sourceforge.net/"
 SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://irda.sf.net"
-KEYWORDS="x86 amd64 ~ppc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc >=dev-libs/glib-1.2"
+DEPEND="virtual/libc
+	>=dev-libs/glib-1.2"
 
 src_unpack() {
 	unpack ${A}
@@ -62,4 +62,3 @@ src_install () {
 	insinto /etc/conf.d ; newins ${FILESDIR}/irda.conf irda
 	insinto /etc/init.d ; insopts -m0755 ; newins ${FILESDIR}/irda.rc irda
 }
-
diff --git a/sys-apps/irqbalance/irqbalance-0.08.ebuild b/sys-apps/irqbalance/irqbalance-0.08.ebuild
index d010e86eb3fb..1439bb6811df 100644
--- a/sys-apps/irqbalance/irqbalance-0.08.ebuild
+++ b/sys-apps/irqbalance/irqbalance-0.08.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.08.ebuild,v 1.4 2004/06/24 22:12:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-0.08.ebuild,v 1.5 2004/06/30 02:44:45 vapier Exp $
 
-S="${WORKDIR}/irqbalance"
 DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
 HOMEPAGE="http://people.redhat.com/arjanv/irqbalance/"
 SRC_URI="http://people.redhat.com/arjanv/irqbalance/${P}.tar.gz"
@@ -12,7 +11,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+S="${WORKDIR}/irqbalance"
 
 src_compile() {
 	emake || die "emake failed"
@@ -24,4 +25,3 @@ src_install() {
 	doman irqbalance.1
 	dodoc Changelog TODO
 }
-
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
index 0c04e6982252..640a8a2fd110 100644
--- a/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild,v 1.13 2004/06/24 22:12:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r1.ebuild,v 1.14 2004/06/30 02:45:31 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Tools for configuring ISA PnP devices"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
index eea49097850b..f4c0c37adbc9 100644
--- a/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild,v 1.12 2004/06/24 22:12:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.23-r6.ebuild,v 1.13 2004/06/30 02:45:31 vapier Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="Tools for configuring ISA PnP devices"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/isapnptools/isapnptools-1.26.ebuild b/sys-apps/isapnptools/isapnptools-1.26.ebuild
index b0681d79f3cb..274e2f8a919d 100644
--- a/sys-apps/isapnptools/isapnptools-1.26.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.26.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26.ebuild,v 1.12 2004/06/24 22:12:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.26.ebuild,v 1.13 2004/06/30 02:45:31 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Tools for configuring ISA PnP devices"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/less/less-378-r1.ebuild b/sys-apps/less/less-378-r1.ebuild
index 15e33b63db6b..68c3ca66116f 100644
--- a/sys-apps/less/less-378-r1.ebuild
+++ b/sys-apps/less/less-378-r1.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r1.ebuild,v 1.11 2004/06/25 03:08:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r1.ebuild,v 1.12 2004/06/30 02:48:14 vapier Exp $
 
-IUSE=""
-
-S="${WORKDIR}/${P}"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ppc ~sparc alpha hppa mips"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc mips alpha hppa amd64"
+IUSE=""
 
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-	./configure --host=${CHOST} --prefix=/usr \
-		    --sysconfdir=/etc || die
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc || die
 
 	emake || die
 }
 
 src_install() {
-	dobin less lessecho lesskey
-	exeinto /usr/bin
-	newexe ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
+	dobin less lessecho lesskey || die
+	newbin ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
 
 	# Needed for groff-1.18 and later ...
 	dodir /etc/env.d
@@ -34,6 +34,5 @@ src_install() {
 	newman lesskey.nro lesskey.1
 	newman less.nro less.1
 
-	dodoc COPYING NEWS README LICENSE
+	dodoc NEWS README
 }
-
diff --git a/sys-apps/less/less-378-r2.ebuild b/sys-apps/less/less-378-r2.ebuild
index 252448d5cbb8..68670c8666dc 100644
--- a/sys-apps/less/less-378-r2.ebuild
+++ b/sys-apps/less/less-378-r2.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r2.ebuild,v 1.11 2004/06/25 03:08:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-378-r2.ebuild,v 1.12 2004/06/30 02:48:14 vapier Exp $
 
-IUSE=""
-
-S="${WORKDIR}/${P}"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa "
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+IUSE=""
 
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-	./configure --host=${CHOST} --prefix=/usr \
-		    --sysconfdir=/etc || die
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc || die
 
 	emake || die
 }
 
 src_install() {
-	dobin less lessecho lesskey
-	exeinto /usr/bin
-	newexe ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
+	dobin less lessecho lesskey || die
+	newbin ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
 
 	# Needed for groff-1.18 and later ...
 	dodir /etc/env.d
@@ -34,6 +34,5 @@ src_install() {
 	newman lesskey.nro lesskey.1
 	newman less.nro less.1
 
-	dodoc COPYING NEWS README LICENSE
+	dodoc NEWS README
 }
-
diff --git a/sys-apps/less/less-381.ebuild b/sys-apps/less/less-381.ebuild
index ae4e504a8500..41790a384134 100644
--- a/sys-apps/less/less-381.ebuild
+++ b/sys-apps/less/less-381.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-381.ebuild,v 1.14 2004/06/25 03:08:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-381.ebuild,v 1.15 2004/06/30 02:48:14 vapier Exp $
 
-IUSE=""
-
-S="${WORKDIR}/${P}"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 alpha sparc ppc mips hppa ia64 ppc64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64"
+IUSE=""
 
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-	./configure --host=${CHOST} --prefix=/usr \
-		    --sysconfdir=/etc || die
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc || die
 
 	emake || die
 }
 
 src_install() {
-	dobin less lessecho lesskey
-	exeinto /usr/bin
-	newexe ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
+	dobin less lessecho lesskey || die
+	newbin ${FILESDIR}/lesspipe.sh-r1 lesspipe.sh
 
 	# Needed for groff-1.18 and later ...
 	dodir /etc/env.d
@@ -34,6 +34,5 @@ src_install() {
 	newman lesskey.nro lesskey.1
 	newman less.nro less.1
 
-	dodoc COPYING NEWS README LICENSE
+	dodoc NEWS README
 }
-
diff --git a/sys-apps/less/less-382-r2.ebuild b/sys-apps/less/less-382-r2.ebuild
index 7ae139282993..6799bce85e9f 100644
--- a/sys-apps/less/less-382-r2.ebuild
+++ b/sys-apps/less/less-382-r2.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/sys-apps/less/less-382-r2.ebuild,v 1.2 2004/06/25 03:08:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382-r2.ebuild,v 1.3 2004/06/30 02:48:14 vapier Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2"
 
 src_install() {
diff --git a/sys-apps/less/less-382.ebuild b/sys-apps/less/less-382.ebuild
index 9cb930c702b1..077ef9c95254 100644
--- a/sys-apps/less/less-382.ebuild
+++ b/sys-apps/less/less-382.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/sys-apps/less/less-382.ebuild,v 1.7 2004/06/25 03:08:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382.ebuild,v 1.8 2004/06/30 02:48:14 vapier Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips alpha arm hppa amd64 ~ia64 ~ppc64 s390"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2"
 
 src_install() {
diff --git a/sys-apps/logwatch/logwatch-4.3.2.ebuild b/sys-apps/logwatch/logwatch-4.3.2.ebuild
index c1e202b5e1da..538ae64a564d 100644
--- a/sys-apps/logwatch/logwatch-4.3.2.ebuild
+++ b/sys-apps/logwatch/logwatch-4.3.2.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.2.ebuild,v 1.7 2004/06/24 22:14:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-4.3.2.ebuild,v 1.8 2004/06/30 02:50:15 vapier Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org"
+HOMEPAGE="http://www.logwatch.org/"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
 IUSE=""
-RDEPEND="virtual/glibc
+
+RDEPEND="virtual/libc
 	virtual/cron
 	virtual/mta
 	dev-lang/perl
diff --git a/sys-apps/logwatch/logwatch-5.0.ebuild b/sys-apps/logwatch/logwatch-5.0.ebuild
index 85f1ead2b0ab..a243a2fdb78b 100644
--- a/sys-apps/logwatch/logwatch-5.0.ebuild
+++ b/sys-apps/logwatch/logwatch-5.0.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.0.ebuild,v 1.6 2004/06/24 22:14:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.0.ebuild,v 1.7 2004/06/30 02:50:15 vapier Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org"
+HOMEPAGE="http://www.logwatch.org/"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-RDEPEND="virtual/glibc
+
+RDEPEND="virtual/libc
 	virtual/cron
 	virtual/mta
 	dev-lang/perl
diff --git a/sys-apps/logwatch/logwatch-5.2.2.ebuild b/sys-apps/logwatch/logwatch-5.2.2.ebuild
index 05738402b145..5f7407873bbc 100644
--- a/sys-apps/logwatch/logwatch-5.2.2.ebuild
+++ b/sys-apps/logwatch/logwatch-5.2.2.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.2.2.ebuild,v 1.2 2004/06/24 22:14:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logwatch/logwatch-5.2.2.ebuild,v 1.3 2004/06/30 02:50:15 vapier Exp $
 
 DESCRIPTION="Analyzes and Reports on system logs"
 HOMEPAGE="http://www.logwatch.org/"
 SRC_URI="ftp://ftp.kaybee.org/pub/linux/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-RDEPEND="virtual/glibc
+
+RDEPEND="virtual/libc
 	virtual/cron
 	virtual/mta
 	dev-lang/perl
diff --git a/sys-apps/lshw/lshw-01.06a.ebuild b/sys-apps/lshw/lshw-01.06a.ebuild
index ee7f4b32b0eb..c6244f36e32f 100644
--- a/sys-apps/lshw/lshw-01.06a.ebuild
+++ b/sys-apps/lshw/lshw-01.06a.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/sys-apps/lshw/lshw-01.06a.ebuild,v 1.4 2004/06/24 22:14:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.06a.ebuild,v 1.5 2004/06/30 02:50:39 vapier Exp $
 
 inherit flag-o-matic
 
@@ -16,9 +16,9 @@ SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
-RESTRICT="nomirror"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-apps/lshw/lshw-01.07a.ebuild b/sys-apps/lshw/lshw-01.07a.ebuild
index f2fbf95548d3..0354ef847b24 100644
--- a/sys-apps/lshw/lshw-01.07a.ebuild
+++ b/sys-apps/lshw/lshw-01.07a.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/sys-apps/lshw/lshw-01.07a.ebuild,v 1.2 2004/06/24 22:14:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.07a.ebuild,v 1.3 2004/06/30 02:50:39 vapier Exp $
 
 inherit flag-o-matic
 
@@ -16,9 +16,9 @@ SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-RESTRICT="nomirror"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-apps/lsof/lsof-4.64.ebuild b/sys-apps/lsof/lsof-4.64.ebuild
index 402395cdd840..0d385ec287b5 100644
--- a/sys-apps/lsof/lsof-4.64.ebuild
+++ b/sys-apps/lsof/lsof-4.64.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.64.ebuild,v 1.18 2004/06/25 03:08:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.64.ebuild,v 1.19 2004/06/30 02:49:27 vapier Exp $
 
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}/${MY_P}_src
 DESCRIPTION="Lists open files for running Unix processes"
+HOMEPAGE="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/README"
 SRC_URI="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.gz
 	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.gz"
-HOMEPAGE="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/README"
-
-DEPEND="virtual/glibc"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa mips"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 #This pkg appears to be highly kernel-dependent.
 
diff --git a/sys-apps/lsof/lsof-4.67.ebuild b/sys-apps/lsof/lsof-4.67.ebuild
index 0f1971ad765f..de17b650ab92 100644
--- a/sys-apps/lsof/lsof-4.67.ebuild
+++ b/sys-apps/lsof/lsof-4.67.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/sys-apps/lsof/lsof-4.67.ebuild,v 1.6 2004/06/25 03:08:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.67.ebuild,v 1.7 2004/06/30 02:49:27 vapier Exp $
 
-IUSE=""
 MY_P=${P/-/_}
 S=${WORKDIR}/${MY_P}/${MY_P}_src
 DESCRIPTION="Lists open files for running Unix processes"
+HOMEPAGE="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/README"
 SRC_URI="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.gz
 	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.gz"
-HOMEPAGE="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/README"
-
-DEPEND="virtual/glibc"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc ~sparc alpha ~hppa "
+KEYWORDS="x86 ~ppc ~sparc alpha ~hppa amd64"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 #This pkg appears to be highly kernel-dependent.
 
diff --git a/sys-apps/lsof/lsof-4.68.ebuild b/sys-apps/lsof/lsof-4.68.ebuild
index 021a53715c66..69d7983816b9 100644
--- a/sys-apps/lsof/lsof-4.68.ebuild
+++ b/sys-apps/lsof/lsof-4.68.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/sys-apps/lsof/lsof-4.68.ebuild,v 1.11 2004/06/25 03:08:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.68.ebuild,v 1.12 2004/06/30 02:49:27 vapier Exp $
 
 inherit flag-o-matic
 
@@ -11,13 +11,13 @@ HOMEPAGE="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/README"
 SRC_URI="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.gz
 	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.gz"
 
-DEPEND="virtual/glibc"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa mips ia64"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
 IUSE="static"
 
+DEPEND="virtual/libc"
+
 #This pkg appears to be highly kernel-dependent.
 
 src_unpack() {
diff --git a/sys-apps/lsof/lsof-4.69.ebuild b/sys-apps/lsof/lsof-4.69.ebuild
index 3b53cbcae0cf..54d561b8d684 100644
--- a/sys-apps/lsof/lsof-4.69.ebuild
+++ b/sys-apps/lsof/lsof-4.69.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/sys-apps/lsof/lsof-4.69.ebuild,v 1.4 2004/06/25 03:08:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.69.ebuild,v 1.5 2004/06/30 02:49:27 vapier Exp $
 
 inherit flag-o-matic
 
@@ -11,13 +11,13 @@ HOMEPAGE="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/README"
 SRC_URI="ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.gz
 	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.gz"
 
-DEPEND="virtual/glibc"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
 IUSE="static"
 
+DEPEND="virtual/libc"
+
 #This pkg appears to be highly kernel-dependent.
 
 src_unpack() {
diff --git a/sys-apps/lsof/lsof-4.71.ebuild b/sys-apps/lsof/lsof-4.71.ebuild
index c10c3205dd19..41806f3f48c7 100644
--- a/sys-apps/lsof/lsof-4.71.ebuild
+++ b/sys-apps/lsof/lsof-4.71.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/sys-apps/lsof/lsof-4.71.ebuild,v 1.5 2004/06/25 03:08:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lsof/lsof-4.71.ebuild,v 1.6 2004/06/30 02:49:27 vapier Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm hppa ~amd64 ~ia64 s390"
 IUSE="static"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 #This pkg appears to be highly kernel-dependent.
 
diff --git a/sys-apps/man/man-1.5l-r6.ebuild b/sys-apps/man/man-1.5l-r6.ebuild
index 17758b99bd05..8256e40caae9 100644
--- a/sys-apps/man/man-1.5l-r6.ebuild
+++ b/sys-apps/man/man-1.5l-r6.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r6.ebuild,v 1.13 2004/06/24 22:14:22 agriffis Exp $
-
-IUSE="nls"
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5l-r6.ebuild,v 1.14 2004/06/30 02:52:00 vapier Exp $
 
 inherit eutils
 
 NV="${PV}"
 S="${WORKDIR}/${PN}-${NV}"
 DESCRIPTION="Standard commands to read man pages"
-SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.tar.gz"
 HOMEPAGE="http://freshmeat.net/projects/man/"
+SRC_URI="mirror://kernel/linux/utils/man/man-${NV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ppc64"
+IUSE="nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
 
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa mips ppc64"
-LICENSE="GPL-2"
-
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-apps/man/man-1.5m-r1.ebuild b/sys-apps/man/man-1.5m-r1.ebuild
index 46354f8a6212..7d2f430c6fb7 100644
--- a/sys-apps/man/man-1.5m-r1.ebuild
+++ b/sys-apps/man/man-1.5m-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/sys-apps/man/man-1.5m-r1.ebuild,v 1.7 2004/06/24 22:14:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m-r1.ebuild,v 1.8 2004/06/30 02:52:00 vapier Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc alpha ~arm ~hppa amd64 ~ia64 s390"
 IUSE="nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
 RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18
diff --git a/sys-apps/man/man-1.5m.ebuild b/sys-apps/man/man-1.5m.ebuild
index ea05e0a5c419..fea67cd83734 100644
--- a/sys-apps/man/man-1.5m.ebuild
+++ b/sys-apps/man/man-1.5m.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/sys-apps/man/man-1.5m.ebuild,v 1.13 2004/06/24 22:14:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5m.ebuild,v 1.14 2004/06/30 02:52:00 vapier Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha arm hppa ~amd64 ia64 s390"
 IUSE="nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
 RDEPEND="sys-apps/cronbase
 	>=sys-apps/groff-1.18"
diff --git a/sys-apps/miscfiles/files/digest-miscfiles-1.2-r1 b/sys-apps/miscfiles/files/digest-miscfiles-1.2-r1
deleted file mode 100644
index 234a0405153a..000000000000
--- a/sys-apps/miscfiles/files/digest-miscfiles-1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83dc137d9b8c90d30b261b3c187ccabf miscfiles-1.2.tar.gz 2154159
diff --git a/sys-apps/miscfiles/files/digest-miscfiles-1.3 b/sys-apps/miscfiles/files/digest-miscfiles-1.3
deleted file mode 100644
index e53257ea21a4..000000000000
--- a/sys-apps/miscfiles/files/digest-miscfiles-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a319c2d15c8d4d4e4149f2742f040c1f miscfiles-1.3.tar.gz 2205613
diff --git a/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild
deleted file mode 100644
index 1e91bc584c02..000000000000
--- a/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.2-r1.ebuild,v 1.14 2004/06/24 22:17:07 agriffis Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Miscellaneous files"
-SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
-KEYWORDS="x86 amd64 ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch < ${FILESDIR}/tasks.info.diff || die
-}
-
-src_compile() {
-	cd ${S}
-	./configure --prefix=/usr \
-		--target=${CHOST} || die
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		install || die
-
-	dodoc GNU* NEWS ORIGIN README dict-README
-}
diff --git a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
index 0b45260630f9..f1ea6bb46d73 100644
--- a/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.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/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.10 2004/06/24 22:17:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3-r1.ebuild,v 1.11 2004/06/30 02:52:49 vapier Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE="uclibc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	uclibc? ( app-arch/gzip )"
 
 src_unpack() {
diff --git a/sys-apps/miscfiles/miscfiles-1.3.ebuild b/sys-apps/miscfiles/miscfiles-1.3.ebuild
deleted file mode 100644
index a9654300f862..000000000000
--- a/sys-apps/miscfiles/miscfiles-1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/miscfiles/miscfiles-1.3.ebuild,v 1.15 2004/06/24 22:17:07 agriffis Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Miscellaneous files"
-SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/directory/miscfiles.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa "
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch < ${FILESDIR}/tasks.info.diff || die
-}
-
-src_compile() {
-	econf || die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	dodoc GNU* NEWS ORIGIN README dict-README
-}
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild
index 7973eaebae5b..feaa18dec50c 100644
--- a/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.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/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild,v 1.12 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.15_pre4.ebuild,v 1.13 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -20,7 +20,7 @@ KEYWORDS="x86 amd64 ppc sparc alpha mips ia64 ppc64 hppa"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
 
 PROVIDE="virtual/modutils"
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
index c859ce28e88e..099a71f6ead2 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-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/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild,v 1.2 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild,v 1.3 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -20,7 +20,7 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ~arm ~ppc64 ~hppa ~s390"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
 
 PROVIDE="virtual/modutils"
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
index dc35f42520a0..3a7e75f541ee 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.4 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.5 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
-IUSE=""
 
 inherit flag-o-matic eutils gnuconfig
 
@@ -11,18 +10,18 @@ MYP="${P/_pre/-pre}"
 S="${WORKDIR}/${MYP}"
 MODUTILS_PV="2.4.26"
 DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 	mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
 	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
 
-KEYWORDS="x86 amd64 ppc sparc alpha mips ia64 arm ppc64 hppa s390"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
-
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
index 0f7e5ec287cb..cda77897102c 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0.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/sys-apps/module-init-tools/module-init-tools-3.0.ebuild,v 1.9 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0.ebuild,v 1.10 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -20,7 +20,7 @@ KEYWORDS="x86 amd64 ppc sparc ~alpha mips ~ia64 arm ppc64 hppa s390"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
 
 PROVIDE="virtual/modutils"
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild
index 25993576a044..4ac1939f74c4 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0_pre10.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/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild,v 1.7 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0_pre10.ebuild,v 1.8 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -20,7 +20,7 @@ KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ~ppc64 ~hppa s390"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
 
 PROVIDE="virtual/modutils"
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild
index dcc9a363921d..5b61bb32d7bc 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0_pre5.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/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild,v 1.5 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0_pre5.ebuild,v 1.6 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -20,7 +20,7 @@ KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ppc64 hppa"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
 
 PROVIDE="virtual/modutils"
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild
index 470a45573acb..dbc4e2e3042b 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0_pre9.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/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild,v 1.5 2004/06/24 22:17:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0_pre9.ebuild,v 1.6 2004/06/30 02:54:18 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 IUSE=""
@@ -20,7 +20,7 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ~ppc64 ~hppa"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib"
 
 PROVIDE="virtual/modutils"
diff --git a/sys-apps/modutils/modutils-2.4.16-r2.ebuild b/sys-apps/modutils/modutils-2.4.16-r2.ebuild
index 7a7f3ec08071..bff9546ea5ef 100644
--- a/sys-apps/modutils/modutils-2.4.16-r2.ebuild
+++ b/sys-apps/modutils/modutils-2.4.16-r2.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/sys-apps/modutils/modutils-2.4.16-r2.ebuild,v 1.19 2004/06/27 17:31:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r2.ebuild,v 1.20 2004/06/30 02:55:09 vapier Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -9,7 +9,7 @@ SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 KEYWORDS="x86 -amd64 ppc sparc "
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 #	zlib? ( sys-libs/zlib )"
 
 src_compile() {
diff --git a/sys-apps/modutils/modutils-2.4.16-r3.ebuild b/sys-apps/modutils/modutils-2.4.16-r3.ebuild
index 30eba3fb1a2a..10ead04b98fc 100644
--- a/sys-apps/modutils/modutils-2.4.16-r3.ebuild
+++ b/sys-apps/modutils/modutils-2.4.16-r3.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/sys-apps/modutils/modutils-2.4.16-r3.ebuild,v 1.18 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.16-r3.ebuild,v 1.19 2004/06/30 02:55:09 vapier Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -9,7 +9,7 @@ SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 KEYWORDS="x86 -amd64 ppc sparc "
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 #	zlib? ( sys-libs/zlib )"
 
 src_compile() {
diff --git a/sys-apps/modutils/modutils-2.4.19.ebuild b/sys-apps/modutils/modutils-2.4.19.ebuild
index c6956d622cd0..4effc2a4e869 100644
--- a/sys-apps/modutils/modutils-2.4.19.ebuild
+++ b/sys-apps/modutils/modutils-2.4.19.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/sys-apps/modutils/modutils-2.4.19.ebuild,v 1.17 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.19.ebuild,v 1.18 2004/06/30 02:55:09 vapier Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -9,7 +9,7 @@ SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 KEYWORDS="x86 -amd64 ppc sparc alpha mips"
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	myconf=""
diff --git a/sys-apps/modutils/modutils-2.4.20.ebuild b/sys-apps/modutils/modutils-2.4.20.ebuild
index f2f18b058af1..64ddae1d923d 100644
--- a/sys-apps/modutils/modutils-2.4.20.ebuild
+++ b/sys-apps/modutils/modutils-2.4.20.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/sys-apps/modutils/modutils-2.4.20.ebuild,v 1.11 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.20.ebuild,v 1.12 2004/06/30 02:55:09 vapier Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 
 KEYWORDS="x86 -amd64 ~ppc ~sparc ~alpha"
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	myconf=""
diff --git a/sys-apps/modutils/modutils-2.4.22.ebuild b/sys-apps/modutils/modutils-2.4.22.ebuild
index 6c549fe87e6e..ea40d81fea48 100644
--- a/sys-apps/modutils/modutils-2.4.22.ebuild
+++ b/sys-apps/modutils/modutils-2.4.22.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/sys-apps/modutils/modutils-2.4.22.ebuild,v 1.15 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.22.ebuild,v 1.16 2004/06/30 02:55:09 vapier Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 -amd64 ppc sparc alpha hppa "
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 
diff --git a/sys-apps/modutils/modutils-2.4.23.ebuild b/sys-apps/modutils/modutils-2.4.23.ebuild
index 2181a42d437b..9cf28d340e86 100644
--- a/sys-apps/modutils/modutils-2.4.23.ebuild
+++ b/sys-apps/modutils/modutils-2.4.23.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/sys-apps/modutils/modutils-2.4.23.ebuild,v 1.10 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.23.ebuild,v 1.11 2004/06/30 02:55:09 vapier Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 -amd64 ~ppc ~sparc ~alpha ~hppa ~mips"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 
diff --git a/sys-apps/modutils/modutils-2.4.24.ebuild b/sys-apps/modutils/modutils-2.4.24.ebuild
index 0c5c6869c61d..13e69af2ff15 100644
--- a/sys-apps/modutils/modutils-2.4.24.ebuild
+++ b/sys-apps/modutils/modutils-2.4.24.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/sys-apps/modutils/modutils-2.4.24.ebuild,v 1.14 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.24.ebuild,v 1.15 2004/06/30 02:55:09 vapier Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 KEYWORDS="x86 -amd64 ppc sparc ~alpha hppa ~mips"
 SLOT="0"
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/modutils/modutils-2.4.25.ebuild b/sys-apps/modutils/modutils-2.4.25.ebuild
index 54b3eb036838..670914db5527 100644
--- a/sys-apps/modutils/modutils-2.4.25.ebuild
+++ b/sys-apps/modutils/modutils-2.4.25.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/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.22 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.25.ebuild,v 1.23 2004/06/30 02:55:09 vapier Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
 KEYWORDS="x86 -amd64 ppc sparc alpha hppa mips ia64"
 SLOT="0"
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
diff --git a/sys-apps/modutils/modutils-2.4.26.ebuild b/sys-apps/modutils/modutils-2.4.26.ebuild
index 75757ecae894..b5bcc5c4936b 100644
--- a/sys-apps/modutils/modutils-2.4.26.ebuild
+++ b/sys-apps/modutils/modutils-2.4.26.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.26.ebuild,v 1.10 2004/06/24 22:17:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.26.ebuild,v 1.11 2004/06/30 02:55:09 vapier Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Standard kernel module utilities"
-SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
-KEYWORDS="~x86 -amd64 ppc ~sparc ~alpha ~hppa ~mips ~ia64 ppc64 s390"
-SLOT="0"
+SRC_URI="mirror://kernel/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
+
 LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc ~mips ~alpha ~hppa -amd64 ~ia64 ppc64 s390"
+IUSE=""
+
+DEPEND="virtual/libc"
 PROVIDE="virtual/modutils"
 
 src_unpack() {
@@ -24,8 +27,6 @@ src_compile() {
 	local myconf=
 	local mymake=
 
-	# filter-flags -fPIC
-
 	# see bug #3897 ... we need insmod static, as libz.so is in /usr/lib
 	#
 	# Final resolution ... dont make it link against zlib, as the static
@@ -45,11 +46,8 @@ src_compile() {
 
 src_install() {
 	local mymake=
-
 	[ ${ARCH} = "hppa" ] && mymake="ARCH=hppa"
-
 	einstall prefix="${D}" ${mymake} || die "make install failed"
 
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
+	dodoc CREDITS ChangeLog NEWS README TODO
 }
-
diff --git a/sys-apps/nbd/nbd-2.0-r1.ebuild b/sys-apps/nbd/nbd-2.0-r1.ebuild
index cfe12fe54af2..c7af61b88783 100644
--- a/sys-apps/nbd/nbd-2.0-r1.ebuild
+++ b/sys-apps/nbd/nbd-2.0-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/sys-apps/nbd/nbd-2.0-r1.ebuild,v 1.4 2004/06/25 03:07:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.0-r1.ebuild,v 1.5 2004/06/30 02:53:07 vapier Exp $
 
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}
 
diff --git a/sys-apps/nbd/nbd-2.6.0.ebuild b/sys-apps/nbd/nbd-2.6.0.ebuild
index a5a097c46e0e..484473cdc594 100644
--- a/sys-apps/nbd/nbd-2.6.0.ebuild
+++ b/sys-apps/nbd/nbd-2.6.0.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/sys-apps/nbd/nbd-2.6.0.ebuild,v 1.2 2004/06/25 03:07:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.6.0.ebuild,v 1.3 2004/06/30 02:53:07 vapier Exp $
 
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}-2.6
 
diff --git a/sys-apps/nbd/nbd-2.7.1.ebuild b/sys-apps/nbd/nbd-2.7.1.ebuild
index fab4272bf277..c647de7e18c2 100644
--- a/sys-apps/nbd/nbd-2.7.1.ebuild
+++ b/sys-apps/nbd/nbd-2.7.1.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/sys-apps/nbd/nbd-2.7.1.ebuild,v 1.2 2004/06/25 03:07:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.7.1.ebuild,v 1.3 2004/06/30 02:53:07 vapier Exp $
 
 DESCRIPTION="Userland client/server for kernel network block device"
 HOMEPAGE="http://nbd.sourceforge.net/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-text/docbook-sgml-utils"
 
 src_unpack() {
diff --git a/sys-apps/netkit-base/files/digest-netkit-base-0.17-r6 b/sys-apps/netkit-base/files/digest-netkit-base-0.17-r6
deleted file mode 100644
index 90e0df4a05c9..000000000000
--- a/sys-apps/netkit-base/files/digest-netkit-base-0.17-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f0193358e92559ec0f598b09ccbc0ec netkit-base-0.17.tar.gz 56473
diff --git a/sys-apps/netkit-base/files/digest-netkit-base-0.17-r7 b/sys-apps/netkit-base/files/digest-netkit-base-0.17-r7
deleted file mode 100644
index 90e0df4a05c9..000000000000
--- a/sys-apps/netkit-base/files/digest-netkit-base-0.17-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f0193358e92559ec0f598b09ccbc0ec netkit-base-0.17.tar.gz 56473
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
deleted file mode 100644
index d1d6e14c87bf..000000000000
--- a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild,v 1.23 2004/06/27 17:32:25 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard linux net thingees -- inetd, ping"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
-
-DEPEND="virtual/glibc"
-
-PROVIDE="virtual/inetd"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use alpha && epatch ${FILESDIR}/001_alpha_${P}-ping-fix.patch.bz2
-}
-
-src_compile() {
-	./configure || die
-
-	cp MCONFIG MCONFIG.orig
-	#sed -e "s/-O2/${CFLAGS}  -Wstrict-prototypes -fomit-frame-pointer/"
-	sed -e "s:^CFLAGS=.*:CFLAGS=${CFLAGS} -Wall -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline:" \
-		MCONFIG.orig > MCONFIG
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	exeopts -m 4755
-	exeinto /bin
-	doexe ping/ping
-
-	if ! use build
-	then
-		cd ${S}/etc.sample
-		sed -e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \
-			< inetd.conf > inetd.conf.new
-		mv inetd.conf.new inetd.conf
-		cd ${S}
-
-		exeopts -m 755
-		exeinto /usr/bin
-		dosbin inetd/inetd
-		doman inetd/inetd.8 inetd/daemon.3 ping/ping.8
-
-		dodoc BUGS ChangeLog README
-		docinto samples ; dodoc etc.sample/*
-		exeinto /etc/init.d ; newexe ${FILESDIR}/inetd.rc6 inetd
-	fi
-}
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
deleted file mode 100644
index 16cc37e4123f..000000000000
--- a/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild,v 1.15 2004/06/27 17:32:25 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard linux net thingees -- inetd, ping"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-
-KEYWORDS="x86 amd64 ppc ~sparc alpha ~hppa mips"
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND="virtual/glibc"
-
-PROVIDE="virtual/inetd"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Note that epatch will intelligently patch architecture specific
-	# patches as well
-	epatch ${FILESDIR}
-}
-
-src_compile() {
-	./configure || die
-
-	cp MCONFIG MCONFIG.orig
-	#sed -e "s/-O2/${CFLAGS}  -Wstrict-prototypes -fomit-frame-pointer/"
-	sed -e "s:^CFLAGS=.*:CFLAGS=${CFLAGS} -Wall -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline:" \
-		MCONFIG.orig > MCONFIG
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	exeopts -m 4755
-	exeinto /bin
-	doexe ping/ping
-
-	if ! use build
-	then
-		cd ${S}/etc.sample
-		sed -e 's:in\.telnetd$:in.telnetd -L /usr/sbin/telnetlogin:' \
-			< inetd.conf > inetd.conf.new
-		mv inetd.conf.new inetd.conf
-		cd ${S}
-
-		exeopts -m 755
-		exeinto /usr/bin
-		dosbin inetd/inetd
-		doman inetd/inetd.8 inetd/daemon.3 ping/ping.8
-
-		dodoc BUGS ChangeLog README
-		docinto samples ; dodoc etc.sample/*
-		exeinto /etc/init.d ; newexe ${FILESDIR}/inetd.rc6 inetd
-	fi
-}
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
index c8c36899c8b9..7d52721f6e41 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild,v 1.10 2004/06/27 17:32:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r8.ebuild,v 1.11 2004/06/30 02:56:31 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Old-style inetd"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 
-# Only keyword for your arch if you have iputils in your default profile!
-KEYWORDS="x86 amd64 alpha ppc mips hppa sparc ia64"
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
+IUSE=""
 
-DEPEND="virtual/glibc"
-
+DEPEND="virtual/libc"
 PROVIDE="virtual/inetd"
 
 src_unpack() {