specs: more firmware-related fixes on amd64/x86 livecds

Several changes here:

-Fix sorting on previous addition, and elsewhere
-Move several firmwares from net-wireless/ to sys-firmware/
-Remove obsolete prism54-firmware
-Remove iwl* firmware (bundled in linux-firmware)
-Add linux-firmware where it's missing

releases/weekly/specs/x86/i686/livecd-stage1.spec

@@ -74,13 +74,8 @@ livecd/packages:
 ### Masked by ~x86
 #	net-wireless/b43-fwcutter
 #	net-wireless/bcm43xx-fwcutter
-	net-wireless/ipw2100-firmware
-	net-wireless/ipw2200-firmware
-	net-wireless/prism54-firmware
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
-	net-wireless/zd1201-firmware
-	net-wireless/zd1211-firmware
 	sys-apps/ethtool
 	sys-apps/fxload
 	sys-apps/hdparm
@@ -110,9 +105,10 @@ livecd/packages:
 #	sys-devel/binutils-hppa64
 	sys-devel/distcc
 #	sys-devel/gcc-hppa64
-	sys-firmware/iwl3945-ucode
-	sys-firmware/iwl4965-ucode
-	sys-firmware/iwl5000-ucode
+	sys-firmware/ipw2100-firmware
+	sys-firmware/ipw2200-firmware
+	sys-firmware/zd1201-firmware
+	sys-firmware/zd1211-firmware
 	sys-fs/dmraid
 	sys-fs/dosfstools
 	sys-fs/e2fsprogs

releases/weekly/specs/x86/i686/livedvd-stage1.spec

@@ -167,15 +167,10 @@ livecd/packages:
 #	net-wireless/b43-fwcutter
 #	net-wireless/bcm43xx-fwcutter
 	net-wireless/gnome-bluetooth
-	net-wireless/ipw2100-firmware
-	net-wireless/ipw2200-firmware
 	net-wireless/kdebluetooth
-	net-wireless/prism54-firmware
 	net-wireless/wepattack
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
-	net-wireless/zd1201-firmware
-	net-wireless/zd1211-firmware
 	rox-base/rox
 	sys-apps/dmidecode
 	sys-apps/ethtool
@@ -217,9 +212,10 @@ livecd/packages:
 	sys-devel/distcc
 #	sys-devel/gcc-hppa64
 	sys-devel/gdb
-	sys-firmware/iwl3945-ucode
-	sys-firmware/iwl4965-ucode
-	sys-firmware/iwl5000-ucode
+	sys-firmware/ipw2100-firmware
+	sys-firmware/ipw2200-firmware
+	sys-firmware/zd1201-firmware
+	sys-firmware/zd1211-firmware
 	sys-fs/dmraid
 	sys-fs/dosfstools
 	sys-fs/e2fsprogs