Fix building with Linux >= 2.6.36 wrt #352335.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 55 insertions, 7 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index c901c6b097c2..529096f4581a 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udisks
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.23 2010/12/02 15:39:13 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.24 2011/01/29 17:11:37 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.1-r1.ebuild,
+  +files/udisks-1.0.1-linux-headers-2.6.36.patch:
+  Fix building with Linux >= 2.6.36 wrt #352335.
 
 *udisks-1.0.2 (02 Dec 2010)
 
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 65a54f41c7e7..10099a1100f7 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,7 +1,8 @@
+AUX udisks-1.0.1-linux-headers-2.6.36.patch 956 RMD160 7fb2b0d189f953e11c287327f62ea67749227e6e SHA1 ccdd61eba3855200e5043953b3fef6e059ab857c SHA256 ace76b568d856352526d85fced10e5104a47b40b88e37888236a60fe932ac076
 AUX udisks-1.0.1-lvm2_api_support.patch 3825 RMD160 c5565b5b2a4152c39711b6588484340abb3d4aa5 SHA1 2c2da4d72713b9930dcb8f814336c566ff1e151c SHA256 0c4499285a6d0005c3a8633cb16cc8914bbdeeafc39e656b669e64faea9b04c8
 DIST udisks-1.0.1.tar.gz 714246 RMD160 f1583b73a0a7ca4a8b4fddf68813f2bb1321b2bb SHA1 ad3e2a79a2638b75448116b292262cfa1e909518 SHA256 d9bf1ab56667dfa12e99461c503736e3964cf94dd41f30a1229a0e173429b841
 DIST udisks-1.0.2.tar.gz 716381 RMD160 a022ac752ac75d3bca102adee05be43f2ebb424e SHA1 a8307d726b7f1255e7008ff708c793a1301d1309 SHA256 7dc1a150a6a31b2727144603fa5a8f9852696fc5bdc4a11917b9b0f1b8e3dcf1
-EBUILD udisks-1.0.1-r1.ebuild 1825 RMD160 abe76d4e74a4711d59dc5ae4b478f569faff438a SHA1 806afe99bb138c835f7179a00f4e1402bf21c030 SHA256 5f41f2619f4cee805fc84457c30ec048d696e7f29fc7c6ae7eb640e8a9dfb637
+EBUILD udisks-1.0.1-r1.ebuild 1881 RMD160 3153aa09a215647fe6b424b500dc0e12f7c76306 SHA1 7cb366dd124e8f9c00cc79efd62bfb9664f62331 SHA256 8b300dcbe02321f36e2d9cce1c46ad7e673d0559bedaf146771a7e42b1c945da
 EBUILD udisks-1.0.2.ebuild 1920 RMD160 9b61fda121593367e93ad99c39da0509305e912b SHA1 fade522418029246267d1c965874028a07dbe6b9 SHA256 d3156a805205c8ca4a654ddfcaf47a5a36d2784eb6e749d87e1d705da87af782
-MISC ChangeLog 3451 RMD160 65398780cc093848da8722059ac8c51efee78c4f SHA1 0adfc57122b4690b49680f693d6c923a0e797701 SHA256 9d6448d89ecbe645205d77fde3c235b5cc38276868880898343f9281bc7bff7c
+MISC ChangeLog 3629 RMD160 579d70ac0547a9ee179eb7645c85b3a6a6e2992f SHA1 8d291261898eaba7757dbe3790ce76ee8e5d1737 SHA256 275a29c2b7e5f6db76b122f4e819005915d90b02368dceec82a2787baf120ae3
 MISC metadata.xml 367 RMD160 3cc82714647236fdce4606ef9e8432ef2753a553 SHA1 6fd0b25ca51d565fdc6c40b9d1fc90ebff4ddb22 SHA256 9da91cf204d0f5616ca669618f4eed4c477140aef9f7f9218217e63e7d88d051
diff --git a/sys-fs/udisks/files/udisks-1.0.1-linux-headers-2.6.36.patch b/sys-fs/udisks/files/udisks-1.0.1-linux-headers-2.6.36.patch
new file mode 100644
index 000000000000..4097a72b12f7
--- /dev/null
+++ b/sys-fs/udisks/files/udisks-1.0.1-linux-headers-2.6.36.patch
@@ -0,0 +1,42 @@
+http://cgit.freedesktop.org/udisks/commit/?id=1f97cf90f30a6184486cee8877494eb828a34da4
+
+--- src/device.c
++++ src/device.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <stdint.h>
+ #include <linux/fs.h>
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
+--- src/helpers/job-drive-benchmark.c
++++ src/helpers/job-drive-benchmark.c
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++#include <stdint.h>
+ #include <linux/fs.h>
+ #include <fcntl.h>
+ #include <string.h>
+--- src/helpers/job-shared.h
++++ src/helpers/job-shared.h
+@@ -30,6 +30,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <stdint.h>
+ #include <linux/fs.h>
+ 
+ #include <glib.h>
+--- src/helpers/partutil.c
++++ src/helpers/partutil.c
+@@ -34,6 +34,7 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <ctype.h>
++#include <stdint.h>
+ #include <linux/fs.h>
+ 
+ #include <linux/hdreg.h>
diff --git a/sys-fs/udisks/udisks-1.0.1-r1.ebuild b/sys-fs/udisks/udisks-1.0.1-r1.ebuild
index e7d61cca0143..9ba06545bd42 100644
--- a/sys-fs/udisks/udisks-1.0.1-r1.ebuild
+++ b/sys-fs/udisks/udisks-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.1-r1.ebuild,v 1.10 2010/10/29 06:24:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.1-r1.ebuild,v 1.11 2011/01/29 17:11:37 ssuominen Exp $
 
 EAPI=3
 inherit eutils bash-completion
@@ -38,7 +38,8 @@ DEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-lvm2_api_support.patch
+	epatch "${FILESDIR}"/${P}-lvm2_api_support.patch \
+		"${FILESDIR}"/${P}-linux-headers-2.6.36.patch
 }
 
 src_configure() {