change glibc to libc

54 files changed, 285 insertions, 298 deletions

diff --git a/sys-apps/acct/acct-6.3.5.ebuild b/sys-apps/acct/acct-6.3.5.ebuild
index b21e575424ff..994d57f2d324 100644
--- a/sys-apps/acct/acct-6.3.5.ebuild
+++ b/sys-apps/acct/acct-6.3.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/acct/acct-6.3.5.ebuild,v 1.8 2004/06/24 21:56:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acct/acct-6.3.5.ebuild,v 1.9 2004/06/28 15:57:00 vapier Exp $
 
 inherit eutils
 
@@ -11,10 +11,10 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/a/acct/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc alpha"
+KEYWORDS="x86 ~ppc alpha amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/acpi/acpi-0.06-r5.ebuild b/sys-apps/acpi/acpi-0.06-r5.ebuild
index 25b9c33bc391..17a2894cc7c8 100644
--- a/sys-apps/acpi/acpi-0.06-r5.ebuild
+++ b/sys-apps/acpi/acpi-0.06-r5.ebuild
@@ -1,23 +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/acpi/acpi-0.06-r5.ebuild,v 1.5 2004/06/24 21:57:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpi/acpi-0.06-r5.ebuild,v 1.6 2004/06/28 15:57:24 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Attempts to replicate the functionality of the 'old' apm command on ACPI systems, including battery and thermal information."
-HOMEPAGE="http://packages.debian.org/unstable/utils/acpi.html"
-
 SRC_URI_BASE="http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}"
 SRC_URI_TGZ="${PN}_${PV}.orig.tar.gz"
 SRC_URI_PATCH="${PN}_${PV}-${PR/r}.diff.gz"
+DESCRIPTION="Attempts to replicate the functionality of the 'old' apm command on ACPI systems, including battery and thermal information."
+HOMEPAGE="http://packages.debian.org/unstable/utils/acpi.html"
 SRC_URI="${SRC_URI_BASE}/${SRC_URI_TGZ} ${SRC_URI_BASE}/${SRC_URI_PATCH}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-alpha -hppa -mips -sparc x86 ~amd64"
