[net-wireless/wimax] Make wimax always builds as 32bit app since it doesnt suport 64bit mode. Also it fixes bug #329935

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

5 files changed, 36 insertions, 21 deletions

diff --git a/net-wireless/wimax/ChangeLog b/net-wireless/wimax/ChangeLog
index 05739b37b35a..dd2d7b0a1b98 100644
--- a/net-wireless/wimax/ChangeLog
+++ b/net-wireless/wimax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wimax
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/ChangeLog,v 1.1 2010/07/25 14:18:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/ChangeLog,v 1.2 2010/07/26 22:13:27 alexxy Exp $
+
+  26 Jul 2010; Alexey Shvetsov <alexxy@gentoo.org> wimax-1.5.ebuild,
+  files/wimax, metadata.xml:
+  Make wimax always builds as 32bit app since it doesnt suport 64bit mode.
+  Also it fixes bug #329935
 
 *wimax-1.5 (25 Jul 2010)
 
diff --git a/net-wireless/wimax/Manifest b/net-wireless/wimax/Manifest
index 1a574c631b16..33026af787e2 100644
--- a/net-wireless/wimax/Manifest
+++ b/net-wireless/wimax/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wimax 645 RMD160 acb0faee1c511555ffbe6ef1166b8c29c7d223e8 SHA1 91c75f394c7e0f142486757b2829f2457e22202e SHA256 70c3da198f97e6a68cfebf778af72791f29e7f746373b41c9435d59c0b65bdb5
+AUX wimax 648 RMD160 baf1cbcbea336001ccf02f320736c065be1eb2c0 SHA1 966520a76609e4f7710afd7d5daf0f58776947b2 SHA256 120727223bfb5d6a3c1a648615e4370c6da9a1ebc2214d569800922844b3e53d
 DIST wimax-1.5.tar.gz 2875992 RMD160 8cd63d506a6324b8ff490acb4c53ebbc94d5ca6c SHA1 a3f441cadec44d1db58f07faa416052fe313be2b SHA256 b8c71cddbacd9c25437708abef2816fed2e870e292c2ed25d76f69ab6a365e3a
-EBUILD wimax-1.5.ebuild 1099 RMD160 18916bc529c52e71f58465c79eb2b0efd69fba02 SHA1 4a68c48beafb644a2a3166e608bc91bd59affce7 SHA256 14d49c2f57e798d4b78473e47227562a8b4f018b4b2398b51cb020367853c0f5
-MISC ChangeLog 426 RMD160 bfdd9b439eca4cd2b2246d825f991e4024a151af SHA1 fa1840d6de158e0057f7255fd8ac9580d0bd4f4f SHA256 f7242f5ab07351f41faa535f2efcf1fa6430cff9187abd9bda83ad1dbcebe276
-MISC metadata.xml 251 RMD160 6696e4de4d89e9d9f68ff11e5290e0716051ed61 SHA1 68adff5234a2192a10d3ebdfd891182312459c41 SHA256 8e918a60690137d280b56f2a90eaf7292c2597a90018ab22751e71b5ab69851d
+EBUILD wimax-1.5.ebuild 1721 RMD160 e0411dd55f99955c772fad2bc15a8bff65445533 SHA1 14cbc0558fe1a4c65d4b7c8b7526c1d6ba4a4968 SHA256 ca5115928413f17407875d3cffff136aa4a7e82b184a09f4ba80a60e86d63a0b
+MISC ChangeLog 628 RMD160 7074139a4438db062c83067ea541c9aa0cfafd01 SHA1 798d57d1824fc022836c3d303b9ebc2882118ab2 SHA256 6ec4d57a2a673364e2ad627631549e3a9bd3bd53ebdd4e3d77e446e3563218ae
+MISC metadata.xml 250 RMD160 94be601f620e3158922f31ac28328a28665555a2 SHA1 ac8010695121148bf3593692aba56938187882c9 SHA256 aea796ea3b08f1f5ca77c34868298e406de62590afbf2662e87d094c3e0041f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxMR9MACgkQ5BmOA85PVLgK5ACfV+wGXl4VPLvPaKIVCZa8X+LD
-UA8AnjBlCCRCdzm/NVPKNE7ttNrxp3hO
-=nUw7
+iEYEARECAAYFAkxOCKgACgkQ5BmOA85PVLjblQCdFMrWJbxZTK6/klxCdZUNJ6v1
+dAcAn1dT6Y1wkWzbBqG770d7SUItOmaH
+=FWES
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wimax/files/wimax b/net-wireless/wimax/files/wimax
index 6d240e12e717..43b4da78ac56 100644
--- a/net-wireless/wimax/files/wimax
+++ b/net-wireless/wimax/files/wimax
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/files/wimax,v 1.1 2010/07/25 14:18:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/files/wimax,v 1.2 2010/07/26 22:13:27 alexxy Exp $
 
 description="WiMAX Network Service"
 
