Added patch for bug #131483; upstream fixed the fix ... and broke it

Package-Manager: portage-2.1.2.7

4 files changed, 32 insertions, 21 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 9afc839c31f5..111b9e650d33 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.64 2007/05/31 06:50:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.65 2007/06/09 15:52:31 corsair Exp $
+
+  09 Jun 2007; Markus Rothe <corsair@gentoo.org>
+  +files/xfsprogs-2.8.21-kern-types.patch, xfsprogs-2.8.21.ebuild:
+  Added patch for bug #131483; upstream fixed the fix ... and broke it
 
 *xfsprogs-2.8.21 (31 May 2007)
 
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 118ee5b939aa..fa667a38dfe6 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xfsprogs-2.7.11-no-compress-docs.patch 532 RMD160 26ed4d45fe9d964e09620d96dda22a740cc3e42a SHA1 1a5624b0dd2c4c4c8da0b938e02a1ff8c5809cfc SHA256 bbcde354b276b7f5bf7f4277c4a478a23cbdfc0e5a3c4b5116190fade584a772
 MD5 889076a01be6f110a20417afcbbd831f files/xfsprogs-2.7.11-no-compress-docs.patch 532
 RMD160 26ed4d45fe9d964e09620d96dda22a740cc3e42a files/xfsprogs-2.7.11-no-compress-docs.patch 532
@@ -13,6 +10,10 @@ AUX xfsprogs-2.8.18-symlinks.patch 339 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211a
 MD5 7ef8391ca33c6276230bb2f66af0ee2c files/xfsprogs-2.8.18-symlinks.patch 339
 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 files/xfsprogs-2.8.18-symlinks.patch 339
 SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16 files/xfsprogs-2.8.18-symlinks.patch 339
+AUX xfsprogs-2.8.21-kern-types.patch 310 RMD160 9ecfe572fc876ad0aa0643a3777cb5d202e066ac SHA1 d18b6ac690d23bcc444012451f3e9101759b6642 SHA256 066c7021965091ff0739b75b3315aff9bc1ef975d7314030ae85b888dbd3dafe
+MD5 ed6ac7b3f37e31400bf2c5c86e59d2dd files/xfsprogs-2.8.21-kern-types.patch 310
+RMD160 9ecfe572fc876ad0aa0643a3777cb5d202e066ac files/xfsprogs-2.8.21-kern-types.patch 310
+SHA256 066c7021965091ff0739b75b3315aff9bc1ef975d7314030ae85b888dbd3dafe files/xfsprogs-2.8.21-kern-types.patch 310
 DIST xfsprogs_2.8.11-1.tar.gz 924389 RMD160 c9e45f617884e4cff56cb809701d9ec442e7115c SHA1 03d0f426848479562f9ce1c5dcb8cb17a150619d SHA256 dc46b4e29fa5250c62fb2617390e30cb336299428544e795fd40ab21e4b4a08f
 DIST xfsprogs_2.8.18-1.tar.gz 979056 RMD160 c8121e9c465dad4444dadff4273e01087afeb237 SHA1 12ed1cbc5784e5df9a8a2a1c7a061ba459647e80 SHA256 17b76af5e54967c2f06b828bacfd2e43c4f056e303e8cfe6613208dabd9a2c46
 DIST xfsprogs_2.8.21-1.tar.gz 978987 RMD160 6f2dcf98540b9593f528b43eb8a80cf99db3ab2a SHA1 eb7b454c07f1d6fe23a4ee5a1a4c7d6ec7ce6a9d SHA256 d0450b00ad9e321484802f83f913fd04ec608d80146d07861ee8019b00ebdf58
@@ -24,14 +25,14 @@ EBUILD xfsprogs-2.8.18.ebuild 1685 RMD160 231c32a0700d870514a3bef893e072bdd24546
 MD5 747b244316bdf0c4c069aa6acd6c530c xfsprogs-2.8.18.ebuild 1685
 RMD160 231c32a0700d870514a3bef893e072bdd245462c xfsprogs-2.8.18.ebuild 1685
 SHA256 9010e5e4ab6ba1b2a0d893a08230e4a783a56cd610d34fc9bf664a126bd32765 xfsprogs-2.8.18.ebuild 1685
