Merged with net-wireless/orinoco

diff --git a/net-wireless/orinoco-cvs/ChangeLog b/net-wireless/orinoco-cvs/ChangeLog
deleted file mode 100644 (file)
index 57e4131..0000000
--- a/net-wireless/orinoco-cvs/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for net-wireless/orinoco-cvs
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco-cvs/ChangeLog,v 1.1 2005/06/14 19:17:27 brix Exp $
-
-*orinoco-cvs-0.15_rc2 (14 Jun 2005)
-
-  14 Jun 2005; <brix@gentoo.org> +orinoco-cvs-0.15_rc2.ebuild:
-  Initial import, fixes bug #29937.
-

diff --git a/net-wireless/orinoco-cvs/Manifest b/net-wireless/orinoco-cvs/Manifest
deleted file mode 100644 (file)
index 06faa30..0000000
--- a/net-wireless/orinoco-cvs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9f5168087b82d41ae79c53ba7d06127a orinoco-cvs-0.15_rc2.ebuild 3050
-MD5 9612403b5d4415ccb11639ae3acfcb15 ChangeLog 356
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-orinoco-cvs-0.15_rc2 0

diff --git a/net-wireless/orinoco-cvs/files/digest-orinoco-cvs-0.15_rc2 b/net-wireless/orinoco-cvs/files/digest-orinoco-cvs-0.15_rc2
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/net-wireless/orinoco-cvs/metadata.xml b/net-wireless/orinoco-cvs/metadata.xml
deleted file mode 100644 (file)
index cfbdff1..0000000
--- a/net-wireless/orinoco-cvs/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mobile</herd>
-<maintainer>
-  <email>brix@gentoo.org</email>
-  <name>Henrik Brix Andersen</name>
-</maintainer>
-</pkgmetadata>

diff --git a/net-wireless/orinoco-cvs/orinoco-cvs-0.15_rc2.ebuild b/net-wireless/orinoco-cvs/orinoco-cvs-0.15_rc2.ebuild
deleted file mode 100644 (file)
index 6b79a38..0000000
--- a/net-wireless/orinoco-cvs/orinoco-cvs-0.15_rc2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco-cvs/orinoco-cvs-0.15_rc2.ebuild,v 1.1 2005/06/14 19:17:27 brix Exp $
-
-inherit eutils linux-mod cvs
-
-ECVS_SERVER="savannah.nongnu.org:/cvsroot/orinoco"
-ECVS_MODULE="orinoco"
-ECVS_AUTH="ext"
-ECVS_USER="anoncvs"
-ECVS_SSH_HOST_KEY="savannah.nongnu.org,199.232.41.4 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0="
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="ORiNOCO IEEE 802.11 wireless LAN driver"
-HOMEPAGE="http://www.nongnu.org/orinoco/"
-SRC_URI=""
-LICENSE="GPL-2 MPL-1.1"
-
-KEYWORDS="~x86"
-IUSE="pcmcia usb"
-SLOT="0"
-
-RDEPEND="net-wireless/wireless-tools
-               usb? ( net-wireless/orinoco-usb-firmware )
-               !net-wireless/orinoco"
-
-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
-
-       if use usb; then
-               einfo "USB support detected"
-
-               MODULE_NAMES="${MODULE_NAMES} prism_usb(net:)"
-
-               if kernel_is gt 2 4 && linux_chkconfig_present FW_LOADER; then
-                       einfo "Firmware loader support detected"
-                       MODULE_NAMES="${MODULE_NAMES} orinoco_usb(net:)"
-               fi
-       fi
-}
-
-src_unpack() {
-       cvs_src_unpack
-       pcmcia_src_unpack
-
-       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
-}

diff --git a/net-wireless/orinoco-fwutils/Manifest b/net-wireless/orinoco-fwutils/Manifest
new file mode 100644 (file)
index 0000000..085e248
--- /dev/null
+++ b/net-wireless/orinoco-fwutils/Manifest
@@ -0,0 +1,4 @@
+MD5 c56604591bc81797b53330158252b809 ChangeLog 444
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 353edbb88ae124a9536e623cf4ca7b6a orinoco-fwutils-0.1.ebuild 750
+MD5 09f2b7073a8cd7f57bf6bfc30a844363 files/digest-orinoco-fwutils-0.1 69