Version bump, bug #115832.

(Portage version: 2.0.53)

4 files changed, 117 insertions, 9 deletions

diff --git a/net-wireless/orinoco/ChangeLog b/net-wireless/orinoco/ChangeLog
index aaa7b13a7cba..45138de7b18f 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.14 2005/12/12 16:31:19 brix Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/ChangeLog,v 1.15 2006/01/01 23:17:03 brix Exp $
+
+*orinoco-0.15_rc4 (01 Jan 2006)
+
+  01 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +orinoco-0.15_rc4.ebuild:
+  Version bump, bug #115832.
 
   12 Dec 2005; Henrik Brix Andersen <brix@gentoo.org> orinoco-9999.ebuild:
   Updated CVS server settings, thanks to jetsaredim on IRC.
diff --git a/net-wireless/orinoco/Manifest b/net-wireless/orinoco/Manifest
index 05e94213af54..6a0d52f661a1 100644
--- a/net-wireless/orinoco/Manifest
+++ b/net-wireless/orinoco/Manifest
@@ -1,11 +1,13 @@
-MD5 e93a03c1e5af887a9761d23b158ac188 orinoco-0.15_rc2-r2.ebuild 2714
-MD5 b99cf4ff02774f0766865fe373c22b1a orinoco-0.15_rc3-r1.ebuild 2856
-MD5 0b05bebfecdd5675cc4a8377c6fabdb6 orinoco-9999.ebuild 2758
-MD5 79e440f51136f06b984ce726bc568749 ChangeLog 2342
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 334e8def043fd55d343d04f251e33a82 ChangeLog 2487
 MD5 1082bcf4c903a8ad9783910524fc419c files/digest-orinoco-0.15_rc2-r2 66
 MD5 7c8b7df86c967166eb696662418f8e6a files/digest-orinoco-0.15_rc3-r1 66
-MD5 f9ce2c15dccfbc14bdb019da42885031 files/orinoco-0.15rc2-firmware.patch 606
+MD5 42da389565989c142acbb2d86aef0784 files/digest-orinoco-0.15_rc4 66
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-orinoco-9999 0
-MD5 05e38fad13b920f1e776939a0ecf0e09 files/orinoco-0.15rc3-memleak.patch 1044
 MD5 26ab41e4c9fbbdbf80de660b20e9f233 files/orinoco-0.15rc2-2.6.10.patch 2755
+MD5 f9ce2c15dccfbc14bdb019da42885031 files/orinoco-0.15rc2-firmware.patch 606
+MD5 05e38fad13b920f1e776939a0ecf0e09 files/orinoco-0.15rc3-memleak.patch 1044
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 e93a03c1e5af887a9761d23b158ac188 orinoco-0.15_rc2-r2.ebuild 2714
+MD5 b99cf4ff02774f0766865fe373c22b1a orinoco-0.15_rc3-r1.ebuild 2856
+MD5 8cf354b2f4209960ff9cdf2805d470e0 orinoco-0.15_rc4.ebuild 2429
+MD5 0b05bebfecdd5675cc4a8377c6fabdb6 orinoco-9999.ebuild 2758
diff --git a/net-wireless/orinoco/files/digest-orinoco-0.15_rc4 b/net-wireless/orinoco/files/digest-orinoco-0.15_rc4
new file mode 100644
index 000000000000..5ef24c6a0c36
--- /dev/null
+++ b/net-wireless/orinoco/files/digest-orinoco-0.15_rc4
@@ -0,0 +1 @@
+MD5 bf7de689b98fb0f0f821df95b355997e orinoco-0.15rc4.tar.gz 85666
diff --git a/net-wireless/orinoco/orinoco-0.15_rc4.ebuild b/net-wireless/orinoco/orinoco-0.15_rc4.ebuild
new file mode 100644
index 000000000000..4ff341ce33ee
--- /dev/null
+++ b/net-wireless/orinoco/orinoco-0.15_rc4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/orinoco/orinoco-0.15_rc4.ebuild,v 1.1 2006/01/01 23:17:03 brix Exp $
+
+inherit linux-mod
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="ORiNOCO IEEE 802.11 wireless LAN driver"
+HOMEPAGE="http://www.nongnu.org/orinoco/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="pcmcia"
+RDEPEND="net-wireless/wireless-tools"
+
+BUILD_TARGETS="all"
+MODULESD_ORINOCO_DOCS="README.orinoco"
+
+CONFIG_CHECK="~FW_LOADER !HERMES NET_RADIO ~PCI ~PCMCIA"
+ERROR_HERMES="${P} requires Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) (CONFIG_HERMES) to be DISABLED."
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+MODULESD_ORINOCO_NORTEL_ENABLED="no"
+MODULESD_ORINOCO_PCI_ENABLED="no"
+MODULESD_ORINOCO_PLX_ENABLED="no"
+MODULESD_ORINOCO_TMD_ENABLED="no"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is lt 2 6 11; then
+		eerror
+		eerror "${P} requires kernel 2.6.11 or above."
+		eerror
+		die "Kernel version too old."
+	fi
+
+	MODULE_NAMES="hermes(net/wireless:)
+				  orinoco(net/wireless:)"
+
+	if linux_chkconfig_present PCI; then
+		MODULE_NAMES="${MODULE_NAMES}
+					orinoco_nortel(net/wireless:)
+					orinoco_pci(net/wireless:)
+					orinoco_plx(net/wireless:)
+					orinoco_tmd(net/wireless:)"
+	fi
+
+	if linux_chkconfig_present PPC_PMAC; then
+		MODULE_NAMES="${MODULE_NAMES} airport(net/wireless:)"
+	fi
+
+	if use pcmcia && linux_chkconfig_present PCMCIA; then
+		MODULE_NAMES="${MODULE_NAMES} orinoco_cs(net/wireless:)"
+
+		if linux_chkconfig_present FW_LOADER; then
+			MODULE_NAMES="${MODULE_NAMES} spectrum_cs(net/wireless:)"
+		fi
+	fi
+
+	BUILD_PARAMS="KERNEL_PATH=${KV_OUT_DIR}"
+}
+
+src_compile() {
+	linux-mod_src_compile
+
+	if use pcmcia; then
+		emake hermes.conf || die "emake hermes.conf failed"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc NEWS
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins hermes.conf
+	fi
+}
+
+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
+}