touch the libc

21 files changed, 116 insertions, 108 deletions

diff --git a/app-arch/macutil/macutil-2.0_beta3.ebuild b/app-arch/macutil/macutil-2.0_beta3.ebuild
index 0622a38ee2f6..88365ec10b4f 100644
--- a/app-arch/macutil/macutil-2.0_beta3.ebuild
+++ b/app-arch/macutil/macutil-2.0_beta3.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/macutil/macutil-2.0_beta3.ebuild,v 1.3 2004/06/24 21:32:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/macutil/macutil-2.0_beta3.ebuild,v 1.4 2004/06/25 23:51:53 vapier Exp $
 
 inherit eutils
 
-S="${WORKDIR}/${PN}"
 MY_P=${P/_beta/b}
 DESCRIPTION="A collection of programs to handle Macintosh files/archives on non-Macintosh systems"
-SRC_URI="ftp://ftp.cwi.nl/pub/dik/${MY_P/-/}.shar.Z"
 HOMEPAGE="http://homepages.cwi.nl/~dik/english/ftp.html"
+SRC_URI="ftp://ftp.cwi.nl/pub/dik/${MY_P/-/}.shar.Z"
 
-SLOT="0"
 LICENSE="as-is"
-IUSE=""
+SLOT="0"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	>=sys-apps/sed-4"
 
+S="${WORKDIR}/${PN}"
+
 src_unpack() {
 	unpack ${A}
 	unshar ${MY_P/-/}.shar
diff --git a/app-arch/mscompress/mscompress-0.3.ebuild b/app-arch/mscompress/mscompress-0.3.ebuild
index 0b6fbe4c1446..b2b3099acd95 100644
--- a/app-arch/mscompress/mscompress-0.3.ebuild
+++ b/app-arch/mscompress/mscompress-0.3.ebuild
@@ -1,37 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/mscompress/mscompress-0.3.ebuild,v 1.4 2004/06/24 21:33:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mscompress/mscompress-0.3.ebuild,v 1.5 2004/06/25 23:52:14 vapier Exp $
 
 inherit gnuconfig eutils
 
 DESCRIPTION="Microsoft compress.exe/expand.exe compatible (de)compressor"
-SRC_URI="http://www.penguin.cz/~mhi/ftp/mscompress/${P}.tar.bz2"
 HOMEPAGE="http://www.penguin.cz/~mhi/ftp/mscompress/"
+SRC_URI="http://www.penguin.cz/~mhi/ftp/mscompress/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${P}-makefile.patch
-}
-
-src_compile() {
 	gnuconfig_update
-
-	econf || die
-	emake || die
 }
 
 src_install() {
-	dobin mscompress msexpand
+	dobin mscompress msexpand || die
 	doman mscompress.1 msexpand.1
 	dodoc README ChangeLog
 
diff --git a/app-arch/mt-st/mt-st-0.6.ebuild b/app-arch/mt-st/mt-st-0.6.ebuild
index 188715f336c5..7288182d1731 100644
--- a/app-arch/mt-st/mt-st-0.6.ebuild
+++ b/app-arch/mt-st/mt-st-0.6.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.6.ebuild,v 1.14 2004/06/24 21:33:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.6.ebuild,v 1.15 2004/06/25 23:52:33 vapier Exp $
 
 DESCRIPTION="Enhanced mt command for Linux, supporting Linux 2.4 ioctls"
-SRC_URI="http://www.ibiblio.org/pub/linux/system/backup/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="http://www.ibiblio.org/pub/linux/system/backup/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
 KEYWORDS="x86 sparc"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -24,6 +24,6 @@ src_compile() {
 }
 
 src_install() {
-	dosbin mt stinit
+	dosbin mt stinit || die
 	doman mt.1 stinit.8
 }
diff --git a/app-arch/mt-st/mt-st-0.7-r1.ebuild b/app-arch/mt-st/mt-st-0.7-r1.ebuild
index 590ef3aadacb..626532d2f5a9 100644
--- a/app-arch/mt-st/mt-st-0.7-r1.ebuild
+++ b/app-arch/mt-st/mt-st-0.7-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/app-arch/mt-st/mt-st-0.7-r1.ebuild,v 1.7 2004/06/24 21:33:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.7-r1.ebuild,v 1.8 2004/06/25 23:52:33 vapier Exp $
 
 DESCRIPTION="Enhanced mt command for Linux, supporting Linux 2.4 ioctls"
 HOMEPAGE="http://www.gnu.org/software/tar/"
-
 SRC_URI="http://www.ibiblio.org/pub/linux/system/backup/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-DEPEND="virtual/glibc"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A} || die
@@ -23,7 +24,7 @@ src_compile() {
 }
 
 src_install() {
-	dosbin mt stinit
+	dosbin mt stinit || die
 	doman mt.1 stinit.8
 	dodoc README* stinit.def.examples
 }
diff --git a/app-arch/mt-st/mt-st-0.7.ebuild b/app-arch/mt-st/mt-st-0.7.ebuild
index 410cd1e42ea1..005888633741 100644
--- a/app-arch/mt-st/mt-st-0.7.ebuild
+++ b/app-arch/mt-st/mt-st-0.7.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.7.ebuild,v 1.17 2004/06/24 21:33:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/mt-st/mt-st-0.7.ebuild,v 1.18 2004/06/25 23:52:33 vapier Exp $
 
 DESCRIPTION="Enhanced mt command for Linux, supporting Linux 2.4 ioctls"
-SRC_URI="http://www.ibiblio.org/pub/linux/system/backup/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="http://www.ibiblio.org/pub/linux/system/backup/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -24,6 +24,6 @@ src_compile() {
 }
 
 src_install() {
-	dosbin mt stinit
+	dosbin mt stinit || die
 	doman mt.1 stinit.8
 }
