Fixed bug #69929 and bug #78366.

Package-Manager: portage-2.0.51.20-r5

5 files changed, 129 insertions, 2 deletions

diff --git a/net-wireless/orinoco/ChangeLog b/net-wireless/orinoco/ChangeLog
index f4bc822a10de..a0d474a53e8e 100644
--- a/net-wireless/orinoco/ChangeLog
+++ b/net-wireless/orinoco/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/orinoco
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.4 2005/01/07 14:14:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.5 2005/04/28 09:36:24 brix Exp $
+
+*orinoco-0.15_rc2-r2 (28 Apr 2005)
+
+  28 Apr 2005; <brix@gentoo.org> +files/orinoco-0.15rc2-firmware.patch,
+  +orinoco-0.15_rc2-r2.ebuild:
+  Fixed bug #69929 and bug #78366.
 
   07 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
   +files/orinoco-0.15rc2-2.6.10.patch, orinoco-0.15_rc2-r1.ebuild:
diff --git a/net-wireless/orinoco/Manifest b/net-wireless/orinoco/Manifest
index 2fe0e6321c13..a8d96879bdaf 100644
--- a/net-wireless/orinoco/Manifest
+++ b/net-wireless/orinoco/Manifest
@@ -1,7 +1,10 @@
 MD5 4d8904a877aca8303a6fc2492646d296 orinoco-0.15_rc2.ebuild 2290
-MD5 1b35d5a92b58a6654108d7405a444abe ChangeLog 884
+MD5 54a610e2e8d5ae966126fce605896c99 orinoco-0.15_rc2-r2.ebuild 2480
+MD5 36dc0c25bf5e12d0479f34cbe3dc5583 ChangeLog 1059
 MD5 159f49ee6f399900bc34dee6aa7269a6 orinoco-0.15_rc2-r1.ebuild 1669
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 85bf652db8f2f4e7c10d071cbeb13aa4 files/digest-orinoco-0.15_rc2-r1 436
+MD5 1082bcf4c903a8ad9783910524fc419c files/digest-orinoco-0.15_rc2-r2 66
+MD5 f9ce2c15dccfbc14bdb019da42885031 files/orinoco-0.15rc2-firmware.patch 606
 MD5 26ab41e4c9fbbdbf80de660b20e9f233 files/orinoco-0.15rc2-2.6.10.patch 2755
 MD5 85bf652db8f2f4e7c10d071cbeb13aa4 files/digest-orinoco-0.15_rc2 436
diff --git a/net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r2 b/net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r2
new file mode 100644
index 000000000000..4c08d54839d9
--- /dev/null
+++ b/net-wireless/orinoco/files/digest-orinoco-0.15_rc2-r2
@@ -0,0 +1 @@
+MD5 2246f0879439d74f7aabc7935cec90c0 orinoco-0.15rc2.tar.gz 98693
diff --git a/net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch b/net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch
new file mode 100644
index 000000000000..5760e54c57e4
--- /dev/null
+++ b/net-wireless/orinoco/files/orinoco-0.15rc2-firmware.patch
@@ -0,0 +1,20 @@
+diff -urp orinoco-0.15rc2/Makefile orinoco-0.15rc2-firmware/Makefile
+--- orinoco-0.15rc2/Makefile	2004-07-28 08:06:45.000000000 +0200
++++ orinoco-0.15rc2-firmware/Makefile	2005-04-28 11:20:54.000000000 +0200
+@@ -69,16 +69,6 @@ ifdef CONFIG_PCI
+ MODULES += orinoco_nortel.o orinoco_pci.o orinoco_plx.o orinoco_tmd.o
+ endif
+ 
+-# Replacement for firmware loader for 2.4 kernels that don't have it
+-ifneq (,$(OLDMAKE))
+-ifdef CONFIG_HOTPLUG
+-ifndef CONFIG_FW_LOADER
+-MODULES += firmware_class.o
+-CONFIG_FW_LOADER = m
+-endif
+-endif
+-endif
+-
+ ifdef CONFIG_PCMCIA
+ MODULES += orinoco_cs.o
+ ifdef CONFIG_FW_LOADER
diff --git a/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild b/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild
new file mode 100644
index 000000000000..a9d1a35cfb1a
--- /dev/null
+++ b/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc2-r2.ebuild,v 1.1 2005/04/28 09:36:24 brix Exp $
+
+inherit eutils linux-mod
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="ORiNOCO wireless driver"
+HOMEPAGE="http://www.nongnu.org/orinoco/"
+SRC_URI="${SRC_URI} http://www.ozlabs.org/people/dgibson/dldwd/${MY_P}.tar.gz"
+LICENSE="GPL-2 MPL-1.1"
+
+KEYWORDS="~x86 ~ppc"
+IUSE="pcmcia"
+SLOT="0"
+
+RDEPEND="net-wireless/wireless-tools"
+
+BUILD_TARGETS="all"
+MODULESD_ORINOCO_DOCS="README.orinoco"
+
+CONFIG_CHECK="NET_RADIO !HERMES"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_HERMES="${P} requires Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) (CONFIG_HERMES) to be DISABLED."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="hermes(net:)
+				  orinoco(net:)"
+
+	if linux_chkconfig_present PCI; then
+		einfo "PCI support detected"
+		MODULE_NAMES="${MODULE_NAMES} orinoco_nortel(net:) orinoco_pci(net:) orinoco_plx(net:) orinoco_tmd(net:)"
+	fi
+
+	if linux_chkconfig_present PPC_PMAC; then
+		einfo "PPC PowerMac support detected"
+		MODULE_NAMES="${MODULE_NAMES} airport(net:)"
+	fi
+
+	if use pcmcia; then
+		einfo "PCMCIA support detected"
+
+		MODULE_NAMES="${MODULE_NAMES} orinoco_cs(net:)"
+
+		if kernel_is gt 2 4 && linux_chkconfig_present FW_LOADER; then
+			einfo "Firmware loader support detected"
+			MODULE_NAMES="${MODULE_NAMES} spectrum_cs(net:)"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	pcmcia_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/${MY_P}-2.6.10.patch
+	epatch ${FILESDIR}/${MY_P}-firmware.patch
+
+	if [[ -n "${PCMCIA_VERSION}" ]]; then
+		sed -i -e "s:^\(PCMCIA_CS\) =.*:\1 = ${PCMCIA_SOURCE_DIR}:" \
+			${S}/Makefile
+	fi
+
+	sed -i "s:^\(KERNEL_SRC\) =.*:\1 = ${KV_DIR}:" \
+		${S}/Makefile
+
+	convert_to_m ${S}/Makefile
+}
+
+src_install() {
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins hermes.conf
+	fi
+
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if [[ -e ${ROOT}/lib/modules/${KV_FULL}/pcmcia/orinoco.${KV_OBJ} ]]; then
+		ewarn
+		ewarn "The modules from this package conflicts with the modules installed"
+		ewarn "by the pcmcia-cs package. You will have to manually delete the"
+		ewarn "duplicate modules from the"
+		ewarn "  ${ROOT}lib/modules/${KV_FULL}/pcmcia/"
+		ewarn "directory and manually run '/sbin/depmod -ae'"
+		ewarn
+	fi
+}