Dont include asm/page.h #168952 by Peter Alfredsen.

Package-Manager: portage-2.1.2-r13

4 files changed, 39 insertions, 10 deletions

diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index 24e11fa4b0f6..46798e49ece4 100644
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/nbd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.21 2007/02/10 13:17:40 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.22 2007/03/03 05:01:48 vapier Exp $
+
+  03 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/nbd-2.9.2-no-page-header.patch, nbd-2.9.2.ebuild:
+  Dont include asm/page.h #168952 by Peter Alfredsen.
 
   10 Feb 2007; Steve Dibb <beandog@gentoo.org> nbd-2.9.0.ebuild:
   amd64 stable, bug 159209
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 11a07c488cbb..63487c511cfb 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nbd-2.8.2-buffer-check.patch 960 RMD160 8dd1f3794005cb5f431d10660b3e2f1a20091770 SHA1 aa5fc88f30e3b8508b22c118428493f9ef1ca667 SHA256 1a59a4810a147d773f7068c50a15e8e16dbf468d7726be720850b658965476d9
 MD5 7e395f41867132f388466283ce268b28 files/nbd-2.8.2-buffer-check.patch 960
 RMD160 8dd1f3794005cb5f431d10660b3e2f1a20091770 files/nbd-2.8.2-buffer-check.patch 960
@@ -22,6 +25,10 @@ AUX nbd-2.9.2-gznbd.patch 289 RMD160 c7a0b627ca64f2979a6bbe41a401e07a4009089d SH
 MD5 5ed75be8df0437f43540bc0bcd63755f files/nbd-2.9.2-gznbd.patch 289
 RMD160 c7a0b627ca64f2979a6bbe41a401e07a4009089d files/nbd-2.9.2-gznbd.patch 289
 SHA256 48730e0ca6c4ff0523860f0e59c51c94c37790c158eefb6d113719ba97b54f6f files/nbd-2.9.2-gznbd.patch 289
+AUX nbd-2.9.2-no-page-header.patch 189 RMD160 2e718a376ce29dee959a6cda1324a077b6029437 SHA1 79c8ca71e1d66bd87544ba01f1bcc45511f1adb0 SHA256 24551fc33cf9b2050c6d9040c4f161926a565dce532a8958b98ebbf3b986b27f
+MD5 9b6fb3e920db894fe1a76aa80b2c4232 files/nbd-2.9.2-no-page-header.patch 189
+RMD160 2e718a376ce29dee959a6cda1324a077b6029437 files/nbd-2.9.2-no-page-header.patch 189
+SHA256 24551fc33cf9b2050c6d9040c4f161926a565dce532a8958b98ebbf3b986b27f files/nbd-2.9.2-no-page-header.patch 189
 DIST nbd-2.8.2.tar.gz 154065 RMD160 b922d739c3111e62a966f875be979245829ce8b2 SHA1 22d39cdbf2087fc4b04c66b9c60ca70fa51e64b9 SHA256 6577f70df239f23244f5617f8f31eafc0a2b0119c1f3b2ee58d49f9b612229e2
 DIST nbd-2.8.6.tar.gz 196643 RMD160 e58fa43592a220a6ebe1a3f8d819472c96318fc5 SHA1 458dda6e40f9b521de69c781869eb50afbe6569e SHA256 28d6e99dc9107d4fc46faa260d7707e6bd40f7388694f6362c098aded487e675
 DIST nbd-2.8.7.tar.bz2 141225 RMD160 2f3d52e586c7895a1c576b70498228c73e1ffaba SHA1 629c12fad9a497c080fa445c83298199fc821dd9 SHA256 a69d1690ad587d81b85c34d1ef9bf47abf0ba21dc96876d95dd6a9a193a859f1
@@ -49,14 +56,14 @@ EBUILD nbd-2.9.1.ebuild 1057 RMD160 574a979cae7310f27aad0f703243336ecb03867a SHA
 MD5 e953e8dd60466b403fd4cba85fe49a9a nbd-2.9.1.ebuild 1057
 RMD160 574a979cae7310f27aad0f703243336ecb03867a nbd-2.9.1.ebuild 1057
 SHA256 f4183694f7d5daab6851637f4604ca34d55b8446950891fb600cf95312502da9 nbd-2.9.1.ebuild 1057
