Convert to USE=uuid since the -luuid interface is portable beyond linux.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

5 files changed, 31 insertions, 32 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 8cd6ac46a9af..7580e335268a 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.123 2012/10/10 19:20:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.124 2012/10/10 19:24:31 vapier Exp $
+
+  10 Oct 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  qemu-1.1.2.ebuild, qemu-9999.ebuild:
+  Convert to USE=uuid since the -luuid interface is portable beyond linux.
 
   10 Oct 2012; Mike Frysinger <vapier@gentoo.org> qemu-1.1.2.ebuild,
   qemu-9999.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6227c6736b7c..443093484903 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -21,25 +21,25 @@ DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c403
 EBUILD qemu-0.11.1-r1.ebuild 4894 SHA256 25ef257efc5ee950d5f93ad3dc059c24cc8104e094b62840477ec719c66bd5f5 SHA512 0afcc745a78a23a8fba3cdd518595894f4ed12b4048b128c55be3f53c96f97d7701dd5bebbfcbb06cf37da617a78f3813f847792542e27e85e932ba9395eb542 WHIRLPOOL 3b606df1b67a37b61f858a0e76133867b2c281d0cde1024c510cf4bcdb433e25db117bd817e6e91eadf0d42246c55873e69078bb5f4c212122fc89a36cd7c5c4
 EBUILD qemu-0.11.1.ebuild 4826 SHA256 7aaf359e5b09721faeb9b97ff0fd8ac4c91ba8906d8f9439ac21550af786fcda SHA512 5a9631fe38c86b1fd56519544f381ab4fdb064004a1b229adda361916724ef88451dd72713c61b092a056111a7a66143d9dd0e4b5638a69f9c782f21b63d2289 WHIRLPOOL 2c50d082e32176108d661a199dd9633c4d5bdd94288921d443148c62657cf9f8f24db268f0babf4fdc707d24e3f317e0a019670104849b6b00b272cb505a2006
 EBUILD qemu-1.1.1-r1.ebuild 12073 SHA256 7f408c7425a3e34d31e48a6c886d4a415a970e7d2fb4ffaf58b44f9d9e88f50c SHA512 efd0c757fab7fa7e06b86e32fcedd0347f8728a7ea0bf67718b34b3b0c0135450276fc13ec02755d173626a5e69f09d5382afe2e901c310f3b50efb2e3e2f21a WHIRLPOOL 63949afad70876a426db6808a60d09d0fcf98e221afc24005181114203bb6586509620dee18b9009cf602c57cc0429cb8e718fc89c44a1d64ac2d7309f9ddb67
-EBUILD qemu-1.1.2.ebuild 12131 SHA256 f2c6ff05fd4989af8215c423b94a9df08e2569f140aa830f1bd7766f88efaf72 SHA512 2e1b5f0eae1610af3ed0abd9453615d4972206841c2e55cfabb6cd872e24f928cb510b300f237e04d6c46356ce9dc8220524ae98648758dc6d0e0b8c23e71e04 WHIRLPOOL 2ef6d02842b16dff75142ac8a1b64a66955392b32f7f4cdd713847f4b9d37079f78194cffa61ec5b8ce04efca5dc59b177c5fc298b88d4db455971a3fb4e8405
+EBUILD qemu-1.1.2.ebuild 11966 SHA256 9d4107eb747964c4230ae32a4ec46bc033fe40a6b2e56f651477b47ec9d4d685 SHA512 3cdc3d8490094bf3243d6f9f53f1e7957468f13eea691638a8053381bc93217fab4410688615de2b5c04e42d7bc4b3e589f8dd3d5742acf0723e74d961c681de WHIRLPOOL e21b8be90971cffb2ebe11840e34241744e5d1e9ce6f309f89553f3104a26743870be56fb3a36e6b091a6ac45cc694636e9a4b8b34f8da5137eee9fa7e15ebca
 EBUILD qemu-1.2.0.ebuild 6781 SHA256 c3315377ba5fe331fa028bc2e1dc4231b09c9180856732943e5fb3b5534c9445 SHA512 68d1422c70f52461294ac703cb8bb6c6daca0efa41fa994f034d5dfc5a47674774b9e60cc03eefe9f635b750a6b089a3333b95ef3be0792d1648437a14a13017 WHIRLPOOL c6ed1c57c820d77c804f6ff5127aa0e16b3597462c3c0005cb1d8a364ac7f84ff00b641d1e95a1d914e48b8e2a1421b326d3095af56163179afe51548d15d4f2
-EBUILD qemu-9999.ebuild 12966 SHA256 47cb6e3c790b883dedbdb68aa736a3d9e3d91646b3a69accc3261cfe0471b255 SHA512 aad12338e10a2c8742217a990d559b8b3d3d648b08126250ee46178048557a98ec661886649cf8ce96f37fce6e6219fef2f1d7dba991cfdb0c23fb7d624ab2c9 WHIRLPOOL 6fc36f3df92d5c97469f692b951087da552c853778901df07de191bac665e95b53e29087174d343ae0d4ed25ccfddb51736951eb5bf422af6ceeb20cadb2e1a5
-MISC ChangeLog 18820 SHA256 0ee24fa27200c745f85c936ae6a0e3ea5246c58b4e3715283a4f8bb637b066e8 SHA512 d106993c2f38c2c1b977be3efe979d22e9b4abd91cd360d7e044fa4431d98a932eebf5de8bcd6d4cc721e22c05b1c48a5a53d0d1223a4070c02961d4ec3a86ef WHIRLPOOL 3c8155cb58528761450d3845eb1e7fb6b891d40605f3f85aaa8f6e028b66df816de1945e00157c15d7463f39a6ea1d000c30628c47def4d304c8719caf676d5c
-MISC metadata.xml 2620 SHA256 b72af52566abe6ab9771e3bfa27cfdcc4e4da67e827c34f958b40f3071e74e0b SHA512 9e26fafc7f6d60f6475794e20cd745ab59ad9b555e7fd2a61c1d78773acd373d3b35d652719adb603029568049010498933129e9491d82740511cae31d8b87d3 WHIRLPOOL fb4e8533724a093ad8636d8fa80debcc91f921f56a3edab18ddeec3bae95cd48f8f25fdbf6f829870175e1e18b485b1cbb30a61d7f9502bbf2b945a37f3db2b4
+EBUILD qemu-9999.ebuild 12801 SHA256 2e5013b4f8e6f71d2cd2fc55e9b8193d7aff7f7007fc7836c91039807f10e02a SHA512 bf61046086e5ed9037f725ec733861ab81b74fbbfa94ebfe15c89c2714a4cb93733cdbcaf080df28e0190a5c130253a2bdc0ed500ff9614b3652165ddd2df092 WHIRLPOOL 1d22638f057106793264dd161924df91eb716adf4d724d3d65a13b16ab7860440db98d68c923ef16223aa53071adbf93f685eeb322f542ee9f5daa31b40b1028
+MISC ChangeLog 18999 SHA256 188f449f7b2c48d69777f2a742532d4dfd55c08dd16fd5b06ef4fe185fa63c7e SHA512 e50a10e23c3dfe860ac96b8917fb1a9befc542b3d17b482bfc62ad49830020e763eb30605a8ff5b7b559c6fda19f7ae3d72a5f4473a64f05b225ed3f8ff0dd52 WHIRLPOOL db6bc9af949f3df6a43b82ac5295786ea9261a2c77deebcf2b1f6c4409fa4fffa9643dcae526c950f7967195f8a2be6af6266e6e182435a6adb1c6a99cc134bd
+MISC metadata.xml 2693 SHA256 a8eb669bccb38cedcf4d53432693a429220f6bc9578c5093e0ea2615b42ff8c6 SHA512 f92ccd385c7c4e31494fe4efbebaaa4ccd48d31e339c5401e9c28cf4c28cde2de646afa17cd37c5e50cb545c3b094f57e2f697126219ebe9314c7c53ed65b3be WHIRLPOOL 77161784daf8a85f80780f7ca962023da3285ca5e9890b74f7a293cea1f2a70dcea40f4e0cd27dc3781971303a21b772d75bdd4947ae2f64e4069de1a4256ff4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQdcqYAAoJELEHsLL7fEFWrrwQAKl8STik6A92zlWMQ+2b0JY2
-WDjlnNC5tfIUDlj84hlVqJjejbl1JLwc2qr6a/ODmDH9MaY5qPD1A7J4NxNWMfNu
-VTni3JQ54t8UCZGpD6TgASX2Vo6HeZBwyoia5bW7JdXcpEEO880qwTkFpxUv3wO9
-4W8ttgF78W/zsVYI4yAw5Syazuu7Oocts9uWFK0voWVMkG8AMkiep574YrZLsWMD
-6oa+l3aZweqrrMAzxRTlmVWXwEpxev3aXtT/hWInYOLnULLCXQBblqSUvQCQ3wke
-iKi2yaBwgFA8ymHmye72znWU8beCiA3rd0t+VG3blDuwIdGaHnToqMCgVryKDNJc
-JxoO7PEpmlqsdfuzgHq5VAa28HONQCxAUcVztsycocWN7hVgIxnNR35b8sLqhFz7
-wEc+aVMkcaVNgjYT4SEKGTCeY/P0KJenA58VtiQO3wRin3/INDPKVTiUrOQB3xFU
-529tIN/EfrfDSdg9ACUNdcXIuVPKJ3mNNuX9ZvpP+ijzOTxyBi7GfoD2So/CdDhk
-KiSMs3n/Msowdg5+kqEpuWCE8zl1hNquJGogCmVKU7zyzP/Mq5YdIWxQirQxSyYX
-NZiIgjYnoSTRsc+vu6ptrH/G6SpR89yJlAgY4YpAuB531BVReNku4tyxIbY2NkmV
-a/Z8FG5cM9jA9oDIZd3+
-=bdgG
+iQIcBAEBCAAGBQJQdctyAAoJELEHsLL7fEFWCsMP/RlbQpSxiyg6HA5OsrKINCRB
+hk9i3sPd8Pm4GAhFOD3yLSgRKb3ht3GHt3DHmhbpQxk6wsfxlE8B93o9mfjBnIhq
+ol+ijq9D0CIAQyip6O7lUdmf/MbIZ+7/KSoW33InuHjWoy00HgQ9wNBX36I5NzEn
+EUptQ1TYPMjPRYoKMW2nXdst5pKelOBE9xJKxk+4aJYRgJi7H8Qc9iUbeFFUaxus
+/fES1x0sT7Y+GynMluEGPNxd9b3wx6ECyGL0XZ8YRG7YobgGNdBu2S/J27u4aPRZ
+SawsBYZJd52d00qtODhkMHm7BWqyS3Vel3A6tIolNQ/1dxgcU0QPm1dPcpuoxxcD
+Z3w3crsnVstpQ9+tmNfCeJle7B6KmOUoiQuVx/Wye4Z95vJz8GMVnSnKEZ2i4AvH
+WgH9G5xoHQ2MWceyqyJVK+H+Z5HE4kHw7KtK8hVQSJoxU66f7VTWieAJTFVgiICm
+ckb6sqEbZvp/ZyOntjn4lQOxiL96cvCivmHdlN7j59zIhXx9L1ahVPi3Aum+5gEj
+NSOSwEExX/VHqAFn6c81CCPZXghTS6IHMjV1xzji3CEm3aS49uFFsoVc6+jBCmLq
+NQ9tBSdZqpycfXNuBsOAc/8kKeXwgGIKUa/QdRXkspPcYOUpQISFBWwnYRirvRRW
+9VaJjDy5qJBATFVgGjJx
+=tpRz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 044c6e460437..4750873fbac8 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -25,6 +25,7 @@
     <flag name='tls'>Enable TLS support for the VNC console server</flag>
     <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
         devices to another machine over TCP</flag>
