Version bump using updated tarball (#383541 by Toralf Förster), using its own SLOT as it's for kernels >= 2.6.38 (#359445 by Maciej Piechotka). Drop old versions, including old slot for kernels < 2.6.30.

(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 24 insertions, 38 deletions

diff --git a/sys-firmware/iwl5000-ucode/ChangeLog b/sys-firmware/iwl5000-ucode/ChangeLog
index c09064117ba8..404a24e376b7 100644
--- a/sys-firmware/iwl5000-ucode/ChangeLog
+++ b/sys-firmware/iwl5000-ucode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-firmware/iwl5000-ucode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl5000-ucode/ChangeLog,v 1.3 2012/11/18 11:37:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl5000-ucode/ChangeLog,v 1.4 2012/12/15 20:47:45 pacho Exp $
+
+*iwl5000-ucode-8.83.5.1-r1 (15 Dec 2012)
+
+  15 Dec 2012; Pacho Ramos <pacho@gentoo.org> +iwl5000-ucode-8.83.5.1-r1.ebuild,
+  -iwl5000-ucode-5.4.0.11.ebuild, -iwl5000-ucode-8.83.5.1.ebuild:
+  Version bump using updated tarball (#383541 by Toralf Förster), using its own
+  SLOT as it's for kernels >= 2.6.38 (#359445 by Maciej Piechotka). Drop old
+  versions, including old slot for kernels < 2.6.30.
 
   18 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop mobile herd as talked in gentoo-dev ML
diff --git a/sys-firmware/iwl5000-ucode/iwl5000-ucode-5.4.0.11.ebuild b/sys-firmware/iwl5000-ucode/iwl5000-ucode-5.4.0.11.ebuild
deleted file mode 100644
index 1c146bf486d4..000000000000
--- a/sys-firmware/iwl5000-ucode/iwl5000-ucode-5.4.0.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl5000-ucode/iwl5000-ucode-5.4.0.11.ebuild,v 1.2 2012/10/03 19:33:31 vapier Exp $
-
-MY_PN="iwlwifi-5000-ucode"
-MY_PV="${PV/0/A}"
-
-DESCRIPTION="Intel (R) Wireless WiFi Link 5100/5300 ucode"
-HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-5000-1.ucode"
-
-	dodoc README* || die "dodoc failed"
-}
diff --git a/sys-firmware/iwl5000-ucode/iwl5000-ucode-8.83.5.1.ebuild b/sys-firmware/iwl5000-ucode/iwl5000-ucode-8.83.5.1-r1.ebuild
index 41e5b570f1b4..bb3d58f46358 100644
--- a/sys-firmware/iwl5000-ucode/iwl5000-ucode-8.83.5.1.ebuild
+++ b/sys-firmware/iwl5000-ucode/iwl5000-ucode-8.83.5.1-r1.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl5000-ucode/iwl5000-ucode-8.83.5.1.ebuild,v 1.2 2012/10/03 19:33:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl5000-ucode/iwl5000-ucode-8.83.5.1-r1.ebuild,v 1.1 2012/12/15 20:47:45 pacho Exp $
+
+EAPI=5
+inherit linux-info
 
 MY_PN="iwlwifi-5000-ucode"
-MY_PV="${PV/0/A}"
+MY_PV="${PV}-1"
 
 DESCRIPTION="Intel (R) Wireless WiFi Link 5100/5300 ucode"
 HOMEPAGE="http://intellinuxwireless.org/?p=iwlwifi"
-SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${MY_PV}.tgz"
+SRC_URI="http://intellinuxwireless.org/iwlwifi/downloads/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="ipw3945"
-SLOT="1"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-src_compile() {
-	true;
+pkg_pretend() {
+	if kernel_is lt 2 6 38; then
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+		ewarn "This microcode image requires a kernel >= 2.6.38."
+		ewarn "For kernel versions < 2.6.38, you may install older SLOTS"
+	fi
 }
 
 src_install() {
 	insinto /lib/firmware
-	doins "${S}/iwlwifi-5000-5.ucode" || die
-
-	dodoc README* || die "dodoc failed"
+	doins "${S}/iwlwifi-5000-5.ucode"
+	dodoc README*
 }