-EBUILD nbd-2.9.2.ebuild 1057 RMD160 4becd9a9db8e37cb9f7fa2b0dbe54acfff921007 SHA1 f0403ecd725eae0176e5637e094332eee2901fa9 SHA256 8640b5137d4b32eae0760ffab54a7fe239d0f45456afaaacd3f9bdbcb81bd7e8
-MD5 22f666ea4197836f6f0b1758db83991d nbd-2.9.2.ebuild 1057
-RMD160 4becd9a9db8e37cb9f7fa2b0dbe54acfff921007 nbd-2.9.2.ebuild 1057
-SHA256 8640b5137d4b32eae0760ffab54a7fe239d0f45456afaaacd3f9bdbcb81bd7e8 nbd-2.9.2.ebuild 1057
-MISC ChangeLog 4654 RMD160 248efe66a459d496b863928b30ab5f0683a0364a SHA1 5fb081aacd10afa4e8f1c3b3d9121f208129d6a7 SHA256 039686bbc6f9055e9b3184d4e56cf722a4191480b8a940334147589babb286e2
-MD5 7c142d2e78c8f85ebeb31f6e06aa2bde ChangeLog 4654
-RMD160 248efe66a459d496b863928b30ab5f0683a0364a ChangeLog 4654
-SHA256 039686bbc6f9055e9b3184d4e56cf722a4191480b8a940334147589babb286e2 ChangeLog 4654
+EBUILD nbd-2.9.2.ebuild 1112 RMD160 9a7712e32a14fd563ec7fc88a2073468c95cf6c2 SHA1 ca9031afc03c37d5971570b3489c03780179ecd0 SHA256 a4a85ffd5390b8c5bd9e66d4a69f1ddf054e81d693265fe316371cdeaf357d39
+MD5 a11abafdf70f2794c4226a50d8d5f1fd nbd-2.9.2.ebuild 1112
+RMD160 9a7712e32a14fd563ec7fc88a2073468c95cf6c2 nbd-2.9.2.ebuild 1112
+SHA256 a4a85ffd5390b8c5bd9e66d4a69f1ddf054e81d693265fe316371cdeaf357d39 nbd-2.9.2.ebuild 1112
+MISC ChangeLog 4817 RMD160 35f84427c09da41e7004600587f9df99009b68c5 SHA1 bafdb6ce88a1bb9d6d206a42cbbf8cc26445b026 SHA256 3fdda5cf669c0a340b37a366d7311656dd928419db46d35579ae360f02eef1c1
+MD5 69349d9aa095add8cd84dd0a2df368ef ChangeLog 4817
+RMD160 35f84427c09da41e7004600587f9df99009b68c5 ChangeLog 4817
+SHA256 3fdda5cf669c0a340b37a366d7311656dd928419db46d35579ae360f02eef1c1 ChangeLog 4817
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -79,3 +86,10 @@ SHA256 9d6dd8c71b04ed7ef1047670060f85850c8567945ce29d2008d38d30e809834f files/di
 MD5 9d5f55d2e3b3fe941c54380915d235ac files/digest-nbd-2.9.2 476
 RMD160 dcf0aa461cdee4d8513a6de3cd17fd9cc26c3886 files/digest-nbd-2.9.2 476
 SHA256 db82b70c88f41fef6c3293b45f92347380231887f93f25689b735d2a0c283575 files/digest-nbd-2.9.2 476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF6QFF8bi6rjpTunYRAs+6AKCe0YOyAY75Allb4quDSuacofRDCACfYnBd
+jGZ3UqSWRcZ9Fd+rC1zqXAA=
+=5hTi
+-----END PGP SIGNATURE-----
diff --git a/sys-block/nbd/files/nbd-2.9.2-no-page-header.patch b/sys-block/nbd/files/nbd-2.9.2-no-page-header.patch
new file mode 100644
index 000000000000..8e1717f1bb74
--- /dev/null
+++ b/sys-block/nbd/files/nbd-2.9.2-no-page-header.patch
@@ -0,0 +1,10 @@
+--- nbd-client.c
++++ nbd-client.c
+@@ -16,7 +16,6 @@
+ #include "config.h"
+ #include "lfs.h"
+ 
+-#include <asm/page.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
diff --git a/sys-block/nbd/nbd-2.9.2.ebuild b/sys-block/nbd/nbd-2.9.2.ebuild
index 01a1ae40d599..7e36613bdd85 100644
--- a/sys-block/nbd/nbd-2.9.2.ebuild
+++ b/sys-block/nbd/nbd-2.9.2.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-block/nbd/nbd-2.9.2.ebuild,v 1.1 2007/01/28 11:33:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.2.ebuild,v 1.2 2007/03/03 05:01:48 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.9.2-gznbd.patch
 	epatch "${FILESDIR}"/${PN}-2.9.1-headers.patch
+	epatch "${FILESDIR}"/${PN}-2.9.2-no-page-header.patch
 
 	mkdir -p "${S}"/inc-after/linux
 	mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h