Fix from upstream for building with newer toolchain packages #197326 by Peter Alfredsen.

Package-Manager: portage-2.1.3.16

4 files changed, 50 insertions, 30 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index b31bae9dcf21..fd805046e0ec 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.144 2007/09/28 17:14:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.145 2007/10/28 21:21:25 vapier Exp $
+
+  28 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/findutils-4.3.8-gnulib-stddef.patch, findutils-4.3.8-r1.ebuild:
+  Fix from upstream for building with newer toolchain packages #197326 by
+  Peter Alfredsen.
 
   28 Sep 2007; nixnut <nixnut@gentoo.org> findutils-4.3.8-r1.ebuild:
   Stable on ppc wrt bug 194010
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 4688bb22fd90..edf2e67e6279 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX findutils-4.1.20-selinux.diff 10392 RMD160 8b17d8de81c8e40a6e558de7ff0e4e8174717320 SHA1 c23a941d9000e0dfce0fb65fbc97d9c2f92e6b56 SHA256 4a6c0d238b31d51cb9cbc1fd918ff5e66d314783ae6a9628c981a6368b6c44d0
 MD5 43e3e3c15b66b30de4be62db3b7674ea files/findutils-4.1.20-selinux.diff 10392
 RMD160 8b17d8de81c8e40a6e558de7ff0e4e8174717320 files/findutils-4.1.20-selinux.diff 10392
@@ -6,14 +9,14 @@ AUX findutils-4.2.24-selinux.diff 14356 RMD160 d9e28cacdfd7cec1f766d2465466c4728
 MD5 0b8c5e1bc2e54e46c292ad6a90729f75 files/findutils-4.2.24-selinux.diff 14356
 RMD160 d9e28cacdfd7cec1f766d2465466c472847df056 files/findutils-4.2.24-selinux.diff 14356
 SHA256 4e5df1395f80328c750d980ecb356aedd989b517e98cc52810ef03fe4f362bef files/findutils-4.2.24-selinux.diff 14356
-AUX findutils-4.3.6-fprint-unwritable.patch 703 RMD160 7c10a4b17633c429f383e80e719863febb7d08fa SHA1 8e49d0bac7441428812d0e2dc2a64d9e766ffa78 SHA256 151032c79d07298c7ca6c444a2ae878d2a7157b7be0ff0907b6badf2687ccf90
-MD5 fcac62817927d4416045396a54dcf3ea files/findutils-4.3.6-fprint-unwritable.patch 703
-RMD160 7c10a4b17633c429f383e80e719863febb7d08fa files/findutils-4.3.6-fprint-unwritable.patch 703
-SHA256 151032c79d07298c7ca6c444a2ae878d2a7157b7be0ff0907b6badf2687ccf90 files/findutils-4.3.6-fprint-unwritable.patch 703
 AUX findutils-4.3.7-selinux.diff 15748 RMD160 1e50f8833150366213b17db3ddf53f378d582180 SHA1 704f341547b744dccc3494aa0e54293517a96821 SHA256 04ce6089ca013939560b76109378f91aa2fb616540f9cb9ed30e48f02584be02
 MD5 26794a548a780ef231981e622f7f4a01 files/findutils-4.3.7-selinux.diff 15748
 RMD160 1e50f8833150366213b17db3ddf53f378d582180 files/findutils-4.3.7-selinux.diff 15748
 SHA256 04ce6089ca013939560b76109378f91aa2fb616540f9cb9ed30e48f02584be02 files/findutils-4.3.7-selinux.diff 15748
