change glibc to libc

3 files changed, 18 insertions, 21 deletions

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}