cpio moved from sys-apps to app-arch

54 files changed, 94 insertions, 93 deletions

diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 59815ace68b2..713769513909 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,13 +1,13 @@
+MD5 b7a5497af019ca472c262da1db315948 rpm2targz-9.0.ebuild 884
+MD5 0e884171958e013ce47715c9e11817d6 rpm2targz-9.0-r1.ebuild 1067
+MD5 128670700c0f077b6c6403cf56916fe2 rpm2targz-9.0-r2.ebuild 1163
+MD5 b3219729a772fe706faafe559e9565b7 rpm2targz-8.0.ebuild 992
 MD5 b6934fe68d5af29f23b1bd24183c5963 ChangeLog 3054
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 df73a8cd1903693cb902a00f3f2dcab0 rpm2targz-8.0.ebuild 991
-MD5 c61a8e8b9398f01ba8b5dba5a0ab10c7 rpm2targz-9.0-r1.ebuild 1065
-MD5 285339d468bfb53d7d461af9341c500a rpm2targz-9.0-r2.ebuild 1163
-MD5 c32983534d5230f5b4aaf29948365173 rpm2targz-9.0.ebuild 883
+MD5 75217fcb7780c16c88ead1295d8e9d7b files/rpm2targz-9.0-bzip2.patch 800
+MD5 96b33b5b51d34b9764ed9c50ffac18d6 files/rpm2targz-9.0-bzip2_rpm2targz.patch 2100
 MD5 242377a7ef1b45e246460cbbf4bb6984 files/digest-rpm2targz-8.0 163
 MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0 63
 MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r1 63
 MD5 d0f2d521642a49ec038e441268ab6480 files/digest-rpm2targz-9.0-r2 63
-MD5 75217fcb7780c16c88ead1295d8e9d7b files/rpm2targz-9.0-bzip2.patch 800
-MD5 96b33b5b51d34b9764ed9c50ffac18d6 files/rpm2targz-9.0-bzip2_rpm2targz.patch 2100
 MD5 a850046e92cebae159a1a554cdab3f91 files/rpm2targz-9.0-gentoo.patch 554
diff --git a/app-arch/rpm2targz/rpm2targz-8.0.ebuild b/app-arch/rpm2targz/rpm2targz-8.0.ebuild
index c178d3c14f54..3138bc33a5bf 100644
--- a/app-arch/rpm2targz/rpm2targz-8.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.17 2003/08/05 14:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-8.0.ebuild,v 1.18 2003/11/15 03:21:23 seemant Exp $
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 sparc ppc alpha hppa amd64"
 
 DEPEND="virtual/glibc
