Add fix from upstream for cross-compiling #328531 by Jacob Godserv.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 46 insertions, 22 deletions

diff --git a/app-arch/cpio/ChangeLog b/app-arch/cpio/ChangeLog
index a38772f21912..c215ca1bd251 100644
--- a/app-arch/cpio/ChangeLog
+++ b/app-arch/cpio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/cpio
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.113 2010/07/18 20:47:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.114 2010/10/10 00:04:57 vapier Exp $
+
+  10 Oct 2010; Mike Frysinger <vapier@gentoo.org> cpio-2.11.ebuild,
+  +files/cpio-2.11-stat.patch:
+  Add fix from upstream for cross-compiling #328531 by Jacob Godserv.
 
   18 Jul 2010; Joseph Jezak <josejx@gentoo.org> cpio-2.11.ebuild:
   Marked ppc stable for bug #314663.
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 13966615e635..9e263314f6ac 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX cpio-2.9-64-bit-wide-inode-fixup.patch 4432 RMD160 6d34d9d4167932ada64a30814a1926f6836ffaf3 SHA1 8e82ed29cb63e53bbd505277017f6cef4fb523c1 SHA256 1f3e2039c7df9e45a877f8302ec7bf1db434f552173a33b8fa58924fadf55883
-AUX cpio-2.9-CVE-2007-4476.patch 2330 RMD160 88ba8d2103f9666f7886f6a39696ab47f46c8d5d SHA1 da29807e9ffb0dbb39e69eff44cc6ad44977764f SHA256 0c0a2fb1c1c02da04fd9b4d2ecb28087849611a2dfaeea821ba7fce0313c61f7
-AUX cpio-2.9-gnu-inline.patch 5997 RMD160 2345e986c114aa4498f4e4fabab9453e02afcc93 SHA1 7b20f00dbdd4edb580ee075ea8372166dec7345c SHA256 8321e782c140397c025822cde84c7f737eb7631655ab07f1803441627086c784
-AUX cpio-2.9-packed.patch 853 RMD160 0c500d121d054a398919a6539450dee66bf41162 SHA1 eb510d8d0092430a51a92e0afbbfef1c90a79000 SHA256 ef9655822561577debf39376d7e6f317184347271c34ab86029c36d3308c22e6
-AUX cpio-2.9-restore-perms-owners.patch 3082 RMD160 e4cee4074f4402f546877bc3e44c6284dedbe7ea SHA1 351084cdb95f2c2a95f1fc799829b5958d6b461c SHA256 f237971131763f18bb419d38941bc2942bb946961d2a32ca18284b0f6c212517
-DIST cpio-2.10.tar.bz2 951395 RMD160 1bbc1b8c4cf59a74d542aabb410d4fe26b6cf180 SHA1 a87f85c23697163000c656db9eb26a348aa3397b SHA256 def23150e4e081599ecb013736f4403617fefbb6f6e6806dc6a98129913d79d5
+AUX cpio-2.11-stat.patch 575 RMD160 43995af9fdc48b87ab8eaa231ed15baa69fffbab SHA1 afd3992f945876552531aeb8deb3208951871341 SHA256 b3d317e3c5705d7f9e503f56540baf3cb6dd1d0e9be0261151a5b08378c2d98c
 DIST cpio-2.11.tar.bz2 1018483 RMD160 52507b8ba556dca888ce1179cfda10f9549ea9ab SHA1 6f1934b0079dc1e85ddff89cabdf01adb3a74abb SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd
