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.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

8 files changed, 35 insertions, 117 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/Manifest b/sys-block/qla-fc-firmware/Manifest
index 9c20028ab387..f25fcce9eec0 100644
--- a/sys-block/qla-fc-firmware/Manifest
+++ b/sys-block/qla-fc-firmware/Manifest
@@ -1,12 +1,8 @@
-DIST qla-fc-firmware-20060312.tar.bz2 496669 RMD160 9bd2d0a54cf8829a171e7bea9be7e20aec3a1a53 SHA1 12363e52a0ed058333f41712122db7a1c5f731ba SHA256 204783131853b0f644eaa5d4eafdf1c8e420fa696beb811e97cbce5ae6e08d76
-DIST qla-fc-firmware-20070226.tar.bz2 627278 RMD160 f4e1b63b5d16493dc992d5b295144d5d99fc85bc SHA1 99fcdc636427b62352e2ce362a617335e4e54ddb SHA256 40c4229d01f9b0eb22a4a8fed956da70127bc17b086ca09d5eb73087580406d1
 DIST qla-fc-firmware-20071207.tar.bz2 910151 RMD160 17d68a99aabf26553cbeef51f8a12eb28ba8029e SHA1 57fe4e0add291b9a7eef8b6ed1e35ac8bc803bc7 SHA256 fc062041b8f82a72a8229075284280bbafd3d297d4b71dd05f787bcaeb8de58b
 DIST qla-fc-firmware-20080423.tar.bz2 1010881 RMD160 73e23391245e5d0268a5739bc246ceb24ab30a8f SHA1 1e9254426fbed1b06eeccc3c2f504b5cb9fc11f1 SHA256 6ecc88f97860717d42793e5ba7f672aa547b83151f176aefce9bbc8decee5497
-EBUILD qla-fc-firmware-20060312-r1.ebuild 1040 RMD160 de733536b25a8df72fe456bc48e56e156039a553 SHA1 751fe18874852d103b95019e5518decfe273f0a7 SHA256 07edd7414eac59603bbbbd8b1ea6777330edfc67b2f008ce922efc429ba39017
-EBUILD qla-fc-firmware-20060312.ebuild 985 RMD160 a88d07ce918c3614273c9022ad4a789b3c5edd9b SHA1 58bc0e41d28dabe703c8fff0654bcfd677d8f953 SHA256 e73216d7cd8025de6751670c74dd1f80008e714d3dbe5f6cb1941aa578dbd14c
-EBUILD qla-fc-firmware-20070226.ebuild 1034 RMD160 39cb29c9d905798007237a0f09a18d407bfa212d SHA1 7e64dbfa964a55f6de84d7e3277a432a59765a0c SHA256 31837745b3b9f49134bc94a5a8fe4547e6fdc8209eb0ca397c9e3446525a38ff
-EBUILD qla-fc-firmware-20071207-r1.ebuild 1556 RMD160 b941093bce6619a81cb26774c17b000e192f12ae SHA1 d9a963299b7b41d57f2a29fa23942152f42e6aab SHA256 b31bfc01499b7c11b8154ea93c13e6c4eb570a7ca6992440be906cf021e02817
-EBUILD qla-fc-firmware-20071207.ebuild 1485 RMD160 22097247d736cf48d0ff3af9af28cb8b09befccc SHA1 01a355aed84f3e2f4f9688c7290b8c6ce3e0a62e SHA256 d6ba21f513db99f2a1a674a5c918772c3477a5ecca16c8a2f3aedaec66e68ebc
-EBUILD qla-fc-firmware-20080423.ebuild 1564 RMD160 e493c0e3229ab3b9e19e9cebcc365854c6dd8b55 SHA1 6c08205d1c247d94a23d605652b5c212a7df3d77 SHA256 b9f69810044a4d0c21590c99abf8c36a97ba31f9d54faad32e09c818b641b852
-MISC ChangeLog 3455 RMD160 b5bc13e850f9ba7b4128c0549c9b0a447294ce55 SHA1 2f55a25a12493a0848ca4478b4c488c3f74d2009 SHA256 ed1f8499e480f04b0bd5c383928ae1089c01908e586ee6d8377ca2ab7a9b9522
+DIST qla-fc-firmware-20101015.tar.bz2 3237889 RMD160 dc7baf8c6733284fe0b38c499fb4c2a41c0af2b3 SHA1 afd6d4b413241d83ec2a1e8a38f0512a03421693 SHA256 e2951f8a130350ca38990afb60d16c4ea3262de5f9a7d9a75c88db04095bb6cb
+EBUILD qla-fc-firmware-20071207-r1.ebuild 1582 RMD160 6bdc058a4cabbd5fd0ba2d17d8d4cd06f3b174c2 SHA1 3cc05352e951b91ccb8fed94002c5bdcb9924e98 SHA256 3474e841d2059a2bdc94efe82abecbba49bbe5fd95a1c52659bc9d1e1827a821
+EBUILD qla-fc-firmware-20080423.ebuild 1590 RMD160 450ec93a0a1d72011bcb81cf607a302658560cb4 SHA1 f96ab0afe45d3d02ff77bfa6ea25394d127170fb SHA256 18edd774a5f446503bff53f0283867e2e95130882e9ccf59aa1c7e6d93702833
+EBUILD qla-fc-firmware-20101015.ebuild 1590 RMD160 8eb650e78d6363e192f7c6551e296c6f54ce4d73 SHA1 066575a0bd524f3e199f82784b7592fcec69a2ea SHA256 55b855121c043421e4bf2951c4049ec575a29371fd532bb2ffa3a33cdc8b5ae6
+MISC ChangeLog 3959 RMD160 a6f008dc1a0d47aef75c2a96d72fbd7e04943c10 SHA1 3e090ed431803cba7fa94df9204c3c1b26fd44a9 SHA256 b1c19e3ed1e906a1e4ed9578eecac8110ee775e2d17bc04aceb40fe21bcefbe2
 MISC metadata.xml 406 RMD160 9d55adb2f6428ea9f289b7970b9c0b6d7671e6d2 SHA1 dd3aff24f68bdc7389ae5329199befc06de50602 SHA256 1c3694d2062762ac704d668916f39fe3855adab4b8e69a70d38a7122fccc7800
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
 }