+AUX findutils-4.3.8-gnulib-stddef.patch 435 RMD160 4eb6e5e07e4124383875efff9ea8b5d47c18f81a SHA1 d85901e8eee3c2c708865a969be847421b02465f SHA256 d15754dfea82f6c8b7d1c377ffc184f759b903ef650aa856560f1fa243a9d08d
+MD5 843aee5f2627210cd30fa3b0dd7054ea files/findutils-4.3.8-gnulib-stddef.patch 435
+RMD160 4eb6e5e07e4124383875efff9ea8b5d47c18f81a files/findutils-4.3.8-gnulib-stddef.patch 435
+SHA256 d15754dfea82f6c8b7d1c377ffc184f759b903ef650aa856560f1fa243a9d08d files/findutils-4.3.8-gnulib-stddef.patch 435
 AUX findutils-4.3.8-listfile-segv.patch 1985 RMD160 f6d01e698d96d755df11da606b74d2a4e2133049 SHA1 f5d5126f28c0125bf15e642a377d01d147961334 SHA256 31eeb7c3e3ba076cbf8649942d42509eadf1cec29c9ad60ae52b4853055e35fc
 MD5 a05804a2aa0e67e61385f49c00f206e2 files/findutils-4.3.8-listfile-segv.patch 1985
 RMD160 f6d01e698d96d755df11da606b74d2a4e2133049 files/findutils-4.3.8-listfile-segv.patch 1985
@@ -24,7 +27,6 @@ RMD160 8a88bf1346d7c54bf9936a037975558e4490e5c2 files/findutils-env-size.patch 6
 SHA256 5d83294b209acbe6dc12b941becc0556e86a80d5f4de4ab3af4dd1c182b7af95 files/findutils-env-size.patch 672
 DIST findutils-4.1.20.tar.gz 777980 RMD160 8911491449f23408e0bebe1e9c8e0f4303aaf66a SHA1 9a2d5f8981f6f5bbdcfa956737658cb5e9051a17 SHA256 8c5dd50a5ca54367fa186f6294b81ec7a365e36d670d9feac62227cb513e63ab
 DIST findutils-4.2.31.tar.gz 1326294 RMD160 0b6775ebf5455e99bf594dd02432d8eeee508ace SHA1 e031ddb4f50c8a053d3f216d10f92621c1fa21ba SHA256 e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204
-DIST findutils-4.3.7.tar.gz 1807397 RMD160 83492bd517e39d5fe5d4c6d3739dcb7074dc5ef4 SHA1 1bba2db2af97bf0e6aa54c2f5e3f4096ed70b2f5 SHA256 60a5fbc06e0c92972c133e6498da88f431f09d483f94a00dd71638ba7f55048a
 DIST findutils-4.3.8.tar.gz 1808049 RMD160 b02144ad9ffff5fe2d02f6a2451f2787e2824d0a SHA1 fb6371a434ae72f30c606d43ff6a6aceafd601ba SHA256 ec933354569f90afaa8112609f8ffe8069294e303fee8669ed3b6b7426ac631d
 EBUILD findutils-4.1.20-r2.ebuild 1828 RMD160 c0ea0c012e32125376c566af866650fb64b4db13 SHA1 1b4f6342acd6467e9b09b29d259cdbff00222823 SHA256 c043f86d05f39b1a6870af94a7089e6dcae5dc41172b1cde8d14d7139d5434ee
 MD5 8bdb303b11f4967b7fcf6e8c945b70df findutils-4.1.20-r2.ebuild 1828
@@ -34,22 +36,14 @@ EBUILD findutils-4.2.31.ebuild 1912 RMD160 628f655456dfdaeaa601e4417a0dac79d7092
 MD5 40c50d6f248a3899da6da131a51eee68 findutils-4.2.31.ebuild 1912
 RMD160 628f655456dfdaeaa601e4417a0dac79d7092d03 findutils-4.2.31.ebuild 1912
 SHA256 74de821fdb9e0b744d9c538df995feeed146dadea4bb8b135c38bb95d7aed749 findutils-4.2.31.ebuild 1912