@@ -13,7 +13,7 @@ depend() {
 start() {
 	ebegin "Starting WiMAX Network Service"
 	[ -e /var/run/wimaxd.pid ] && rm -f /var/run/wimaxd.pid
-	start-stop-daemon --start --quiet --pidfile /var/run/wimax.pid --exec /usr/bin/wimaxd
+	start-stop-daemon --start --quiet --pidfile /var/run/wimax.pid --exec /usr/bin/wimaxd -b
 	eend $?
 }
 
diff --git a/net-wireless/wimax/metadata.xml b/net-wireless/wimax/metadata.xml
index 02833989d95d..7bb2ba51de03 100644
--- a/net-wireless/wimax/metadata.xml
+++ b/net-wireless/wimax/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>mobile</herd>
 <maintainer>
 	<email>alexxy@gentoo.org</email>
 	<name>Alexey Shvetsov</name>
diff --git a/net-wireless/wimax/wimax-1.5.ebuild b/net-wireless/wimax/wimax-1.5.ebuild
index b017711578c0..ea22bd83e678 100644
--- a/net-wireless/wimax/wimax-1.5.ebuild
+++ b/net-wireless/wimax/wimax-1.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/wimax-1.5.ebuild,v 1.1 2010/07/25 14:18:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/wimax-1.5.ebuild,v 1.2 2010/07/26 22:13:27 alexxy Exp $
 
 EAPI="3"
 
-inherit linux-info multilib
+inherit linux-info
 
 DESCRIPTION="Intel WiMAX daemon used to interface to the hardware"
 HOMEPAGE="http://www.linuxwimax.org/"
@@ -12,28 +12,38 @@ SRC_URI="http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/libnl-1.1
+DEPEND="|| ( >=dev-libs/libnl-1.1 >=app-emulation/emul-linux-x86-baselibs-20100611 )
 		>=sys-kernel/linux-headers-2.6.34"
 RDEPEND="${DEPEND}
-	net-wireless/wimax-tools
-	net-wireless/wpa_supplicant[wimax]"
+		net-wireless/wimax-tools
+		|| ( net-wireless/wpa_supplicant[wimax] net-wireless/libeap )"
 
-src_prepare() {
-	use amd64 && sed -i 's:REG_EIP:REG_RIP:g' \
-		InfraStack/OSDependent/Linux/InfraStackModules/Skeletons/AppSrv/GenericConsole.c \
-			|| die "Sed failed"
+pkg_setup() {
+	use amd64 && multilib_toolchain_setup x86
+	linux-info_pkg_setup
 }
 
 src_configure() {
 	econf \
 		--with-libwimaxll=/usr/$(get_libdir) \
+		--localstatedir=/var \
 		--with-i2400m=/usr || die "econf failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
+	dodir /usr/lib
+	mv "${D}/usr/lib32/pkgconfig" "${D}/usr/lib/pkgconfig"
 	doinitd "${FILESDIR}"/wimax || die "failed to place the init daemon"
+	sed -e "s:/usr/lib/libeap.so.0:/usr/$(get_libdir)/libeap.so.0:g" \
+		-e "s:<GetDeviceTraces>3</GetDeviceTraces>:<GetDeviceTraces>0</GetDeviceTraces>:g" \
+		-e "s:<OutputTarget>console</OutputTarget>:<OutputTarget>daemon</OutputTarget>:g" \
+		-e "s:<IPRenew>1</IPRenew>:<IPRenew>0</IPRenew>:g" \
+		-e "s:<ModeOfOperationProduction>0</ModeOfOperationProduction>:<ModeOfOperationProduction>1</ModeOfOperationProduction>:g" \
+		-i "${D}/etc/wimax/config.xml" || die "Fixing config failed"
+	# Drop udev rusles for now
+	rm -rf  "${D}/etc/udev"
 }