Use sysconf to get the page size so we no longer need asm/page.h

  Fixes #170502.
Package-Manager: portage-2.1.2.2

4 files changed, 55 insertions, 12 deletions

diff --git a/app-laptop/radeontool/ChangeLog b/app-laptop/radeontool/ChangeLog
index 99ff07c9f366..acaa89fdc94f 100644
--- a/app-laptop/radeontool/ChangeLog
+++ b/app-laptop/radeontool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/radeontool
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/ChangeLog,v 1.18 2006/07/19 11:21:15 uberlord Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/ChangeLog,v 1.19 2007/03/15 11:41:55 uberlord Exp $
+
+  15 Mar 2007; Roy Marples <uberlord@gentoo.org>
+  +files/radeontool-1.5-pagesize.patch, radeontool-1.5-r3.ebuild:
+  Use sysconf to get the page size so we no longer need asm/page.h
+  Fixes #170502.
 
   19 Jul 2006; Roy Marples <uberlord@gentoo.org> metadata.xml,
   radeontool-1.5-r3.ebuild:
diff --git a/app-laptop/radeontool/Manifest b/app-laptop/radeontool/Manifest
index d1677a4a0a99..daf9f45e7207 100644
--- a/app-laptop/radeontool/Manifest
+++ b/app-laptop/radeontool/Manifest
@@ -2,19 +2,23 @@ AUX radeontool-1.5-mmap.patch 502 RMD160 7c0bfe4204f6759687ea719767f0baf22ebf184
 MD5 322e4f9536fffd2172a01583f65d46ca files/radeontool-1.5-mmap.patch 502
 RMD160 7c0bfe4204f6759687ea719767f0baf22ebf184b files/radeontool-1.5-mmap.patch 502
 SHA256 27d14db7d811636a66ca6a3ea5d468a56cfce83b10e1087fc0fed81027b3a542 files/radeontool-1.5-mmap.patch 502
+AUX radeontool-1.5-pagesize.patch 1018 RMD160 6a889b40ae2537e3504e83436831221502794ffe SHA1 d7c7722a943c98aa7c8962eed8be3fa1fdf95e84 SHA256 f8d7020cd5c4f55e1496a1906e8bd00a49c2937bb352876b4a324fd93f683adc
+MD5 a046235af18c5a78801c9c8b0676e8dc files/radeontool-1.5-pagesize.patch 1018
+RMD160 6a889b40ae2537e3504e83436831221502794ffe files/radeontool-1.5-pagesize.patch 1018
+SHA256 f8d7020cd5c4f55e1496a1906e8bd00a49c2937bb352876b4a324fd93f683adc files/radeontool-1.5-pagesize.patch 1018
 AUX radeontool-1.5-vga-ati.patch 612 RMD160 945544cf8c1a18301a207e28b3084d21510a17a2 SHA1 1bc0ee963fabc7adb7a1af2638140cd77ab0d907 SHA256 16ae055e6d6cebd8c38bdd71066857099d85492d872a20d4a271d27ee1e09a98
 MD5 2d97b579ecca328f1be6a1c0c3be9edf files/radeontool-1.5-vga-ati.patch 612
 RMD160 945544cf8c1a18301a207e28b3084d21510a17a2 files/radeontool-1.5-vga-ati.patch 612
 SHA256 16ae055e6d6cebd8c38bdd71066857099d85492d872a20d4a271d27ee1e09a98 files/radeontool-1.5-vga-ati.patch 612
 DIST radeontool-1.5.tar.gz 20869 RMD160 1cdeeb7ad379afa7bc03e1cd79adbb09f6a9cb85 SHA1 bd9096d5b18b31a1f1addbea80e6debfc707abf6 SHA256 598190677279001fd8d2724ac28aae11820d3c01f850bc167ec0030c21577361