-DIST cpio-2.9.tar.bz2 758195 RMD160 6fbd93755e266ad7ff9644cb7fe3c3e54d61ac44 SHA1 ef381d0f33f1ea74475b6d813c42a74327762c4a SHA256 bb9a5fa693a8f4ef4685eb447cea1dc5b787e37c302569928ef74df460724707
-EBUILD cpio-2.10-r1.ebuild 1038 RMD160 370d4e8ad404fdfd54b19f76acbdadca8f433331 SHA1 5110537cfd726e8849122c71fd4a860e053cd5aa SHA256 58358cdadb2bd478ee7434b572c2ff1e5ab067c4813ed3ee01937dde3eac9bbc
-EBUILD cpio-2.10.ebuild 806 RMD160 fc7523487250674d200998c4e9e13d145ba658ab SHA1 a80b3745d1b335239bec143da6938071a964989e SHA256 ebabb228205709a873d5987a9ee5eb9fb111560d2fd11333bcf1c1899b21eab0
-EBUILD cpio-2.11.ebuild 796 RMD160 fa8a9e6aa4a64b63ca3175565144fdfdc12b6943 SHA1 54fb4c1399976e4f2d4fab63011aae3bdaa7f80a SHA256 55878051838a14e27917659134b6d350ed71254fe6fc8b441baffd0fa24f1e3a
-EBUILD cpio-2.9-r2.ebuild 1031 RMD160 6d6dddae5e8f8c14f24c2e1bd8a81ddfc7631dad SHA1 026fb2e6e608dd8b7e69585ea1454e5ff55fdec1 SHA256 f0eee2f139dfcb911b03be9291c570c05267010cf64b32a1630b4ea064d71ee6
-EBUILD cpio-2.9-r3.ebuild 1094 RMD160 370b7ae3ee8a46c3c8d5b1577f70349e0ae13d60 SHA1 e1528f44b92b8c62aee8220b4b0ba1d76907b61e SHA256 cf711d25e2a60cbd5761faf3ca9e1927ebf9a5fe2177f275cc0d56d076c8cda9
-MISC ChangeLog 15206 RMD160 0b5c2dba88519ad7d37b4bf9ea86970326bbb22f SHA1 aca27f296868bd7c0934f9b053c4f8032b1a9dca SHA256 2629deff6c7df1aff7d674132f01d283e41f27179a469892ecda478f67cc5829
+EBUILD cpio-2.11.ebuild 866 RMD160 951414567f924b01f4e7e4a14596a0893af62acc SHA1 978ede667d56b688358e4f2d9aa3c05fd889705b SHA256 3e6e3e827218a9a220e02a2e24261fd6888f56f8297f6e792245399b2fe1e271
+MISC ChangeLog 15376 RMD160 bb61981116a3adea1022f4fca894389afac54a8d SHA1 04a1b6db2840b7bc8da9d16b56493856340bad58 SHA256 e9765444b937231b5ea194d009c09b24f5f4600f97fcb20f9ef8d64dc6556ada
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxDaHQACgkQcsIHjyDViGQYMQCgry8BXf74ZAk7cH0/2XkhZaFW
-3PYAniLgrPaaclcZkKsyytdGhSDPJ6FN
-=y8zN
+iF4EAREIAAYFAkyxArcACgkQTwhj9JtAlp49JAEAplx+554VCPztqkqF3GWQ5rrk
+3VSTavGmhGUBBVAg20UBAJBjfrwdMuCuRpwEiTyAIM+ae9KhOsOP5Yz9Xsw2SFkM
+=BLWS
 -----END PGP SIGNATURE-----
diff --git a/app-arch/cpio/cpio-2.11.ebuild b/app-arch/cpio/cpio-2.11.ebuild
index 7e51fa2b9dcf..48aaa10d156d 100644
--- a/app-arch/cpio/cpio-2.11.ebuild
+++ b/app-arch/cpio/cpio-2.11.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11.ebuild,v 1.7 2010/07/18 20:47:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11.ebuild,v 1.8 2010/10/10 00:04:57 vapier Exp $
 
 EAPI="2"
 
+inherit eutils
+
 DESCRIPTION="A file archival tool which can also read and write tar files"
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
 SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
@@ -13,12 +15,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-stat.patch #328531
+}
+
 src_configure() {
 	econf \
 		$(use_enable nls) \
 		--bindir=/bin \
-		--with-rmt=/usr/sbin/rmt \
-		|| die
+		--with-rmt=/usr/sbin/rmt
 }
 
 src_install() {
diff --git a/app-arch/cpio/files/cpio-2.11-stat.patch b/app-arch/cpio/files/cpio-2.11-stat.patch
new file mode 100644
index 000000000000..dcd991e3f20c
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.11-stat.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/328531
+
+From 3a7a1820d4cecbd77c7b74c785af5942510bf080 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org.ua>
+Date: Thu, 22 Jul 2010 13:13:34 +0300
+Subject: [PATCH] Minor fix.
+
+* src/filetypes.h: Remove declarations of stat and lstat.
+---
+ src/filetypes.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/filetypes.h b/src/filetypes.h
+index f80faab..81f0c32 100644
+--- a/src/filetypes.h
++++ b/src/filetypes.h
+@@ -81,5 +81,3 @@
+ #ifndef S_ISLNK
+ #define lstat stat
+ #endif
+-int lstat ();
+-int stat ();
+-- 
+1.7.3
+