Include utsrelease.h for kernels >= 2.6.18 (#140723).

(Portage version: 2.1-r2)
 (Signed Manifest commit)

3 files changed, 15 insertions, 70 deletions

diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 8e11646149a1..c49d0bb78c49 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX slmodem-2.9.11-devfs.patch 1259 RMD160 091b9b84f8368237d945fe9a800eaf53d1f347f0 SHA1 274717599314406139a2378fbf83be0e744f6152 SHA256 1c072b12c54c723d342307d40b1d4d87965af3d2c8e0bd21969fe5f26f7c2ab0
-MD5 1c6bdfc7fae87a4b1f5e019442cfbda8 files/slmodem-2.9.11-devfs.patch 1259
-RMD160 091b9b84f8368237d945fe9a800eaf53d1f347f0 files/slmodem-2.9.11-devfs.patch 1259
-SHA256 1c072b12c54c723d342307d40b1d4d87965af3d2c8e0bd21969fe5f26f7c2ab0 files/slmodem-2.9.11-devfs.patch 1259
+AUX slmodem-2.9.11-kernel-2.6.18.patch 1724 RMD160 b9510f6bc823dc3e56cabe32458136b0c204824f SHA1 09f57b9830d59b23936b16c6720b83a7e31c3694 SHA256 8d3540177b25624c19ab66526e5666cef570226c6426422d815fe3040416d148
+MD5 6f4ceab8b6496bed4d7ded34fca88f0b files/slmodem-2.9.11-kernel-2.6.18.patch 1724
+RMD160 b9510f6bc823dc3e56cabe32458136b0c204824f files/slmodem-2.9.11-kernel-2.6.18.patch 1724
+SHA256 8d3540177b25624c19ab66526e5666cef570226c6426422d815fe3040416d148 files/slmodem-2.9.11-kernel-2.6.18.patch 1724
 AUX slmodem-2.9.11-makefile.patch 872 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc439402 SHA1 3c8d191a0e7983247a64e54ca70551fe4b83d046 SHA256 56518c7fa8ce442613ff9f23d87cbabe83ddb1fc21d10ae11dc8e7fd57610189
 MD5 ead92ab897f69fd1b9fc97c4c0e305e1 files/slmodem-2.9.11-makefile.patch 872
 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc439402 files/slmodem-2.9.11-makefile.patch 872
@@ -29,28 +29,24 @@ AUX slmodem-2.9.conf 649 RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c SHA1 62
 MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-2.9.conf 649
 RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c files/slmodem-2.9.conf 649
 SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff files/slmodem-2.9.conf 649
-AUX slmodem-2.9.devfs 786 RMD160 bc7d4385206864b16cd315d14ea60ef99533618d SHA1 5f457c7f76b1981032ca99049afdf181ae6b352f SHA256 4349b9ffa2c5b9adf43722c7b71dbf33f3ffce767a4ddbc630397ee23599ffa6
-MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
-RMD160 bc7d4385206864b16cd315d14ea60ef99533618d files/slmodem-2.9.devfs 786
-SHA256 4349b9ffa2c5b9adf43722c7b71dbf33f3ffce767a4ddbc630397ee23599ffa6 files/slmodem-2.9.devfs 786
 AUX slusb.hotplug 262 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 SHA1 79d922f24852a17385ff4ac82f586ca0ad477f3f SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
 SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
 DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
 DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
-EBUILD slmodem-2.9.11_pre20051101-r1.ebuild 4594 RMD160 59bef22ccfbeeeb4ae38141ec18b7228558b3aed SHA1 f695f07b1827c35d3a63a51db91bba4ffbcfff15 SHA256 7ccfafc0b48694db5d521c99bf1bf979d3e78a84cf1ce2b7c1963bc0a5c78a6b
-MD5 265e4a9877b3bb12b00c3f6518c20105 slmodem-2.9.11_pre20051101-r1.ebuild 4594
-RMD160 59bef22ccfbeeeb4ae38141ec18b7228558b3aed slmodem-2.9.11_pre20051101-r1.ebuild 4594
-SHA256 7ccfafc0b48694db5d521c99bf1bf979d3e78a84cf1ce2b7c1963bc0a5c78a6b slmodem-2.9.11_pre20051101-r1.ebuild 4594
+EBUILD slmodem-2.9.11_pre20051101-r1.ebuild 4602 RMD160 2d2786c990e7741ac3fe065c14d7e7c740b8cc4b SHA1 c8737ba5f09152ad9042b5e4167f4498f04291fc SHA256 b3e42d591186d865cbf708a637f5b1d88c1d6155275e7e1b274ffa56e813ed31
+MD5 9774cfab75c894dcb26ce324235500c4 slmodem-2.9.11_pre20051101-r1.ebuild 4602
+RMD160 2d2786c990e7741ac3fe065c14d7e7c740b8cc4b slmodem-2.9.11_pre20051101-r1.ebuild 4602
+SHA256 b3e42d591186d865cbf708a637f5b1d88c1d6155275e7e1b274ffa56e813ed31 slmodem-2.9.11_pre20051101-r1.ebuild 4602
 EBUILD slmodem-2.9.11_pre20051101.ebuild 4619 RMD160 cfed55daf1c5d6fdd7607d2b5c28736fc4ceed49 SHA1 85d4c940fc793b0cbbdb25d814cdd60de7ed76e5 SHA256 71c708a1b978333292b311f357f08b44b6e4c434c755859f615757e873964813
 MD5 efea4cd18104c7257dd76d8b7830a418 slmodem-2.9.11_pre20051101.ebuild 4619
 RMD160 cfed55daf1c5d6fdd7607d2b5c28736fc4ceed49 slmodem-2.9.11_pre20051101.ebuild 4619
 SHA256 71c708a1b978333292b311f357f08b44b6e4c434c755859f615757e873964813 slmodem-2.9.11_pre20051101.ebuild 4619
-MISC ChangeLog 14934 RMD160 1b9dd5914c160842e4bb6d4de75d8d39dda47c29 SHA1 54012e5c37cc07a6f1717a82b32c6fc079b2f986 SHA256 e0cffe6c459068ebfc591a901fafcaf899f37e176db43b968655ddc61fc9099c
-MD5 a18d8f03f5797032a54d88f5f8180332 ChangeLog 14934
-RMD160 1b9dd5914c160842e4bb6d4de75d8d39dda47c29 ChangeLog 14934
-SHA256 e0cffe6c459068ebfc591a901fafcaf899f37e176db43b968655ddc61fc9099c ChangeLog 14934
+MISC ChangeLog 15190 RMD160 c24348b449e088c7ba56fa5290a79dec44fb8d4a SHA1 5e632bf39a6c65f157841e6ac2205cc11087541e SHA256 b905bea11ceed1071002f5e62982ccb842388e1003be19d910ecf2aef003444b
+MD5 5966a5435f5148002965b35bd866b697 ChangeLog 15190
+RMD160 c24348b449e088c7ba56fa5290a79dec44fb8d4a ChangeLog 15190
+SHA256 b905bea11ceed1071002f5e62982ccb842388e1003be19d910ecf2aef003444b ChangeLog 15190
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -64,7 +60,7 @@ SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAt173sf9c6kjmR8RAoBcAJ98C1OpcWA0NN87TTzyjRfqJi/EKwCfdT48
-j3OQrIgr5GZpd6x7U4H7Wlg=
-=eDXg
+iD8DBQFFA+EX3sf9c6kjmR8RAtTPAKCUqpHO0nRJMKKoF4II7vacNpfU9ACfSjnh
+zy53pOkWQ/gb2+lUw/ZOwU0=
+=6lSs
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-devfs.patch b/net-dialup/slmodem/files/slmodem-2.9.11-devfs.patch
deleted file mode 100644
index 226fc3f00618..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-devfs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c slmodem-2.9.11-20051101/drivers/amrmo_init.c
---- slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c	2005-10-10 00:14:13.000000000 +0300
-+++ slmodem-2.9.11-20051101/drivers/amrmo_init.c	2006-09-09 18:13:47.219081000 +0300
-@@ -53,7 +53,13 @@
- #include <linux/poll.h>
- #include <linux/fs.h>
- #include <asm/uaccess.h>
--#include <linux/devfs_fs_kernel.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#	include <linux/devfs_fs_kernel.h>
-+#else
-+#	define devfs_mk_cdev(dev, mode, fmt, i)
-+#	define devfs_remove(fmt, i)
-+#endif
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- #define OLD_KERNEL 1
-diff -Nru slmodem-2.9.11-20051101.orig/drivers/st7554.c slmodem-2.9.11-20051101/drivers/st7554.c
---- slmodem-2.9.11-20051101.orig/drivers/st7554.c	2005-11-01 17:31:45.000000000 +0200
-+++ slmodem-2.9.11-20051101/drivers/st7554.c	2006-09-09 18:14:36.910186500 +0300
-@@ -55,7 +55,13 @@
- #include <linux/poll.h>
- #include <linux/usb.h>
- #include <linux/device.h>
--#include <linux/devfs_fs_kernel.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#	include <linux/devfs_fs_kernel.h>
-+#else
-+#	define devfs_mk_cdev(dev, mode, fmt, i)
-+#	define devfs_remove(fmt, i)
-+#endif
- 
- #include <modem_defs.h>
- 
diff --git a/net-dialup/slmodem/files/slmodem-2.9.devfs b/net-dialup/slmodem/files/slmodem-2.9.devfs
deleted file mode 100644
index 719f95f303d2..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.devfs
+++ /dev/null
@@ -1,15 +0,0 @@
-# slmodem kernel modules' devfs configuration file
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.devfs,v 1.3 2004/06/08 05:38:04 dragonheart Exp $
-
-# Create /dev/modem for /dev/slamr0 (Change to suit your setup)
-LOOKUP          ^slamr0$   MODLOAD ACTION slamr
-LOOKUP          ^slamr0$   CFUNCTION GLOBAL mksymlink ttySL0 modem
-REGISTER        ^slamr0$   CFUNCTION GLOBAL mksymlink $devname modem
-UNREGISTER      ^slamr0$   CFUNCTION GLOBAL unlink modem
-
-# Create /dev/modem for /dev/slusb0 (Change to suit your setup)
-LOOKUP          ^slusb0$   MODLOAD ACTION slusb
-LOOKUP          ^slusb0$   CFUNCTION GLOBAL mksymlink ttySL0 modem
-REGISTER        ^slusb0$   CFUNCTION GLOBAL mksymlink $devname modem
-UNREGISTER      ^slusb0$   CFUNCTION GLOBAL unlink modem
-