#8492, #84927

(Portage version: 2.0.51.19)

6 files changed, 56 insertions, 15 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 4108eaf185d1..1bc8677e26e5 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.6 2005/03/08 05:42:29 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.7 2005/03/16 21:02:59 mrness Exp $
+
+*hsfmodem-7.18.00.03-r1 (16 Mar 2005)
+
+  16 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/hsfmodem-7.18.00.03-export_symbol.patch,
+  +files/hsfmodem-7.18.00.03-nvminstall.patch, -hsfmodem-7.18.00.03.ebuild,
+  +hsfmodem-7.18.00.03-r1.ebuild:
+  Fix missing region files (#84927) and replace deprecated
+  EXPORT_SYMBOL_NOVERS (#84926).
 
   08 Mar 2005; Alin Nastac <mrness@gentoo.org> hsfmodem-7.18.00.02.ebuild,
   hsfmodem-7.18.00.03.ebuild:
diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest
index 29bb0c7fb29b..6daeeefad9d0 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0795a16ef55f9b7c97e74d31909ebc61 hsfmodem-7.18.00.02.ebuild 1063
+MD5 e7925d63a64b6e66c944aa32133e5a73 hsfmodem-7.18.00.03-r1.ebuild 1184
 MD5 95a7df73a17820d395dbbc015d66da71 ChangeLog 3051
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 f4f302bb14b37c0729bb5ee4aa501c76 hsfmodem-7.18.00.03.ebuild 1064
+MD5 31d29dc8b8c0cc6b9e0037de5d0e4269 files/hsfmodem-7.18.00.03-nvminstall.patch 522
+MD5 4523eaa6fcb480127dcf1881e1d2bbad files/digest-hsfmodem-7.18.00.03-r1 158
 MD5 e284b1513d312c30e77623de2a16b405 files/digest-hsfmodem-7.18.00.02 158
 MD5 4523eaa6fcb480127dcf1881e1d2bbad files/digest-hsfmodem-7.18.00.03 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLTtRjiC39V7gKu0RAkaAAJwOiZ4Lt4UM5MxnYYFwo3dB/sC+CgCfWAk6
-0UeF9tbkXJP9zyl1mlxp/pA=
-=7mn2
------END PGP SIGNATURE-----
diff --git a/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03 b/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03-r1
index 92e95f14a158..92e95f14a158 100644
--- a/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03
+++ b/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03-r1
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.18.00.03-export_symbol.patch b/net-dialup/hsfmodem/files/hsfmodem-7.18.00.03-export_symbol.patch
new file mode 100644
index 000000000000..65532137617c
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.18.00.03-export_symbol.patch
@@ -0,0 +1,14 @@
+diff -Nru hsfmodem-7.18.00.03full.orig/modules/GPL/oscompat.h hsfmodem-7.18.00.03full/modules/GPL/oscompat.h
+--- hsfmodem-7.18.00.03full.orig/modules/GPL/oscompat.h	2005-03-03 22:28:08.000000000 +0200
++++ hsfmodem-7.18.00.03full/modules/GPL/oscompat.h	2005-03-16 22:39:30.512270696 +0200
+@@ -86,6 +86,10 @@
+ #undef max
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#define EXPORT_SYMBOL_NOVERS EXPORT_SYMBOL
++#endif
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ #include <linux/tqueue.h>
+ #else
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.18.00.03-nvminstall.patch b/net-dialup/hsfmodem/files/hsfmodem-7.18.00.03-nvminstall.patch
new file mode 100644
index 000000000000..20cbaf3beab3
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.18.00.03-nvminstall.patch
@@ -0,0 +1,12 @@
+diff -urN hsfmodem-7.18.00.03full/nvm/makefile hsfmodem-7.18.00.03full-nvminstall/nvm/makefile
+--- hsfmodem-7.18.00.03full/nvm/makefile	2004-12-14 02:52:49.000000000 -0500
++++ hsfmodem-7.18.00.03full-nvminstall/nvm/makefile	2005-03-16 05:19:28.009765480 -0500
+@@ -68,7 +68,7 @@
+ 	touch $(NVMCVTDIR)/.linksame
+ 
+ install: all $(CNXTNVMDIR)
+-	cd $(NVMCVTDIR) && (find $(patsubst %, $(CNXTTARGET)%, $(NVMDIRS)) | cpio -pdmu $(CNXTNVMDIR))
++	cp -ra $(NVMCVTDIR)/* $(CNXTNVMDIR)
+ 
+ $(NVMCVTDIR) $(CNXTNVMDIR):
+ 	$(MKDIR) -p $@
diff --git a/net-dialup/hsfmodem/hsfmodem-7.18.00.03.ebuild b/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r1.ebuild
index ef63db56afb5..71fa4778a751 100644
--- a/net-dialup/hsfmodem/hsfmodem-7.18.00.03.ebuild
+++ b/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r1.ebuild
@@ -1,17 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.18.00.03.ebuild,v 1.2 2005/03/08 05:42:29 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r1.ebuild,v 1.1 2005/03/16 21:02:59 mrness Exp $
+
+inherit eutils
 
 DESCRIPTION="Linuxant's modem driver for Connexant HSF chipset"
 HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
 SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
 	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )"
 
-DEPEND="virtual/libc"
-IUSE=""
-SLOT="0"
 LICENSE="Conexant"
 KEYWORDS="-* ~x86 ~amd64"
+IUSE=""
+SLOT="0"
+
+DEPEND="virtual/libc
+	dev-lang/perl
+	app-arch/cpio"
 
 S="${WORKDIR}"
 
@@ -23,6 +28,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+
+	cd $MY_ARCH_S
+	epatch ${FILESDIR}/${P}-nvminstall.patch
+	epatch ${FILESDIR}/${P}-export_symbol.patch
+}
+
 src_compile() {
 	cd ${MY_ARCH_S}
 	emake all || die "make failed"