Version bump. Corrected LICENSE to be an or between GPL-2 and MPL-1.1. Also added a note that pci, plx and pcmcia use flags will most likely be removed in the near future.

Package-Manager: portage-2.0.53

7 files changed, 164 insertions, 11 deletions

diff --git a/net-wireless/linux-wlan-ng-modules/ChangeLog b/net-wireless/linux-wlan-ng-modules/ChangeLog
index 1670b5e99a1d..de2399590dea 100644
--- a/net-wireless/linux-wlan-ng-modules/ChangeLog
+++ b/net-wireless/linux-wlan-ng-modules/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-wireless/linux-wlan-ng-modules
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.4 2005/12/03 11:52:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/ChangeLog,v 1.5 2005/12/19 10:52:35 betelgeuse Exp $
+
+*linux-wlan-ng-modules-0.2.3 (19 Dec 2005)
+
+  19 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +files/linux-wlan-ng-0.2.3-module_param.patch,
+  linux-wlan-ng-modules-0.2.2.ebuild, linux-wlan-ng-modules-0.2.2-r1.ebuild,
+  +linux-wlan-ng-modules-0.2.3.ebuild:
+  Version bump. Corrected LICENSE to be an or between GPL-2 and MPL-1.1. Also
+  added a note that pci, plx and pcmcia use flags will most likely be removed
+  in the near future.
 
   03 Dec 2005; Simon Stelling <blubb@gentoo.org>
   linux-wlan-ng-modules-0.2.2-r1.ebuild:
diff --git a/net-wireless/linux-wlan-ng-modules/Manifest b/net-wireless/linux-wlan-ng-modules/Manifest
index c0c70c200ca5..1671af7d835f 100644
--- a/net-wireless/linux-wlan-ng-modules/Manifest
+++ b/net-wireless/linux-wlan-ng-modules/Manifest
@@ -1,8 +1,21 @@
-MD5 c0731d062c3f98dc9a8d34e5657bf256 ChangeLog 1008
-MD5 0ae3ed8165e7a96b178c4e6051a1c1c3 linux-wlan-ng-modules-0.2.2.ebuild 2389
-MD5 bd46277fb8c768aa34612bb9cb43fe75 metadata.xml 571
-MD5 11604202eb883e9b2a358c423364a35b linux-wlan-ng-modules-0.2.2-r1.ebuild 2444
-MD5 f24842a9d1aeeaa901a2423011ef3b38 files/digest-linux-wlan-ng-modules-0.2.2 72
-MD5 581c6aa56e352d9edfa2a935a23bcd0f files/linux-wlan-ng-0.2.2-module_param.patch 717
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a57d78086cbf50216f12bc07cdb09ca6 ChangeLog 1454
 MD5 9e66078bd27004847709f071774bd51d files/0.2.2-kernel-2.6.14.patch 6067
+MD5 f24842a9d1aeeaa901a2423011ef3b38 files/digest-linux-wlan-ng-modules-0.2.2 72
 MD5 f24842a9d1aeeaa901a2423011ef3b38 files/digest-linux-wlan-ng-modules-0.2.2-r1 72
+MD5 3414fdda8cf331136d23c69378f70a97 files/digest-linux-wlan-ng-modules-0.2.3 72
+MD5 581c6aa56e352d9edfa2a935a23bcd0f files/linux-wlan-ng-0.2.2-module_param.patch 717
+MD5 a4b2153476d6759ee96ab8b4ac7df4aa files/linux-wlan-ng-0.2.3-module_param.patch 657
+MD5 1deb7f8d9d24a664b06079a9d3eafb2c linux-wlan-ng-modules-0.2.2-r1.ebuild 2462
+MD5 aeeed0b2305debc92233ae39f2229d79 linux-wlan-ng-modules-0.2.2.ebuild 2406
+MD5 e7a955634c7ebdec581be8fcc5651dad linux-wlan-ng-modules-0.2.3.ebuild 2974
+MD5 bd46277fb8c768aa34612bb9cb43fe75 metadata.xml 571
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDppEBQiJ/wx066S4RAlGzAJ9ZiyvUXJ/5doqj7APeQJB5uS97cACfeI6m
+WTTY38qcMSi/mDwr/ZNl6cc=
+=1lCE
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3 b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3
new file mode 100644
index 000000000000..46d1364abf27
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.3
@@ -0,0 +1 @@
+MD5 f26e41336a2838d69a366ab3a2d93ea0 linux-wlan-ng-0.2.3.tar.bz2 454053
diff --git a/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-module_param.patch b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-module_param.patch
new file mode 100644
index 000000000000..78ba7f48582c
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/files/linux-wlan-ng-0.2.3-module_param.patch
@@ -0,0 +1,12 @@
+diff -ur linux-wlan-ng-0.2.3.old/src/prism2/driver/prism2_cs.c linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c
+--- linux-wlan-ng-0.2.3.old/src/prism2/driver/prism2_cs.c	2005-12-19 00:10:31.529760168 +0200
++++ linux-wlan-ng-0.2.3/src/prism2/driver/prism2_cs.c	2005-12-19 00:12:59.458271616 +0200
+@@ -21,7 +21,7 @@
+ 						 * is set to and what the CIS
+ 						 * says.
+ 						 */
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)) && (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8))
+ static int numlist = 4;
+ module_param_array(irq_list, int, numlist, 0444);
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2-r1.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2-r1.ebuild
index 27922f4b1e42..91e602485692 100644
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2-r1.ebuild
+++ b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2-r1.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/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2-r1.ebuild,v 1.3 2005/12/03 11:52:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2-r1.ebuild,v 1.4 2005/12/19 10:52:35 betelgeuse Exp $
 
 inherit eutils linux-mod
 
