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

6 files changed, 147 insertions, 1 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 44700baf94f2..10c46dcc2073 100644
--- 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/Manifest b/net-wireless/ipw2100/Manifest
index b9875da5c77d..537b4b253005 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,3 +1,4 @@
+MD5 20d34b16e2dd1dcdb3411323b7b6094d ipw2100-1.0.2-r2.ebuild 2121
 MD5 d3917613ee819694283dd4e9264cef96 ipw2100-1.0.2.ebuild 3464
 MD5 9f09dd228443a63445fc103d46bd49e1 ipw2100-0.56-r2.ebuild 4031
 MD5 840349419b1af3ca9d7ee148a88ed628 ipw2100-1.0.2-r1.ebuild 3520
@@ -5,6 +6,7 @@ MD5 e92586881dd4116789f0050229800463 ipw2100-1.0.1.ebuild 3938
 MD5 a0e0690ee5dda207d6418c312d672ec2 ipw2100-0.56-r1.ebuild 4029
 MD5 bf48b6b32bf70a3403566aa21858593a ipw2100-1.0.1-r1.ebuild 3994
 MD5 73eea775b845d737438dd08da6841ba9 ChangeLog 11495
+MD5 9c15f6d00de4d2293aea11ea73f095d6 ipw2100-0.56-r3.ebuild 2176
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
 MD5 1a8dff16278da18ece260f813b8741b8 ipw2100-1.0.0.ebuild 3851
 MD5 a39621a007808bbc6866a7cbb530dbec ipw2100-1.0.0-r1.ebuild 3907
@@ -18,9 +20,11 @@ MD5 e268f53cf63bf9a02d4c67252d0ca889 files/digest-ipw2100-1.0.1 197
 MD5 9fd4b97cffd1a381e8e34e126d4cc0c2 files/digest-ipw2100-1.0.2 197
 MD5 3281ce7f4f675298655322854f41fdd6 files/digest-ipw2100-0.56-r1 195
 MD5 3281ce7f4f675298655322854f41fdd6 files/digest-ipw2100-0.56-r2 195
+MD5 64010ab95cd4018d88f0b52edea00671 files/digest-ipw2100-0.56-r3 132
 MD5 20fe178fabb9591d81a6cbf182fd520a files/digest-ipw2100-1.0.0-r1 125
 MD5 e268f53cf63bf9a02d4c67252d0ca889 files/digest-ipw2100-1.0.1-r1 197
 MD5 9fd4b97cffd1a381e8e34e126d4cc0c2 files/digest-ipw2100-1.0.2-r1 197
+MD5 c1fad8b75bf62b41751ccf777adac2b3 files/digest-ipw2100-1.0.2-r2 134
 MD5 b98ff1fd62c4b394070a81df3f582021 files/ipw2100-1.0.2-2.6.10-susp.patch 450
 MD5 aca6bf1c2d71e72adfc952d903c77f6b files/ipw2100-0.56-ieee80211_scan_age.2.patch 1718
 MD5 a3c145c628f8694f780d445db4d83390 files/ipw2100-1.0.0-2.6.10-susp.patch 450
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
index 000000000000..4af7455ebda4
--- /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
index 000000000000..7678583774c4
--- /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
index 000000000000..f673ff036d25
--- /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
index 000000000000..94f537f4e25c
--- /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
+}