diff --git a/net-wireless/intel-wimax-binary-supplicant/Manifest b/net-wireless/intel-wimax-binary-supplicant/Manifest index f5f0dd28b..7d3eaf46a 100644 --- a/net-wireless/intel-wimax-binary-supplicant/Manifest +++ b/net-wireless/intel-wimax-binary-supplicant/Manifest @@ -1,4 +1,4 @@ AUX 50-intel-wimax-binary-supplicant 45 RMD160 46711ead5a6004251de62705d5891a359c33814d SHA1 f719e882b255318e56c9a2bcdeed5933b2ad65b0 SHA256 91bd4adab801e226d3ebe736eec25b6da116580705cb6ef47c65fd7c2645d31e AUX install-to-usr-lib.patch 497 RMD160 b4ed0cbfaaf7820d4e97def5c2dda6b319c3497b SHA1 62c83eedfb166dac0ef814d14f8246abf0ee4222 SHA256 20631e0db3838f80011ee07f55243bee51fce64f02956a396578bcf14d891241 DIST WiMAX-Binary-Supplicant-1.4.0.tar.bz2 237353 RMD160 086b294a299c45a4a239170fa13fd04bea343a01 SHA1 458edd676589d6015aed1135e8f9852dc91d9aca SHA256 e5eb91f8d07a6687c9a68126035caf4c73ea326fc4b48ab7fbbd8357d981f1ac -EBUILD intel-wimax-binary-supplicant-1.4.0.ebuild 802 RMD160 2129eead79393ccfda09cd90977ecf8df234252f SHA1 c0fddb91e3a478cd5b55cca6ccade1cba2e2d718 SHA256 ec76faabdaf7bc9fab6f08dfae655d0f2cf723b05545c9487c8cb7bab993cb30 +EBUILD intel-wimax-binary-supplicant-1.4.0.ebuild 806 RMD160 0dd5176667c16ae2fb01e68f512b5460a3b8b003 SHA1 d3174b1adafa00376f515135452faa6580d386e7 SHA256 bc65d9a6e96b53dee558916100783f493c4e3e2a5a9e53dc99c189ca8fed7e91 diff --git a/net-wireless/intel-wimax-binary-supplicant/intel-wimax-binary-supplicant-1.4.0.ebuild b/net-wireless/intel-wimax-binary-supplicant/intel-wimax-binary-supplicant-1.4.0.ebuild index 9a2842004..a03587540 100644 --- a/net-wireless/intel-wimax-binary-supplicant/intel-wimax-binary-supplicant-1.4.0.ebuild +++ b/net-wireless/intel-wimax-binary-supplicant/intel-wimax-binary-supplicant-1.4.0.ebuild @@ -2,25 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -DESCRIPTION="Intel WiMAX Network Service has no description" -HOMEPAGE="http://linuxwimax.org/" -SRC_URI="http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=Intel-WiMAX-Binary-Supplicant-${PV}.tar.bz2 -> WiMAX-Binary-Supplicant-${PV}.tar.bz2" - EAPI=2 inherit eutils -LICENSE="IFDBL" #legal to redistribute but not mess with +DESCRIPTION="Authentication information for WiMax Networks" +HOMEPAGE="http://www.linuxwimax.org/" +SRC_URI="http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=Intel-WiMAX-Binary-Supplicant-${PV}.tar.bz2 -> WiMAX-Binary-Supplicant-${PV}.tar.bz2" +LICENSE="IFDBL" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RESTRICT="mirror" S=${WORKDIR}/Intel-WiMAX-Binary-Supplicant-${PV} -src_install() { +src_prepare() { epatch "${FILESDIR}"/install-to-usr-lib.patch - DESTDIR=${D} ./install_supplicant.sh install - dodoc README - dodir /etc/revdep-rebuild +} + +src_install() { + DESTDIR=${D} ./install_supplicant.sh install || dir "install_supplicant.sh failed" + dodoc README || die "Failed to find README" insinto /etc/revdep-rebuild doins "${FILESDIR}"/50-intel-wimax-binary-supplicant } diff --git a/net-wireless/intel-wimax-network-service/Manifest b/net-wireless/intel-wimax-network-service/Manifest index 39a730ce6..5602b7800 100644 --- a/net-wireless/intel-wimax-network-service/Manifest +++ b/net-wireless/intel-wimax-network-service/Manifest @@ -1,3 +1,3 @@ -AUX wimax 376 RMD160 d28ebc69c8715033d2129c1918c4de4ba1fe9222 SHA1 63988a7ad22995c342d4bfc5568d61ddf55289ef SHA256 a511ac7ca2be6f48802d7ab5583b2afd4dde99c9f5d131ebca86e5f7d6bdc3e3 +AUX wimax 433 RMD160 7c9291b4189588547c854cc36477d7c413ca6ad4 SHA1 c5d9a10d018a8144ccf441409c9db54117489dc9 SHA256 1dfa24bb9d83ad711a9331b917fc7a37ac4d439d13bb82b90d0b8dff0ebf343c DIST WiMAX-Network-Service-1.4.0.tar.bz2 1360859 RMD160 518678f32275e1c890c7a1f4266732a2ec9dedda SHA1 4b6e174ba7b604474ab0ced72d78c9ebfa66749d SHA256 a421b2f6e7912280cbddc6818892b4bffa4da0ff5347a9d26ddbcb81e99963ec -EBUILD intel-wimax-network-service-1.4.0.ebuild 892 RMD160 662cce7f8f38a3b565e0e52be25514d5d57745d8 SHA1 37b1f196946d157a9a1c3e94214301b25ee299ce SHA256 689a39a2e57eb3c89008c169e2e7f8857cd3c401eab4d1fecef4fb465e2ec3ae +EBUILD intel-wimax-network-service-1.4.0.ebuild 933 RMD160 6e1b70eb6a472529063cd5055df0d43d0d7563de SHA1 66e037c130626136469ad2c2847f7ffbfb3d8efc SHA256 6c8e30d735af8417c9ce80f69d8303664e3bd44a6905c482ff0ad02f28074735 diff --git a/net-wireless/intel-wimax-network-service/files/wimax b/net-wireless/intel-wimax-network-service/files/wimax index 4aeafe073..201c43a54 100755 --- a/net-wireless/intel-wimax-network-service/files/wimax +++ b/net-wireless/intel-wimax-network-service/files/wimax @@ -9,6 +9,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 eend $? } diff --git a/net-wireless/intel-wimax-network-service/intel-wimax-network-service-1.4.0.ebuild b/net-wireless/intel-wimax-network-service/intel-wimax-network-service-1.4.0.ebuild index df49a8bd6..c8ba55218 100644 --- a/net-wireless/intel-wimax-network-service/intel-wimax-network-service-1.4.0.ebuild +++ b/net-wireless/intel-wimax-network-service/intel-wimax-network-service-1.4.0.ebuild @@ -2,17 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -DESCRIPTION="Intel WiMAX Network Service has no description" -HOMEPAGE="http://linuxwimax.org/" +DESCRIPTION="Intel WiMAX daemon used to interface to the hardware" +HOMEPAGE="http://www.linuxwimax.org/" SRC_URI="http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=WiMAX-Network-Service-${PV}.tar.bz2 -> WiMAX-Network-Service-${PV}.tar.bz2" EAPI=2 -inherit linux-info +inherit linux-info multilib LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RESTRICT="mirror" DEPEND=">=dev-libs/libnl-1.1" RDEPEND="${DEPEND} @@ -22,12 +21,12 @@ RDEPEND="${DEPEND} S=${WORKDIR}/WiMAX-Network-Service-${PV} src_configure() { - econf --prefix=/usr --localstatedir=/var --with-libwimaxll=/usr/lib/ --with-i2400m="${KV_DIR}" || die "econf failed" + econf --prefix=/usr --localstatedir=/var --with-libwimaxll=/usr/$(get_libdir) --with-i2400m="${KV_DIR}" || die "econf failed" } src_install() { emake DESTDIR="${D}" install || die "Install failed" doinitd "${FILESDIR}"/wimax - dodoc README + dodoc README || die "Failed to find README" } diff --git a/net-wireless/intel-wimax-tools/Manifest b/net-wireless/intel-wimax-tools/Manifest index 63eb98fb4..02e6242f6 100644 --- a/net-wireless/intel-wimax-tools/Manifest +++ b/net-wireless/intel-wimax-tools/Manifest @@ -1,2 +1,2 @@ DIST wimax-tools-1.4.2.tar.bz2 283674 RMD160 7dfd59f090dccb32f3f9ffb5546cfe4e72d108de SHA1 834221ef3739e3803c2c25de2ebf701f28cee897 SHA256 b1ffe56ad8ac4897011caf143b2ef33a9692fac71f1b03a6d83d459b19649330 -EBUILD intel-wimax-tools-1.4.2.ebuild 528 RMD160 235e3012722df03f6c16b1a772cd2345cbc952d1 SHA1 64dec3e767796004976add3ef157da04c3f21b48 SHA256 8ff70a2fcafcb61060468711082a6849213b85440c01bca426814b4325a00277 +EBUILD intel-wimax-tools-1.4.2.ebuild 497 RMD160 a7ac68fc000ed718f9e7dffa61d63ebfc20fcaed SHA1 4226e78c503758f6d53d4c894f3a4920ef4bbe9c SHA256 3de27380f6a6bea0409553656abe00e95a7f121223946f6cff356286f7b86a9c diff --git a/net-wireless/intel-wimax-tools/intel-wimax-tools-1.4.2.ebuild b/net-wireless/intel-wimax-tools/intel-wimax-tools-1.4.2.ebuild index afc64204d..644f68c82 100644 --- a/net-wireless/intel-wimax-tools/intel-wimax-tools-1.4.2.ebuild +++ b/net-wireless/intel-wimax-tools/intel-wimax-tools-1.4.2.ebuild @@ -2,22 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -DESCRIPTION="You really need a description for intel-wimaxtools?" +DESCRIPTION="Tools to use Intel's WiMax cards" HOMEPAGE="http://www.linuxwimax.org" SRC_URI="http://kernel.org/pub/linux/kernel/people/inaky/wimax-tools-${PV}.tar.bz2" -inherit "eutils" - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" -RESTRICT="mirror" S=${WORKDIR}/wimax-tools-${PV} src_install() { emake DESTDIR="${D}" install || die "Install failed" - dodoc README || die + dodoc README || die "Failed to find README" }