Fix building with GLIBC 2.10+ wrt #277593. Rename modprobe.d/mwave to modprobe.d/mwave.conf.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 56 insertions, 19 deletions

diff --git a/net-dialup/mwavem/ChangeLog b/net-dialup/mwavem/ChangeLog
index 2f5b6b910c98..c41bf41c686d 100644
--- a/net-dialup/mwavem/ChangeLog
+++ b/net-dialup/mwavem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/mwavem
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.16 2009/05/09 13:23:56 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/ChangeLog,v 1.17 2009/08/08 08:58:20 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mwavem-2.0-r1.ebuild,
+  +files/mwavem-2.0-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277593. Rename modprobe.d/mwave to
+  modprobe.d/mwave.conf.
 
   09 May 2009; Alin Năstac <mrness@gentoo.org> mwavem-2.0-r1.ebuild:
   Migrate to EAPI 2.
diff --git a/net-dialup/mwavem/Manifest b/net-dialup/mwavem/Manifest
index ef90a53c9ec3..6dd49a330fa8 100644
--- a/net-dialup/mwavem/Manifest
+++ b/net-dialup/mwavem/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mwave-dev-handler 210 RMD160 9defd57698c80023a0393fa7c106ee33ff9ed20a SHA1 faac34a5597065198c583541bd296a79cbce7988 SHA256 432642343ccd048758a1f33eb27e4523edad399e89ef77de367bd4c90f086eff
 AUX mwave.devfs 150 RMD160 c35c5ee159a4cb7aca5dc0f677acebe235569f11 SHA1 06c1c64def74fc8239c47851f2a65fcde04da90a SHA256 93b5848123a25170298ae158290e37ad1d443712a7bfa69606a7aac28bad674b
 AUX mwave.modules 30 RMD160 545433b24d2e1bec1e4fa9faf3a2cb8e7f482e3f SHA1 839d3aad7e3bc3408ae973802e19031b352b6e20 SHA256 875f0c3f2872e5cc74a17c70f2c72a4ecd76122988aa3065bd32810c10dd5437
 AUX mwavem-2.0-gentoo.patch 1010 RMD160 61f117e80b76d42fd876d727e72a031550c0f6c5 SHA1 f9a9dfd28d729eed6346947ba564b165042d21c5 SHA256 3f6cb623e1017088a58fd31d4e832c40bb74491bd05d21c27dd3eff242b6f88d
+AUX mwavem-2.0-glibc-2.10.patch 1389 RMD160 8c2712e23249160e27c58f3f5456cd98a8ac6da3 SHA1 28864d1c0bb73e3fe6a3c86fe8a69630504f85bb SHA256 b8bd22d52a067927960f4062ad8ee10bf678243730d24e48a42ee1b641211d0c
 DIST mwavem-2.0.tar.gz 1443167 RMD160 079cc7f9bcd70daa983f41050cc5817d8af36690 SHA1 a674422e64e306ee4cfeeae9caad0ddcf8898593 SHA256 4b3da6be3ec44caee70ef041f58054ac15ddc12c95455a068ef44edf633329ee
-EBUILD mwavem-2.0-r1.ebuild 1611 RMD160 8df999e69ca7fbf56142995b1a939bc977fe4a3b SHA1 08324490de1ec2c25d0288bca2a28617067c29f6 SHA256 b428bee2f49adb4c58913d372004598d7f4061073fecf9b0996fb057d5d42518
-MISC ChangeLog 2965 RMD160 dd1616c78030cb9a0d01c5c1d24ebce5eba5371f SHA1 d649d081c240f2860c00ec78fac2df795bd8e8f4 SHA256 762131d26d54e17057d0cf2f9a00740a60486782f1342b884472d51e21252034
+EBUILD mwavem-2.0-r1.ebuild 1679 RMD160 f7175ed8ef6dedfbfc1d11a4b257250fafdf94eb SHA1 8f821015e15e08b03f7b002d93b800a7b77cf1a1 SHA256 3bf96961055c81a8207ae6f0594cc8e9222f21f5a00118c92e28a2b91a91a5d7
+MISC ChangeLog 3180 RMD160 ca955e23f4a233dd5471b2bc1c391bfb18763bab SHA1 f318aabd9fd87a3922c9d1cebdf7979fcbdf4672 SHA256 102aa854e16ba0268f2e68d7959c54ddf3cc0127be947bef3e647d0dcb468e0f
 MISC metadata.xml 379 RMD160 acdd9e1a66b82334cb74240ed63c953b4881f485 SHA1 aa2e1f18acb90bdfa620c18b63f098fee0fb37ba SHA256 774817fb98b23045f380db2647d7d88b258b23dc098e1257e5831b262a75beb4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkoFoBIACgkQts85UDFmaOXd/gCfeumhTgsOs8FvgpCWprELJ49w
