old

Package-Manager: portage-2.0.51.22-r1

9 files changed, 1 insertions, 611 deletions

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 686e099ca239..2fb097a4983a 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,17 +1,9 @@
 MD5 dcb981084efd60f03a5e3f8051d47816 ChangeLog 24288
 MD5 0a532171a448adf8d523ca631e388f3b coreutils-5.2.1-r2.ebuild 4383
-MD5 a041d2d2ace692ab73aa932cae01debf coreutils-5.2.1-r3.ebuild 4205
-MD5 814ab16ac6cac4e2825942dad9b41e69 coreutils-5.2.1-r4.ebuild 4453
-MD5 7ddbb3bd0c85181c0bc342e7dc41e239 coreutils-5.2.1-r5.ebuild 4619
+MD5 603beb7446727807ca806fd08ca1fe83 coreutils-5.2.1-r5.ebuild 4618
 MD5 2363cef984f499e4dd5945b23b949c5f coreutils-5.2.1-r6.ebuild 4303
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c63fee729a210ba400b1fb34bbbe76c5 files/DIR_COLORS 4053
 MD5 a7f49f56e12b6b16a5c347a666fb9b37 files/digest-coreutils-5.2.1-r6 149
 MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
-MD5 5336abda618b9eaa721564d34bb6de9b files/digest-coreutils-5.2.1-r3 225
-MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
-MD5 db20bb64b1d832abc699dc46d9b40304 files/digest-coreutils-5.2.1-r4 226
-MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
-MD5 dfc60c0aadb6d857701fb3fa137a12b5 files/003_all_coreutils-gentoo-uname.patch 3261
 MD5 a35ffb7e8488a498124e0a4c144102bc files/digest-coreutils-5.2.1-r5 227
