Ported to use linux-mod.eclass, split out firmware to net-wireless/ipw2100-firmware...

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 44700baf94f25d6423451e7f9503607f35744647..10c46dcc2073645bfa235d808b6bba0330a788de 100644 (file)
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.57 2005/01/04 00:30:20 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.58 2005/01/04 00:38:32 brix Exp $
+
+*ipw2100-1.0.2-r2 (04 Jan 2005)
+
+  04 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +ipw2100-0.56-r3.ebuild,
+  +ipw2100-1.0.2-r2.ebuild:
+  Ported to use linux-mod.eclass, split out firmware to
+  net-wireless/ipw2100-firmware, added modules.d files.
 
   04 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> ipw2100-0.56-r1.ebuild,
   ipw2100-0.56-r2.ebuild, ipw2100-1.0.0-r1.ebuild, ipw2100-1.0.0.ebuild,

diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r3 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r3
new file mode 100644 (file)
index 0000000..4af7455
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r3
@@ -0,0 +1,2 @@
+MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854
+MD5 5367fe7ad991a70f3af0797ba0d83e2d ipw2100-0.56-2.4-v9.patch.gz 8832

diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r2 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r2
new file mode 100644 (file)
index 0000000..7678583
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2-r2
@@ -0,0 +1,2 @@
+MD5 5ba45b7586ee61e319681d6c5f77616e ipw2100-1.0.2.tgz 138288
+MD5 4079de13bea12b656ddfd9e05527b9a6 ipw2100-1.0.2-2.4-v1.patch.gz 8891

diff --git a/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild
new file mode 100644 (file)
index 0000000..f673ff0
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r3.ebuild,v 1.1 2005/01/04 00:38:32 brix Exp $
+
+inherit linux-mod eutils
+
+FW_VERSION="1.3"
+PATCH_2_4_VERSION="9"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+               mirror://gentoo/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
+               >=net-wireless/wireless-tools-27_pre23
+               !net-wireless/ipw2200"
+
+BUILD_PARAMS="KSRC=${KV_DIR}"
+BUILD_TARGETS="all"
+
+MODULE_NAMES="ipw2100(net:) ieee80211(net:) ieee80211_crypt(net:) ieee80211_crypt_wep(net:) ieee80211_crypt_ccmp(net:) ieee80211_crypt_tkip(net:)"
+MODULESD_IPW2100_DOCS="ISSUES README.ipw2100 CHANGES LICENSE"
+
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
+NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+
+pkg_setup() {
+       if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
+               eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
+               eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+               die "CONFIG_CRYPTO_AES_586 support not detected"
+       fi
+
+       linux-mod_pkg_setup
+}
+
+src_unpack() {
+       unpack ${A}
+
+       if kernel_is 2 4; then
+               cd ${S}
+               epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
+       fi
+
+       cd ${S}
+       epatch ${FILESDIR}/${P}-wpa_eapol_fix.patch
+       epatch ${FILESDIR}/${P}-ieee80211_scan_age.2.patch
+       epatch ${FILESDIR}/${P}-2.6.10-susp.2.patch
+
+       einfo "Patching Makefile to enable WPA"
+       sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+               ${S}/Makefile
+
+       convert_to_m ${S}/Makefile
+}

diff --git a/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild b/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild
new file mode 100644 (file)
index 0000000..94f537f
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.2-r2.ebuild,v 1.1 2005/01/04 00:38:32 brix Exp $
+
+inherit linux-mod eutils
+
+FW_VERSION="1.3"
+PATCH_2_4_VERSION="1"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+               mirror://gentoo/${P}-2.4-v${PATCH_2_4_VERSION}.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+RDEPEND="=net-wireless/ipw2100-firmware-${FW_VERSION}
+               >=net-wireless/wireless-tools-27_pre23
+               !net-wireless/ipw2200"
+
+BUILD_PARAMS="KSRC=${KV_DIR}"
+BUILD_TARGETS="all"
+
+MODULE_NAMES="ipw2100(net:) ieee80211(net:) ieee80211_crypt(net:) ieee80211_crypt_wep(net:) ieee80211_crypt_ccmp(net:) ieee80211_crypt_tkip(net:)"
+MODULESD_IPW2100_DOCS="ISSUES README.ipw2100 CHANGES LICENSE"
+
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
+NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+CRYPTO_ARC4_ERROR="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+CRYPTO_MICHAEL_MIC_ERROR="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+FW_LOADER_ERROR="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+CRC32_ERROR="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+
+pkg_setup() {
+       if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
+               eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
+               eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+               die "CONFIG_CRYPTO_AES_586 support not detected"
+       fi
+
+       linux-mod_pkg_setup
+}
+
+src_unpack() {
+       unpack ${A}
+
+       if kernel_is 2 4; then
+               cd ${S}
+               epatch ${WORKDIR}/${P}-2.4-v${PATCH_2_4_VERSION}.patch
+       fi
+
+       cd ${S}
+       epatch ${FILESDIR}/${P}-2.6.10-susp.patch
+       epatch ${FILESDIR}/${P}-set_security.patch
+
+       einfo "Patching Makefile to enable WPA"
+       sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+               ${S}/Makefile
+
+       convert_to_m ${S}/Makefile
+}