-	sys-apps/cpio"
+	app-arch/cpio"
 
 src_unpack() {
 	cd ${WORKDIR} && mkdir ${P}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
index 8aca0a3701f1..bbd5d0ab9a8c 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.10 2003/09/30 17:49:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild,v 1.11 2003/11/15 03:21:24 seemant Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="ia64 x86 sparc ppc alpha hppa amd64 ~mips"
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
 DEPEND="virtual/glibc
-	sys-apps/cpio
+	app-arch/cpio
 	sys-apps/file"
 
 RDEPEND="$DEPEND sys-apps/util-linux sys-apps/which"
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
index f70f7610e2ed..5503f7e6d6ba 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.1 2003/10/15 08:27:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild,v 1.2 2003/11/15 03:21:24 seemant Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="ia64 x86 sparc ppc alpha hppa amd64 ~mips"
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
 DEPEND="virtual/glibc
-	sys-apps/cpio
+	app-arch/cpio
 	sys-apps/file"
 
 RDEPEND="$DEPEND sys-apps/util-linux sys-apps/which"
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
index dde607584e07..f1d23afb9f41 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.4 2003/08/05 14:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.5 2003/11/15 03:21:24 seemant Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa"
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
 DEPEND="virtual/glibc
-	sys-apps/cpio
+	app-arch/cpio
 	sys-apps/file"
 
 S=${WORKDIR}
diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest
index 4744221626f5..c3665cd754bc 100644
--- a/dev-java/sun-j2sdk/Manifest
+++ b/dev-java/sun-j2sdk/Manifest
@@ -1,25 +1,25 @@
-MD5 40b0812386437da871b8eece12f297b9 ChangeLog 2973
 MD5 10bd0d93531b3ec8d1aa020a7d1f8d13 sun-j2sdk-1.4.0-r3.ebuild 5002
-MD5 4425ec111b2f65e2920d2f3e15472242 sun-j2sdk-1.4.1.ebuild 4441
-MD5 5044efdc458265e19923ce25155efd4e sun-j2sdk-1.4.1-r1.ebuild 4460
+MD5 974c3a70ad2f2f8c1dde587f5f7fc0f9 sun-j2sdk-1.4.1.ebuild 4440
+MD5 40b0812386437da871b8eece12f297b9 ChangeLog 2973
+MD5 42dd2f5e8e026f6c33707013e2611e53 sun-j2sdk-1.4.1-r1.ebuild 4459
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-sun-j2sdk-1.4.0-r3 63
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1 0
 MD5 c147a3bf17e43d34055a763a266c2fe1 files/sun-j2sdk-1.4.0 603
 MD5 d689a6b6d3c969dfd49a1d39e47ff769 files/sun-j2sdk-1.4.1 603
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1 0
+MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-sun-j2sdk-1.4.0-r3 63
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1-r1 0
+MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724
 MD5 527f4756568740c19c32b1e5eb59ee20 files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch 650
-MD5 822826bf40a3f7f475946637acc61ec2 files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch 2056
+MD5 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
+MD5 0a15b5d4154c7fc0a713970c4b1780f1 files/1.4.1/j2sdk-1.4.1-gcc3.3-fixes.patch 5398
 MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.1/j2sdk-1.4.1-force-motif.patch 3137
-MD5 9e80bf2ca2a4cbbd2570d00d1fc28143 files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch 2248
 MD5 9f4c7a21ea50890a893b9850bbfc3b67 files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch 592
+MD5 9e80bf2ca2a4cbbd2570d00d1fc28143 files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch 2248
 MD5 95b8d1c6d35af8fd31117163ce56bfe7 files/1.4.1/j2sdk-1.4.1-link-jpda-2-libjvm.patch 486
-MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724
-MD5 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
-MD5 0a15b5d4154c7fc0a713970c4b1780f1 files/1.4.1/j2sdk-1.4.1-gcc3.3-fixes.patch 5398
-MD5 061f6c0bace8a70fb12b69a2e18ea1b1 files/patches/j2sdk-1.4.0-disable-sanity-check.patch.bz2 450
+MD5 822826bf40a3f7f475946637acc61ec2 files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch 2056
 MD5 cfe7807401a123893c6bc78aa3ffd170 files/patches/j2sdk-1.4.0-fix-intl-files.patch.bz2 826
+MD5 553a29526471461a8dd0b889ec0ee7d1 files/patches/j2sdk-1.4.0-remove-fixed-paths.patch.bz2 1455
 MD5 70c3f7f9a5a49d7d52283541da221e1f files/patches/j2sdk-1.4.0-gcc3-syntax.patch.bz2 1582
-MD5 266d66824fd48d8590da4aaae84bcd60 files/patches/j2sdk-1.4.0-glibc-2.3.1-fixes.patch.bz2 863
 MD5 2133d3d4a54ea1db1ce04d72beecb031 files/patches/j2sdk-1.4.0-link-jpda-2-libjvm.patch.bz2 337
-MD5 553a29526471461a8dd0b889ec0ee7d1 files/patches/j2sdk-1.4.0-remove-fixed-paths.patch.bz2 1455
+MD5 266d66824fd48d8590da4aaae84bcd60 files/patches/j2sdk-1.4.0-glibc-2.3.1-fixes.patch.bz2 863
+MD5 061f6c0bace8a70fb12b69a2e18ea1b1 files/patches/j2sdk-1.4.0-disable-sanity-check.patch.bz2 450
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
index d678dcf17dfe..eb4776eaba75 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.5 2003/09/10 01:49:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.6 2003/11/15 03:21:54 seemant Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -39,7 +39,7 @@ RDEPEND="virtual/glibc
 	virtual/x11
 	>=dev-java/java-config-0.1.3"
 DEPEND="${RDEPEND}
-	sys-apps/cpio
+	app-arch/cpio
 	app-arch/zip
 	app-arch/unzip
 	>=virtual/jdk-1.4"
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
index 2f4292910642..aed10c6b9930 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.11 2003/09/10 01:49:07 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.12 2003/11/15 03:21:54 seemant Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -38,7 +38,7 @@ RDEPEND="virtual/glibc
 	virtual/x11
 	>=dev-java/java-config-0.1.3"
 DEPEND="${RDEPEND}
-	sys-apps/cpio
+	app-arch/cpio
 	app-arch/zip
 	app-arch/unzip
 	>=virtual/jdk-1.4"
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 5b2a0ef5a7fe..a7ce85feb7a4 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,13 +1,13 @@
 MD5 ccd677c4921873c05964b44ba41f9911 icc-7.1.029.ebuild 3795
 MD5 9d24368640b754755be7c13c1d8c0179 icc-7.1.006.ebuild 3733
-MD5 356256656e0df2db03b5f36673f1b0ff icc-6.0-r1.ebuild 3135
-MD5 ba482af3531a84aeaccd6c1e54a842cf icc-7.0.065-r1.ebuild 3230
+MD5 aea33ac92805a2e94241ee9ab6cb00ce icc-6.0-r1.ebuild 3138
+MD5 a28df65b5923b0e0b4f0d90113059bc6 icc-7.0.065-r1.ebuild 3232
 MD5 175b8f6008e3b6903a811a897c0d2b17 icc-7.1.030.ebuild 3931
-MD5 75845f8c8389441c8d7c6f2d80d7ca1b icc-6.0.ebuild 2936
+MD5 ffd8deaee5f083991409d31756239fcd icc-6.0.ebuild 2938
 MD5 365841de426972cfa6bdc2286c80e0b6 ChangeLog 3919
 MD5 13e8ac1fb111e241dfd6d934ef305abd metadata.xml 313
-MD5 8267a3baf3fc2b1813c82c008f61634d icc-7.0.065-r2.ebuild 3230
-MD5 13a5fd0e0298651c759d69aaa769acd7 icc-7.0.065.ebuild 3177
+MD5 d9c62043a4790f5fa5e2f1e49535cdea icc-7.0.065-r2.ebuild 3232
+MD5 51a83b60c5329c03984767f72ef606c0 icc-7.0.065.ebuild 3179
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 65
 MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
 MD5 90412c57cdaf14d472fe7bcc10ac9656 files/digest-icc-7.0.065-r2 643
diff --git a/dev-lang/icc/icc-6.0-r1.ebuild b/dev-lang/icc/icc-6.0-r1.ebuild
index 8832f57715cd..bf309f2617a8 100644
--- a/dev-lang/icc/icc-6.0-r1.ebuild
+++ b/dev-lang/icc/icc-6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0-r1.ebuild,v 1.9 2003/05/10 22:51:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0-r1.ebuild,v 1.10 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 
@@ -19,7 +19,7 @@ LICENSE="icc-6.0"
 
 DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.2
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
 RDEPEND="virtual/linux-sources
diff --git a/dev-lang/icc/icc-6.0.ebuild b/dev-lang/icc/icc-6.0.ebuild
index 8a7bcd82fcaf..e63f01288990 100644
--- a/dev-lang/icc/icc-6.0.ebuild
+++ b/dev-lang/icc/icc-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0.ebuild,v 1.11 2003/05/10 22:51:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0.ebuild,v 1.12 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 
@@ -19,7 +19,7 @@ LICENSE="icc-6.0"
 
 DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.2
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
 RDEPEND="virtual/linux-sources
diff --git a/dev-lang/icc/icc-7.0.065-r1.ebuild b/dev-lang/icc/icc-7.0.065-r1.ebuild
index 0d5a5bac3b23..72c33eb56331 100644
--- a/dev-lang/icc/icc-7.0.065-r1.ebuild
+++ b/dev-lang/icc/icc-7.0.065-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.6 2003/05/10 22:51:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.7 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 
@@ -16,7 +16,7 @@ LICENSE="icc-7.0"
 
 DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
 RDEPEND="virtual/linux-sources
diff --git a/dev-lang/icc/icc-7.0.065-r2.ebuild b/dev-lang/icc/icc-7.0.065-r2.ebuild
index 2b63160b97b5..9768e8f053af 100644
--- a/dev-lang/icc/icc-7.0.065-r2.ebuild
+++ b/dev-lang/icc/icc-7.0.065-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r2.ebuild,v 1.7 2003/05/10 22:51:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r2.ebuild,v 1.8 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 
@@ -16,7 +16,7 @@ LICENSE="icc-7.0"
 
 DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
 RDEPEND="virtual/linux-sources
diff --git a/dev-lang/icc/icc-7.0.065.ebuild b/dev-lang/icc/icc-7.0.065.ebuild
index b247ecbd9d29..972a1c02e469 100644
--- a/dev-lang/icc/icc-7.0.065.ebuild
+++ b/dev-lang/icc/icc-7.0.065.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065.ebuild,v 1.6 2003/05/10 22:51:35 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065.ebuild,v 1.7 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 
@@ -16,7 +16,7 @@ LICENSE="icc-7.0"
 
 DEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4
-		sys-apps/cpio
+		app-arch/cpio
 		app-arch/rpm"
 
 RDEPEND="virtual/linux-sources
diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest
index 9a24c1bd14e5..48e56c463700 100644
--- a/dev-lang/ifc/Manifest
+++ b/dev-lang/ifc/Manifest
@@ -1,11 +1,11 @@
+MD5 301f69a77d648425857297505a39952f ifc-7.0.064.ebuild 3172
+MD5 c1badf470aa14fac9e3ee006cf5a8c2d ifc-6.0.ebuild 2707
 MD5 0a4772caf23e9c3447b9f2e78b70b300 ChangeLog 1511
-MD5 501532d79fe96d761efedbe9bc42c666 ifc-6.0.ebuild 2705
-MD5 e9c542edb1da833e069c7c6fe8bc07cf ifc-7.0.064.ebuild 3173
 MD5 f50b571e90df495eddc6b3dc77fdb66d ifc-7.0.064-r1.ebuild 3420
 MD5 0e550038b4a16719d30d2c5298ee4a9b files/digest-ifc-6.0 65
-MD5 5edab4cd21580d1e9a97206e9bfcdeab files/digest-ifc-7.0.064 65
 MD5 5edab4cd21580d1e9a97206e9bfcdeab files/digest-ifc-7.0.064-r1 65
+MD5 5edab4cd21580d1e9a97206e9bfcdeab files/digest-ifc-7.0.064 65
 MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0/05icc-ifc 225
-MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.064/05icc-ifc 225
-MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.064-r1/05icc-ifc 225
 MD5 a3b9072faee233848ad6fbd111240a8f files/7.0.064-r1/ifc 155
+MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.064-r1/05icc-ifc 225
+MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.064/05icc-ifc 225
diff --git a/dev-lang/ifc/ifc-6.0.ebuild b/dev-lang/ifc/ifc-6.0.ebuild
index 4ee44e438f72..8f2d789c9045 100644
--- a/dev-lang/ifc/ifc-6.0.ebuild
+++ b/dev-lang/ifc/ifc-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-6.0.ebuild,v 1.10 2003/03/29 04:47:44 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-6.0.ebuild,v 1.11 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Intel Fortran Compiler - The Pentium optimized compiler for Linux"
@@ -20,7 +20,7 @@ KEYWORDS="-* x86"
 
 DEPEND=">=virtual/linux-sources-2.4
 	>=sys-libs/glibc-2.2.2
-	sys-apps/cpio
+	app-arch/cpio
 	app-arch/rpm"
 
 RDEPEND=">=virtual/linux-sources-2.4
diff --git a/dev-lang/ifc/ifc-7.0.064.ebuild b/dev-lang/ifc/ifc-7.0.064.ebuild
index 75a231ab98f3..0d29b7538254 100644
--- a/dev-lang/ifc/ifc-7.0.064.ebuild
+++ b/dev-lang/ifc/ifc-7.0.064.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.0.064.ebuild,v 1.6 2003/09/11 01:08:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-7.0.064.ebuild,v 1.7 2003/11/15 03:22:26 seemant Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Intel Fortran Compiler - The Pentium optimized compiler for Linux"
@@ -20,7 +20,7 @@ KEYWORDS="-* x86"
 
 DEPEND=">=virtual/linux-sources-2.4
 	>=sys-libs/glibc-2.2.4
-	sys-apps/cpio
+	app-arch/cpio
 	app-arch/rpm"
 
 RDEPEND=">=virtual/linux-sources-2.4
diff --git a/dev-libs/mkl/Manifest b/dev-libs/mkl/Manifest
index 4c5005fd29aa..fed8866a878d 100644
--- a/dev-libs/mkl/Manifest
+++ b/dev-libs/mkl/Manifest
@@ -1,4 +1,4 @@
 MD5 35a46c02bf8e61439c34325824d7880d ChangeLog 621
-MD5 c3e83c069accf97cb099707f92b412cf mkl-5.1.ebuild 1148
+MD5 f56b9aa07b45f8ab893273b5bdf3f845 mkl-5.1.ebuild 1150
 MD5 35d67ea2ef34f47eb99b92b47ade49a8 files/digest-mkl-5.1 62
 MD5 af62c3af9662665138e5854c1dac52a2 files/5.1/35mkl 54
diff --git a/dev-libs/mkl/mkl-5.1.ebuild b/dev-libs/mkl/mkl-5.1.ebuild
index e02dec5332ab..ba7b2d223b26 100644
--- a/dev-libs/mkl/mkl-5.1.ebuild
+++ b/dev-libs/mkl/mkl-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mkl/mkl-5.1.ebuild,v 1.9 2003/02/13 10:47:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mkl/mkl-5.1.ebuild,v 1.10 2003/11/15 03:23:01 seemant Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Intel(R) Math Kernel Library"
@@ -17,7 +17,7 @@ LICENSE="imkl-5.1"
 KEYWORDS="x86 sparc "
 
 
-DEPEND="sys-apps/cpio
+DEPEND="app-arch/cpio
 	app-arch/rpm"
 
 RDEPEND=">=sys-kernel/linux-headers-2.4
diff --git a/profiles/cdimage-ppc/packages b/profiles/cdimage-ppc/packages
index 594fca432610..93c086532cdf 100644
--- a/profiles/cdimage-ppc/packages
+++ b/profiles/cdimage-ppc/packages
@@ -8,7 +8,7 @@ net-misc/wget
 app-shells/bash
 app-arch/bzip2
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/cdimage-sparc/packages b/profiles/cdimage-sparc/packages
index c9e40f26ee2a..3c39fafc0e16 100644
--- a/profiles/cdimage-sparc/packages
+++ b/profiles/cdimage-sparc/packages
@@ -10,7 +10,7 @@ net-misc/wget
 app-shells/bash
 app-arch/bzip2
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/cdimage/packages b/profiles/cdimage/packages
index 594fca432610..93c086532cdf 100644
--- a/profiles/cdimage/packages
+++ b/profiles/cdimage/packages
@@ -8,7 +8,7 @@ net-misc/wget
 app-shells/bash
 app-arch/bzip2
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-1.0-gcc3/packages b/profiles/default-1.0-gcc3/packages
index f54241610df2..16b85e14a356 100644
--- a/profiles/default-1.0-gcc3/packages
+++ b/profiles/default-1.0-gcc3/packages
@@ -58,7 +58,7 @@ dev-lang/perl
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-1.0/packages b/profiles/default-1.0/packages
index 5b7dc58a7294..44e2950d0a7b 100644
--- a/profiles/default-1.0/packages
+++ b/profiles/default-1.0/packages
@@ -59,7 +59,7 @@ dev-lang/perl
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-alpha-1.4/packages b/profiles/default-alpha-1.4/packages
index 673c37fb4af1..137d2ca4b362 100644
--- a/profiles/default-alpha-1.4/packages
+++ b/profiles/default-alpha-1.4/packages
@@ -53,7 +53,7 @@ virtual/os-headers
 *app-arch/bzip2
 *sys-apps/kbd
 *sys-apps/coreutils
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-alpha-1.4/packages.cdimage b/profiles/default-alpha-1.4/packages.cdimage
index 7a56ed0655f9..6b391f3249f5 100644
--- a/profiles/default-alpha-1.4/packages.cdimage
+++ b/profiles/default-alpha-1.4/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-amd64-1.4/packages b/profiles/default-amd64-1.4/packages
index d2f486aaae7f..072b1daf80fe 100644
--- a/profiles/default-amd64-1.4/packages
+++ b/profiles/default-amd64-1.4/packages
@@ -21,7 +21,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-arm-1.4/packages b/profiles/default-arm-1.4/packages
index 02463245bc14..d42c4e1b27af 100644
--- a/profiles/default-arm-1.4/packages
+++ b/profiles/default-arm-1.4/packages
@@ -54,7 +54,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-hppa-1.4/packages b/profiles/default-hppa-1.4/packages
index f89c968c36ae..16ec862d2504 100644
--- a/profiles/default-hppa-1.4/packages
+++ b/profiles/default-hppa-1.4/packages
@@ -46,7 +46,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-ia64-1.4/packages b/profiles/default-ia64-1.4/packages
index 673c37fb4af1..137d2ca4b362 100644
--- a/profiles/default-ia64-1.4/packages
+++ b/profiles/default-ia64-1.4/packages
@@ -53,7 +53,7 @@ virtual/os-headers
 *app-arch/bzip2
 *sys-apps/kbd
 *sys-apps/coreutils
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-mips-1.4/packages b/profiles/default-mips-1.4/packages
index 1197e7f04407..5a43062909c2 100644
--- a/profiles/default-mips-1.4/packages
+++ b/profiles/default-mips-1.4/packages
@@ -49,7 +49,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/default-mips-1.4/packages.cdimage b/profiles/default-mips-1.4/packages.cdimage
index 7a56ed0655f9..6b391f3249f5 100644
--- a/profiles/default-mips-1.4/packages.cdimage
+++ b/profiles/default-mips-1.4/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-mips64-1.4/packages b/profiles/default-mips64-1.4/packages
index 1197e7f04407..5a43062909c2 100644
--- a/profiles/default-mips64-1.4/packages
+++ b/profiles/default-mips64-1.4/packages
@@ -49,7 +49,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/default-mips64-1.4/packages.cdimage b/profiles/default-mips64-1.4/packages.cdimage
index 7a56ed0655f9..6b391f3249f5 100644
--- a/profiles/default-mips64-1.4/packages.cdimage
+++ b/profiles/default-mips64-1.4/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-ppc-1.0/packages b/profiles/default-ppc-1.0/packages
index 16d9c8103ddf..2f158070cbd7 100644
--- a/profiles/default-ppc-1.0/packages
+++ b/profiles/default-ppc-1.0/packages
@@ -100,7 +100,7 @@ net-misc/rsync
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-ppc-1.0/packages.cdimage b/profiles/default-ppc-1.0/packages.cdimage
index f93c90c54827..4f3a65c1e22e 100644
--- a/profiles/default-ppc-1.0/packages.cdimage
+++ b/profiles/default-ppc-1.0/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-ppc-1.4/packages b/profiles/default-ppc-1.4/packages
index 9327a16399c0..0606876f9781 100644
--- a/profiles/default-ppc-1.4/packages
+++ b/profiles/default-ppc-1.4/packages
@@ -36,7 +36,7 @@
 >=sys-apps/apmd-3.0.1-r6
 >=sys-apps/at-3.1.8-r6
 *app-arch/bzip2
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *>=sys-fs/devfsd-1.3.20
 *sys-apps/diffutils
diff --git a/profiles/default-ppc-1.4/packages.cdimage b/profiles/default-ppc-1.4/packages.cdimage
index 7a56ed0655f9..6b391f3249f5 100644
--- a/profiles/default-ppc-1.4/packages.cdimage
+++ b/profiles/default-ppc-1.4/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-ppc/packages b/profiles/default-ppc/packages
index dae0bd985f30..3d6de8be8886 100644
--- a/profiles/default-ppc/packages
+++ b/profiles/default-ppc/packages
@@ -77,7 +77,7 @@ net-misc/rsync
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-ppc/packages.cdimage b/profiles/default-ppc/packages.cdimage
index 145da5179277..6537ebc7e107 100644
--- a/profiles/default-ppc/packages.cdimage
+++ b/profiles/default-ppc/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/default-sparc-1.0/packages b/profiles/default-sparc-1.0/packages
index ba683d244e00..276709ad1d43 100644
--- a/profiles/default-sparc-1.0/packages
+++ b/profiles/default-sparc-1.0/packages
@@ -54,7 +54,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/default-sparc-1.4/packages b/profiles/default-sparc-1.4/packages
index 9cee563da7f0..2bc535b4d0da 100644
--- a/profiles/default-sparc-1.4/packages
+++ b/profiles/default-sparc-1.4/packages
@@ -64,7 +64,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/default-sparc64-1.0/packages b/profiles/default-sparc64-1.0/packages
index 88f4b863462a..b486d8f1e5d2 100644
--- a/profiles/default-sparc64-1.0/packages
+++ b/profiles/default-sparc64-1.0/packages
@@ -28,7 +28,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
@@ -140,7 +140,7 @@
 <=sys-apps/tcp-wrappers-7.6-r3
 
 # These lines added by ../default-sparc-1.0/scripts/generate-packages.sh
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages,v 1.44 2003/11/14 23:13:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages,v 1.45 2003/11/15 03:24:19 seemant Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
diff --git a/profiles/default-sparc64-1.4/packages b/profiles/default-sparc64-1.4/packages
index ec36a15ae0a7..cb447e2c4185 100644
--- a/profiles/default-sparc64-1.4/packages
+++ b/profiles/default-sparc64-1.4/packages
@@ -81,7 +81,7 @@
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/default-x86-1.4/packages b/profiles/default-x86-1.4/packages
index 14a6ad1217cc..963076b6746b 100644
--- a/profiles/default-x86-1.4/packages
+++ b/profiles/default-x86-1.4/packages
@@ -56,7 +56,7 @@ virtual/os-headers
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/default/packages b/profiles/default/packages
index 6b8e4c26053f..64dd2606727e 100644
--- a/profiles/default/packages
+++ b/profiles/default/packages
@@ -23,7 +23,7 @@
 *app-shells/bash
 *app-arch/bzip2
 sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/daemontools
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/embedded/uclibc-x86-1.4/packages b/profiles/embedded/uclibc-x86-1.4/packages
index 22923f17977b..d73bbbae7f53 100644
--- a/profiles/embedded/uclibc-x86-1.4/packages
+++ b/profiles/embedded/uclibc-x86-1.4/packages
@@ -30,7 +30,7 @@ virtual/os-headers
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/gcc33-sparc64-1.4/packages b/profiles/gcc33-sparc64-1.4/packages
index ceb9dbf1bc01..c2b39949942c 100644
--- a/profiles/gcc33-sparc64-1.4/packages
+++ b/profiles/gcc33-sparc64-1.4/packages
@@ -82,7 +82,7 @@
 *app-arch/bzip2
 *sys-apps/kbd
 *sys-apps/coreutils
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/grp-x86-1.4/packages b/profiles/grp-x86-1.4/packages
index 48a626d95722..61e35f9adf5d 100644
--- a/profiles/grp-x86-1.4/packages
+++ b/profiles/grp-x86-1.4/packages
@@ -55,7 +55,7 @@
 *sys-apps/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-fs/e2fsprogs
diff --git a/profiles/hardened-x86-1.4/packages b/profiles/hardened-x86-1.4/packages
index 00805d115806..0ee70018bbf1 100644
--- a/profiles/hardened-x86-1.4/packages
+++ b/profiles/hardened-x86-1.4/packages
@@ -60,7 +60,7 @@ virtual/os-headers
 *app-shells/bash
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
diff --git a/profiles/selinux-ppc-1.4/packages b/profiles/selinux-ppc-1.4/packages
index 99bd4c91e724..bf58dcc8a153 100644
--- a/profiles/selinux-ppc-1.4/packages
+++ b/profiles/selinux-ppc-1.4/packages
@@ -62,7 +62,7 @@
 *net-misc/rsync
 *net-misc/wget
 *app-arch/bzip2
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-apps/ed
diff --git a/profiles/selinux-ppc-1.4/packages.cdimage b/profiles/selinux-ppc-1.4/packages.cdimage
index 7a56ed0655f9..6b391f3249f5 100644
--- a/profiles/selinux-ppc-1.4/packages.cdimage
+++ b/profiles/selinux-ppc-1.4/packages.cdimage
@@ -8,7 +8,7 @@ app-shells/bash
 app-arch/bzip2
 sys-apps/console-data
 sys-apps/kbd
-sys-apps/cpio
+app-arch/cpio
 sys-apps/debianutils
 sys-fs/devfsd
 sys-apps/diffutils
diff --git a/profiles/selinux-x86-1.4/packages b/profiles/selinux-x86-1.4/packages
index b5148fa3bea7..b2ba9bd5f5c7 100644
--- a/profiles/selinux-x86-1.4/packages
+++ b/profiles/selinux-x86-1.4/packages
@@ -59,7 +59,7 @@
 *net-misc/wget
 *app-arch/bzip2
 *sys-apps/kbd
-*sys-apps/cpio
+*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
 *sys-apps/ed
diff --git a/profiles/updates/4Q-2003 b/profiles/updates/4Q-2003
index 802f7640d879..6f307786b972 100644
--- a/profiles/updates/4Q-2003
+++ b/profiles/updates/4Q-2003
@@ -18,3 +18,4 @@ move sys-apps/gzip app-arch/gzip
 move sys-apps/gzip_x86 app-arch/gzip-x86
 move sys-apps/sharutils app-arch/sharutils
 move sys-apps/genflags app-portage/genflags
+move sys-apps/cpio app-arch/cpio