Version bump and fix for bug #84508.

(Portage version: 2.0.51.19)

5 files changed, 85 insertions, 4 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 1089baa722ad..04208cfebc5b 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # 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.70 2005/03/12 11:20:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.71 2005/03/25 18:32:35 brix Exp $
+
+*ipw2100-1.1.0 (25 Mar 2005)
+
+  25 Mar 2005; <brix@gentoo.org> ipw2100-1.0.5.ebuild, +ipw2100-1.1.0.ebuild:
+  Version bump and fix for bug #84508.
 
   12 Mar 2005; Henrik Brix Andersen <brix@gentoo.org>
   -files/ipw2100-0.56-2.6.10-susp.2.patch,
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index facce74c258b..ec3e6b0e93ce 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,4 +1,6 @@
+MD5 90d6c4f1b2011c325321c9ee9c203470 ipw2100-1.1.0.ebuild 2051
 MD5 e5302cd080123428b7be302d03d5e1b4 ChangeLog 13755
 MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
-MD5 2b1dccc79a79e00c61b52d4f3fc55f0c ipw2100-1.0.5.ebuild 2260
+MD5 f9e8eb5d0f916b2961371908af174103 ipw2100-1.0.5.ebuild 2264
 MD5 fa1d9b13fc88f31abe34565753ff0b90 files/digest-ipw2100-1.0.5 62
+MD5 8c080b5455def312dc8b8fb2da3ffa12 files/digest-ipw2100-1.1.0 62
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.1.0 b/net-wireless/ipw2100/files/digest-ipw2100-1.1.0
new file mode 100644
index 000000000000..89a56f35612c
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.1.0
@@ -0,0 +1 @@
+MD5 d185a19e73895a4f4e8401b536f6d6ef ipw2100-1.1.0.tgz 133396
diff --git a/net-wireless/ipw2100/ipw2100-1.0.5.ebuild b/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
index c347a1b1ebc4..2ebecef70d24 100644
--- a/net-wireless/ipw2100/ipw2100-1.0.5.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.0.5.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/ipw2100/ipw2100-1.0.5.ebuild,v 1.2 2005/03/02 20:51:14 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.0.5.ebuild,v 1.3 2005/03/25 18:32:35 brix Exp $
 
 inherit linux-mod eutils
 
@@ -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/ipw2100/ipw2100-1.1.0.ebuild b/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
new file mode 100644
index 000000000000..8ed0637154d6
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.1.0.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/ipw2100/ipw2100-1.1.0.ebuild,v 1.1 2005/03/25 18:32:35 brix Exp $
+
+inherit linux-mod eutils
+
+FW_VERSION="1.3"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="debug"
+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="README.ipw2100"
+
+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
+}