-EBUILD findutils-4.3.7.ebuild 1643 RMD160 494861e27e9aa8a8464f8bcc1505f4702c45055c SHA1 efc59f4001c061d470d9e960364ac9405c0fb54d SHA256 57e6fec83168cc6513bbca4309687ec36587a112c2be63ef773197ff62a076ee
-MD5 938e8ec6f04bb6c6224d225af28a6d66 findutils-4.3.7.ebuild 1643
-RMD160 494861e27e9aa8a8464f8bcc1505f4702c45055c findutils-4.3.7.ebuild 1643
-SHA256 57e6fec83168cc6513bbca4309687ec36587a112c2be63ef773197ff62a076ee findutils-4.3.7.ebuild 1643
-EBUILD findutils-4.3.8-r1.ebuild 1601 RMD160 fbfb90987f7557f4ff45606d21ca3b59b5e0c97c SHA1 cda08dce6e74c9ff68aa4d66c6298976d38bb187 SHA256 19d201065b1b7f81ddc426e26c0ade0598e3b95897cd5128d971fc3d66fa6030
-MD5 7e68f97721662aafe4fed3d1d1db6cb5 findutils-4.3.8-r1.ebuild 1601
-RMD160 fbfb90987f7557f4ff45606d21ca3b59b5e0c97c findutils-4.3.8-r1.ebuild 1601
-SHA256 19d201065b1b7f81ddc426e26c0ade0598e3b95897cd5128d971fc3d66fa6030 findutils-4.3.8-r1.ebuild 1601
-EBUILD findutils-4.3.8.ebuild 1579 RMD160 b10d290a10b86597c35f784c9e6cd47473bb98b1 SHA1 3c7ec7974d87119634ae4ed05bb438e14b32ec33 SHA256 5a9e90488aabdede07eb04fbdddfdcd8e424d8642555a827841da5a3f9c063a5
-MD5 eb7ef1c5f0310a3f4dbc8cc90158c2c0 findutils-4.3.8.ebuild 1579
-RMD160 b10d290a10b86597c35f784c9e6cd47473bb98b1 findutils-4.3.8.ebuild 1579
-SHA256 5a9e90488aabdede07eb04fbdddfdcd8e424d8642555a827841da5a3f9c063a5 findutils-4.3.8.ebuild 1579
-MISC ChangeLog 20384 RMD160 2c525e1500f894c1b3b5f1f29e03827ada29895d SHA1 a40907fba8d1b3bbd2ed779a5013cf27f7ee8e71 SHA256 5ba8412bc3e1b63c01f77aef3a1d18a41e39a69d37ec305c26c0d3f6eef215c5
-MD5 61454baf0a4a3013c2ebc8d2695b8ef7 ChangeLog 20384
-RMD160 2c525e1500f894c1b3b5f1f29e03827ada29895d ChangeLog 20384
-SHA256 5ba8412bc3e1b63c01f77aef3a1d18a41e39a69d37ec305c26c0d3f6eef215c5 ChangeLog 20384
+EBUILD findutils-4.3.8-r1.ebuild 1652 RMD160 5c6dc566db50c4e6dfe7f101e3ac1b3d6bdcbb74 SHA1 a37570e5bddf36a05baf9acc13ad1d17b70bc822 SHA256 12c9647978b8011429f94fd8ab8b6f4f65c93dc3c86c1c62916cbba50b6480a2
+MD5 25df5ce1eaa94275ee2538e5afa365bf findutils-4.3.8-r1.ebuild 1652
+RMD160 5c6dc566db50c4e6dfe7f101e3ac1b3d6bdcbb74 findutils-4.3.8-r1.ebuild 1652
+SHA256 12c9647978b8011429f94fd8ab8b6f4f65c93dc3c86c1c62916cbba50b6480a2 findutils-4.3.8-r1.ebuild 1652
+MISC ChangeLog 20601 RMD160 0d908b94e436efb98a18a130ce9947fdf10ee3be SHA1 6c874603e5353eaf20e065df5375467a58c5bd69 SHA256 4d47479b0f7217505b3b7aaec06d32cb35f50566a654f6c3f6243e890afb83cb
+MD5 40453278de7396bc6bff05294998be87 ChangeLog 20601
+RMD160 0d908b94e436efb98a18a130ce9947fdf10ee3be ChangeLog 20601
+SHA256 4d47479b0f7217505b3b7aaec06d32cb35f50566a654f6c3f6243e890afb83cb ChangeLog 20601
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 MD5 6fe58567b648100d4ff11902921b6889 metadata.xml 165
 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 metadata.xml 165