+KEYWORDS="-* x86 ~amd64"
 IUSE=""
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} sys-apps/help2man sys-devel/gcc"
-S=${WORKDIR}/${P}
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-devel/gcc"
 
 src_unpack() {
 	unpack ${SRC_URI_TGZ}
diff --git a/sys-apps/acpi/acpi-0.06.ebuild b/sys-apps/acpi/acpi-0.06.ebuild
index 039b4893e796..4a011162934f 100644
--- a/sys-apps/acpi/acpi-0.06.ebuild
+++ b/sys-apps/acpi/acpi-0.06.ebuild
@@ -1,15 +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/acpi/acpi-0.06.ebuild,v 1.6 2004/06/24 21:57:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpi/acpi-0.06.ebuild,v 1.7 2004/06/28 15:57:24 vapier Exp $
 
 DESCRIPTION="Attempts to replicate the functionality of the 'old' apm command on ACPI systems, including battery and thermal information."
 HOMEPAGE="http://packages.debian.org/unstable/utils/acpi.html"
 SRC_URI="http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-alpha -hppa -mips -sparc x86"
+KEYWORDS="-* x86"
 IUSE=""
-DEPEND="virtual/glibc"
+
+DEPEND="virtual/libc"
+
 S=${WORKDIR}/${PN}
 
 src_compile() {
diff --git a/sys-apps/acpid/acpid-1.0.1.ebuild b/sys-apps/acpid/acpid-1.0.1.ebuild
index c2c8d1a577a9..2c154f61785e 100644
--- a/sys-apps/acpid/acpid-1.0.1.ebuild
+++ b/sys-apps/acpid/acpid-1.0.1.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.1.ebuild,v 1.14 2004/06/24 21:57:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.1.ebuild,v 1.15 2004/06/28 15:57:44 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
-SRC_URI="ftp://download.sourceforge.net/pub/sourceforge/acpid/${P}.tar.gz"
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
 HOMEPAGE="http://acpid.sourceforge.net/"
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
+SRC_URI="ftp://download.sourceforge.net/pub/sourceforge/acpid/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
 
 # We need the patched kernel with latest ACPI code, or else it will
 # be broken.  Hopefully it will be merge into release kernel soon.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/linux-sources"
 
 src_compile() {
-
 	# DO NOT compile with optimizations !
 	make INSTPREFIX=${D} ||die
 }
 
-src_install () {
-
+src_install() {
 	make INSTPREFIX=${D} install || die
 
 	dodir /etc/acpi/events
diff --git a/sys-apps/acpid/acpid-1.0.2-r1.ebuild b/sys-apps/acpid/acpid-1.0.2-r1.ebuild
index 915d759c9bf5..3a856ced19ed 100644
--- a/sys-apps/acpid/acpid-1.0.2-r1.ebuild
+++ b/sys-apps/acpid/acpid-1.0.2-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/sys-apps/acpid/acpid-1.0.2-r1.ebuild,v 1.5 2004/06/24 21:57:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.2-r1.ebuild,v 1.6 2004/06/28 15:57:44 vapier Exp $
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
-SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz"
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
 HOMEPAGE="http://acpid.sourceforge.net/"
-IUSE=""
-KEYWORDS="x86 amd64 -ppc"
-SLOT="0"
+SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
 
 # We need the patched kernel with latest ACPI code, or else it will
 # be broken.  Hopefully it will be merge into release kernel soon.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/linux-sources"
 
 src_compile() {
-
 	# DO NOT COMPILE WITH OPTIMISATIONS.
 	# That is a note to the devs.  IF you are a user, go ahead and optimise
 	# if you want, but we won't support bugs associated with that"
@@ -38,4 +37,3 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/acpid.rc6 acpid
 }
-
diff --git a/sys-apps/acpid/acpid-1.0.2-r2.ebuild b/sys-apps/acpid/acpid-1.0.2-r2.ebuild
index aa9ea5f82360..932e946f4cd5 100644
--- a/sys-apps/acpid/acpid-1.0.2-r2.ebuild
+++ b/sys-apps/acpid/acpid-1.0.2-r2.ebuild
@@ -1,27 +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/acpid/acpid-1.0.2-r2.ebuild,v 1.6 2004/06/24 21:57:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acpid/acpid-1.0.2-r2.ebuild,v 1.7 2004/06/28 15:57:44 vapier Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${P}"
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface."
-SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz"
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
 HOMEPAGE="http://acpid.sourceforge.net/"
-IUSE=""
-KEYWORDS="x86 amd64 -ppc alpha ia64"
-SLOT="0"
+SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -ppc alpha amd64 ia64"
+IUSE=""
 
 # We need the patched kernel with latest ACPI code, or else it will
 # be broken.  Hopefully it will be merge into release kernel soon.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/linux-sources"
 
 src_compile() {
-
 	# Fix bug # 22238 (default.sh broken)
-	( cd debian && epatch ${FILESDIR}/default.sh-gentoo.patch )
+	cd debian && epatch ${FILESDIR}/default.sh-gentoo.patch && cd ..
 
 	# DO NOT COMPILE WITH OPTIMISATIONS.
 	# That is a note to the devs.  IF you are a user, go ahead and optimise
@@ -43,4 +42,3 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/acpid.rc6 acpid
 }
-
diff --git a/sys-apps/anacron/anacron-2.3.ebuild b/sys-apps/anacron/anacron-2.3.ebuild
index 44666c6b46c7..e7983f6f8b09 100644
--- a/sys-apps/anacron/anacron-2.3.ebuild
+++ b/sys-apps/anacron/anacron-2.3.ebuild
@@ -1,21 +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/anacron/anacron-2.3.ebuild,v 1.8 2004/06/24 21:57:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/anacron/anacron-2.3.ebuild,v 1.9 2004/06/28 15:58:09 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Anacron -- a periodic command scheduler"
+DESCRIPTION="a periodic command scheduler"
 HOMEPAGE="http://anacron.sourceforge.net/"
 SRC_URI=" http://umn.dl.sourceforge.net/sourceforge/anacron/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc"
+KEYWORDS="x86 ppc amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
-
 RDEPEND="virtual/mta
 	virtual/cron"
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild
index e0145947d370..ed414101acd0 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.10-r1.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/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild,v 1.4 2004/06/24 21:57:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild,v 1.5 2004/06/28 15:58:34 vapier Exp $
 
 inherit eutils
 
-IUSE="doc snmp usb apache2"
-
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
 	virtual/glibc
@@ -85,7 +85,7 @@ src_install () {
 
 	ln -s onbattery powerout
 
-	if [ "`use doc`x" != "x" ]
+	if use doc
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
diff --git a/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild
index e308abd1ded7..66abe081e1f4 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild,v 1.3 2004/06/24 21:57:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10-r2.ebuild,v 1.4 2004/06/28 15:58:34 vapier Exp $
 
 inherit eutils
 
-IUSE="doc snmp usb apache2"
-
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
+	virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/ucd-snmp )
 	sys-libs/ncurses"
@@ -87,7 +87,7 @@ src_install () {
 
 	ln -s onbattery powerout
 
-	if [ "`use doc`x" != "x" ]
+	if use doc
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
diff --git a/sys-apps/apcupsd/apcupsd-3.10.10.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10.ebuild
index 9c9159df8e8b..091c4bb48826 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.10.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.10.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10.ebuild,v 1.4 2004/06/24 21:57:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10.ebuild,v 1.5 2004/06/28 15:58:34 vapier Exp $
 
 inherit eutils
 
-IUSE="doc snmp usb apache2"
-
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
+	virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/ucd-snmp )
 	sys-libs/ncurses"
@@ -84,7 +84,7 @@ src_install () {
 
 	ln -s onbattery powerout
 
-	if [ "`use doc`x" != "x" ]
+	if use doc
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
diff --git a/sys-apps/apcupsd/apcupsd-3.10.13.ebuild b/sys-apps/apcupsd/apcupsd-3.10.13.ebuild
index ddf87bf01416..1b94ec5062c6 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.13.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.13.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.13.ebuild,v 1.4 2004/06/24 21:57:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.13.ebuild,v 1.5 2004/06/28 15:58:34 vapier Exp $
 
 inherit eutils
 
-IUSE="doc snmp usb apache2"
-
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
+	virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/ucd-snmp )
 	sys-libs/ncurses"
@@ -84,7 +84,7 @@ src_install () {
 
 	ln -s onbattery powerout
 
-	if [ "`use doc`x" != "x" ]
+	if use doc
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
diff --git a/sys-apps/apcupsd/apcupsd-3.10.8.ebuild b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
index 609d259ed503..a1378fc1f9a2 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.8.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.8.ebuild,v 1.6 2004/06/24 21:57:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.8.ebuild,v 1.7 2004/06/28 15:58:34 vapier Exp $
 
 inherit eutils
 
-IUSE="doc snmp usb apache2"
-
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
+	virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/ucd-snmp )
 	sys-libs/ncurses"
@@ -84,7 +84,7 @@ src_install () {
 
 	ln -s onbattery powerout
 
-	if [ "`use doc`x" != "x" ]
+	if use doc
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
diff --git a/sys-apps/apcupsd/apcupsd-3.10.9.ebuild b/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
index e163436ebc4f..3d24f135e7e3 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.9.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.9.ebuild,v 1.6 2004/06/24 21:57:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.9.ebuild,v 1.7 2004/06/28 15:58:35 vapier Exp $
 
 inherit eutils
 
-IUSE="doc snmp usb apache2"
-
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
 SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
 	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
-HOMEPAGE="http://www.sibbald.com/apcupsd/"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+IUSE="doc snmp usb apache2"
 
 DEPEND=">=sys-apps/baselayout-1.8.4
-	virtual/glibc
+	virtual/libc
 	virtual/mta
 	snmp? ( net-analyzer/ucd-snmp )
 	sys-libs/ncurses"
@@ -84,7 +84,7 @@ src_install () {
 
 	ln -s onbattery powerout
 
-	if [ "`use doc`x" != "x" ]
+	if use doc
 	then
 		einfo "Installing full documentation into /usr/share/doc/${P}..."
 		cd ${S}/doc
diff --git a/sys-apps/at/at-3.1.8-r10.ebuild b/sys-apps/at/at-3.1.8-r10.ebuild
index ec47567a714c..28206b1f7dcc 100644
--- a/sys-apps/at/at-3.1.8-r10.ebuild
+++ b/sys-apps/at/at-3.1.8-r10.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r10.ebuild,v 1.4 2004/06/24 21:58:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r10.ebuild,v 1.5 2004/06/28 15:59:01 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Queues jobs for later execution"
-SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
 HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc alpha ~ia64 ~ppc64"
-SLOT="0"
+SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc alpha ~amd64 ~ia64 ~ppc64"
+IUSE=""
 
-DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a"
-RDEPEND="virtual/glibc virtual/mta"
+DEPEND="virtual/libc
+	>=sys-devel/flex-2.5.4a"
+RDEPEND="virtual/libc
+	virtual/mta"
 
 src_unpack() {
 	unpack ${A} && cd ${S} || die "error unpacking"
diff --git a/sys-apps/at/at-3.1.8-r9.ebuild b/sys-apps/at/at-3.1.8-r9.ebuild
index 8ac61be524a2..7525eb3d4125 100644
--- a/sys-apps/at/at-3.1.8-r9.ebuild
+++ b/sys-apps/at/at-3.1.8-r9.ebuild
@@ -1,17 +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/at/at-3.1.8-r9.ebuild,v 1.4 2004/06/24 21:58:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r9.ebuild,v 1.5 2004/06/28 15:59:01 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Queues jobs for later execution"
-SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
 HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
-KEYWORDS="x86 amd64 ppc sparc alpha ia64 ppc64"
-SLOT="0"
+SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha amd64 ia64 ppc64"
+IUSE=""
 
-DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a"
-RDEPEND="virtual/glibc virtual/mta"
+DEPEND="virtual/libc
+	>=sys-devel/flex-2.5.4a"
+RDEPEND="virtual/libc
+	virtual/mta"
 
 src_compile() {
 	./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \
diff --git a/sys-apps/attr/attr-2.4.7-r1.ebuild b/sys-apps/attr/attr-2.4.7-r1.ebuild
index 783072a631b9..196d7238c66e 100644
--- a/sys-apps/attr/attr-2.4.7-r1.ebuild
+++ b/sys-apps/attr/attr-2.4.7-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.7-r1.ebuild,v 1.22 2004/06/24 21:58:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.7-r1.ebuild,v 1.23 2004/06/28 15:59:34 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="xfs extended attributes tools"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
-		http://acl.bestbits.at/current/tar/${P}.src.tar.gz"
+	http://acl.bestbits.at/current/tar/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-apps/attr/attr-2.4.8.ebuild b/sys-apps/attr/attr-2.4.8.ebuild
index a1ed1d37471e..aa9d27aeb30f 100644
--- a/sys-apps/attr/attr-2.4.8.ebuild
+++ b/sys-apps/attr/attr-2.4.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.8.ebuild,v 1.5 2004/06/25 20:19:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.8.ebuild,v 1.6 2004/06/28 15:59:35 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="xfs extended attributes tools"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 SRC_URI="ftp://oss.sgi.com/projects/xfs/download/latest/cmd_tars/${P}.src.tar.gz
-		http://acl.bestbits.at/current/tar/${P}.src.tar.gz"
+	http://acl.bestbits.at/current/tar/${P}.src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -16,11 +16,10 @@ IUSE="nls debug"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4.0.5
-	virtual/glibc
+	virtual/libc
 	nls? ( sys-devel/gettext )
 	sys-devel/libtool"
-
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/buffer/buffer-1.19-r1.ebuild b/sys-apps/buffer/buffer-1.19-r1.ebuild
index 18814315b721..0a31fe8b0b06 100644
--- a/sys-apps/buffer/buffer-1.19-r1.ebuild
+++ b/sys-apps/buffer/buffer-1.19-r1.ebuild
@@ -1,27 +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/buffer/buffer-1.19-r1.ebuild,v 1.5 2004/06/24 21:59:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/buffer/buffer-1.19-r1.ebuild,v 1.6 2004/06/28 16:00:29 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="a tapedrive tool for speeding up reading from and writing to tape"
-SRC_URI="http://www.microwerks.net/~hugo/download/${P}.tgz"
 HOMEPAGE="http://www.microwerks.net/~hugo/download.html"
+SRC_URI="http://www.microwerks.net/~hugo/download/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	make clean
 	emake || die "make failed"
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe buffer
+src_install() {
+	dobin buffer || die
 	dodoc README
-
 	newman buffer.man buffer.1
 }
diff --git a/sys-apps/busybox/busybox-0.60.3-r1.ebuild b/sys-apps/busybox/busybox-0.60.3-r1.ebuild
index c053eb9eca33..ddc4b5f538d5 100644
--- a/sys-apps/busybox/busybox-0.60.3-r1.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3-r1.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/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.7 2004/06/24 21:59:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r1.ebuild,v 1.8 2004/06/28 16:01:00 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
 SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
-HOMEPAGE="http://www.busybox.net"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -amd64 ppc sparc ~alpha"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha -amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/busybox/busybox-0.60.3-r2.ebuild b/sys-apps/busybox/busybox-0.60.3-r2.ebuild
index b28f4e0e6b95..97d231ecb0ac 100644
--- a/sys-apps/busybox/busybox-0.60.3-r2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.3-r2.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/busybox/busybox-0.60.3-r2.ebuild,v 1.4 2004/06/24 21:59:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.3-r2.ebuild,v 1.5 2004/06/28 16:01:00 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
 SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
-HOMEPAGE="http://www.busybox.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="-* sparc -amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/busybox/busybox-0.60.5-r1.ebuild b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
index 9957ec07521e..de5e9fc436bf 100644
--- a/sys-apps/busybox/busybox-0.60.5-r1.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5-r1.ebuild
@@ -1,19 +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/busybox/busybox-0.60.5-r1.ebuild,v 1.12 2004/06/25 20:28:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r1.ebuild,v 1.13 2004/06/28 16:01:00 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
 SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
-HOMEPAGE="http://www.busybox.net"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -amd64 -alpha"
+SLOT="0"
+KEYWORDS="~x86 -alpha -amd64"
 IUSE="static uclibc"
 
-DEPEND="virtual/glibc"
-RDEPEND="!static? ${DEPEND}"
+DEPEND="virtual/libc"
+RDEPEND="!static? ( virtual/libc )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/busybox/busybox-0.60.5-r2.ebuild b/sys-apps/busybox/busybox-0.60.5-r2.ebuild
index 643267216540..8665602eb4dc 100644
--- a/sys-apps/busybox/busybox-0.60.5-r2.ebuild
+++ b/sys-apps/busybox/busybox-0.60.5-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/busybox/busybox-0.60.5-r2.ebuild,v 1.9 2004/06/25 20:28:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.60.5-r2.ebuild,v 1.10 2004/06/28 16:01:00 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,14 +10,15 @@ SRC_URI="http://www.busybox.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 arm -amd64 -alpha"
+KEYWORDS="~x86 arm -alpha -amd64"
 IUSE="static uclibc diet devfs"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	diet? ( dev-libs/dietlibc )
 	>=sys-apps/sed-4"
-RDEPEND="!static? (
-		!diet? ( virtual/glibc )
+RDEPEND="
+	!static? (
+		!diet? ( virtual/libc )
 		diet? ( dev-libs/dietlibc )
 	)"
 
diff --git a/sys-apps/busybox/busybox-1.00_pre8.ebuild b/sys-apps/busybox/busybox-1.00_pre8.ebuild
index 386d0e378f98..6946a2526c8d 100644
--- a/sys-apps/busybox/busybox-1.00_pre8.ebuild
+++ b/sys-apps/busybox/busybox-1.00_pre8.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/busybox/busybox-1.00_pre8.ebuild,v 1.7 2004/06/24 21:59:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00_pre8.ebuild,v 1.8 2004/06/28 16:01:00 vapier Exp $
 
 inherit eutils
 
@@ -13,10 +13,10 @@ SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc arm ~amd64 ~mips"
+KEYWORDS="~x86 ~ppc ~mips arm ~amd64"
 IUSE="debug static uclibc savedconfig make-busybox-symlinks"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	!amd64? ( uclibc? ( dev-libs/uclibc ) )"
 RDEPEND="!static? ( ${DEPEND} )"
 # <pebenito> then eventually turning on selinux would mean
diff --git a/sys-apps/chpax/chpax-0.5.ebuild b/sys-apps/chpax/chpax-0.5.ebuild
index 09d29b3a34a3..79853dc39fcc 100644
--- a/sys-apps/chpax/chpax-0.5.ebuild
+++ b/sys-apps/chpax/chpax-0.5.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/sys-apps/chpax/chpax-0.5.ebuild,v 1.8 2004/06/25 03:08:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.5.ebuild,v 1.9 2004/06/28 16:01:35 vapier Exp $
 
 # S=${WORKDIR}/chpax
-
 DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binaries."
+HOMEPAGE="http://pageexec.virtualave.net/"
 SRC_URI="http://pageexec.virtualave.net/chpax-${PV}.tar.gz"
-HOMEPAGE="http://pageexec.virtualave.net"
-KEYWORDS="x86 ~amd64 sparc ppc ~hppa ia64"
+
 LICENSE="public-domain"
 SLOT="0"
-
+KEYWORDS="x86 ppc sparc ~hppa ~amd64 ia64"
 IUSE=""
-DEPEND="virtual/glibc"
+
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -37,5 +37,4 @@ src_install() {
 	newins ${FILESDIR}/pax-conf.d chpax
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/pax-init.d chpax
-
 }
diff --git a/sys-apps/chpax/chpax-0.6.1.ebuild b/sys-apps/chpax/chpax-0.6.1.ebuild
index b3a2435d01bb..6a47ae15eb07 100644
--- a/sys-apps/chpax/chpax-0.6.1.ebuild
+++ b/sys-apps/chpax/chpax-0.6.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/chpax/chpax-0.6.1.ebuild,v 1.10 2004/06/25 03:08:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.6.1.ebuild,v 1.11 2004/06/28 16:01:35 vapier Exp $
 
 inherit flag-o-matic gcc
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc ~mips alpha ~arm hppa amd64 ia64"
 #IUSE="static"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/clrngd/clrngd-1.0.3.ebuild b/sys-apps/clrngd/clrngd-1.0.3.ebuild
index 3a850fef7207..bb9fc56e89b1 100644
--- a/sys-apps/clrngd/clrngd-1.0.3.ebuild
+++ b/sys-apps/clrngd/clrngd-1.0.3.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/clrngd/clrngd-1.0.3.ebuild,v 1.2 2004/06/24 22:00:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/clrngd/clrngd-1.0.3.ebuild,v 1.3 2004/06/28 16:01:58 vapier Exp $
 
 DESCRIPTION="Clock randomness gathering daemon"
 HOMEPAGE="http://echelon.pl/pubs/"
 SRC_URI="http://echelon.pl/pubs/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND="virtual/glibc sys-devel/gcc"
-RDEPEND="virtual/glibc"
-S=${WORKDIR}/${P}
+
+DEPEND="virtual/libc sys-devel/gcc"
+RDEPEND="virtual/libc"
 
 src_compile() {
 	econf --bindir=/usr/sbin || die
diff --git a/sys-apps/daemontools/daemontools-0.76-r3.ebuild b/sys-apps/daemontools/daemontools-0.76-r3.ebuild
index be082e97d215..1d538855db65 100644
--- a/sys-apps/daemontools/daemontools-0.76-r3.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-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/daemontools/daemontools-0.76-r3.ebuild,v 1.10 2004/06/24 22:01:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r3.ebuild,v 1.11 2004/06/28 16:02:57 vapier Exp $
 
 inherit eutils gcc
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="selinux"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
 
 S=${WORKDIR}/admin/${P}
diff --git a/sys-apps/daemontools/daemontools-0.76-r4.ebuild b/sys-apps/daemontools/daemontools-0.76-r4.ebuild
index 3e2bada0d95c..763437b6435d 100644
--- a/sys-apps/daemontools/daemontools-0.76-r4.ebuild
+++ b/sys-apps/daemontools/daemontools-0.76-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/daemontools/daemontools-0.76-r4.ebuild,v 1.10 2004/06/24 22:01:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/daemontools-0.76-r4.ebuild,v 1.11 2004/06/28 16:02:57 vapier Exp $
 
 inherit eutils gcc
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc mips alpha arm hppa ~amd64 ~ia64"
 IUSE="selinux"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
 
 S=${WORKDIR}/admin/${P}
diff --git a/sys-apps/dcfldd/dcfldd-1.0.ebuild b/sys-apps/dcfldd/dcfldd-1.0.ebuild
index b4d2b3d7b70b..1e29b6d433be 100644
--- a/sys-apps/dcfldd/dcfldd-1.0.ebuild
+++ b/sys-apps/dcfldd/dcfldd-1.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/dcfldd/dcfldd-1.0.ebuild,v 1.3 2004/06/24 22:02:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcfldd/dcfldd-1.0.ebuild,v 1.4 2004/06/28 16:03:19 vapier Exp $
 
 DESCRIPTION="Enhanced dd with md5 checksums"
 HOMEPAGE="http://biatchux.dmzs.com/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/dcron/dcron-2.7-r10.ebuild b/sys-apps/dcron/dcron-2.7-r10.ebuild
index ce49f6d6e23a..df9afea0a7cb 100644
--- a/sys-apps/dcron/dcron-2.7-r10.ebuild
+++ b/sys-apps/dcron/dcron-2.7-r10.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/sys-apps/dcron/dcron-2.7-r10.ebuild,v 1.7 2004/06/24 22:02:31 agriffis Exp $
-
-# to use this, you must be part of the "cron" group
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7-r10.ebuild,v 1.8 2004/06/28 16:03:39 vapier Exp $
 
 inherit eutils
 
@@ -11,17 +9,16 @@ DESCRIPTION="A cute little cron from Matt Dillon"
 HOMEPAGE="http://apollo.backplane.com/"
 SRC_URI="http://apollo.backplane.com/FreeSrc/dcron27.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc hppa mips"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
-
 RDEPEND="!virtual/cron
 	sys-apps/cronbase
 	virtual/mta"
-
 PROVIDE="virtual/cron"
 
 src_unpack() {
diff --git a/sys-apps/dcron/dcron-2.9-r1.ebuild b/sys-apps/dcron/dcron-2.9-r1.ebuild
index 1d97faa1ebd9..75fc18796d71 100644
--- a/sys-apps/dcron/dcron-2.9-r1.ebuild
+++ b/sys-apps/dcron/dcron-2.9-r1.ebuild
@@ -1,27 +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/dcron/dcron-2.9-r1.ebuild,v 1.4 2004/06/24 22:02:31 agriffis Exp $
-
-# to use this, you must be part of the "cron" group
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9-r1.ebuild,v 1.5 2004/06/28 16:03:39 vapier Exp $
 
 inherit eutils
 
 MY_PV=29
 S=${WORKDIR}/${PN}
 DESCRIPTION="A cute little cron from Matt Dillon"
-SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
 HOMEPAGE="http://apollo.backplane.com/"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~mips"
-SLOT="0"
+SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
-
 RDEPEND="!virtual/cron
 	>=sys-apps/cronbase-0.2.1-r3
 	virtual/mta"
-
 PROVIDE="virtual/cron"
 
 src_unpack() {
diff --git a/sys-apps/dcron/dcron-2.9-r2.ebuild b/sys-apps/dcron/dcron-2.9-r2.ebuild
index 93c55552e231..7e50c87dddd9 100644
--- a/sys-apps/dcron/dcron-2.9-r2.ebuild
+++ b/sys-apps/dcron/dcron-2.9-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/dcron/dcron-2.9-r2.ebuild,v 1.10 2004/06/24 22:02:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9-r2.ebuild,v 1.11 2004/06/28 16:03:39 vapier Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
 RDEPEND="!virtual/cron
 	>=sys-apps/cronbase-0.2.1-r3
diff --git a/sys-apps/dcron/dcron-2.9.ebuild b/sys-apps/dcron/dcron-2.9.ebuild
index 36947c941ee2..e6f652eb1010 100644
--- a/sys-apps/dcron/dcron-2.9.ebuild
+++ b/sys-apps/dcron/dcron-2.9.ebuild
@@ -1,27 +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/dcron/dcron-2.9.ebuild,v 1.13 2004/06/24 22:02:31 agriffis Exp $
-
-# to use this, you must be part of the "cron" group
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.9.ebuild,v 1.14 2004/06/28 16:03:39 vapier Exp $
 
 inherit eutils
 
 MY_PV=29
 S=${WORKDIR}/${PN}
 DESCRIPTION="A cute little cron from Matt Dillon"
-SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
 HOMEPAGE="http://apollo.backplane.com/"
-KEYWORDS="x86 amd64 ~ppc sparc hppa alpha mips"
-SLOT="0"
+SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc mips alpha hppa amd64"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
-
 RDEPEND="!virtual/cron
 	sys-apps/cronbase
 	virtual/mta"
-
 PROVIDE="virtual/cron"
 
 src_unpack() {
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
index 67425ee51876..c90edaff7fdb 100644
--- a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-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/debianutils/debianutils-1.16.7-r4.ebuild,v 1.8 2004/06/24 22:02:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.9 2004/06/28 16:04:01 vapier Exp $
 
 inherit eutils
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE="static build"
 
-DEPEND="virtual/glibc"
-
+DEPEND="virtual/libc"
 RDEPEND="app-arch/bzip2
 	sys-apps/coreutils"
 
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
index 5517eca4381e..69a6838d0d61 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild
@@ -1,31 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild,v 1.20 2004/06/25 20:41:21 agriffis Exp $
-
-IUSE="nls build static"
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r3.ebuild,v 1.21 2004/06/28 16:04:27 vapier Exp $
 
 inherit eutils flag-o-matic
 
-# sdiff SIGSEGVs with this on gcc-3.2.1, so take it out
-# this fixes bug #13502
-filter-flags "-mpowerpc-gfxopt"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
-SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${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="nls build static"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	!build? ( sys-apps/texinfo sys-apps/help2man )"
-
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -54,6 +47,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# sdiff SIGSEGVs with this on gcc-3.2.1, so take it out
+	# this fixes bug #13502
+	filter-flags -mpowerpc-gfxopt
+
 	econf --build=${CHOST} `use_enable nls` || die "econf"
 
 	if use static ; then
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
index f98c8baf973c..d5adf7e69236 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-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/diffutils/diffutils-2.8.4-r4.ebuild,v 1.14 2004/06/24 22:03:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.15 2004/06/28 16:04:27 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,12 +13,12 @@ SLOT="0"
 KEYWORDS="x86 ~ppc sparc mips alpha arm hppa ~amd64 ia64 ppc64 s390"
 IUSE="nls build static"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	!build? ( sys-apps/texinfo sys-apps/help2man )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/diffutils/diffutils-2.8.7.ebuild b/sys-apps/diffutils/diffutils-2.8.7.ebuild
index 43fc92628c96..43cbcfd028d6 100644
--- a/sys-apps/diffutils/diffutils-2.8.7.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.7.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/diffutils/diffutils-2.8.7.ebuild,v 1.5 2004/06/24 22:03:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7.ebuild,v 1.6 2004/06/28 16:04:27 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,15 +10,15 @@ SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86 ppc ~hppa ~ppc64 amd64"
+KEYWORDS="-* ~x86 ppc ~hppa amd64 ~ppc64"
 IUSE="nls build static"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	!build? ( sys-apps/texinfo sys-apps/help2man )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild b/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild
index c0e3fcd44ecb..6061f7056ef2 100644
--- a/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild
+++ b/sys-apps/discover-data/discover-data-2.2003.02.05.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/discover-data/discover-data-2.2003.02.05.ebuild,v 1.7 2004/06/24 22:03:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-2.2003.02.05.ebuild,v 1.8 2004/06/28 16:04:50 vapier Exp $
 
 DESCRIPTION="data for discover. list of pci ids. pnp ids etc."
 HOMEPAGE="http://hackers.progeny.com/discover/"
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc -sparc mips ~alpha hppa amd64"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_install() {
 	make prefix=/usr DESTDIR=${D} install || die
diff --git a/sys-apps/ed/ed-0.2-r3.ebuild b/sys-apps/ed/ed-0.2-r3.ebuild
index d243d9d6946d..edcb844e3c66 100644
--- a/sys-apps/ed/ed-0.2-r3.ebuild
+++ b/sys-apps/ed/ed-0.2-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/ed/ed-0.2-r3.ebuild,v 1.27 2004/06/24 22:04:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ed/ed-0.2-r3.ebuild,v 1.28 2004/06/28 16:05:20 vapier Exp $
 
 inherit 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
 	sys-apps/texinfo"
 
 src_unpack() {
diff --git a/sys-apps/eject/eject-2.0.12-r1.ebuild b/sys-apps/eject/eject-2.0.12-r1.ebuild
index c16eb8c20d04..9f98c1861398 100644
--- a/sys-apps/eject/eject-2.0.12-r1.ebuild
+++ b/sys-apps/eject/eject-2.0.12-r1.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/eject/eject-2.0.12-r1.ebuild,v 1.8 2004/06/24 22:04:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.12-r1.ebuild,v 1.9 2004/06/28 16:05:39 vapier Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
+HOMEPAGE="http://eject.sourceforge.net/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
 	http://www.pobox.com/~tranter/${P}.tar.gz"
-HOMEPAGE="http://eject.sourceforge.net/"
 
-KEYWORDS="x86 amd64 ppc sparc alpha hppa ia64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/eject/eject-2.0.13.ebuild b/sys-apps/eject/eject-2.0.13.ebuild
index 88246455a210..493ec1cd3060 100644
--- a/sys-apps/eject/eject-2.0.13.ebuild
+++ b/sys-apps/eject/eject-2.0.13.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/eject/eject-2.0.13.ebuild,v 1.11 2004/06/24 22:04:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13.ebuild,v 1.12 2004/06/28 16:05:39 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A command to eject a disc from the CD-ROM drive"
 HOMEPAGE="http://eject.sourceforge.net/"
 SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
 	http://www.pobox.com/~tranter/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc sparc alpha hppa ppc64 ia64 mips"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc mips alpha hppa amd64 ia64 ppc64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild b/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
index d8aeffb650a1..a215945c5a2f 100644
--- a/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-0.4.4-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/fakeroot/fakeroot-0.4.4-r1.ebuild,v 1.10 2004/06/24 22:05:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4-r1.ebuild,v 1.11 2004/06/28 16:06:17 vapier Exp $
 
 inherit gnuconfig
 
@@ -13,8 +13,9 @@ SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/utils/${MY_P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc alpha amd64"
+IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/fakeroot/fakeroot-0.4.4.ebuild b/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
index 53c490a6663d..a60f7557d16a 100644
--- a/sys-apps/fakeroot/fakeroot-0.4.4.ebuild
+++ b/sys-apps/fakeroot/fakeroot-0.4.4.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/fakeroot/fakeroot-0.4.4.ebuild,v 1.6 2004/06/24 22:05:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fakeroot/fakeroot-0.4.4.ebuild,v 1.7 2004/06/28 16:06:17 vapier Exp $
 
 MY_P="${PN}_${PV}-4.1"
 
@@ -10,14 +10,10 @@ SRC_URI="http://ftp.debian.org/debian/dists/potato/main/source/utils/${MY_P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~hppa"
+KEYWORDS="x86 ~hppa amd64"
+IUSE=""
 
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
+RDEPEND="virtual/libc"
 
 src_install() {
 	make DESTDIR=${D} install || die "install problem"
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 9a4a8debcc88..957f48fbc5c6 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.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/fbset/fbset-2.1.ebuild,v 1.24 2004/06/24 22:05:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fbset/fbset-2.1.ebuild,v 1.25 2004/06/28 16:06:36 vapier Exp $
 
 inherit gcc
 
@@ -11,8 +11,9 @@ SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha arm hppa amd64 ia64 ppc64 s390"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/file/file-3.41.ebuild b/sys-apps/file/file-3.41.ebuild
index 4bf65ae23d69..7ce0e441da8d 100644
--- a/sys-apps/file/file-3.41.ebuild
+++ b/sys-apps/file/file-3.41.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/file/file-3.41.ebuild,v 1.7 2004/06/25 20:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.41.ebuild,v 1.8 2004/06/28 16:07:10 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa "
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/file/file-4.02.ebuild b/sys-apps/file/file-4.02.ebuild
index 0ad4fe390f4a..e623c916da8d 100644
--- a/sys-apps/file/file-4.02.ebuild
+++ b/sys-apps/file/file-4.02.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/file/file-4.02.ebuild,v 1.13 2004/06/25 20:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.02.ebuild,v 1.14 2004/06/28 16:07:10 vapier Exp $
 
 inherit flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ppc sparc alpha hppa"
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 
diff --git a/sys-apps/file/file-4.06.ebuild b/sys-apps/file/file-4.06.ebuild
index 72b48a0197f4..9544ba26cee5 100644
--- a/sys-apps/file/file-4.06.ebuild
+++ b/sys-apps/file/file-4.06.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/file/file-4.06.ebuild,v 1.18 2004/06/25 20:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.06.ebuild,v 1.19 2004/06/28 16:07:10 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="x86 amd64 ~ppc sparc alpha hppa mips ia64 ppc64"
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc mips alpha hppa amd64 ia64 ppc64"
 IUSE="uclibc"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/file/file-4.07-r1.ebuild b/sys-apps/file/file-4.07-r1.ebuild
index c8a5231d5c27..8f5cc33bedd0 100644
--- a/sys-apps/file/file-4.07-r1.ebuild
+++ b/sys-apps/file/file-4.07-r1.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/file/file-4.07-r1.ebuild,v 1.6 2004/06/25 20:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.07-r1.ebuild,v 1.7 2004/06/28 16:07:10 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~ppc64 s390"
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64 s390"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/file/file-4.07.ebuild b/sys-apps/file/file-4.07.ebuild
index 5aa953b20b81..ffbc57e9102a 100644
--- a/sys-apps/file/file-4.07.ebuild
+++ b/sys-apps/file/file-4.07.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/file/file-4.07.ebuild,v 1.6 2004/06/25 20:43:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.07.ebuild,v 1.7 2004/06/28 16:07:10 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils
 
 DESCRIPTION="Program to identify a file's format by scanning binary data for patterns"
+HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 SRC_URI="ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
 	ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~ppc64"
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/file/file-4.08.ebuild b/sys-apps/file/file-4.08.ebuild
index b996949e6c7e..de19b18a0f0c 100644
--- a/sys-apps/file/file-4.08.ebuild
+++ b/sys-apps/file/file-4.08.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/file/file-4.08.ebuild,v 1.8 2004/06/24 22:06:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.08.ebuild,v 1.9 2004/06/28 16:07:10 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc ~mips ~alpha arm hppa ~amd64 ~ia64 ~ppc64 s390"
 IUSE="build uclibc"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/file/file-4.09.ebuild b/sys-apps/file/file-4.09.ebuild
index f9c1678b1cec..ff288af72e0a 100644
--- a/sys-apps/file/file-4.09.ebuild
+++ b/sys-apps/file/file-4.09.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/file/file-4.09.ebuild,v 1.7 2004/06/25 23:45:58 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.09.ebuild,v 1.8 2004/06/28 16:07:10 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils
 use python && inherit distutils
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc sparc mips alpha ~arm ~hppa amd64 ~ia64 ~ppc64 s390"
 IUSE="python build"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	!build? ( python? ( virtual/python ) )"
 
 src_unpack() {
diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
index cb2309d63967..a5c50d94dd94 100644
--- a/sys-apps/findutils/findutils-4.1.20-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20-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/findutils/findutils-4.1.20-r1.ebuild,v 1.21 2004/06/25 20:59:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.22 2004/06/28 16:07:47 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -19,12 +19,12 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa alpha amd64 ia64 ppc64 s390"
 IUSE="nls build afs selinux"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	x86? ( afs? ( net-fs/openafs ) )
 	selinux? ( sys-libs/libselinux )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/findutils/findutils-4.1.20.ebuild b/sys-apps/findutils/findutils-4.1.20.ebuild
index c44c81b8fc65..426cdf50388b 100644
--- a/sys-apps/findutils/findutils-4.1.20.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20.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/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.7 2004/06/24 22:06:58 agriffis Exp $
-
-IUSE="nls build afs"
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.8 2004/06/28 16:07:47 vapier Exp $
 
 inherit eutils
 
@@ -18,12 +16,13 @@ SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~ia64"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE="nls build afs"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	x86? ( afs? ( net-fs/openafs ) )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/findutils/findutils-4.1.7-r1.ebuild b/sys-apps/findutils/findutils-4.1.7-r1.ebuild
index 04586ba81370..272d83259b4a 100644
--- a/sys-apps/findutils/findutils-4.1.7-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r1.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/findutils/findutils-4.1.7-r1.ebuild,v 1.20 2004/06/25 20:59:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r1.ebuild,v 1.21 2004/06/28 16:07:47 vapier Exp $
 
-IUSE="nls build"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="GNU utilities to find files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
-SLOT="0"
+SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+IUSE="nls build"
 
-DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
+DEPEND="virtual/libc
+	nls? ( sys-devel/gettext )"
+RDEPEND="virtual/libc"
 
 src_compile() {