Only install the firmware components if we're building a target that uses them. Update some USE=static blockers. Update the elog message to print out in correct cases.

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

4 files changed, 128 insertions, 66 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index e1d7f511f4bd..35f15ab43816 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.168 2013/01/13 02:53:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.169 2013/01/14 22:24:07 cardoe Exp $
+
+  14 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2.ebuild,
+  qemu-1.3.0.ebuild, qemu-9999.ebuild:
+  Only install the firmware components if we're building a target that uses
+  them. Update some USE=static blockers. Update the elog message to print out
+  in correct cases.
 
   13 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2.ebuild:
   Rebase backport patchset to fix a glaringly obvious mistake I made when
diff --git a/app-emulation/qemu/qemu-1.2.2.ebuild b/app-emulation/qemu/qemu-1.2.2.ebuild
index c095ee161ee6..bdbe1f88374e 100644
--- a/app-emulation/qemu/qemu-1.2.2.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.7 2013/01/13 02:53:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.8 2013/01/14 22:24:07 cardoe Exp $
 
 EAPI="4"
 
@@ -54,7 +54,7 @@ done
 
 # Block USE flag configurations known to not work
 REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
+	static? ( !alsa !pulseaudio !bluetooth !opengl )
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
@@ -80,10 +80,18 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
-	sys-firmware/ipxe
-	~sys-firmware/seabios-1.7.1
-	~sys-firmware/sgabios-0.1_pre8
-	~sys-firmware/vgabios-0.7a
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.1
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.1
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
@@ -344,7 +352,9 @@ src_install() {
 
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 
 	# Remove vgabios since we're using the vgabios packaged one
 	rm "${ED}/usr/share/qemu/vgabios.bin"
@@ -352,28 +362,36 @@ src_install() {
 	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
 
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
 
 	# Remove iPXE since we're using the iPXE packaged one
 	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
 }
 
 pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -384,7 +402,8 @@ pkg_postinst() {
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
+
+	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 }
diff --git a/app-emulation/qemu/qemu-1.3.0.ebuild b/app-emulation/qemu/qemu-1.3.0.ebuild
index 73f905e60622..2228201c9567 100644
--- a/app-emulation/qemu/qemu-1.3.0.ebuild
+++ b/app-emulation/qemu/qemu-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.3.0.ebuild,v 1.1 2013/01/12 23:38:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.3.0.ebuild,v 1.2 2013/01/14 22:24:07 cardoe Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ done
 
 # Block USE flag configurations known to not work
 REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
+	static? ( !alsa !pulseaudio !bluetooth !opengl )
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
@@ -77,9 +77,16 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
-	sys-firmware/ipxe
-	~sys-firmware/seabios-1.7.2
-	~sys-firmware/sgabios-0.1_pre8
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.2
+		~sys-firmware/sgabios-0.1_pre8
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.2
+		~sys-firmware/sgabios-0.1_pre8
+	)	
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
@@ -338,7 +345,9 @@ src_install() {
 
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 
 	# Remove vgabios since we're using the vgabios packaged one
 	rm "${ED}/usr/share/qemu/vgabios.bin"
@@ -346,28 +355,36 @@ src_install() {
 	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
 
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
 
 	# Remove iPXE since we're using the iPXE packaged one
 	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
 }
 
 pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -378,7 +395,8 @@ pkg_postinst() {
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
+
+	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 }
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 628da3dc04f2..76d246ab8f39 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.41 2013/01/12 07:36:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.42 2013/01/14 22:24:07 cardoe Exp $
 
 EAPI="4"
 
@@ -50,7 +50,7 @@ done
 
 # Block USE flag configurations known to not work
 REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
+	static? ( !alsa !pulseaudio !bluetooth !opengl )
 	virtfs? ( xattr )"
 
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
@@ -76,10 +76,18 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	!app-emulation/kqemu
-	sys-firmware/ipxe
-	>=sys-firmware/seabios-1.7.0
-	sys-firmware/sgabios
-	sys-firmware/vgabios
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.7.0
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.7.0
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
@@ -338,7 +346,9 @@ src_install() {
 
 	# Remove SeaBIOS since we're using the SeaBIOS packaged one
 	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
 
 	# Remove vgabios since we're using the vgabios packaged one
 	rm "${ED}/usr/share/qemu/vgabios.bin"
@@ -346,28 +356,36 @@ src_install() {
 	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
 
 	# Remove sgabios since we're using the sgabios packaged one
 	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
 
 	# Remove iPXE since we're using the iPXE packaged one
 	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
 }
 
 pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -378,7 +396,8 @@ pkg_postinst() {
 		elog "Make sure your user is in the 'kvm' group"
 		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
 		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 	fi
+
+	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
 }