-EBUILD xfsprogs-2.8.21.ebuild 1693 RMD160 221346c3fd7178e82b66b968122cbf45da31c4f2 SHA1 d72fc88d60b7a3a1d063a17f206b9f5a5b2cc7f5 SHA256 7053097ff07b7fc9a75e624ecafd8be21c342f4fe2b935e3395d28aeec6edd42
-MD5 97584b98d2092c5b22e17e617762d35c xfsprogs-2.8.21.ebuild 1693
-RMD160 221346c3fd7178e82b66b968122cbf45da31c4f2 xfsprogs-2.8.21.ebuild 1693
-SHA256 7053097ff07b7fc9a75e624ecafd8be21c342f4fe2b935e3395d28aeec6edd42 xfsprogs-2.8.21.ebuild 1693
-MISC ChangeLog 11862 RMD160 5cb45f85f3d80e950b05cb9a54830100f107bc68 SHA1 ec59c699f89163a032f7f055a88cd8d81857d9e8 SHA256 d25cad4c292343c93ef3d2490ff05e55e8fef2cf61843e752e1517a8e21f233a
-MD5 1afd40b9d7a6a363e1055b2a56ccbd5e ChangeLog 11862
-RMD160 5cb45f85f3d80e950b05cb9a54830100f107bc68 ChangeLog 11862
-SHA256 d25cad4c292343c93ef3d2490ff05e55e8fef2cf61843e752e1517a8e21f233a ChangeLog 11862
+EBUILD xfsprogs-2.8.21.ebuild 1767 RMD160 fc28f0d350238fcec70b4d5ce10149c2e5b5e114 SHA1 303766033e2a2d7556c8fafae46f521b511d7926 SHA256 a5a83c9eabf9d97a0f083255faa2d8b32f49087049508fa01ef73e91eb30949d
+MD5 5f9d47fd1c0c09124283b4d09c5d006e xfsprogs-2.8.21.ebuild 1767
+RMD160 fc28f0d350238fcec70b4d5ce10149c2e5b5e114 xfsprogs-2.8.21.ebuild 1767
+SHA256 a5a83c9eabf9d97a0f083255faa2d8b32f49087049508fa01ef73e91eb30949d xfsprogs-2.8.21.ebuild 1767
+MISC ChangeLog 12051 RMD160 af9c9f377da72cb5c1598f56d66917ead5779172 SHA1 ccfb37da5c81c134f5b0277ea26957e7aa6cb93c SHA256 3e704d6692a66bfcdd0051273501532f0208244806021ff528eea9676df2bffd
+MD5 9196e0cb5ff97df1c719a4b8d6f9c0b1 ChangeLog 12051
+RMD160 af9c9f377da72cb5c1598f56d66917ead5779172 ChangeLog 12051
+SHA256 3e704d6692a66bfcdd0051273501532f0208244806021ff528eea9676df2bffd ChangeLog 12051
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -45,10 +46,3 @@ SHA256 07bc02d7010dde13508f7a9fe6de00da6ed11505dd359e6ec098ac9626553b36 files/di
 MD5 58ac698798634edb9ccfcc96eff5f915 files/digest-xfsprogs-2.8.21 253
 RMD160 d5b3e9c0f9dc4e93930fee934452a9db0211d257 files/digest-xfsprogs-2.8.21 253
 SHA256 96f9617dd3773cd42adc87187ae93627b15c048ce1ec88a9f593ab454cd387fc files/digest-xfsprogs-2.8.21 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGXnB68bi6rjpTunYRAtgaAJ9lbbJFRfQ+4FsWPQONpCzroqll9gCgsVUx
-RUMwf0eKevvuVCJjU/gx0y4=
-=Blm2
------END PGP SIGNATURE-----
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch b/sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch
new file mode 100644
index 000000000000..dd451ac42153
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.8.21-kern-types.patch
@@ -0,0 +1,11 @@
+--- xfsprogs-2.8.21/configure.in.orig	2007-03-16 02:40:23.000000000 +0000
++++ xfsprogs-2.8.21/configure.in	2007-06-09 15:39:09.282258693 +0000
+@@ -57,7 +57,7 @@
+ 
+ AC_TYPE_PSINT
+ AC_TYPE_PSUNSIGNED
+-AC_TYPE_U32
++AC_CHECK_TYPES(__u32,,,[#include <asm/types.h>])
+ AC_SIZEOF_POINTERS_AND_LONG
+ AC_MANUAL_FORMAT
+ 
diff --git a/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild b/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild
index 5af0b2ea3fc8..c189e0340443 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild,v 1.1 2007/05/31 06:50:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.8.21.ebuild,v 1.2 2007/06/09 15:52:31 corsair Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs autotools
 
 MY_P="${PN}_${PV}-1"
 DESCRIPTION="xfs filesystem utilities"
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.8.18-symlinks.patch #166729
+	epatch "${FILESDIR}"/${P}-kern-types.patch #131483
 	# Inject our own CFLAGS / docpath
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
@@ -33,6 +34,7 @@ src_unpack() {
 	# We'll handle /lib versus /usr/lib install
 	sed -i -e '/INSTALL.* -S .*LIBNAME/d' \
 		include/buildmacros || die "sed symlinks"
+	eautoconf
 }
 
 src_compile() {