-EBUILD radeontool-1.5-r3.ebuild 878 RMD160 f84b3463f18fd7ee950f3f9ebb282f56099bee23 SHA1 9219c08091da5997e513c170f9ede96c05fc7671 SHA256 e3faede314939785f803f0a3465372220219237a988d6bbf5e20dd41c9779b22
-MD5 08feb487556c84caffef96870234b7c6 radeontool-1.5-r3.ebuild 878
-RMD160 f84b3463f18fd7ee950f3f9ebb282f56099bee23 radeontool-1.5-r3.ebuild 878
-SHA256 e3faede314939785f803f0a3465372220219237a988d6bbf5e20dd41c9779b22 radeontool-1.5-r3.ebuild 878
-MISC ChangeLog 2619 RMD160 6caddb65dea79f856a93ea4a7559069bcdace81b SHA1 fa1a4fc9a61991c3e7198ee16e8d4e0be34d8c6a SHA256 014c88d396363eabc29f1723925c4b0d0cf7dc3cbb1b778c395a45e4d89c28f3
-MD5 55fc26dec7a2dd0cb25e68324a818fe6 ChangeLog 2619
-RMD160 6caddb65dea79f856a93ea4a7559069bcdace81b ChangeLog 2619
-SHA256 014c88d396363eabc29f1723925c4b0d0cf7dc3cbb1b778c395a45e4d89c28f3 ChangeLog 2619
+EBUILD radeontool-1.5-r3.ebuild 920 RMD160 4c824d6c7106939e5320d5d1f15cce7619f646de SHA1 aad07a1558abcbc25572e9802bbde3ac6d514a77 SHA256 34f3c5f513229db341902d1b1533bd5560dd19f5ec5f31ba03d64aabd5f6dd37
+MD5 0d3d7742d66eaea83482d54f01233829 radeontool-1.5-r3.ebuild 920
+RMD160 4c824d6c7106939e5320d5d1f15cce7619f646de radeontool-1.5-r3.ebuild 920
+SHA256 34f3c5f513229db341902d1b1533bd5560dd19f5ec5f31ba03d64aabd5f6dd37 radeontool-1.5-r3.ebuild 920
+MISC ChangeLog 2819 RMD160 26cdf554af224ee8832b58aa806104b3cf3ecd10 SHA1 0f18ce90fafa650937e64830f2c3d105a00b4a79 SHA256 16ea443c13b5287591361cb75bb43d0c41a0a7ff724ddb6047d82dd7ca3c0751
+MD5 ffa29aa5402adcae282b7bc73dc58516 ChangeLog 2819
+RMD160 26cdf554af224ee8832b58aa806104b3cf3ecd10 ChangeLog 2819
+SHA256 16ea443c13b5287591361cb75bb43d0c41a0a7ff724ddb6047d82dd7ca3c0751 ChangeLog 2819
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
diff --git a/app-laptop/radeontool/files/radeontool-1.5-pagesize.patch b/app-laptop/radeontool/files/radeontool-1.5-pagesize.patch
new file mode 100644
index 000000000000..caa8be42f883
--- /dev/null
+++ b/app-laptop/radeontool/files/radeontool-1.5-pagesize.patch
@@ -0,0 +1,33 @@
+--- radeontool.c.orig	2007-03-15 11:25:23.000000000 +0000
++++ radeontool.c	2007-03-15 11:27:30.000000000 +0000
+@@ -21,7 +21,6 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+-#include <asm/page.h>
+ 
+ #include "radeon_reg.h"
+ 
+@@ -87,6 +86,7 @@
+ {
+     int mem_fd;
+     unsigned char *device_mem;
++    long page_size = sysconf(_SC_PAGESIZE);
+ 
+     /* open /dev/mem */
+     if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) {
+@@ -94,11 +94,11 @@
+     }
+ 
+     /* mmap graphics memory */
+-    if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) {
++    if ((device_mem = malloc(length + (page_size-1))) == NULL) {
+         fatal("allocation error \n");
+     }
+-    if ((unsigned long)device_mem % PAGE_SIZE)
+-        device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE);
++    if ((unsigned long)device_mem % page_size)
++        device_mem += page_size - ((unsigned long)device_mem % page_size);
+     device_mem = (unsigned char *)mmap(
+         (caddr_t)device_mem, 
+         length,
diff --git a/app-laptop/radeontool/radeontool-1.5-r3.ebuild b/app-laptop/radeontool/radeontool-1.5-r3.ebuild
index 49708d673ee5..74fc33acab7e 100644
--- a/app-laptop/radeontool/radeontool-1.5-r3.ebuild
+++ b/app-laptop/radeontool/radeontool-1.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.5-r3.ebuild,v 1.3 2006/07/19 11:21:15 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.5-r3.ebuild,v 1.4 2007/03/15 11:41:55 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}"-mmap.patch
 	epatch "${FILESDIR}/${P}"-vga-ati.patch
+	epatch "${FILESDIR}/${P}"-pagesize.patch
 
 	sed -i \
 		-e "s:-Wall -O2:${CFLAGS}:" \