Version bump thanks to Scott Paul Robertson <spr5@email.byu.edu> and Josh Nichols <nichoj@rpi.edu> in bug 71632

(Portage version: 2.0.51-r15)

6 files changed, 60 insertions, 66 deletions

diff --git a/net-wireless/prism54/ChangeLog b/net-wireless/prism54/ChangeLog
index 054cf3f9bda9..f3bea510f6cd 100644
--- a/net-wireless/prism54/ChangeLog
+++ b/net-wireless/prism54/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/prism54
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/ChangeLog,v 1.8 2005/01/03 16:37:13 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/ChangeLog,v 1.9 2005/01/25 17:14:59 genstef Exp $
+
+*prism54-20050125 (25 Jan 2005)
+
+  25 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
+  -prism54-20040208.ebuild, +prism54-20050125.ebuild:
+  Version bump thanks to Scott Paul Robertson <spr5@email.byu.edu> and Josh
+  Nichols <nichoj@rpi.edu> in bug 71632
 
   03 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
   prism54-20040208.ebuild:
diff --git a/net-wireless/prism54/Manifest b/net-wireless/prism54/Manifest
index 0834b3eb3537..a660a4a6bc90 100644
--- a/net-wireless/prism54/Manifest
+++ b/net-wireless/prism54/Manifest
@@ -1,4 +1,4 @@
-MD5 f991db85524e20cb536d865fa1401112 prism54-20040208.ebuild 1562
-MD5 13d58828bc8a5fcc0957c8739c5fe62f ChangeLog 1326
+MD5 6b348827367b48e25595b0dee52aa896 prism54-20050125.ebuild 1593
+MD5 15d730504b9f4af2822cf288539a0fa5 ChangeLog 1583
 MD5 660ef34a943e76869241f0a03a3dedaf metadata.xml 417
-MD5 fa86834af97b863936701bd2f8c9e95e files/digest-prism54-20040208 122
+MD5 1b7efc5743a6c299ea2eda56261a5d40 files/digest-prism54-20050125 72
diff --git a/net-wireless/prism54/files/digest-prism54-20040208 b/net-wireless/prism54/files/digest-prism54-20040208
deleted file mode 100644
index 96702f534d50..000000000000
--- a/net-wireless/prism54/files/digest-prism54-20040208
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b63a90fd916569420892c0df9d6fe632 prism54-cvs20040208.tar.bz2 78156
-MD5 8bd4310971772a486b9784c77f8a6df9 isl3890 93996
diff --git a/net-wireless/prism54/files/digest-prism54-20050125 b/net-wireless/prism54/files/digest-prism54-20050125
new file mode 100644
index 000000000000..2e7206228072
--- /dev/null
+++ b/net-wireless/prism54/files/digest-prism54-20050125
@@ -0,0 +1 @@
+MD5 6dfb6d27fb155180f967a5c1315ca762 prism54-svn=20050125.tar.bz2 76744
diff --git a/net-wireless/prism54/prism54-20040208.ebuild b/net-wireless/prism54/prism54-20040208.ebuild
deleted file mode 100644
index 2f69fb698c87..000000000000
--- a/net-wireless/prism54/prism54-20040208.ebuild
+++ /dev/null
@@ -1,60 +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/prism54/prism54-20040208.ebuild,v 1.8 2005/01/03 16:37:13 genstef Exp $
-
-MY_P=${P/prism54-/prism54-cvs}
-DESCRIPTION="Driver for Intersil Prism GT / Prism Duette wireless chipsets"
-HOMEPAGE="http://prism54.org/"
-
-# nomirror for firmware issues. Emails sent to inquire about this.
-RESTRICT="nomirror"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-		http://prism54.org/~mcgrof/firmware/isl3890"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="pcmcia"
-
-DEPEND="virtual/linux-sources
-		!net-wireless/prism54-firmware"
-RDEPEND=">=sys-apps/hotplug-20030805-r2
-		net-wireless/wireless-tools
-		pcmcia? ( sys-apps/pcmcia-cs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	check_KV
-
-	einfo "Make sure you have CONFIG_FW_LOADER enabled in your kernel."
-	einfo "2.6 users will need to disable sandbox for now to avoid"
-	einfo "sandbox issues. See bug #32737 for info on work being done to"
-	einfo "fix this."
-	einfo "Module versioning (CONFIG_MODVERSION) should be disabled."
-
-	unpack ${MY_P}.tar.bz2
-}
-
-src_compile() {
-	unset ARCH
-	make KVER=${KV} KDIR=/usr/src/linux modules || die
-}
-
-src_install() {
-	make KDIR=/usr/src/linux KVER=${KV} \
-		KMISC=${D}/lib/modules/${KV}/kernel/drivers/net/wireless/prism54/ \
-		install || die
-
-	# Install the firmware image
-	insinto /usr/lib/hotplug/firmware/
-	doins ${DISTDIR}/isl3890
-
-	dodoc README ksrc/{TODO,ChangeLog}
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} = / ]]; then
-		/sbin/depmod -a
-	fi
-}
diff --git a/net-wireless/prism54/prism54-20050125.ebuild b/net-wireless/prism54/prism54-20050125.ebuild
new file mode 100644
index 000000000000..caee453564fd
--- /dev/null
+++ b/net-wireless/prism54/prism54-20050125.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/prism54/prism54-20050125.ebuild,v 1.1 2005/01/25 17:14:59 genstef Exp $
+
+inherit linux-mod
+
+MY_P=${P/prism54-/prism54-svn=}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Driver for Intersil Prism GT / Prism Duette wireless chipsets"
+HOMEPAGE="http://prism54.org/"
+SRC_URI="http://prism54.org/pub/linux/snapshot/tars/${PV:0:4}-${PV:4:2}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="pcmcia"
+RDEPEND="net-wireless/prism54-firmware
+		net-wireless/wireless-tools
+		pcmcia? ( sys-apps/pcmcia-cs )"
+
+MODULE_NAMES="prism54(net:${S}/ksrc)"
+BUILD_PARAMS="KVER=${KV_FULL} KDIR=${KV_DIR}"
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="!PRISM54 NET_RADIO FW_LOADER"
+PRISM54_ERROR="You need prism54-firmware for the in-kernel driver or deselect
+the in-kernel driver to use the (probably older) driver from this ebuild."
+NET_RADIO_ERROR='You should enable "Wireless LAN drivers (non-hamradio) &
+Wireless Extensions"[CONFIG_NET_RADIO] in your kernel config'
+FW_LOADER_ERROR="Make sure you have CONFIG_FW_LOADER enabled in your kernel."
+
+useq pcmcia && CONFIG_CHECK="${CONFIG_CHECK} PCMCIA CARDBUS"
+PCMCIA_ERROR=CARDBUS_ERROR="General setup  --->
+	PCMCIA/CardBus support  --->
+		PCMCIA/CardBus support (m or y)
+		[*]   CardBus support (Important!)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	if kernel_is ge 2 6 10; then
+		eerror "The driver in your kernel is newer than this snapshot, please use it"
+		eerror "together with prism54-firmware instead of this ebuild."
+		die "kernel drivers are newer"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README ksrc/ChangeLog
+}