-MD5 569870ec2f958c2a2a716a7f695deb42 files/coreutils-5.2.1-unamefix.patch 485
diff --git a/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild
deleted file mode 100644
index 854effe21bc2..000000000000
--- a/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild,v 1.5 2005/03/03 17:59:18 ciaranm Exp $
-
-inherit eutils flag-o-matic
-
-PATCH_VER=0.8
-I18N_VER=i18n-0.2
-PATCHDIR=${WORKDIR}/patch
-
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
-HOMEPAGE="http://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2
-	mirror://gentoo/${P}-${I18N_VER}.patch.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}-gentoo-${PATCH_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build acl selinux static uclibc"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	acl? ( sys-apps/acl sys-apps/attr )
-	nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.3-r5"
-DEPEND="${RDEPEND}
-	virtual/libc
-	>=sys-apps/portage-2.0.49
-	=sys-devel/automake-1.8*
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/m4-1.4-r1
-	!uclibc? ( sys-apps/help2man )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
-	epatch ${WORKDIR}/${P}-${I18N_VER}.patch
-
-	# Apply the ACL patches. 
-	# WARNING: These CONFLICT with the SELINUX patches
-	if use acl ; then
-		mv ${PATCHDIR}/generic/00{1,2,4}* ${PATCHDIR}/excluded
-		mv ${PATCHDIR}/selinux/001_all_coreutils-noacl* ${PATCHDIR}/excluded
-		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
-	else
-		mv ${PATCHDIR}/selinux/001_all_coreutils-acl* ${PATCHDIR}/excluded
-	fi
-
-	# patch to remove Stallman's su/wheel group rant (which doesn't apply,
-	# since Gentoo's su is not GNU/su, but that from shadow.
-	# do not include su infopage, as it is not valid for the su
-	# from sys-apps/shadow that we are using.
-	# Patch to add processor specific info to the uname output
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/generic
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/extra
-
-	use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
-
-	# Sparc32 SMP bug fix -- see bug #46593
-	use sparc && echo -ne "\n\n" >> ${S}/src/pr.c
-
-	# Since we've patched many .c files, the make process will 
-	# try to re-build the manpages by running `./bin --help`.  
-	# When cross-compiling, we can't do that since 'bin' isn't 
-	# a native binary, so let's just install outdated man-pages.
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] && touch man/*.1
-}
-
-src_compile() {
-	if ! type -p cvs > /dev/null ; then
-		# Fix issues with gettext's autopoint if cvs is not installed,
-		# bug #28920.
-		export AUTOPOINT="/bin/true"
-	fi
-
-	ebegin "Reconfiguring configure scripts (be patient)"
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-
-	mv m4/inttypes.m4 m4/inttypes-eggert.m4
-	touch aclocal.m4 configure config.hin \
-		Makefile.in */Makefile.in */*/Makefile.in
-
-	aclocal -I m4 || die "aclocal"
-	autoconf || die "autoconf"
-	automake || die "automake"
-	eend $?
-
-	econf \
-		--bindir=/bin \
-		--enable-largefile \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die "econf"
-
-	use static && append-ldflags -static
-	emake LDFLAGS="${LDFLAGS}" || die "emake"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	# add DIRCOLORS
-	insinto /etc
-	doins ${FILESDIR}/DIR_COLORS
-
-	# move non-critical packages into /usr
-	cd "${D}"
-	dodir /usr/bin
-	mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
-	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
-	mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
-	cd bin
-	local x
-	for x in * ; do
-		dosym /bin/${x} /usr/bin/${x}
-	done
-
-	if ! use build ; then
-		cd ${S}
-		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
-	else
-		rm -r "${D}"/usr/share
-	fi
-}
-
-pkg_postinst() {
-	# hostname does not get removed as it is included with older stage1
-	# tarballs, and net-tools installs to /bin
-	if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
-	then
-		rm -f ${ROOT}/usr/bin/hostname
-	fi
-}
diff --git a/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild
deleted file mode 100644
index 70fbb91c7492..000000000000
--- a/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild,v 1.6 2005/03/04 17:09:02 morfic Exp $
-
-inherit eutils flag-o-matic
-
-PATCH_VER=0.9
-I18N_VER=i18n-0.2
-PATCHDIR=${WORKDIR}/patch
-
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
-HOMEPAGE="http://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
-	mirror://gentoo/${P}-${I18N_VER}.patch.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86"
-IUSE="nls build acl selinux static uclibc"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	acl? ( sys-apps/acl sys-apps/attr )
-	nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.3-r5"
-DEPEND="${RDEPEND}
-	virtual/libc
-	>=sys-apps/portage-2.0.49
-	=sys-devel/automake-1.8*
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/m4-1.4-r1
-	!uclibc? ( sys-apps/help2man )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
-	epatch ${WORKDIR}/${P}-${I18N_VER}.patch
-
-	# Apply the ACL patches. 
-	# WARNING: These CONFLICT with the SELINUX patches
-	if use acl ; then
-		mv ${PATCHDIR}/generic/00{1,2,4}* ${PATCHDIR}/excluded
-		mv ${PATCHDIR}/selinux/001_all_coreutils-noacl* ${PATCHDIR}/excluded
-		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
-	else
-		mv ${PATCHDIR}/selinux/001_all_coreutils-acl* ${PATCHDIR}/excluded
-	fi
-
-	# patch to remove Stallman's su/wheel group rant (which doesn't apply,
-	# since Gentoo's su is not GNU/su, but that from shadow.
-	# do not include su infopage, as it is not valid for the su
-	# from sys-apps/shadow that we are using.
-	# Patch to add processor specific info to the uname output
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/generic
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/extra
-
-	use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
-
-	# Sparc32 SMP bug fix -- see bug #46593
-	use sparc && echo -ne "\n\n" >> ${S}/src/pr.c
-
-	# Since we've patched many .c files, the make process will 
-	# try to re-build the manpages by running `./bin --help`.  
-	# When cross-compiling, we can't do that since 'bin' isn't 
-	# a native binary, so let's just install outdated man-pages.
-	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] && touch man/*.1
-}
-
-src_compile() {
-	if ! type -p cvs > /dev/null ; then
-		# Fix issues with gettext's autopoint if cvs is not installed,
-		# bug #28920.
-		export AUTOPOINT="/bin/true"
-	fi
-
-	ebegin "Reconfiguring configure scripts (be patient)"
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-
-	mv m4/inttypes.m4 m4/inttypes-eggert.m4
-	touch aclocal.m4 configure config.hin \
-		Makefile.in */Makefile.in */*/Makefile.in
-
-	aclocal -I m4 || die "aclocal"
-	autoconf || die "autoconf"
-	automake || die "automake"
-	eend $?
-
-	econf \
-		--bindir=/bin \
-		--enable-largefile \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die "econf"
-
-	use static && append-ldflags -static
-	emake LDFLAGS="${LDFLAGS}" || die "emake"
-}
-
-src_test() {
-	# Non-root tests will fail if the full path isnt
-	# accessible to non-root users
-	chmod a+rx "${WORKDIR}"
-	addwrite /dev/full
-	export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	make check || die "make check failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	# add DIRCOLORS
-	insinto /etc
-	doins ${FILESDIR}/DIR_COLORS
-
-	# move non-critical packages into /usr
-	cd "${D}"
-	dodir /usr/bin
-	mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
-	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
-	mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
-	cd bin
-	local x
-	for x in * ; do
-		dosym /bin/${x} /usr/bin/${x}
-	done
-
-	if ! use build ; then
-		cd ${S}
-		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
-	else
-		rm -r "${D}"/usr/share
-	fi
-}
-
-pkg_postinst() {
-	# hostname does not get removed as it is included with older stage1
-	# tarballs, and net-tools installs to /bin
-	if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
-	then
-		rm -f ${ROOT}/usr/bin/hostname
-	fi
-}
diff --git a/sys-apps/coreutils/files/003_all_coreutils-gentoo-uname-s390.patch b/sys-apps/coreutils/files/003_all_coreutils-gentoo-uname-s390.patch
deleted file mode 100644
index 6596a0c8cfa2..000000000000
--- a/sys-apps/coreutils/files/003_all_coreutils-gentoo-uname-s390.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- coreutils-5.2.0/src/uname.c.orig	2004-04-15 22:42:13.000000000 +0200
-+++ coreutils-5.2.0/src/uname.c	2004-04-15 22:39:44.000000000 +0200
-@@ -44,6 +44,11 @@
- # endif
- #endif
- 
-+#if defined (__linux__)
-+#define USE_PROCINFO	
-+#define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- 
-@@ -129,6 +134,82 @@
-   exit (status);
- }
- 
-+/* Carlos E. Gorges <carlos@techlinux.com.br> - return vendor_id from proc cpuinfo */
-+#if defined(USE_PROCINFO)
-+/* x==0, processor type | x==1, hardware-platform */
-+int
-+__linux_procinfo (int x, char *fstr) 
-+{
-+	FILE *ffd;
-+	char 	*cstr=calloc(64,sizeof(char)),
-+		*dstr=calloc(257,sizeof(char)),
-+		*retr=NULL;
-+#if defined(__s390__) || defined(__s390x__)
-+	if ( ffd=fopen("/proc/sysinfo", "r") )
-+#else
-+	if ( ffd=fopen("/proc/cpuinfo", "r") )
-+#endif
-+	{
-+#if defined(__s390__) || defined(__s390x__)
-+		while ( fscanf(ffd, "%[^ :]%*[ :]%[^\n]\n", cstr, dstr) != EOF )
-+#else
-+		while ( fscanf(ffd, "%[^:\t]\t: %[^\n]\n", cstr, dstr) != EOF )
-+#endif
-+		{
-+			char *sdata[] = 
-+			{
-+				#if defined(__i386__)
-+					"model name", "vendor_id"
-+				#endif
-+				#if defined(__ia64__) || defined(__x86_64__)
-+					"model", "vendor"
-+				#endif
-+				#if defined(__alpha__)
-+					"cpu model", "system type"
-+				#endif
-+				#if defined(sparc) || defined(__sparc__)
-+					"type", "cpu"
-+				#endif
-+				#if defined(__hppa__)
-+					"cpu", "model"
-+				#endif
-+				#if defined(__mips__)
-+					"cpu model", "system type"
-+				#endif
-+				#if defined(PPC)
-+					"cpu", "machine"
-+				#endif
-+				#if defined(__s390__) || defined(__s390x__)
-+					"Type", "Manufacturer"
-+				#endif
-+			};
-+				
-+			if(!retr)
-+			{
-+				if (!strcmp(cstr, sdata[x])) 
-+						retr = strdup(dstr);
-+			} else
-+				break;
-+			
-+		}
-+		fclose(ffd);
-+
-+		if(retr)
-+		{
-+#if defined(__s390__) || defined(__s390x__)
-+			while (strlen(retr) && isblank(retr[strlen(retr)-1]))
-+				retr[strlen(retr)-1] = 0;
-+#endif
-+			strncpy(fstr,retr,257);
-+			return 1;
-+		}
-+	}
-+	return 0;
-+}
-+
-+#endif
-+
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -243,13 +324,19 @@
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
- 	static char processor[257];
-+#if HAVE_SYSINFO && defined SI_ARCHITECTURE
- 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-+#if defined(USE_PROCINFO)
-+	if( 0 <= __linux_procinfo(0, processor))
-+#endif
- 	  element = processor;
-       }
- #endif
-+
- #ifdef UNAME_PROCESSOR
-       if (element == unknown)
- 	{
-@@ -278,9 +365,13 @@
-       if (element == unknown)
- 	{
- 	  static char hardware_platform[257];
-+#if ! defined (USE_PROCINFO)
- 	  size_t s = sizeof hardware_platform;
- 	  static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
- 	  if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#else
-+	  if( 0 <= __linux_procinfo(1, hardware_platform))
-+#endif
- 	    element = hardware_platform;
- 	}
- #endif
-@@ -294,3 +385,4 @@
- 
-   exit (EXIT_SUCCESS);
- }
-+
diff --git a/sys-apps/coreutils/files/003_all_coreutils-gentoo-uname.patch b/sys-apps/coreutils/files/003_all_coreutils-gentoo-uname.patch
deleted file mode 100644
index 6bc500e1c1b9..000000000000
--- a/sys-apps/coreutils/files/003_all_coreutils-gentoo-uname.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -urN coreutils-5.0.91.old/src/uname.c coreutils-5.0.91/src/uname.c
---- coreutils-5.0.91.old/src/uname.c	2003-07-23 00:26:48.000000000 -0700
-+++ coreutils-5.0.91/src/uname.c	2003-12-27 13:42:18.000000000 -0800
-@@ -44,6 +44,11 @@
- # endif
- #endif
- 
-+#if defined (__linux__)
-+#define USE_PROCINFO	
-+#define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- 
-@@ -129,6 +134,84 @@
-   exit (status);
- }
- 
-+/* Carlos E. Gorges <carlos@techlinux.com.br> - return vendor_id from proc cpuinfo */
-+#if defined(USE_PROCINFO)
-+/* x==0, processor type | x==1, hardware-platform */
-+int
-+__linux_procinfo (int x, char *fstr) 
-+{
-+	FILE *ffd;
-+	char 	*cstr=calloc(64,sizeof(char)),
-+		*dstr=calloc(257,sizeof(char)),
-+		*retr=NULL;
-+
-+	if ( ffd=fopen(
-+#if defined(__s390__) || defined(__s390x__)
-+	               "/proc/sysinfo"
-+#else
-+	               "/proc/cpuinfo"
-+#endif
-+	               ,"r") )
-+	{
-+		while ( fscanf(ffd,
-+#if defined(__s390__) || defined(__s390x__)
-+		                   "%[^ :]%*[ :]%[^\n]\n"
-+#else
-+		                   "%[^:\t]\t: %[^\n]\n"
-+#endif
-+		                   , cstr, dstr) != EOF )
-+		{
-+			char *sdata[] = 
-+			{
-+				#if defined(__i386__) || defined(__x86_64__)
-+					"model name", "vendor_id"
-+				#elif defined(__ia64__)
-+					"model", "vendor"
-+				#elif defined(__alpha__)
-+					"cpu model", "system type"
-+				#elif defined(sparc) || defined(__sparc__)
-+					"type", "cpu"
-+				#elif defined(__hppa__)
-+					"cpu", "model"
-+				#elif defined(__mips__)
-+					"cpu model", "system type"
-+				#elif defined(PPC)
-+					"cpu", "machine"
-+				#elif defined(__arm__)
-+					"Processor", "Hardware"
-+				#elif defined(__s390__) || defined(__s390x__
-+					"Type", "Manufacturer"
-+				#else
-+					"???", "???"
-+				#endif
-+			};
-+				
-+			if(!retr)
-+			{
-+				if (!strcmp(cstr, sdata[x])) 
-+						retr = strdup(dstr);
-+			} else
-+				break;
-+			
-+		}
-+		fclose(ffd);
-+
-+		if(retr)
-+		{
-+#if defined(__s390__) || defined(__s390x__)
-+			while (strlen(retr) && isblank(retr[strlen(retr)-1]))
-+				retr[strlen(retr)-1] = 0;
-+#endif
-+			strncpy(fstr,retr,257);
-+			return 1;
-+		}
-+	}
-+	return 0;
-+}
-+
-+#endif
-+
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -243,13 +310,19 @@
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
- 	static char processor[257];
-+#if HAVE_SYSINFO && defined SI_ARCHITECTURE
- 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-+#if defined(USE_PROCINFO)
-+	if( 0 <= __linux_procinfo(0, processor))
-+#endif
- 	  element = processor;
-       }
- #endif
-+
- #ifdef UNAME_PROCESSOR
-       if (element == unknown)
- 	{
-@@ -278,9 +351,13 @@
-       if (element == unknown)
- 	{
- 	  static char hardware_platform[257];
-+#if ! defined (USE_PROCINFO)
- 	  size_t s = sizeof hardware_platform;
- 	  static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
- 	  if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#else
-+	  if( 0 <= __linux_procinfo(1, hardware_platform))
-+#endif
- 	    element = hardware_platform;
- 	}
- #endif
-@@ -294,3 +371,4 @@
- 
-   exit (EXIT_SUCCESS);
- }
-+
diff --git a/sys-apps/coreutils/files/coreutils-5.0.91-ppc64-1.patch b/sys-apps/coreutils/files/coreutils-5.0.91-ppc64-1.patch
deleted file mode 100644
index 3af8811be619..000000000000
--- a/sys-apps/coreutils/files/coreutils-5.0.91-ppc64-1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/uname.c.orig	2004-06-01 08:24:52.395946664 +0000
-+++ src/uname.c	2004-06-01 08:25:12.755913616 +0000
-@@ -172,6 +172,9 @@
- 				#if defined(PPC)
- 					"cpu", "machine"
- 				#endif
-+				#if defined(__powerpc64__)
-+					"cpu", "machine"
-+				#endif
- 			};
- 				
- 			if(!retr)
diff --git a/sys-apps/coreutils/files/coreutils-5.2.1-unamefix.patch b/sys-apps/coreutils/files/coreutils-5.2.1-unamefix.patch
deleted file mode 100644
index 8d0391fe2e91..000000000000
--- a/sys-apps/coreutils/files/coreutils-5.2.1-unamefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/uname.c.orig	2004-08-26 07:08:06.064972152 -0500
-+++ src/uname.c	2004-08-26 07:08:44.153906792 -0500
-@@ -177,9 +177,11 @@
- 					"cpu model", "system type"
- 				#elif defined(PPC)
- 					"cpu", "machine"
-+				#elif defined(__powerpc64__)
-+					"cpu", "machine"
- 				#elif defined(__arm__)
- 					"Processor", "Hardware"
--				#elif defined(__s390__) || defined(__s390x__
-+				#elif defined(__s390__) || defined(__s390x__)
- 					"Type", "Manufacturer"
- 				#else
- 					"???", "???"
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r3 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r3
deleted file mode 100644
index 8e2651485ffc..000000000000
--- a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
-MD5 63b6e60935827a48ddb9162a0e30532b coreutils-5.2.1-gentoo-0.8.tar.bz2 64856
-MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r4 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r4
deleted file mode 100644
index 918feca40bc4..000000000000
--- a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
-MD5 b11e708dccac63c1a96cad6de46ec065 coreutils-5.2.1-patches-0.9.tar.bz2 70090
-MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795