-vDYAn1+F/yg69sl3/1FVevacIAxNuSXj
-=zOcK
------END PGP SIGNATURE-----
diff --git a/net-dialup/mwavem/files/mwavem-2.0-glibc-2.10.patch b/net-dialup/mwavem/files/mwavem-2.0-glibc-2.10.patch
new file mode 100644
index 000000000000..fa867986ec22
--- /dev/null
+++ b/net-dialup/mwavem/files/mwavem-2.0-glibc-2.10.patch
@@ -0,0 +1,40 @@
+diff -ur mwavem-2.0.orig/src/include/mwmparsi.h mwavem-2.0/src/include/mwmparsi.h
+--- mwavem-2.0.orig/src/include/mwmparsi.h	2001-05-04 22:28:52.000000000 +0300
++++ mwavem-2.0/src/include/mwmparsi.h	2009-08-08 11:58:51.000000000 +0300
+@@ -516,8 +516,8 @@
+ 
+   
+ #ifdef DEBUG
+-   void    dprintf(char *szFormat, ...);
+-   #define DPF  dprintf
++   void    mwavem_dprintf(char *szFormat, ...);
++   #define DPF  mwavem_dprintf
+    
+ #else
+    #define DPF ((void)0)
+diff -ur mwavem-2.0.orig/src/include/mwmspcfc.h mwavem-2.0/src/include/mwmspcfc.h
+--- mwavem-2.0.orig/src/include/mwmspcfc.h	2001-05-04 22:28:52.000000000 +0300
++++ mwavem-2.0/src/include/mwmspcfc.h	2009-08-08 11:56:34.000000000 +0300
+@@ -705,8 +705,8 @@
+ void MWM_ENTRY mwmPostMessage(UINT uMsg, LONG wParam, LONG lParam); // @TBD
+ 
+ #ifdef DEBUG
+-   void    dprintf(char *szFormat, ...);
+-   #define DPF  dprintf
++   void    mwavem_dprintf(char *szFormat, ...);
++   #define DPF  mwavem_dprintf
+ #else
+    #define DPF ((void)0)
+ #endif
+diff -ur mwavem-2.0.orig/src/mwmlw32/mwmload.c mwavem-2.0/src/mwmlw32/mwmload.c
+--- mwavem-2.0.orig/src/mwmlw32/mwmload.c	2004-03-31 06:58:55.000000000 +0300
++++ mwavem-2.0/src/mwmlw32/mwmload.c	2009-08-08 11:56:50.000000000 +0300
+@@ -72,7 +72,7 @@
+ 
+ 
+ #define MODNAME "MWMODEM"
+-void dprintf(char *szFormat, ...)
++void mwavem_dprintf(char *szFormat, ...)
+ {
+   /*if (usDebugWindow)
+   {*/
diff --git a/net-dialup/mwavem/mwavem-2.0-r1.ebuild b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
index 97172cc947c4..59d38fcf2a4a 100644
--- a/net-dialup/mwavem/mwavem-2.0-r1.ebuild
+++ b/net-dialup/mwavem/mwavem-2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0-r1.ebuild,v 1.3 2009/05/09 13:23:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mwavem/mwavem-2.0-r1.ebuild,v 1.4 2009/08/08 08:58:20 ssuominen Exp $
 
 EAPI="2"
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="User level application for IBM Mwave modem"
 HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
@@ -12,16 +12,17 @@ SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	exeinto /usr/sbin
 	doexe "${FILESDIR}/mwave-dev-handler"
@@ -30,7 +31,7 @@ src_install() {
 	newins "${FILESDIR}/mwave.devfs" mwave
 
 	insinto /etc/modprobe.d
-	newins "${FILESDIR}/mwave.modules" mwave
+	newins "${FILESDIR}/mwave.modules" mwave.conf
 
 	dodoc AUTHORS ChangeLog FAQ NEWS README README.devfs THANKS
 	docinto doc