+    <flag name='uuid'>Enable UUID support in the vdi block driver</flag>
     <flag name='vde'>Enable VDE-based networking</flag>
     <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
 	<flag name='virtfs'>Enable VirtFS support. See http://wiki.qemu.org/Documentation/9psetup</flag>
diff --git a/app-emulation/qemu/qemu-1.1.2.ebuild b/app-emulation/qemu/qemu-1.1.2.ebuild
index 3e60c7df93ea..9443f871aed5 100644
--- a/app-emulation/qemu/qemu-1.1.2.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.3 2012/10/10 19:20:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.4 2012/10/10 19:24:31 vapier Exp $
 
 EAPI="4"
 
@@ -30,7 +30,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
 kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
-smartcard spice static systemtap tci tls usbredir vde +vhost-net \
+smartcard spice static systemtap tci tls usbredir +uuid vde +vhost-net \
 virtfs xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
@@ -66,13 +66,13 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	kernel_linux? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	ncurses? ( sys-libs/ncurses[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
 	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
 	tls? ( net-libs/gnutls[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(+)] )"
@@ -242,9 +242,6 @@ src_configure() {
 	use pulseaudio && audio_opts="pa,${audio_opts}"
 	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
 
-	# conditionally making UUID work on Linux only is wrong
-	# but the Gentoo/FreeBSD guys need to figure out what
-	# provides libuuid on their platform
 	# --enable-vnc-thread will go away in 1.2
 	# $(use_enable xen xen-pci-passthrough) for 1.2
 	./configure --prefix=/usr \
@@ -271,7 +268,6 @@ src_configure() {
 		$(use_enable kernel_linux kvm) \
 		$(use_enable kernel_linux kvm-device-assignment) \
 		$(use_enable kernel_linux nptl) \
-		$(use_enable kernel_linux uuid) \
 		$(use_enable ncurses curses) \
 		$(use_enable opengl) \
 		$(use_enable rbd) \
@@ -283,6 +279,7 @@ src_configure() {
 		$(use_enable tci tcg-interpreter) \
 		$(use_enable tls vnc-tls) \
 		$(use_enable usbredir usb-redir) \
+		$(use_enable uuid) \
 		$(use_enable vde) \
 		$(use_enable vhost-net) \
 		$(use_enable virtfs) \
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index c039e493d843..5de78762d5bc 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.23 2012/10/10 19:20:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.24 2012/10/10 19:24:31 vapier Exp $
 
 EAPI="4"
 
@@ -30,7 +30,7 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
 kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
-smartcard spice static systemtap tci tls usbredir vde +vhost-net \
+smartcard spice static systemtap tci tls usbredir +uuid vde +vhost-net \
 virtfs xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
@@ -72,13 +72,13 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	kernel_linux? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	ncurses? ( sys-libs/ncurses[static-libs(+)] )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
 	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
 	tls? ( net-libs/gnutls[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(+)] )"
@@ -248,9 +248,6 @@ src_configure() {
 	use pulseaudio && audio_opts="pa,${audio_opts}"
 	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
 
-	# conditionally making UUID work on Linux only is wrong
-	# but the Gentoo/FreeBSD guys need to figure out what
-	# provides libuuid on their platform
 	# --enable-vnc-thread will go away in 1.2
 	# $(use_enable xen xen-pci-passthrough) for 1.2
 	# $(use_enable debug debug-mon) goes away for 1.2
@@ -278,7 +275,6 @@ src_configure() {
 		$(use_enable fdt) \
 		$(use_enable kernel_linux kvm) \
 		$(use_enable kernel_linux nptl) \
-		$(use_enable kernel_linux uuid) \
 		$(use_enable ncurses curses) \
 		$(use_enable opengl) \
 		$(use_enable rbd) \
@@ -290,6 +286,7 @@ src_configure() {
 		$(use_enable tci tcg-interpreter) \
 		$(use_enable tls vnc-tls) \
 		$(use_enable usbredir usb-redir) \
+		$(use_enable uuid) \
 		$(use_enable vde) \
 		$(use_enable vhost-net) \
 		$(use_enable virtfs) \