vapier 15/03/28 04:15:37 Modified: qemu-9999.ebuild ChangeLog Log: Put softmmu/user deps behind the respective flags so we do not pull in one set when they are not enabled #538958 by Anthoine Bourgeois. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.95 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.95&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.95&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.94&r2=1.95 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- qemu-9999.ebuild 16 Mar 2015 18:41:00 -0000 1.94 +++ qemu-9999.ebuild 28 Mar 2015 04:15:37 -0000 1.95 @@ -1,10 +1,10 @@ # Copyright 1999-2015 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.94 2015/03/16 18:41:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.95 2015/03/28 04:15:37 vapier Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="ncurses,readline" inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ @@ -43,15 +43,13 @@ IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb" IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus" -use_targets=" - $(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) - $(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -" -IUSE+=" ${use_targets}" +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" # Require at least one softmmu or user target. # Block USE flag configurations known to not work. -REQUIRED_USE="|| ( ${use_targets} ) +REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} ) ${PYTHON_REQUIRED_USE} qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) @@ -77,12 +75,12 @@ fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) infiniband? ( sys-infiniband/librdmacm[static-libs(+)] ) - jpeg? ( virtual/jpeg[static-libs(+)] ) + jpeg? ( virtual/jpeg:=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) - png? ( media-libs/libpng[static-libs(+)] ) + png? ( media-libs/libpng:0=[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) @@ -108,8 +106,9 @@ sys-firmware/sgabios sys-firmware/vgabios )" -CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) - !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) +CDEPEND=" + !static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) ) + !static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) ) qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) accessibility? ( app-accessibility/brltty ) @@ -137,8 +136,8 @@ virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) - static-softmmu? ( ${SOFTMMU_LIB_DEPEND} ) - static-user? ( ${USER_LIB_DEPEND} ) + static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) ) + static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) ) test? ( dev-libs/glib[utils] sys-devel/bc 1.318 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.318&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.318&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.317&r2=1.318 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- ChangeLog 25 Mar 2015 14:04:44 -0000 1.317 +++ ChangeLog 28 Mar 2015 04:15:37 -0000 1.318 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.317 2015/03/25 14:04:44 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.318 2015/03/28 04:15:37 vapier Exp $ + + 28 Mar 2015; Mike Frysinger <[email protected]> qemu-9999.ebuild: + Put softmmu/user deps behind the respective flags so we do not pull in one set + when they are not enabled #538958 by Anthoine Bourgeois. 25 Mar 2015; Agostino Sarubbo <[email protected]> qemu-2.2.0.ebuild: Stable for x86, wrt bug #542910
