Version bump and fix for bug #84508.

Package-Manager: portage-2.0.51.19

5 files changed, 86 insertions, 5 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 0d75ac0a93fd..aa841c0b841c 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.25 2005/03/12 11:21:53 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.26 2005/03/25 18:47:39 brix Exp $
+
+*ipw2200-1.0.2 (25 Mar 2005)
+
+  25 Mar 2005; <brix@gentoo.org> ipw2200-1.0.1.ebuild, +ipw2200-1.0.2.ebuild:
+  Version bump and fix for bug #84508.
 
   12 Mar 2005; Henrik Brix Andersen <brix@gentoo.org> -ipw2200-1.0.0.ebuild:
   Pruned old version.
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 94ae9c20aa79..fb56d87b2b88 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,4 +1,6 @@
-MD5 2aec3255e60cdc65d2ca1fad94f85ffe ipw2200-1.0.1.ebuild 2279
-MD5 c92f165a15c3050b7f71b2e99cc30ee5 ChangeLog 4780
+MD5 e3bb299c6a4520a8f5c414bb76396354 ipw2200-1.0.1.ebuild 2283
+MD5 94c77bdb3e15a214a42d450a3da63205 ChangeLog 4928
+MD5 7cb5af70662fca55365487cf11c136e7 ipw2200-1.0.2.ebuild 2164
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 d2a1aca212498ad4de9f4a79ac12026b files/digest-ipw2200-1.0.1 62
+MD5 336dd10c8bdf4e1c806e851f7bc7fdc6 files/digest-ipw2200-1.0.2 62
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.2 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.2
new file mode 100644
index 000000000000..7d45b71e770d
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-1.0.2
@@ -0,0 +1 @@
+MD5 a6974b0b7399a53fe497b68bd2fca10a ipw2200-1.0.2.tgz 131641
diff --git a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
index 7b33c0f1b989..0b5812914514 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.1.ebuild,v 1.3 2005/03/02 20:54:37 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.1.ebuild,v 1.4 2005/03/25 18:47:39 brix Exp $
 
 inherit linux-mod
 
@@ -43,7 +43,7 @@ pkg_setup() {
 		die "${P} does not support building against kernel 2.4.x"
 	fi
 
-	if linux_chkconfig_present CRYPTO_AES_586 && linux_chkconfig_present CRYPTO_AES; then
+	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"
diff --git a/net-wireless/ipw2200/ipw2200-1.0.2.ebuild b/net-wireless/ipw2200/ipw2200-1.0.2.ebuild
new file mode 100644
index 000000000000..f8862eb67305
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-1.0.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.2.ebuild,v 1.1 2005/03/25 18:47:39 brix Exp $
+
+inherit linux-mod
+
+FW_VERSION="2.2"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
+
+HOMEPAGE="http://ipw2200.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="debug"
+RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools
+		!net-wireless/ipw2100"
+
+BUILD_PARAMS="KSRC=${KV_DIR}"
+BUILD_TARGETS="all"
+
+MODULE_NAMES="ipw2200(net:)
+			ieee80211(net:)
+			ieee80211_crypt(net:)
+			ieee80211_crypt_wep(net:)
+			ieee80211_crypt_ccmp(net:)
+			ieee80211_crypt_tkip(net:)"
+MODULESD_IPW2200_DOCS="README.ipw2200"
+
+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 kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	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() {
+	local debug="n"
+
+	unpack ${A}
+
+	use debug && debug="y"
+	sed -i \
+		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
+		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=$debug:" \
+		${S}/Makefile
+
+	convert_to_m ${S}/Makefile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES ISSUES
+}