Changed the detection method for 2.4 kernels in both of the compatibility patches; closes bug #42307.

4 files changed, 19 insertions, 30 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 912d373fa8e4..6dc546cb8741 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.30 2004/02/23 21:51:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.31 2004/02/23 22:48:51 plasmaroo Exp $
+
+  23 Feb 2004; <plasmaroo@gentoo.org> files/svgalib-1.9.17-linux2.6.patch,
+  files/svgalib-1.9.18-linux2.6.patch:
+  Changed the detection method for 2.4 kernels in both of the compatibility
+  patches; closes bug #42307.
 
   23 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
   files/svgalib-1.9.18-linux2.6.patch:
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 1450ca9a7fce..caf2817c8400 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,17 +1,17 @@
-MD5 a9aa78998b682bc30b2ba7e3ef14bea1 ChangeLog 5142
+MD5 3883c6588884bbef9fde171fcd0ab0a1 ChangeLog 5366
 MD5 b3845e961f29a0e3754831e90ff5e798 svgalib-1.4.3-r4.ebuild 2566
-MD5 7aae39539c1f87ab37a6d216f9f9be87 svgalib-1.9.17-r3.ebuild 3180
 MD5 9c9bec5553c4cea54d66704b3ef472a8 svgalib-1.9.18.ebuild 3365
-MD5 08beaed909b549304425870873b67c19 files/svgalib-1.9.18-gcc33.patch 426
-MD5 80817f5a0e398576901c43b38df8a2a8 files/svgalib-1.9.18-linux2.6.patch 8199
-MD5 19b74fedfd6953bd3537a803abecc4d3 files/svgalib-1.4.3-gentoo.diff 10364
+MD5 7aae39539c1f87ab37a6d216f9f9be87 svgalib-1.9.17-r3.ebuild 3180
+MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
 MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18 66
-MD5 0ded96494b4c3f4f744474ff89033c18 files/svgalib-1.9.17-linux2.6.patch 38611
+MD5 c4b69ccaea188c0ee4b32111b769ae6d files/svgalib-1.4.3-userpriv.patch 1267
+MD5 19b74fedfd6953bd3537a803abecc4d3 files/svgalib-1.4.3-gentoo.diff 10364
+MD5 72bba0fb5841145da689fda817c7e2d9 files/svgalib-1.4.3-gcc3.patch 303
 MD5 3538c97a42a76d7c1b210319171d3daa files/svgalib-1.4.3-linux2.6.patch 195
-MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
 MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r3 66
-MD5 c2977469108170b5851b7706829ad646 files/svgalib-1.9.17-gentoo.patch 11536
-MD5 c4b69ccaea188c0ee4b32111b769ae6d files/svgalib-1.4.3-userpriv.patch 1267
+MD5 84638d1958dd8a0851602dc50dad3998 files/svgalib-1.9.18-linux2.6.patch 7981
 MD5 9e8f47b421194ae42b3ff7e3a8ba8aed files/svgalib-1.9.17-modversions_h.patch 2414
+MD5 08beaed909b549304425870873b67c19 files/svgalib-1.9.18-gcc33.patch 426
 MD5 ae00198d9110c4de5bc6dd4d6424ab26 files/digest-svgalib-1.4.3-r4 132
-MD5 72bba0fb5841145da689fda817c7e2d9 files/svgalib-1.4.3-gcc3.patch 303
+MD5 77f41d500708786d9533e47041f5a150 files/svgalib-1.9.17-linux2.6.patch 38457
+MD5 c2977469108170b5851b7706829ad646 files/svgalib-1.9.17-gentoo.patch 11536
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
index c9bbf837bf86..d62ebf274ab3 100644
--- a/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
@@ -121,18 +121,11 @@ diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel25compat.h svgalib-1.9.17
 diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel26compat.h
 --- svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h	1970-01-01 02:00:00.000000000 +0200
 +++ svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel26compat.h	2003-08-03 14:33:28.000000000 +0200
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,42 @@
 +#ifndef minor
 +#define minor(x) MINOR(x)
 +#endif
 +
-+#ifndef KERNEL_VERSION
-+# include <linux/version.h>
-+#else
-+# undef KERNEL_VERSION
-+# include <linux/version.h>
-+#endif
-+
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 +
 +# ifdef KERNEL_2_6
@@ -140,7 +133,7 @@ diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.17
 +# endif
 +
 +#define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(start,ofs,len,prot)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
++# ifndef IRQ_NONE
 +   typedef void irqreturn_t;
 +# endif
 +#else
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
index c1b489473499..335d6409630d 100644
--- a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
@@ -44,20 +44,11 @@ diff -urpN svgalib-1.9.18/kernel/svgalib_helper/Makefile svgalib-1.9.18.new/kern
 diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h
 --- svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h	2003-10-04 15:42:01.000000000 +0200
 +++ svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h	2004-02-23 00:41:03.176196576 +0200
-@@ -1,5 +1,8 @@
- #ifndef KERNEL_VERSION
- # include <linux/version.h>
-+#else
-+# undef KERNEL_VERSION
-+# include <linux/version.h>
- #endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- 
 @@ -9,9 +12,11 @@
  
  # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot)
  
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
++# ifndef IRQ_NONE
  typedef void irqreturn_t;
 -# define IRQ_NONE
 -# define IRQ_HANDLED