diff --git a/app-arch/par/par-1.1.ebuild b/app-arch/par/par-1.1.ebuild
index 4272c36a96eb..512db3674b47 100644
--- a/app-arch/par/par-1.1.ebuild
+++ b/app-arch/par/par-1.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/app-arch/par/par-1.1.ebuild,v 1.18 2004/06/24 21:33:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par/par-1.1.ebuild,v 1.19 2004/06/25 23:52:56 vapier Exp $
 
 DESCRIPTION="Parchive archive fixing tool"
 HOMEPAGE="http://parchive.sourceforge.net/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
 
 S=${WORKDIR}/par-cmdline
@@ -19,8 +19,7 @@ S=${WORKDIR}/par-cmdline
 src_unpack() {
 	unpack par-v${PV}.tar.gz
 	cd ${S}
-	source /etc/make.conf
-	sed -i "s/CFLAGS.*/CFLAGS = -Wall $CFLAGS/" Makefile
+	sed -i "s/CFLAGS.*/CFLAGS = -Wall ${CFLAGS}/" Makefile
 }
 
 src_compile() {
diff --git a/app-arch/pax/pax-3.3.4.ebuild b/app-arch/pax/pax-3.3.4.ebuild
index ee4689b66567..6174ce163887 100644
--- a/app-arch/pax/pax-3.3.4.ebuild
+++ b/app-arch/pax/pax-3.3.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/app-arch/pax/pax-3.3.4.ebuild,v 1.8 2004/06/24 21:34:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pax/pax-3.3.4.ebuild,v 1.9 2004/06/25 23:53:19 vapier Exp $
 
 inherit eutils rpm
 
@@ -10,12 +10,13 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
 HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
 SRC_URI="ftp://rpmfind.net/linux/contrib/libc6/SRPMS/${MY_PS}.src.rpm"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha hppa ~mips ~amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips alpha hppa ~amd64 ~ia64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/rpm2targz"
 
 src_unpack() {
diff --git a/app-arch/pdumpfs/pdumpfs-0.6.ebuild b/app-arch/pdumpfs/pdumpfs-0.6.ebuild
index cd81b6dfe876..d9e1622af154 100644
--- a/app-arch/pdumpfs/pdumpfs-0.6.ebuild
+++ b/app-arch/pdumpfs/pdumpfs-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pdumpfs/pdumpfs-0.6.ebuild,v 1.6 2004/06/24 21:34:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdumpfs/pdumpfs-0.6.ebuild,v 1.7 2004/06/25 23:53:36 vapier Exp $
 
 DESCRIPTION="a daily backup system similar to Plan9's dumpfs"
 HOMEPAGE="http://www.namazu.org/~satoru/pdumpfs/"
@@ -11,11 +11,11 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="cjk"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="virtual/ruby"
 
 src_install() {
-	dobin pdumpfs
+	dobin pdumpfs || die
 	dosed 's:/usr/local:/usr:g' /usr/bin/pdumpfs
 
 	doman man/man8/pdumpfs.8
diff --git a/app-arch/pdumpfs/pdumpfs-0.8.ebuild b/app-arch/pdumpfs/pdumpfs-0.8.ebuild
index 02caf05117a0..afeb3d4d166c 100644
--- a/app-arch/pdumpfs/pdumpfs-0.8.ebuild
+++ b/app-arch/pdumpfs/pdumpfs-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pdumpfs/pdumpfs-0.8.ebuild,v 1.5 2004/06/24 21:34:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdumpfs/pdumpfs-0.8.ebuild,v 1.6 2004/06/25 23:53:36 vapier Exp $
 
 DESCRIPTION="a daily backup system similar to Plan9's dumpfs"
 HOMEPAGE="http://www.namazu.org/~satoru/pdumpfs/"
@@ -8,10 +8,10 @@ SRC_URI="http://www.namazu.org/~satoru/pdumpfs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="cjk"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="virtual/ruby"
 
 src_install() {
diff --git a/app-arch/pure-sfv/pure-sfv-0.3.ebuild b/app-arch/pure-sfv/pure-sfv-0.3.ebuild
index d5b34b59a617..ceb45be31b81 100644
--- a/app-arch/pure-sfv/pure-sfv-0.3.ebuild
+++ b/app-arch/pure-sfv/pure-sfv-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/pure-sfv-0.3.ebuild,v 1.6 2004/06/24 21:35:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pure-sfv/pure-sfv-0.3.ebuild,v 1.7 2004/06/25 23:54:04 vapier Exp $
 
 DESCRIPTION="utility to test and create .sfv files and create .par files"
 HOMEPAGE="http://pure-sfv.sourceforge.net/"
@@ -8,10 +8,10 @@ SRC_URI="mirror://sourceforge/pure-sfv/${PN}_${PV}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86 amd64 ~sparc"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}
 
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin pure-sfv
+	dobin pure-sfv || die
 	dodoc ReadMe.txt
 }
diff --git a/app-arch/rpm2targz/rpm2targz-8.0.ebuild b/app-arch/rpm2targz/rpm2targz-8.0.ebuild
index 9d1775446f89..8f713b9be463 100644
--- a/app-arch/rpm2targz/rpm2targz-8.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-8.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-8.0.ebuild,v 1.21 2004/06/24 21:35:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-8.0.ebuild,v 1.22 2004/06/25 23:54:36 vapier Exp $
+
+inherit gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -10,10 +12,10 @@ SRC_URI="ftp://ftp.slackware.com/pub/slackware/slackware-${PV}/source/a/bin/rpm2
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 sparc ppc alpha hppa amd64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio"
 
 src_unpack() {
@@ -24,10 +26,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
index f28c48b9e8f6..abaca611199d 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild,v 1.15 2004/06/24 21:35:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild,v 1.16 2004/06/25 23:54:36 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -10,16 +10,17 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ~mips amd64 ia64 ~ppc64"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ~ppc64"
 IUSE=""
 
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio
 	sys-apps/file"
-
-RDEPEND="$DEPEND sys-apps/util-linux sys-apps/which"
+RDEPEND="${DEPEND}
+	sys-apps/util-linux
+	sys-apps/which"
 
 S=${WORKDIR}
 
@@ -33,10 +34,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
index 57625a25ba68..e18d9c6ed0dd 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild,v 1.8 2004/06/24 21:35:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild,v 1.9 2004/06/25 23:54:36 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -15,7 +15,7 @@ IUSE=""
 
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio
 	sys-apps/file"
 RDEPEND="${DEPEND}
@@ -36,10 +36,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
index 1a9a5554c0f7..7b339045f8ea 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.8 2004/06/24 21:35:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.9 2004/06/25 23:54:36 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -10,12 +10,12 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
 IUSE=""
 
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio
 	sys-apps/file"
 
@@ -27,10 +27,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rzip/rzip-2.0.ebuild b/app-arch/rzip/rzip-2.0.ebuild
index 5d46e981722a..0acbafc7a496 100644
--- a/app-arch/rzip/rzip-2.0.ebuild
+++ b/app-arch/rzip/rzip-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/app-arch/rzip/rzip-2.0.ebuild,v 1.7 2004/06/24 21:35:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.0.ebuild,v 1.8 2004/06/25 23:54:53 vapier Exp $
 
 DESCRIPTION="compression program for large files"
 HOMEPAGE="http://rzip.samba.org/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-apps/coreutils
 	app-arch/bzip2"
 
diff --git a/app-arch/star/star-1.4.3.ebuild b/app-arch/star/star-1.4.3.ebuild
index 2a8c025e0542..d9da800e5af7 100644
--- a/app-arch/star/star-1.4.3.ebuild
+++ b/app-arch/star/star-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.4.3.ebuild,v 1.5 2004/06/24 21:36:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.4.3.ebuild,v 1.6 2004/06/25 23:55:18 vapier Exp $
 
 DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
@@ -14,15 +14,17 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc ~mips amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/DEFAULTS
-	cp Defaults.linux Defaults.linux.orig
-	sed -e 's:/opt/schily:/usr:g' -e 's:bin:root:g' Defaults.linux.orig > Defaults.linux
+	sed -i \
+		-e 's:/opt/schily:/usr:g' \
+		-e 's:bin:root:g' \
+		Defaults.linux
 }
 
 src_compile() {
diff --git a/app-arch/star/star-1.5_alpha14.ebuild b/app-arch/star/star-1.5_alpha14.ebuild
index 17be19b2b54b..226bfbe4a08c 100644
--- a/app-arch/star/star-1.5_alpha14.ebuild
+++ b/app-arch/star/star-1.5_alpha14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5_alpha14.ebuild,v 1.7 2004/06/24 21:36:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5_alpha14.ebuild,v 1.8 2004/06/25 23:55:18 vapier Exp $
 
 S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
@@ -16,13 +16,16 @@ SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~mips alpha hppa amd64 ia64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/DEFAULTS
-	sed -e 's:/opt/schily:/usr:g' -e 's:bin:root:g' -i Defaults.linux
-	sed -e 's:/usr/src/linux/include:/usr/include:' -i Defaults.linux
+	sed -i \
+		-e 's:/opt/schily:/usr:g' \
+		-e 's:bin:root:g' \
+		-e 's:/usr/src/linux/include:/usr/include:' \
+		Defaults.linux
 
 	if [ "${ARCH}" = "amd64" ]
 	then
diff --git a/app-arch/tar/tar-1.14.ebuild b/app-arch/tar/tar-1.14.ebuild
index ef3ad8756103..7a38d160821c 100644
--- a/app-arch/tar/tar-1.14.ebuild
+++ b/app-arch/tar/tar-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.ebuild,v 1.4 2004/06/25 14:16:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.14.ebuild,v 1.5 2004/06/25 23:55:44 vapier Exp $
 
 inherit eutils gnuconfig
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
 IUSE="nls static build"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/gzip
 	app-arch/bzip2
 	app-arch/ncompress"
diff --git a/app-arch/unace/unace-1.2b.ebuild b/app-arch/unace/unace-1.2b.ebuild
index 39a53243a87b..36c4625668b5 100644
--- a/app-arch/unace/unace-1.2b.ebuild
+++ b/app-arch/unace/unace-1.2b.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/app-arch/unace/unace-1.2b.ebuild,v 1.9 2004/06/24 21:37:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-1.2b.ebuild,v 1.10 2004/06/25 23:56:06 vapier Exp $
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="ACE unarchiver"
-SRC_URI="http://wilma.vub.ac.be/~pdewacht/${P}.tar.gz"
 HOMEPAGE="http://www.winace.com/"
-IUSE=""
-SLOT="1"
-KEYWORDS="x86 -sparc -ppc"
+SRC_URI="http://wilma.vub.ac.be/~pdewacht/${P}.tar.gz"
+
 LICENSE="freedist"
-DEPEND="virtual/glibc"
+SLOT="1"
+KEYWORDS="x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
@@ -24,11 +27,11 @@ src_compile() {
 		-e "s/-DCASEINSENSE//g" \
 		makefile
 
-	emake dep
-	emake
+	emake dep || die
+	emake || die
 }
 
 src_install() {
-	dobin unace
+	dobin unace || die
 	dodoc readme.txt changes.log
 }
diff --git a/app-arch/unace/unace-2.2.ebuild b/app-arch/unace/unace-2.2.ebuild
index 9a3377e1a984..961070fb9c7d 100644
--- a/app-arch/unace/unace-2.2.ebuild
+++ b/app-arch/unace/unace-2.2.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-2.2.ebuild,v 1.11 2004/06/24 21:37:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-2.2.ebuild,v 1.12 2004/06/25 23:56:06 vapier Exp $
 
 DESCRIPTION="ACE unarchiver"
 HOMEPAGE="http://www.winace.com/"
 SRC_URI="http://www.maxeline.com/winace/linunace${PV//.}.tgz"
-IUSE=""
+
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* x86 amd64 s390"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}
 
 src_install() {
-	into /opt/
-	dobin unace
+	into /opt
+	dobin unace || die
 }
diff --git a/app-arch/unzip/unzip-5.50-r2.ebuild b/app-arch/unzip/unzip-5.50-r2.ebuild
index 4cb295c4d069..a50c8d349025 100644
--- a/app-arch/unzip/unzip-5.50-r2.ebuild
+++ b/app-arch/unzip/unzip-5.50-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/app-arch/unzip/unzip-5.50-r2.ebuild,v 1.12 2004/06/24 21:38:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.50-r2.ebuild,v 1.13 2004/06/25 23:56:50 vapier Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
 IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"