Update for new OLAND firmware.

(Portage version: 2.1.11.50/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 36 insertions, 78 deletions

diff --git a/x11-drivers/radeon-ucode/ChangeLog b/x11-drivers/radeon-ucode/ChangeLog
index d549594060c8..127aadfc6944 100644
--- a/x11-drivers/radeon-ucode/ChangeLog
+++ b/x11-drivers/radeon-ucode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/radeon-ucode
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/ChangeLog,v 1.24 2012/06/24 18:59:27 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/ChangeLog,v 1.25 2013/02/15 15:47:56 chithanh Exp $
+
+*radeon-ucode-20130204 (15 Feb 2013)
+
+  15 Feb 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +radeon-ucode-20130204.ebuild, -radeon-ucode-20110302.ebuild,
+  -radeon-ucode-20110531.ebuild:
+  Update for new OLAND firmware.
 
   24 Jun 2012; Agostino Sarubbo <ago@gentoo.org> radeon-ucode-20120320.ebuild:
   Stable for x86, wrt bug #419473
@@ -108,4 +115,3 @@
   15 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +radeon-ucode-20091209.ebuild, +metadata.xml:
   Initial import, based on an ebuild by scarabeus
-
diff --git a/x11-drivers/radeon-ucode/radeon-ucode-20110302.ebuild b/x11-drivers/radeon-ucode/radeon-ucode-20110302.ebuild
deleted file mode 100644
index 9908f534385e..000000000000
--- a/x11-drivers/radeon-ucode/radeon-ucode-20110302.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20110302.ebuild,v 1.3 2011/03/26 10:32:45 fauli Exp $
-
-inherit linux-info
-
-UCODE_BASE_URI="http://people.freedesktop.org/~agd5f/${PN/-/_}"
-UCODE_FILES=(
-	"BARTS_mc.bin"
-	"BARTS_me.bin"
-	"BARTS_pfp.bin"
-	"BTC_rlc.bin"
-	"CAICOS_mc.bin"
-	"CAICOS_me.bin"
-	"CAICOS_pfp.bin"
-	"CAYMAN_mc.bin"
-	"CAYMAN_me.bin"
-	"CAYMAN_pfp.bin"
-	"CAYMAN_rlc.bin"
-	"CEDAR_me.bin"
-	"CEDAR_pfp.bin"
-	"CEDAR_rlc.bin"
-	"CYPRESS_me.bin"
-	"CYPRESS_pfp.bin"
-	"CYPRESS_rlc.bin"
-	"JUNIPER_me.bin"
-	"JUNIPER_pfp.bin"
-	"JUNIPER_rlc.bin"
-	"R600_rlc.bin"
-	"R700_rlc.bin"
-	"PALM_me.bin"
-	"PALM_pfp.bin"
-	"REDWOOD_me.bin"
-	"REDWOOD_pfp.bin"
-	"REDWOOD_rlc.bin"
-	"SUMO_rlc.bin"
-	"TURKS_mc.bin"
-	"TURKS_me.bin"
-	"TURKS_pfp.bin"
-)
-
-DESCRIPTION="IRQ microcode for r6xx/r7xx/Evergreen Radeon GPUs"
-HOMEPAGE="http://people.freedesktop.org/~agd5f/radeon_ucode/"
-SRC_URI="${UCODE_FILES[@]/#/${UCODE_BASE_URI}/}"
-
-LICENSE="radeon-ucode"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_unpack() { :; }
-
-src_install() {
-	insinto /lib/firmware/radeon || die "insinto failed"
-	doins "${UCODE_FILES[@]/#/${DISTDIR}/}" || die "doins failed"
-}
-
-pkg_postinst() {
-	if linux_config_exists && linux_chkconfig_builtin DRM_RADEON; then
-		if ! linux_chkconfig_present FIRMWARE_IN_KERNEL || \
-			! [[ "$(linux_chkconfig_string EXTRA_FIRMWARE)" == *_rlc.bin* ]]; then
-			ewarn "Your kernel has radeon DRM built-in but not the IRQ microcode."
-			ewarn "For kernel modesetting to work, please set in kernel config"
-			ewarn "CONFIG_FIRMWARE_IN_KERNEL=y"
-			ewarn "CONFIG_EXTRA_FIRMWARE_DIR=\"/lib/firmware\""
-			ewarn "CONFIG_EXTRA_FIRMWARE=\"${UCODE_FILES[@]/#/radeon/}\""
-			ewarn "You may skip microcode files for which no hardware is installed."
-			ewarn "More information at http://wiki.x.org/wiki/radeonBuildHowTo"
-		fi
-	fi
-}
diff --git a/x11-drivers/radeon-ucode/radeon-ucode-20110531.ebuild b/x11-drivers/radeon-ucode/radeon-ucode-20130204.ebuild
index 60b8495fe127..65f02d913a2b 100644
--- a/x11-drivers/radeon-ucode/radeon-ucode-20110531.ebuild
+++ b/x11-drivers/radeon-ucode/radeon-ucode-20130204.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20110531.ebuild,v 1.4 2011/09/04 12:07:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20130204.ebuild,v 1.1 2013/02/15 15:47:56 chithanh Exp $
 
 inherit linux-info
 
 UCODE_BASE_URI="http://people.freedesktop.org/~agd5f/${PN/-/_}"
 UCODE_FILES=(
+	"ARUBA_me.bin"
+	"ARUBA_pfp.bin"
+	"ARUBA_rlc.bin"
 	"BARTS_mc.bin"
 	"BARTS_me.bin"
 	"BARTS_pfp.bin"
@@ -26,10 +29,20 @@ UCODE_FILES=(
 	"JUNIPER_me.bin"
 	"JUNIPER_pfp.bin"
 	"JUNIPER_rlc.bin"
+	"OLAND_ce.bin"
+	"OLAND_mc.bin"
+	"OLAND_me.bin"
+	"OLAND_pfp.bin"
+	"OLAND_rlc.bin"
 	"R600_rlc.bin"
 	"R700_rlc.bin"
 	"PALM_me.bin"
 	"PALM_pfp.bin"
+	"PITCAIRN_ce.bin"
+	"PITCAIRN_mc.bin"
+	"PITCAIRN_me.bin"
+	"PITCAIRN_pfp.bin"
+	"PITCAIRN_rlc.bin"
 	"REDWOOD_me.bin"
 	"REDWOOD_pfp.bin"
 	"REDWOOD_rlc.bin"
@@ -38,18 +51,28 @@ UCODE_FILES=(
 	"SUMO_me.bin"
 	"SUMO_pfp.bin"
 	"SUMO_rlc.bin"
+	"TAHITI_ce.bin"
+	"TAHITI_mc.bin"
+	"TAHITI_me.bin"
+	"TAHITI_pfp.bin"
+	"TAHITI_rlc.bin"
 	"TURKS_mc.bin"
 	"TURKS_me.bin"
 	"TURKS_pfp.bin"
+	"VERDE_ce.bin"
+	"VERDE_mc.bin"
+	"VERDE_me.bin"
+	"VERDE_pfp.bin"
+	"VERDE_rlc.bin"
 )
 
-DESCRIPTION="IRQ microcode for r6xx/r7xx/Evergreen/Northern Islands Radeon GPUs and APUs"
+DESCRIPTION="IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs"
 HOMEPAGE="http://people.freedesktop.org/~agd5f/radeon_ucode/"
 SRC_URI="${UCODE_FILES[@]/#/${UCODE_BASE_URI}/}"
 
 LICENSE="radeon-ucode"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_unpack() { :; }