Version bump. Fix broken build on hosts with kernel 2.6.24 (#207555).

Package-Manager: portage-2.1.3.19

6 files changed, 60 insertions, 32 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index c4851ec32f9a..15eadef370be 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.88 2008/01/08 10:22:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.89 2008/01/29 10:28:45 mrness Exp $
+
+*slmodem-2.9.11_pre20080126 (29 Jan 2008)
+
+  29 Jan 2008; Alin Năstac <mrness@gentoo.org>
+  +files/slmodem-2.9.11-kernel-2.6.24.patch,
+  -slmodem-2.9.11_pre20070505.ebuild, +slmodem-2.9.11_pre20080126.ebuild:
+  Version bump. Fix broken build on hosts with kernel 2.6.24 (#207555).
 
   08 Jan 2008; Markus Meier <maekke@gentoo.org>
   slmodem-2.9.11_pre20070813.ebuild:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 05a346b3ad57..961ff1cceb69 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX slmodem-2.9.11-kernel-2.6.24.patch 450 RMD160 c7cae33121da5e006f097171c8dd86a85db1327d SHA1 418137eb0ab52aa24b1be22c6010ed4410a2cf95 SHA256 5955c7df1747e0c207e557681149bfff650df7713757b89e7d5fd117ebc8ca20
+MD5 269f00d887fcafd913d6603ac1dba798 files/slmodem-2.9.11-kernel-2.6.24.patch 450
+RMD160 c7cae33121da5e006f097171c8dd86a85db1327d files/slmodem-2.9.11-kernel-2.6.24.patch 450
+SHA256 5955c7df1747e0c207e557681149bfff650df7713757b89e7d5fd117ebc8ca20 files/slmodem-2.9.11-kernel-2.6.24.patch 450
 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
@@ -25,35 +29,35 @@ AUX slusb-udev.script 257 RMD160 62a2d7d4ec28622e89b0dfb045b570a2687e1c9a SHA1 8
 MD5 543b775e9eaf20cc5a6c9a23a27744bb files/slusb-udev.script 257
 RMD160 62a2d7d4ec28622e89b0dfb045b570a2687e1c9a files/slusb-udev.script 257
 SHA256 e93d7a46309898cb6e578f5e56e8b25753b4c371260466b10875034cca96480a files/slusb-udev.script 257
-DIST slmodem-2.9.11-20070505.tar.gz 840019 RMD160 9b052bd749a96771060a63f2f27289287bf06f38 SHA1 3eee8eab39ba567f74c950edaa95993ddfefabf8 SHA256 616a5d8cefb2fadec085c19a17a8e38a8c51d836fe4c813e874636f915249adc
 DIST slmodem-2.9.11-20070813.tar.gz 838510 RMD160 9fa5697d00a242e5ad33fa39bdcf48d7b3954955 SHA1 c686623fa6233040b0448a71973c8b09d422621c SHA256 7698ef23b4993446644eb609107aa7840d56dc5a86db4c96cbfa2caef4156125
+DIST slmodem-2.9.11-20080126.tar.gz 841978 RMD160 0a49fed9fdd932deef1a55308fb72b8949c75b1d SHA1 bae9d65fbb0fb5f4334af58e110d13324cda9410 SHA256 ab17ec6d1be5ef8bc7e58f4847d45b434bb5fe44c7031358451133b4b7b34d86
 DIST ungrab-winmodem-20070505.tar.gz 2254 RMD160 51b71b203688004718826f23dc2485223d8b4a17 SHA1 a89f3bcb2519b4d8413eac45aa984be19f2f49b4 SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781
-EBUILD slmodem-2.9.11_pre20070505.ebuild 4548 RMD160 7923dff39311bf19c1d1f3ecc0c0dbebb1286529 SHA1 d47716d90297757d6d8b22ade05e0fe1628badae SHA256 0cae6f77fde5d7be34946c17266ee8c639c82e95109e224ebe85590efdb6848c
-MD5 441c20ee63a32802cbfcce4c68438b3f slmodem-2.9.11_pre20070505.ebuild 4548
-RMD160 7923dff39311bf19c1d1f3ecc0c0dbebb1286529 slmodem-2.9.11_pre20070505.ebuild 4548
-SHA256 0cae6f77fde5d7be34946c17266ee8c639c82e95109e224ebe85590efdb6848c slmodem-2.9.11_pre20070505.ebuild 4548
 EBUILD slmodem-2.9.11_pre20070813.ebuild 4568 RMD160 4b660ce31bd924b613a348261eeb1168e7299140 SHA1 166d66ebea8d2fee4a2bf04c48541fd303806ab2 SHA256 9d8cda17597de92d8aa507ec71d1d14ddeccd569a56e13825ff01d95e8dc2631
 MD5 be74ec2f214f4536078e98d834972e58 slmodem-2.9.11_pre20070813.ebuild 4568
 RMD160 4b660ce31bd924b613a348261eeb1168e7299140 slmodem-2.9.11_pre20070813.ebuild 4568
 SHA256 9d8cda17597de92d8aa507ec71d1d14ddeccd569a56e13825ff01d95e8dc2631 slmodem-2.9.11_pre20070813.ebuild 4568
-MISC ChangeLog 19470 RMD160 c4c50b39031c77394df02f139f6f68aab1a6b265 SHA1 25debf462350e845c0719cfc078c255f6b7b203f SHA256 99fb900987d18be5813b5d6e4ae70106c8d132255fcf0a35d3d74a9388957d3d
-MD5 a698b7ea8ed83b477fddc3c1b9bc53d4 ChangeLog 19470
-RMD160 c4c50b39031c77394df02f139f6f68aab1a6b265 ChangeLog 19470
-SHA256 99fb900987d18be5813b5d6e4ae70106c8d132255fcf0a35d3d74a9388957d3d ChangeLog 19470
+EBUILD slmodem-2.9.11_pre20080126.ebuild 4620 RMD160 cb3c9305184e28ff054e796e4ce7b480cb850177 SHA1 2258645b87c20bd48238b16e04f499879a930c00 SHA256 ec81b12b98fb10e552c5f8372e58446c5763c718217bf79fbdff5be89044e6ca
+MD5 a115b0e5b88c41afa739aa6200f0d2fb slmodem-2.9.11_pre20080126.ebuild 4620
+RMD160 cb3c9305184e28ff054e796e4ce7b480cb850177 slmodem-2.9.11_pre20080126.ebuild 4620
+SHA256 ec81b12b98fb10e552c5f8372e58446c5763c718217bf79fbdff5be89044e6ca slmodem-2.9.11_pre20080126.ebuild 4620
+MISC ChangeLog 19753 RMD160 b7d23e0d18d41a2d775ffe64f7507ef674ddffbd SHA1 38ab3b49d19fe67184c97f76b36843639be1702c SHA256 952ef02ccb545f81a1c17acfefc95897b3b2ffc592e3d376adae8465fc00758a
+MD5 d0d3702fe56c62bb58f9bc5cbb1f260f ChangeLog 19753
+RMD160 b7d23e0d18d41a2d775ffe64f7507ef674ddffbd ChangeLog 19753
+SHA256 952ef02ccb545f81a1c17acfefc95897b3b2ffc592e3d376adae8465fc00758a ChangeLog 19753
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
-MD5 222b3ae611685ac69d6db7665a8efb0f files/digest-slmodem-2.9.11_pre20070505 539
-RMD160 b7c19dad4b797f3541d4e789c5cd49739fba0b89 files/digest-slmodem-2.9.11_pre20070505 539
-SHA256 2c097e4e5141c283e1d23b5ff7401152b86c95db57177e6de0cd62f6f26c0887 files/digest-slmodem-2.9.11_pre20070505 539
 MD5 7943cf4557b3d3029129f55d02490460 files/digest-slmodem-2.9.11_pre20070813 539
 RMD160 4cb405c0d7ec5dd0c7a2946375497a3004c4d0c9 files/digest-slmodem-2.9.11_pre20070813 539
 SHA256 22bdaf311d933c2fed6008952207ae82de2c421e1a8999101952263fe19f4f0a files/digest-slmodem-2.9.11_pre20070813 539
+MD5 539a69e738cfc285be0ab1919e8599e9 files/digest-slmodem-2.9.11_pre20080126 539
+RMD160 e6d5cf036ba1c74cbb4e7e58d6587ed25e98ab7d files/digest-slmodem-2.9.11_pre20080126 539
+SHA256 fe96be18bc50999a8737eb294dc7fdf7d4a39f99d61c8ddd70c0346899b13220 files/digest-slmodem-2.9.11_pre20080126 539
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeDTzsACgkQkKaRLQcq0GJzXACgnSsW7L3Fwr3RGcsvXcBU41fR
-RCgAniV97R0CaSggUfx1qXeANSqInF4u
-=ORuz
+iEYEARECAAYFAkee//YACgkQ+fWpoTWIA9Fr4gCfaokIweiUBFhL+IcVTXLc7Npx
+mxgAn3Af+iR8NIhxcwWL/TYWCwBYkJiQ
+=TIQr
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505
deleted file mode 100644
index 18cce0d9d83c..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 150c089024501e93e640c898aba2debf slmodem-2.9.11-20070505.tar.gz 840019
-RMD160 9b052bd749a96771060a63f2f27289287bf06f38 slmodem-2.9.11-20070505.tar.gz 840019
-SHA256 616a5d8cefb2fadec085c19a17a8e38a8c51d836fe4c813e874636f915249adc slmodem-2.9.11-20070505.tar.gz 840019
-MD5 748bfc7387006293f9eddde119fa9d6f ungrab-winmodem-20070505.tar.gz 2254
-RMD160 51b71b203688004718826f23dc2485223d8b4a17 ungrab-winmodem-20070505.tar.gz 2254
-SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781 ungrab-winmodem-20070505.tar.gz 2254
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20080126 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20080126
new file mode 100644
index 000000000000..1fe981b8506f
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20080126
@@ -0,0 +1,6 @@
+MD5 d238e705af9e87b2251ee1768edc94f3 slmodem-2.9.11-20080126.tar.gz 841978
+RMD160 0a49fed9fdd932deef1a55308fb72b8949c75b1d slmodem-2.9.11-20080126.tar.gz 841978
+SHA256 ab17ec6d1be5ef8bc7e58f4847d45b434bb5fe44c7031358451133b4b7b34d86 slmodem-2.9.11-20080126.tar.gz 841978
+MD5 748bfc7387006293f9eddde119fa9d6f ungrab-winmodem-20070505.tar.gz 2254
+RMD160 51b71b203688004718826f23dc2485223d8b4a17 ungrab-winmodem-20070505.tar.gz 2254
+SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781 ungrab-winmodem-20070505.tar.gz 2254
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
new file mode 100644
index 000000000000..0238a301f3f8
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
@@ -0,0 +1,14 @@
+--- drivers/amrmo_init.c	2008-01-29 12:19:19.000000000 +0200
++++ drivers/amrmo_init.c	2008-01-29 12:24:05.000000000 +0200
+@@ -609,7 +609,11 @@
+ 		}
+ 	}
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+         ret = request_irq(amrmo->irq, &amrmo_pci_interrupt,SA_SHIRQ,
++#else
++        ret = request_irq(amrmo->irq, &amrmo_pci_interrupt,IRQF_SHARED,
++#endif
+ 			  amrmo->name,amrmo);
+ 	if(ret) {
+ 		printk(KERN_ERR "slamr: failed request_irq\n");
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080126.ebuild
index 3169fb4592a9..b56a51efa0b9 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20080126.ebuild
@@ -1,17 +1,19 @@
-# 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/slmodem/slmodem-2.9.11_pre20070505.ebuild,v 1.5 2007/10/28 13:51:04 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080126.ebuild,v 1.1 2008/01/29 10:28:45 mrness Exp $
 
 inherit eutils linux-mod multilib
 
+UNGRAB_PV="20070505"
+
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
 SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz
-	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${PV/*_pre/}.tar.gz"
+	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${UNGRAB_PV}.tar.gz"
 
 LICENSE="Smart-Link"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa usb"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -27,7 +29,7 @@ S="${WORKDIR}"/${P/_pre/-}
 pkg_setup() {
 	use amd64 && multilib_toolchain_setup x86
 
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${PV/*_pre/})"
+	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
 	if ! use amd64; then
 		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
 		if use usb; then
@@ -43,14 +45,15 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${PV/*_pre/}:" \
-		ungrab-winmodem-${PV/*_pre/}/Makefile
-	convert_to_m ungrab-winmodem-${PV/*_pre/}/Makefile
+	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}:" \
+		ungrab-winmodem-${UNGRAB_PV}/Makefile
+	convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile
 
 	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
 
 	cd "${S}"
 	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
+	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.24.patch"
 
 	cd "${S}"/drivers
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
@@ -92,7 +95,7 @@ src_install() {
 		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
 	fi
 
-	# Add module aliases and install hotplug script
+	# Add module aliases and install udev script
 	insinto /etc/modules.d/
 	newins "${FILESDIR}/slmodem-modules" ${PN}
 	if use usb; then
@@ -113,7 +116,7 @@ src_install() {
 	fi
 
 	dodoc Changes README
-	newdoc "${WORKDIR}"/ungrab-winmodem-${PV/*_pre}/Readme.txt README-ungrab-winmodem.txt
+	newdoc "${WORKDIR}"/ungrab-winmodem-${UNGRAB_PV}/Readme.txt README-ungrab-winmodem.txt
 }
 
 pkg_postinst() {