Version bump. Also block linux-firmware package. Note that the qlogic firmware in this package is a major version newer than the linux-firmware package.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

7 files changed, 30 insertions, 108 deletions

diff --git a/sys-block/qla-fc-firmware/ChangeLog b/sys-block/qla-fc-firmware/ChangeLog
index 5c824c3e076d..dea5ecd85321 100644
--- a/sys-block/qla-fc-firmware/ChangeLog
+++ b/sys-block/qla-fc-firmware/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-block/qla-fc-firmware
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/ChangeLog,v 1.23 2008/07/17 19:23:45 corsair Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/ChangeLog,v 1.24 2010/11/30 20:48:24 robbat2 Exp $
+
+*qla-fc-firmware-20101015 (30 Nov 2010)
+
+  30 Nov 2010; Robin H. Johnson <robbat2@gentoo.org>
+  -qla-fc-firmware-20060312.ebuild, -qla-fc-firmware-20060312-r1.ebuild,
+  -qla-fc-firmware-20070226.ebuild, -qla-fc-firmware-20071207.ebuild,
+  qla-fc-firmware-20071207-r1.ebuild, qla-fc-firmware-20080423.ebuild,
+  +qla-fc-firmware-20101015.ebuild:
+  Version bump. Also block linux-firmware package. Note that the qlogic
+  firmware in this package is a major version newer than the linux-firmware
+  package.
 
   17 Jul 2008; Markus Rothe <corsair@gentoo.org>
   qla-fc-firmware-20080423.ebuild:
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20060312-r1.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20060312-r1.ebuild
deleted file mode 100644
index 529506788511..000000000000
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20060312-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20060312-r1.ebuild,v 1.6 2007/04/22 13:53:46 dertobi123 Exp $
-
-DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
-HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="qlogic-fibre-channel-firmware"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-# really depends on absolutely nothing
-DEPEND=""
-RDEPEND=""
-
-FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin
-ql2400_fw.bin ql6312_fw.bin"
-
-src_install() {
-	dodoc LICENSE # We must install this, say QLogic's people.
-	dodoc README.gentoo CURRENT_VERSIONS
-	insinto /lib/firmware
-	# some older firmware are always provided by upstream
-	# for reasons documented in CURRENT_VERSIONS
-	for f in ${FW_BASENAME} ; do
-		doins ${f}.*
-		latest_f="$(ls ${f}.* | sort -n | tail -n1)"
-		dosym ${latest_f} /lib/firmware/${f}
-	done
-}
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20060312.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20060312.ebuild
deleted file mode 100644
index 14d591be3d05..000000000000
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20060312.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20060312.ebuild,v 1.2 2006/03/31 05:27:19 rajiv Exp $
-
-DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
-HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="qlogic-fibre-channel-firmware"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin
-ql2400_fw.bin ql6312_fw.bin"
-
-src_install() {
-	dodoc LICENSE # We must install this, say QLogic's people.
-	dodoc README.gentoo CURRENT_VERSIONS
-	insinto /lib/firmware
-	# some older firmware are always provided by upstream
-	# for reasons documented in CURRENT_VERSIONS
-	for f in ${FW_BASENAME} ; do
-		doins ${f}.*
-		latest_f="$(ls ${f}.* | sort -ng | tail -n1)"
-		dosym ${latest_f} /lib/firmware/${f}
-	done
-}
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20070226.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20070226.ebuild
deleted file mode 100644
index 97190226128d..000000000000
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20070226.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20070226.ebuild,v 1.5 2008/01/14 03:08:45 robbat2 Exp $
-
-DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
-HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="qlogic-fibre-channel-firmware"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-# really depends on absolutely nothing
-DEPEND=""
-RDEPEND=""
-
-FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin
-ql2400_fw.bin ql6312_fw.bin"
-
-src_install() {
-	dodoc LICENSE # We must install this, say QLogic's people.
-	dodoc README.gentoo CURRENT_VERSIONS
-	insinto /lib/firmware
-	# some older firmware are always provided by upstream
-	# for reasons documented in CURRENT_VERSIONS
-	for f in ${FW_BASENAME} ; do
-		doins ${f}.*
-		latest_f="$(ls ${f}.* | sort -n | tail -n1)"
-		dosym ${latest_f} /lib/firmware/${f}
-	done
-}
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild
index b6a4cef11fb3..5d5d6fe7f6b3 100644
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild
+++ b/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild,v 1.5 2008/06/25 02:54:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20071207-r1.ebuild,v 1.6 2010/11/30 20:48:24 robbat2 Exp $
 
 DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
 HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
@@ -12,7 +12,7 @@ IUSE=""
 
 # really depends on absolutely nothing
 DEPEND=""
-RDEPEND=""
+RDEPEND="!sys-kernel/linux-firmware"
 
 FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin"
 
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild
index 3fd66a3d39ec..832300e17514 100644
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild
+++ b/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild,v 1.2 2008/07/17 19:23:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20080423.ebuild,v 1.3 2010/11/30 20:48:24 robbat2 Exp $
 
 DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
 HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
@@ -12,7 +12,7 @@ IUSE=""
 
 # really depends on absolutely nothing
 DEPEND=""
-RDEPEND=""
+RDEPEND="!sys-kernel/linux-firmware"
 
 FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin"
 
diff --git a/sys-block/qla-fc-firmware/qla-fc-firmware-20071207.ebuild b/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild
index 107a59a43f88..a12dd415f459 100644
--- a/sys-block/qla-fc-firmware/qla-fc-firmware-20071207.ebuild
+++ b/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20071207.ebuild,v 1.3 2008/03/30 04:12:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/qla-fc-firmware/qla-fc-firmware-20101015.ebuild,v 1.1 2010/11/30 20:48:24 robbat2 Exp $
 
 DESCRIPTION="QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards"
 HOMEPAGE="ftp://ftp.qlogic.com/outgoing/linux/firmware/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="qlogic-fibre-channel-firmware"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # really depends on absolutely nothing
 DEPEND=""
-RDEPEND=""
+RDEPEND="!sys-kernel/linux-firmware"
 
 FW_BASENAME="ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin ql2400_fw.bin ql2500_fw.bin ql6312_fw.bin"
 
@@ -24,15 +24,17 @@ src_install() {
 	# thus strongly encouraged to keep a copy of the LICENSE file with them on
 	# the system.
 	dodoc LICENSE
-	dodoc README.gentoo CURRENT_VERSIONS
+	dodoc README.* CURRENT_VERSIONS
 	insinto /lib/firmware
 	# some older firmware are always provided by upstream
-	# for reasons documented in CURRENT_VERSIONS
-	# When multiple types are available for a single version, we should provide a
-	# way to select between them
+	# for reasons documented in CURRENT_VERSIONS.
+
+	# Please see README.* as to why we do not use the MID/MIDX versions by
+	# default if they are newer.
+	# TODO: Provide a means to get them for people that really want them.
 	for f in ${FW_BASENAME} ; do
 		doins ${f}.*
-		latest_f="$(ls ${f}.* | sort -n | tail -n1)"
+		latest_f="$(ls ${f}.* |grep -v MID | sort -n | tail -n1)"
 		dosym ${latest_f} /lib/firmware/${f}
 	done
 }