@@ -60,12 +54,13 @@ SHA256 fb616a31a4be1506218c96ff7cff23daa0f5415712eee056096915758036ef54 files/di
 MD5 1ea24fc4bc4aaadaae9a822d843d6b0a files/digest-findutils-4.2.31 253
 RMD160 646b9c9a77bd0e8daad9b559cb308e34ad5d1773 files/digest-findutils-4.2.31 253
 SHA256 4e02c68f8f688513ce88db95498b053d06ad4521b958c283bf68876ddbb8bc60 files/digest-findutils-4.2.31 253
-MD5 afae49f90b2d9bf29225c77ec7f3049d files/digest-findutils-4.3.7 250
-RMD160 ddb923c015c3c380ff23f77a2a74eff1a7393e95 files/digest-findutils-4.3.7 250
-SHA256 19af16a0ce0ca2713b309af1a996676e6eebcab4b4df01c85cdca67cf3363185 files/digest-findutils-4.3.7 250
-MD5 61f80a973ac2dc6cf59abb9963c37c3d files/digest-findutils-4.3.8 250
-RMD160 b65e8ba00e176e5e9236cc821296ca41717b6dee files/digest-findutils-4.3.8 250
-SHA256 19198b3f2d31e72df648a63e7c9cd11f370ceabdc047c488e6014d09a148b5fe files/digest-findutils-4.3.8 250
 MD5 61f80a973ac2dc6cf59abb9963c37c3d files/digest-findutils-4.3.8-r1 250
 RMD160 b65e8ba00e176e5e9236cc821296ca41717b6dee files/digest-findutils-4.3.8-r1 250
 SHA256 19198b3f2d31e72df648a63e7c9cd11f370ceabdc047c488e6014d09a148b5fe files/digest-findutils-4.3.8-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHJP1bp/wUKkr7RBoRApkmAJoCMPhPTh2k38okbYxbnsORnLNAUgCfT2Fy
+httbOIwY79xZXjHj9CHxDd8=
+=AReP
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch b/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch
new file mode 100644
index 000000000000..1f17bea5b50c
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.3.8-gnulib-stddef.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/197326
+
+2007-06-10  Bruno Haible  <bruno@clisp.org>
+ 
+	* lib/mbiter.h: Include <stddef.h>, needed for ptrdiff_t.
+	* lib/mbuiter.h: Likewise.
+
+diff --git a/gnulib/lib/mbuiter.h b/gnulib/lib/mbuiter.h
+index e6ad488..c4ceddb 100644
+--- a/gnulib/lib/mbuiter.h
++++ b/gnulib/lib/mbuiter.h
+@@ -92,6 +92,7 @@
+ 
+ #include <assert.h>
+ #include <stdbool.h>
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/sys-apps/findutils/findutils-4.3.8-r1.ebuild b/sys-apps/findutils/findutils-4.3.8-r1.ebuild
index b37d65d97f82..4c60bb5db8b5 100644
--- a/sys-apps/findutils/findutils-4.3.8-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.8-r1.ebuild,v 1.8 2007/09/28 17:14:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.8-r1.ebuild,v 1.9 2007/10/28 21:21:25 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -29,6 +29,7 @@ src_unpack() {
 	# which is a secure version of locate.  See bug 18729
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
 
+	epatch "${FILESDIR}"/${P}-gnulib-stddef.patch #197326
 	epatch "${FILESDIR}"/${P}-listfile-segv.patch #188249
 	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
 }