@@ -11,7 +11,7 @@ DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b wireless LAN products
 HOMEPAGE="http://linux-wlan.org"
 SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
 
-LICENSE="MPL-1.1"
+LICENSE="|| ( GPL-2 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2.ebuild
index c5ab7f2107bc..1f1c1b045a64 100644
--- a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2.ebuild
+++ b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2.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/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2.ebuild,v 1.2 2005/10/15 23:06:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.2.ebuild,v 1.3 2005/12/19 10:52:35 betelgeuse Exp $
 
 inherit eutils linux-mod
 
@@ -11,7 +11,7 @@ DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b wireless LAN products
 HOMEPAGE="http://linux-wlan.org"
 SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
 
-LICENSE="MPL-1.1"
+LICENSE="|| ( GPL-2 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
diff --git a/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild
new file mode 100644
index 000000000000..4114c4c0137e
--- /dev/null
+++ b/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng-modules/linux-wlan-ng-modules-0.2.3.ebuild,v 1.1 2005/12/19 10:52:35 betelgeuse Exp $
+
+inherit eutils linux-mod
+
+MY_PN=${PN/-modules/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Kernel modules for Prism2/2.5/3 based 802.11b wireless LAN products"
+HOMEPAGE="http://linux-wlan.org"
+SRC_URI="ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="debug pci pcmcia plx usb"
+
+BUILD_TARGETS="default"
+BUILD_PARAMS="WLAN_SRC=${S}/src"
+
+show_deprecated_message() {
+	if use pci || use plx || use pcmcia; then
+		einfo ""
+		einfo "You really should try other alternatives for prism support."
+		einfo "For example the hostap-driver or orinoco drivers should work"
+		einfo "with your wireless card. Support for pci, plx and pcmcia drivers"
+		einfo "will most likely be removed in the near future. If the alternatives"
+		einfo "don't work for you, please report this to betelgeuse@gentoo.org."
+		einfo ""
+	fi
+}
+
+pkg_setup() {
+	# We have to put this to the global scope inside the function or it will be
+	# reset between functions because the ebuild is sourced many times.
+
+	MODULE_NAMES="p80211(net/wireless:${S}/src/p80211)"
+
+	if use pci; then
+		MODULE_NAMES="${MODULE_NAMES} prism2_pci(net/wireless:${S}/src/prism2/driver)"
+	fi
+
+	if use plx; then
+		MODULE_NAMES="${MODULE_NAMES} prism2_plx(net/wireless:${S}/src/prism2/driver)"
+	fi
+
+	if use pcmcia; then
+		MODULE_NAMES="${MODULE_NAMES} prism2_cs(net/wireless:${S}/src/prism2/driver)"
+	fi
+
+	if use usb; then
+		MODULE_NAMES="${MODULE_NAMES} prism2_usb(net/wireless:${S}/src/prism2/driver)"
+	fi
+
+	show_deprecated_message
+	linux-mod_pkg_setup
+}
+
+config_by_usevar() {
+	local config=${3}
+	[[ -z ${config} ]] && config=${S}/default.config
+
+	if use ${2}; then
+		echo "${1}=y" >> ${config}
+	else
+		echo "${1}=n" >> ${config}
+	fi
+}
+
+src_unpack() {
+	local config=${S}/default.config
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-module_param.patch
+
+	cp ${S}/config.in ${config}
+
+	echo "TARGET_ROOT_ON_HOST=${D}" >> ${config}
+	echo "LINUX_SRC=${KERNEL_DIR}"  >> ${config}
+	echo "FIRMWARE_DIR=/lib/firmware/" >> ${config}
+
+	if use pcmcia && [[ -n "${PCMCIA_VERSION}" ]]; then
+		echo "PCMCIA_SRC=${PCMCIA_SOURCE_DIR}" >> ${config}
+	fi
+
+	config_by_usevar PRISM2_USB usb
+	config_by_usevar PRISM2_PCI pci
+	config_by_usevar PRISM2_PLX plx
+	config_by_usevar PRISM2_PCMCIA pcmcia
+	config_by_usevar WLAN_DEBUG debug
+
+	if kernel_is gt 2 4; then
+		echo "KERN_25=y" >> ${config}
+	fi
+
+	sed -i -e "s:dep modules:modules:" ${S}/src/p80211/Makefile
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake default_config || die "emake default_config failed"
+	set_arch_to_portage
+
+	cd ${S}/src/mkmeta
+	emake || die "emake mkmeta failed"
+
+	linux-mod_src_compile
+}
+
+pkg_postinst() {
+	show_deprecated_message
+}