Fix compilation issues on kernel 2.6.24 (#209472).

Package-Manager: portage-2.1.3.19

4 files changed, 42 insertions, 6 deletions

diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 64c8402e7331..baa5d25face8 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/ltmodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.38 2008/01/03 13:41:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.39 2008/02/13 15:27:13 mrness Exp $
+
+  13 Feb 2008; Alin Năstac <mrness@gentoo.org>
+  +files/ltmodem-2.6.9-kernel-2.6.24.patch, ltmodem-2.6.9.ebuild:
+  Fix compilation issues on kernel 2.6.24 (#209472).
 
   03 Jan 2008; Alin Năstac <mrness@gentoo.org>
   -files/ltmodem-2.6-alk-8-kernel-changes.patch, -files/ltmodem_devfs,
diff --git a/net-dialup/ltmodem/Manifest b/net-dialup/ltmodem/Manifest
index 0093cbbeb36f..109a4bd56adc 100644
--- a/net-dialup/ltmodem/Manifest
+++ b/net-dialup/ltmodem/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ltmodem-2.6.9-kernel-2.6.24.patch 648 RMD160 8e4137c109aa98b07be159418e0ddc728a0613fc SHA1 279663430bafdab85d906d5261027afa7c5b8f48 SHA256 5b0e95206df10ec0e606cb2a28c6ba6685452bd61f57879f19bcc9df67922e0d
 AUX ltmodem_udev 183 RMD160 77fcc7ad359f1a80c63b8d3dbdd2a65c7375fb2b SHA1 6426b537c272e00aeb81616d278429e6f952dfbf SHA256 af14018c5c6e9fc6dcb87ef1abf737296354b8fb5cd59d773d723e3d46b9963c
 DIST ltmodem-2.6-alk-9.tar.bz2 436144 RMD160 cba66ad674cd4fdb9254041e5f8ae70a52996b67 SHA1 ea8ac7f907f39d49226334d65ac94db9d21a9ab9 SHA256 fb5082cf62434be59a32dc8bd304d9946ba275412057dc439bc569e8be71293f
-EBUILD ltmodem-2.6.9.ebuild 2213 RMD160 52267ccbd383d3a5d2bfdf0a02bc3c4da01c1df2 SHA1 e6a38663693d11bb5fa7f6ffa8b74b0660c87827 SHA256 12b2ceb7d17335a9d09b62acaa10afef4535d940042cbd5dbd44e70756dce037
-MISC ChangeLog 5816 RMD160 ec9ac0256602f4d2d64870eaa3dd1b3100adbaff SHA1 37be74823bfd6733e54c3430f63ba06740ab17d0 SHA256 3707f2271177266ba2e8ee06d2c00cce93e2ece598cb901d6859cedce90f162f
+EBUILD ltmodem-2.6.9.ebuild 2299 RMD160 ba8ae2042279b84c4c882830f52b61fba1f9e452 SHA1 e358b0f2f2d80abc3726963ae29fa05d2d0f6041 SHA256 7f68ce350536d66689f615ce42b8fead0e4678c1243a98be1e8220fc3c1bce6c
+MISC ChangeLog 5984 RMD160 ecd679d88a461499fbbd96a2cec5f814716358f1 SHA1 0c3a8d59d2436f72b26e86ad1a9e6b7f09e9f919 SHA256 4145039e5e0c40b8cfa9d055b7b3529516a7115d59b331ffceee5e750ce32df9
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkezDF0ACgkQ+fWpoTWIA9FFMACgjei/ff/kSZ3bGqU2rWijF4HZ
+2fwAnj2iQIEROZKM9YmqtHDHxYCguU0Q
+=R1Sn
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
new file mode 100644
index 000000000000..b2d8f111a882
--- /dev/null
+++ b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
@@ -0,0 +1,15 @@
+diff -Nru ltmodem-2.6-alk-9.orig/serial.c ltmodem-2.6-alk-9/serial.c
+--- ltmodem-2.6-alk-9.orig/serial.c	2007-09-06 04:56:25.000000000 +0300
++++ ltmodem-2.6-alk-9/serial.c	2008-02-13 17:21:44.000000000 +0200
+@@ -826,7 +826,11 @@
+ 	*lt_modem_ops.virtual_isr_ptr = lt_virtual_rs_interrupt;
+ 
+ 	/* lets try to grap dsp interrupt here */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, SA_INTERRUPT | SA_SHIRQ,
++#else
++	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, IRQF_DISABLED | IRQF_SHARED,
++#endif
+ 				ltserialstring, &lt_modem_res.BaseAddress);
+ 	if (ret<0)
+ 		goto out_port;
diff --git a/net-dialup/ltmodem/ltmodem-2.6.9.ebuild b/net-dialup/ltmodem/ltmodem-2.6.9.ebuild
index 430468f60cf9..74011b90690a 100644
--- a/net-dialup/ltmodem/ltmodem-2.6.9.ebuild
+++ b/net-dialup/ltmodem/ltmodem-2.6.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9.ebuild,v 1.2 2007/12/28 11:13:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9.ebuild,v 1.3 2008/02/13 15:27:13 mrness Exp $
 
-inherit linux-mod
+inherit linux-mod eutils
 
 MY_ALK_VER="${PV%.*}-alk-${PV##*.}"
 
@@ -42,6 +42,12 @@ pkg_setup() {
 	BUILD_PARAMS="KERNEL_DIR='${KV_DIR}'"
 }
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-kernel-2.6.24.patch
+}
+
 src_install() {
 	# Add configuration for udev
 	insinto /etc/udev/rules.d/; newins "${FILESDIR}/ltmodem_udev" 55-ltmodem.rules