vapier 14/09/06 10:15:43 Modified: qemu-9999.ebuild qemu-2.1.0-r1.ebuild ChangeLog Log: Move USE=xattr logic to common code path since qemu-user uses it too #522202 by Thomas Reitmayr. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.89 app-emulation/qemu/qemu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.89&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.89&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.88&r2=1.89 Index: qemu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- qemu-9999.ebuild 6 Sep 2014 10:13:19 -0000 1.88 +++ qemu-9999.ebuild 6 Sep 2014 10:15:43 -0000 1.89 @@ -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.88 2014/09/06 10:13:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.89 2014/09/06 10:15:43 vapier Exp $ EAPI=5 @@ -62,8 +62,13 @@ virtfs? ( xattr )" # Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the extranl library. COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)]" + sys-libs/zlib[static-libs(+)] + xattr? ( sys-apps/attr[static-libs(+)] )" SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) @@ -89,7 +94,6 @@ usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] )" USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" X86_FIRMWARE_DEPEND=" @@ -298,6 +302,7 @@ $(use_enable debug debug-tcg) --enable-docs $(use_enable tci tcg-interpreter) + $(use_enable xattr attr) ) # Disable options not used by user targets as the default configure @@ -346,7 +351,6 @@ $(conf_softmmu vhost-net) $(conf_softmmu virtfs) $(conf_softmmu vnc) - $(conf_softmmu xattr attr) $(conf_softmmu xen) $(conf_softmmu xen xen-pci-passthrough) $(conf_softmmu xfs xfsctl) 1.4 app-emulation/qemu/qemu-2.1.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.0-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.0-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.0-r1.ebuild?r1=1.3&r2=1.4 Index: qemu-2.1.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qemu-2.1.0-r1.ebuild 28 Aug 2014 12:02:06 -0000 1.3 +++ qemu-2.1.0-r1.ebuild 6 Sep 2014 10:15:43 -0000 1.4 @@ -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.1.0-r1.ebuild,v 1.3 2014/08/28 12:02:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0-r1.ebuild,v 1.4 2014/09/06 10:15:43 vapier Exp $ EAPI=5 @@ -62,8 +62,13 @@ virtfs? ( xattr )" # Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the extranl library. COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)]" + sys-libs/zlib[static-libs(+)] + xattr? ( sys-apps/attr[static-libs(+)] )" SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) @@ -89,7 +94,6 @@ usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] )" USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" X86_FIRMWARE_DEPEND=" @@ -299,6 +303,7 @@ $(use_enable debug debug-tcg) --enable-docs $(use_enable tci tcg-interpreter) + $(use_enable xattr attr) ) # Disable options not used by user targets as the default configure @@ -347,7 +352,6 @@ $(conf_softmmu vhost-net) $(conf_softmmu virtfs) $(conf_softmmu vnc) - $(conf_softmmu xattr attr) $(conf_softmmu xen) $(conf_softmmu xen xen-pci-passthrough) $(conf_softmmu xfs xfsctl) 1.292 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.292&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.292&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.291&r2=1.292 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- ChangeLog 6 Sep 2014 10:13:19 -0000 1.291 +++ ChangeLog 6 Sep 2014 10:15:43 -0000 1.292 @@ -1,6 +1,11 @@ # 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.291 2014/09/06 10:13:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.292 2014/09/06 10:15:43 vapier Exp $ + + 06 Sep 2014; Mike Frysinger <[email protected]> qemu-2.1.0-r1.ebuild, + qemu-9999.ebuild: + Move USE=xattr logic to common code path since qemu-user uses it too #522202 + by Thomas Reitmayr. 28 Aug 2014; Mike Frysinger <[email protected]> qemu-2.1.0-r1.ebuild, qemu-9999.ebuild:
