Now using the correct revision of the v 0.21 ebuild for v 1.0.0.

Package-Manager: portage-2.0.51-r13

3 files changed, 15 insertions, 36 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 9a8a56fd0790..ddda869586d0 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,9 @@
 # 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.18 2005/02/01 16:32:27 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.19 2005/02/01 17:42:06 jbms Exp $
+
+  01 Feb 2005; Jeremy Maitin-Shepard <jbms@gentoo.org> ipw2200-1.0.0.ebuild:
+  Replaced the ebuild with the correct version of the v 0.21 ebuild.
 
 *ipw2200-1.0.0 (01 Feb 2005)
 
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 9b5d2e47b7b0..9c12f73ff58d 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -4,10 +4,10 @@ MD5 c6028a295da5614a2977aee06109bafd ipw2200-0.12.ebuild 3668
 MD5 d6804e66a8e235af963cc6958e266526 ipw2200-0.19.ebuild 3985
 MD5 b6fb7d359984e8d89dcec0478885d5cb ipw2200-0.16.ebuild 3668
 MD5 e934b277b47e877fbbbfb0aa2b016907 ipw2200-0.11.ebuild 3668
-MD5 0f68ddd4bcf1ccaa4d86460e50cba479 ipw2200-1.0.0.ebuild 2251
+MD5 363a476450a235ae2adee14e1036842a ipw2200-1.0.0.ebuild 1328
 MD5 b7581b33c459c7a8cd3c923548519f36 ipw2200-0.18.ebuild 3812
 MD5 62271cfb8fa212fa0e8cea90da97d385 ipw2200-0.13.ebuild 3668
-MD5 5eddf794b878b70b1536df3af59b432e ChangeLog 3786
+MD5 ab943636720647a098fe956521645291 ChangeLog 3933
 MD5 e33c43b256ce937ba82846532879e312 metadata.xml 219
 MD5 10a5303ff88f49217030a40b6788c85f ipw2200-0.15.ebuild 3668
 MD5 601ee5ee19593a86cd81b66b97e69b93 files/digest-ipw2200-0.11 124
diff --git a/net-wireless/ipw2200/ipw2200-1.0.0.ebuild b/net-wireless/ipw2200/ipw2200-1.0.0.ebuild
index 389c5264433f..17de601d0a52 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.0.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.0.ebuild
@@ -1,23 +1,23 @@
 # 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.0.ebuild,v 1.1 2005/02/01 16:32:27 jbms Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.0.ebuild,v 1.2 2005/02/01 17:42:06 jbms Exp $
 
-inherit linux-mod eutils
+inherit linux-mod
 
 FW_VERSION="2.2"
 
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG miniPCI adapter"
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI adapter"
 
-HOMEPAGE="http://ipw2200.sourceforge.net/"
+HOMEPAGE="http://ipw2200.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-IUSE="debug"
+IUSE=""
 RDEPEND="=net-wireless/ipw2200-firmware-${FW_VERSION}
-		>=net-wireless/wireless-tools-27_pre23
+		net-wireless/wireless-tools
 		!net-wireless/ipw2100"
 
 BUILD_PARAMS="KSRC=${KV_DIR}"
@@ -26,42 +26,18 @@ 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_IPW2100_DOCS="README.${PN}"
+			ieee80211_crypt_wep(net:)"
+MODULESD_IPW2200_DOCS="README.ipw2200"
 
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 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}
 
-
-	einfo "Patching Makefile to enable WPA"
-	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
-		${S}/Makefile
-
-	if ! use debug > /dev/null; then
-		einfo "Patching Makefile to disable debugging"
-		sed -i -e 's/CONFIG_IPW_DEBUG=y/CONFIG_IPW_DEBUG=n/' "${S}/Makefile"
-		sed -i -e 's/CONFIG_IEEE80211_DEBUG=y/CONFIG_IEEE80211_DEBUG=n/' "${S}/Makefile"
-	fi
-
 	convert_to_m ${S}/Makefile
 }