Add patch to fix compilation with >=linux headers-2.6.19. See bug 185828.

Package-Manager: portage-2.1.2.9

4 files changed, 50 insertions, 12 deletions

diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index e5ab8111acc1..150da523dcec 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/opendx
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.4 2007/02/22 01:09:47 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.5 2007/07/19 08:11:02 je_fro Exp $
+
+  19 Jul 2007; Jeff Gardner <je_fro@gentoo.org> +files/opendx-sys.h.patch,
+  opendx-4.3.2-r1.ebuild:
+  Add patch to fix compilation with >=linux headers-2.6.19. See bug 185828.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index ef0a16f4927b..2c51bb649ac7 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -1,12 +1,16 @@
+AUX opendx-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b
+MD5 58792d72b2d48172fdf2f28b80973b74 files/opendx-sys.h.patch 1200
+RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 files/opendx-sys.h.patch 1200
+SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b files/opendx-sys.h.patch 1200
 DIST dx-4.3.2.tar.gz 9904514 RMD160 855c9ce1bdd953873178eb2840b68cd35cf2b0a2 SHA1 e05c28b8db33c9e647bede27d1cc3cfd4146d524 SHA256 e128562b952687e988b93e36a59af2aa5aaf6d491a88d583fce89d3979e96515
-EBUILD opendx-4.3.2-r1.ebuild 2884 RMD160 473f85e0cbce0503327925b32c9ed376ee743767 SHA1 590ab273384b8a2e8efba6ff9552e468f2ad76a7 SHA256 26585ed9c6c2cc08b5677bfaf7935472794996d087c9b1d09904fcbeed4f366e
-MD5 96e424b12041d337a3e446b7406e2970 opendx-4.3.2-r1.ebuild 2884
-RMD160 473f85e0cbce0503327925b32c9ed376ee743767 opendx-4.3.2-r1.ebuild 2884
-SHA256 26585ed9c6c2cc08b5677bfaf7935472794996d087c9b1d09904fcbeed4f366e opendx-4.3.2-r1.ebuild 2884
-MISC ChangeLog 2675 RMD160 18a91eec565861f13a295c9df85496447ba2747c SHA1 2a9f7b130e0a9db72109457cc426cf619db6dbcb SHA256 0d06e4d0083a3b0bbee1685585f03000075941db125973a888b611bdc9c0823e
-MD5 a4fe674c2ca4fa608b9731a8e8c034df ChangeLog 2675
-RMD160 18a91eec565861f13a295c9df85496447ba2747c ChangeLog 2675
-SHA256 0d06e4d0083a3b0bbee1685585f03000075941db125973a888b611bdc9c0823e ChangeLog 2675
+EBUILD opendx-4.3.2-r1.ebuild 3085 RMD160 d7155b82028949894071db21977ec78fd3e1ba32 SHA1 b4501e7a9afcb2a851d01f5db29b7d14546d1fe5 SHA256 9c39d268189c09693a5646b1d59007c321b817a327f2fd836e228d6793ebd1a1
+MD5 2874fb32d667bbc17fdcab4757aad2cb opendx-4.3.2-r1.ebuild 3085
+RMD160 d7155b82028949894071db21977ec78fd3e1ba32 opendx-4.3.2-r1.ebuild 3085
+SHA256 9c39d268189c09693a5646b1d59007c321b817a327f2fd836e228d6793ebd1a1 opendx-4.3.2-r1.ebuild 3085
+MISC ChangeLog 2854 RMD160 82cc95d06ba4e59c8bdd148191e52fd40b5aeeda SHA1 d80f4bbc7b3957960b2bf42a69beddee06233a48 SHA256 9bc370598ab71d9d2a97a819ad9aef28226bcec0c8ae7c8f729ea8a24e15bd16
+MD5 9ed29f1c5ffa7dbfdefc7430194dd229 ChangeLog 2854
+RMD160 82cc95d06ba4e59c8bdd148191e52fd40b5aeeda ChangeLog 2854
+SHA256 9bc370598ab71d9d2a97a819ad9aef28226bcec0c8ae7c8f729ea8a24e15bd16 ChangeLog 2854
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-visualization/opendx/files/opendx-sys.h.patch b/sci-visualization/opendx/files/opendx-sys.h.patch
new file mode 100644
index 000000000000..93bf18efb38c
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-sys.h.patch
@@ -0,0 +1,23 @@
+diff -aurN dx-4.3.2-orig/configure.ac dx-4.3.2/configure.ac
+--- dx-4.3.2-orig/configure.ac	2007-07-19 00:59:55.000000000 -0500
++++ dx-4.3.2/configure.ac	2007-07-19 01:02:34.000000000 -0500
+@@ -1004,7 +1004,7 @@
+   Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \
+   Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \
+   gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
+-  linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
++  linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
+   os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \
+   sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \
+   sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
+diff -aurN dx-4.3.2-orig/src/exec/libdx/memory.c dx-4.3.2/src/exec/libdx/memory.c
+--- dx-4.3.2-orig/src/exec/libdx/memory.c	2007-07-19 00:59:54.000000000 -0500
++++ dx-4.3.2/src/exec/libdx/memory.c	2007-07-19 01:01:57.000000000 -0500
+@@ -66,7 +66,6 @@
+ 
+ #if linux
+ #include <linux/kernel.h>
+-#include <linux/sys.h>
+ #include <sys/sysinfo.h>
+ #endif
+ 
diff --git a/sci-visualization/opendx/opendx-4.3.2-r1.ebuild b/sci-visualization/opendx/opendx-4.3.2-r1.ebuild
index 0a4120ff3d4d..dbf418dcaf66 100644
--- a/sci-visualization/opendx/opendx-4.3.2-r1.ebuild
+++ b/sci-visualization/opendx/opendx-4.3.2-r1.ebuild
@@ -1,12 +1,12 @@
-# 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/sci-visualization/opendx/opendx-4.3.2-r1.ebuild,v 1.2 2007/06/26 02:45:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild,v 1.3 2007/07/19 08:11:02 je_fro Exp $
 
 # Set SMP="no" to force disable of SMP compilation.
 # Set SMP="yes" to force enable of SMP compilation.
 # Otherwise it will be autodetected from /usr/src/linux.
 
-inherit eutils flag-o-matic linux-info
+inherit eutils flag-o-matic linux-info autotools
 
 DESCRIPTION="A 3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/"
@@ -58,6 +58,13 @@ smp_check() {
 }
 
 src_compile() {
+
+	if has_version '>=sys-kernel/linux-headers-2.6.19' ; then
+		epatch ${FILESDIR}/opendx-sys.h.patch || die "Failed to apply sys.h patch."
+	fi
+
+	eautoreconf || die "Failed running eautoreconf."
+
 	local myconf="--with-x \
 		--host=${CHOST}"