Fixed configure script's detection of virtualbox-ose, based on patch from Jan Vanstee...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index b0cc517e6e297f596ee7e6ed6e1627d6a0a9afb2..7a0e0ce95fa46513dd728e2c94679c352a0ab508 100644 (file)
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.59 2010/07/07 18:17:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.60 2010/07/13 02:52:58 cardoe Exp $
+
+  13 Jul 2010; Doug Goldstein <cardoe@gentoo.org> libvirt-0.8.2-r1.ebuild:
+  Fixed configure script's detection of virtualbox-ose, based on patch from
+  Jan Vansteenkiste <jan@vstone.eu> bug #327255
 
 *libvirt-0.8.2-r1 (07 Jul 2010)
 

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8083652ca1c30a792281ab6841c4ae84b440028b..e7af1a8655e24630cf5c3e8f3e38c970ccd9f12d 100644 (file)
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,6 +6,6 @@ DIST libvirt-0.8.1-backports-1.tar.bz2 7521 RMD160 2d4784ccd1ab4484c77a1eea5184e
 DIST libvirt-0.8.1.tar.gz 11659399 RMD160 d43f46092029a4cc030e302c78929e3e4b36ae90 SHA1 a7e7066b4d2c99ec2c17e65e5bf19d0d9fdf27b0 SHA256 8d3e8d63884c4fd24465e083458edea92d2792339ce6c73c23bc6838df8eb76a
 DIST libvirt-0.8.2.tar.gz 12230368 RMD160 280c95e74c41c56686a50892105b2c41b196a107 SHA1 553c984e1fc1eae288d32ff911ba5614010bece4 SHA256 69d2bbf2d4057bdb2781a2ba45b2628a0f0312597ef7dd15a6a3d34720b33e60
 EBUILD libvirt-0.8.1-r1.ebuild 6314 RMD160 3c1886e786c0c322fa6ac9eaf9ec18e78b371d7e SHA1 06641c72f4a032a7575b98d92a3114ea241f479f SHA256 d7ea34f42e6792df515716cf09e44389c2b8358f24723b70fac79950bfd154df
-EBUILD libvirt-0.8.2-r1.ebuild 6757 RMD160 4e405473801d66a8ac744e8c131ab72e6af14ea7 SHA1 bd361986257d6e88ad439e28d90c096640abc6dc SHA256 10d3880b68831059beb1524d5c7fe4798ade5aff8860b3b31096b546fbe685c3
-MISC ChangeLog 14029 RMD160 d43489ff1d584ee12534ad8d05a08eb1c04da95d SHA1 d722b6bf7b19cb807bc77c8cc3d3795f28fb86d4 SHA256 b93593b39ce832197609298ea25d3b5f8e74ec47a8a5e28a41723d3396128cae
+EBUILD libvirt-0.8.2-r1.ebuild 6895 RMD160 25f311f8152192ec9a421da0ada49c06bd77dded SHA1 9b16f9219b03d65e325dff0791215bc3df16e17a SHA256 26a86ecb98c2f18e095588ff3c7c4a3e09c26f1a5a245ab6bab8a0f31e5720d4
+MISC ChangeLog 14229 RMD160 a27a870c3b397621a84e6d1d4cfe1ce543086e6d SHA1 aceb41265a8690489808a58abc5771d632490d04 SHA256 a2b68cc0ef76a30998d050c393e68a2911ac2bd4f36dd3e3797325f4a8e7139b
 MISC metadata.xml 1983 RMD160 c6b39d8d0adfd2a7acd32fecc80ffbdaf667d690 SHA1 1a5a6b78fd2b9e536742301441aebfc4e65bb8ad SHA256 1a781681093c05d500a676f4c72146a87f61144b1b5eabbeb987f1dbb885102d

diff --git a/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild
index f30c527a7750ff4563c838ed4908e1015d15f7dc..0918643b6eb8a1824a70e8957be83a6a64eb66a9 100644 (file)
--- a/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild,v 1.1 2010/07/07 18:17:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.2-r1.ebuild,v 1.2 2010/07/13 02:52:58 cardoe Exp $
 
 #BACKPORTS=1
 
@@ -84,7 +84,11 @@ src_configure() {
        fi
        myconf="${myconf} $(use_with openvz)"
        myconf="${myconf} $(use_with lxc)"
-       myconf="${myconf} $(use_with virtualbox vbox)"
+       if use virtualbox && has_version app-emulation/virtualbox-ose; then
+               myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
+       else
+               myconf="${myconf} $(use_with virtualbox vbox)"
+       fi
        myconf="${myconf} $(use_with uml)"
        myconf="${myconf} $(use_with qemu)"
        # doesn't belong with hypervisors but links to libvirtd for some reason