adding DEPEND="virtual/glibc" Closes #31474.

4 files changed, 16 insertions, 14 deletions

diff --git a/sys-apps/cpio/ChangeLog b/sys-apps/cpio/ChangeLog
index b7c15f7452f6..b9b2d127f9f2 100644
--- a/sys-apps/cpio/ChangeLog
+++ b/sys-apps/cpio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/cpio
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/ChangeLog,v 1.17 2003/06/23 22:28:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/ChangeLog,v 1.18 2003/10/19 09:23:53 mholzer Exp $
+
+  19 Oct 2003; Martin Holzer <mholzer@gentoo.org> cpio-2.4.2-r4.ebuild,
+  cpio-2.5.ebuild:
+  adding DEPEND="virtual/glibc" Closes #31474.
 
   23 Jun 2003; Aron Griffis <agriffis@gentoo.org> cpio-2.5.ebuild:
   Mark stable on alpha
diff --git a/sys-apps/cpio/Manifest b/sys-apps/cpio/Manifest
index 53c4dc2a7ef4..dba12537399a 100644
--- a/sys-apps/cpio/Manifest
+++ b/sys-apps/cpio/Manifest
@@ -1,5 +1,5 @@
-MD5 6b9886ddc953662865ce0d11f0cab85f ChangeLog 1976
-MD5 8b2552fe1b8e0b0efa530e15e6c5e134 cpio-2.4.2-r4.ebuild 1003
-MD5 247d4a26f8879e610fe08f61789d9208 cpio-2.5.ebuild 792
+MD5 473749e86d430137b25ee2135df42cbd ChangeLog 2114
+MD5 f8bd118b88fc596377dd106d414ce79f cpio-2.4.2-r4.ebuild 898
+MD5 e7cf838471578741dd761bd212f37760 cpio-2.5.ebuild 791
 MD5 6d916de4f4c7c2ce09bb45559eb50658 files/digest-cpio-2.4.2-r4 62
 MD5 a0838e9d5ff0463ecb8758db81652ff1 files/digest-cpio-2.5 60
diff --git a/sys-apps/cpio/cpio-2.4.2-r4.ebuild b/sys-apps/cpio/cpio-2.4.2-r4.ebuild
index e63f6aa21b84..6ab680dafb53 100644
--- a/sys-apps/cpio/cpio-2.4.2-r4.ebuild
+++ b/sys-apps/cpio/cpio-2.4.2-r4.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/sys-apps/cpio/cpio-2.4.2-r4.ebuild,v 1.18 2003/09/18 00:00:00 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.4.2-r4.ebuild,v 1.19 2003/10/19 09:23:53 mholzer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A file archival tool which can also read and write tar files"
@@ -11,15 +11,12 @@ SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 
 DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	mv rmt.c rmt.c.orig
-	sed -e "78d" rmt.c.orig > rmt.c
-	mv userspec.c userspec.c.orig
-	sed -e "85d" userspec.c.orig > userspec.c
+	sed -i "78d" rmt.c
+	sed -i "85d" userspec.c
 }
 
 src_compile() {
diff --git a/sys-apps/cpio/cpio-2.5.ebuild b/sys-apps/cpio/cpio-2.5.ebuild
index 35c8492affe3..559980054a07 100644
--- a/sys-apps/cpio/cpio-2.5.ebuild
+++ b/sys-apps/cpio/cpio-2.5.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/sys-apps/cpio/cpio-2.5.ebuild,v 1.16 2003/09/18 00:00:00 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.5.ebuild,v 1.17 2003/10/19 09:23:53 mholzer Exp $
 
 DESCRIPTION="A file archival tool which can also read and write tar files"
 SRC_URI="mirror://gnu/cpio/${P}.tar.gz"
@@ -10,15 +10,16 @@ KEYWORDS="x86 amd64 ppc sparc alpha hppa arm mips ia64"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 
+DEPEND="virtual/glibc"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	mv rmt.c rmt.c.orig
-	sed -e "78d" rmt.c.orig > rmt.c
+	sed -i "78d" rmt.c
 }
 
 src_compile() {
-	econf
+	econf || die
 	emake || die
 }