vapier 14/04/25 22:56:26 Modified: qemu-9999.ebuild qemu-2.0.0.ebuild ChangeLog Log: Fix static lib requirements for USE=static-user #487918 by jannis. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.69 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.69&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.69&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.68&r2=1.69 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- qemu-9999.ebuild 25 Apr 2014 22:16:35 -0000 1.68 +++ qemu-9999.ebuild 25 Apr 2014 22:56:26 -0000 1.69 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.68 2014/04/25 22:16:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.69 2014/04/25 22:56:26 vapier Exp $ EAPI=5 @@ -61,9 +61,9 @@ virtfs? ( xattr )" # Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-apps/pciutils[static-libs(+)] - sys-libs/zlib[static-libs(+)] +COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)]" +SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) @@ -85,8 +85,9 @@ vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] )" -RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) +USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" +RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) + !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 sys-firmware/seabios @@ -118,14 +119,14 @@ usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )" - DEPEND="${RDEPEND} dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static-softmmu? ( ${LIB_DEPEND} ) + static-softmmu? ( ${SOFTMMU_LIB_DEPEND} ) + static-user? ( ${USER_LIB_DEPEND} ) test? ( dev-libs/glib[utils] sys-devel/bc @@ -289,7 +290,7 @@ --disable-kvm --disable-libiscsi --disable-glusterfs - $(use_enable seccomp) + --disable-seccomp --disable-sdl --disable-smartcard-nss --disable-tools 1.5 app-emulation/qemu/qemu-2.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild?r1=1.4&r2=1.5 Index: qemu-2.0.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qemu-2.0.0.ebuild 25 Apr 2014 22:16:35 -0000 1.4 +++ qemu-2.0.0.ebuild 25 Apr 2014 22:56:26 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.4 2014/04/25 22:16:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.5 2014/04/25 22:56:26 vapier Exp $ EAPI=5 @@ -61,9 +61,9 @@ virtfs? ( xattr )" # Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-apps/pciutils[static-libs(+)] - sys-libs/zlib[static-libs(+)] +COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)]" +SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) @@ -85,8 +85,9 @@ vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] )" -RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) +USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" +RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) + !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.3.2 @@ -118,14 +119,14 @@ usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )" - DEPEND="${RDEPEND} dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static-softmmu? ( ${LIB_DEPEND} ) + static-softmmu? ( ${SOFTMMU_LIB_DEPEND} ) + static-user? ( ${USER_LIB_DEPEND} ) test? ( dev-libs/glib[utils] sys-devel/bc @@ -289,7 +290,7 @@ --disable-kvm --disable-libiscsi --disable-glusterfs - $(use_enable seccomp) + --disable-seccomp --disable-sdl --disable-smartcard-nss --disable-tools 1.257 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.257&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.257&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.256&r2=1.257 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- ChangeLog 25 Apr 2014 22:16:35 -0000 1.256 +++ ChangeLog 25 Apr 2014 22:56:26 -0000 1.257 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.256 2014/04/25 22:16:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.257 2014/04/25 22:56:26 vapier Exp $ + + 25 Apr 2014; Mike Frysinger <[email protected]> qemu-2.0.0.ebuild, + qemu-9999.ebuild: + Fix static lib requirements for USE=static-user #487918 by jannis. 25 Apr 2014; Mike Frysinger <[email protected]> qemu-2.0.0.ebuild, qemu-9999.ebuild:
