gentoo resync : 16.04.2022

4 files changed, 76 insertions, 265 deletions

diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 02036956eb29..0eac8da5aa3c 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,10 +1,8 @@
 AUX 1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1149 BLAKE2B 7b9f870370a3ff32cb9ae7ca75cad885c442d322b695349efa238dd27709e890d98bc1c4a093446a4ad3eacf6e1ac55057a4a4b757a5e5520d2df315bbac3a8d SHA512 83cee02636508ce674688584095954d90e1830d85d869a9c9bea73bbf5193da980116313ebc8726dce7708d464bca0f647c3738b36197d5e78adf398b2608d57
 AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1697 BLAKE2B 1bad83944c4c0a320814e76279dadc36a441ab379ff89e1fe2b2cfb403663668f5f507e5053be8f791f3e81b33255e4c1970c60894700722d8920a8eb7846a80 SHA512 821e7344efefd3dcc0bb57f8c6f2a3e751e85963a4aa5f29635b9d6437acc4e4478d6e7534d656c6ccb6e44cbadce655776222ede261755b2552bf997558562e
 AUX 1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch 991 BLAKE2B 213bea03f22a03f6cd7a82d310fcd106c1b06493e744a7bfb95b7820fe7813208e343170cf9d4322180528ea9e05ab94d54b1ba601bd0550388a33b1bf222211 SHA512 344729229c35e66d21911ae040b4a15ce9a5b37de0f1965272de1c85f21d3293182bbb7953cdd99bb8fe7909754ae462c5d7e973d369ff6d0b64c590fc1d2ee8
-DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33
 DIST libguestfs-1.46.0.tar.gz 18500858 BLAKE2B 1d69d79fa33b5a6bdde00cdb3acdad51a6042d0307117ab6c230259dbc9646fe694df0d7e8f2cf2ae63f146ea756269ea7bf139e61786c46d42c33bb176937e1 SHA512 9b1670dff924e046ab82ff1ce6e25428d95b88700b507d4f1dd68a309641e376d14520c7b5aa5bbb81a6ba5c708ebcc46b6fe0970d903a3ed79e76d4ccdca614
-EBUILD libguestfs-1.38.6-r104.ebuild 4708 BLAKE2B 1a55c043dfacd8975e1e401425292e5e13c35d7ac117bfece2b5b1b8dd745d0b16bf41090922cda2eab3ccd507032e2c986381e381837de0ef25411b07674612 SHA512 f20bcceea53ac79ed720a0dcedba0c936f46cf6236b1464493aa0403418fdb1906c1a81a645a9bb98ebd25b4f6a46895976fbe22d4e2be3cd144a1385ab22afc
-EBUILD libguestfs-1.44.1-r1.ebuild 5020 BLAKE2B ffc8eb503c07b171a6caf8531c1d2f0b940368bc5aa3c8f59340535ea4837fccdf6532e4f6d11c323471e846d4a06b092ca65743833abb5d9b621ae5bbeecab3 SHA512 d2134eb6e9855f5d65377b43aadffc6fceeddc5d14777654aafa24a1aa4c366d090c18b1bd0ec3ba94a719a3bf0e1fbd246a39239f5cda568d1c047866570324
-EBUILD libguestfs-1.46.0-r3.ebuild 5112 BLAKE2B 68db4300c6ee226d5e1965f5a39153e2d7e1bed2887e116fd28981fa7ad08e56327d6bc16f2819a6f59bfa9f3a35bbfb1b30f48eaaa6cbd864d872debd9eb629 SHA512 ec6dbae46dd68f2506a2a2751aa3bbc3031d0308123be58e9a0f74cccb2388f5915d8d7857a3a35dbe5cab0f74e32f97b317b94000160469f56457f9f202dbc8
+DIST libguestfs-1.48.0.tar.gz 18426132 BLAKE2B a0ace19998e6eb368fa8ad73242b7c35c72244e9b9881f3adb76dcc8ed6e9a77691012e5786a26680a944d0876091bbb1d0f9ac63c0f5046538acf4402f840ac SHA512 b2486f32a3958c2b3e68d3f547dcd192dc7f8c59e0efd8660cd27cae9c218ce4fc2a60480dcb6bb0d10d8abbc2d2f4796075aea1cfab5e3c7cd12c38d4352fe2
+EBUILD libguestfs-1.46.0-r4.ebuild 5212 BLAKE2B a04c93c7c227776c2b03ea286aae766d50499f30e0282993f9a891d649c8b0860d6246fc47300bc936caeef9812732bbaf33fb837a6de9fad9bb8f4eda6c64b2 SHA512 75472d70607a85c9514afb7e063a1c332a9e6f13b7f264285534e4f1c0185c35091b722d1e89d36a3ed8d79b5f30be33d8b87756ab980b18316460424f4f6e04
+EBUILD libguestfs-1.48.0.ebuild 5283 BLAKE2B 6ee79999c8f08b9049465794eba05b8032b3882e824ab62233bb02d4392c5afcbc8de44f6064ec08ec350022b1663c558d78d30743868472149ca22ad832b844 SHA512 1b87f8e4842279feb6a01255fab33273138a4f9355cae0aa22ce9b601dc8854995b4eae6134a7a0d64d2d7b1ada02cc513da8d8d4f0adbb98c0633d0c3481c59
 MISC metadata.xml 612 BLAKE2B 434f61bf6376288a782f4d2781938b6d647b7c1fab5d598a8fdd96c380ecef5947bd326a2c4f0d09fa40b6d00b1d59b86b27bea92cef311d9eae411d31465c3c SHA512 3dc1ae8480b6d1c1e2a800d8f8bb0f4171f645c69a47c9319b6d7ccefc2434c2d57fbcd0b47d48008196d1d1835693ccef984219bf7a2b10c444ffd04ef55672
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild
deleted file mode 100644
index 7556d8a8b6d4..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas xdg-utils flag-o-matic
-
-MY_PV_1="$(ver_cut 1-2)"
-MY_PV_2="$(ver_cut 2)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	!app-emulation/guestfs-tools
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	python? ( ${PYTHON_DEPS} )
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( ${LUA_DEPS} )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-lang/ocaml-4.03:=[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	|| (
-		<dev-ml/ocaml-gettext-0.4.2
-		dev-ml/ocaml-gettext-stub[ocamlopt]
-	)
-	dev-ml/ounit2[ocamlopt]
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-# Upstream build scripts compile and install Lua bindings for the ABI version
-# obtained by running 'lua' on the build host
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use lua && lua-single_pkg_setup
-		use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	# Give a nudge to help find libxcrypt[-system]
-	# bug #703118, bug #789354
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-	append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		$(use_enable python) \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-
-	if ! use ocaml ; then
-		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
-	fi
-
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.46.0-r3.ebuild b/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild
index 3a181e38f453..6142ac3f5146 100644
--- a/app-emulation/libguestfs/libguestfs-1.46.0-r3.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.46.0-r4.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
+
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{8,9,10} )
 
@@ -30,6 +32,7 @@ COMMON_DEPEND="
 	>=app-admin/augeas-1.8.0
 	app-arch/cpio
 	app-arch/lzma
+	app-arch/rpm
 	app-arch/unzip[natspec]
 	app-arch/xz-utils
 	app-cdr/cdrtools
@@ -49,7 +52,6 @@ COMMON_DEPEND="
 	sys-apps/file
 	sys-devel/gettext
 	sys-fs/squashfs-tools:*
-	>=sys-libs/db-4.6:*
 	sys-libs/libcap
 	sys-libs/readline:=
 	virtual/acl
diff --git a/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.48.0.ebuild
index 845470ae27d0..d1121225a090 100644
--- a/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.48.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
+
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic
+inherit autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
 [[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
 
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images"
 HOMEPAGE="https://libguestfs.org/"
 SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
-
 KEYWORDS="~amd64"
 IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
@@ -27,33 +28,36 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Failures - doc
-
-# FIXME: selinux support is automagic
 COMMON_DEPEND="
-	!app-emulation/guestfs-tools
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
+	>=app-admin/augeas-1.8.0
 	app-arch/cpio
-	dev-lang/perl:=
+	app-arch/lzma
+	app-arch/rpm
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-forensics/yara
 	app-cdr/cdrtools
+	app-crypt/gnupg
 	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
+	>=app-misc/hivex-1.3.1
+	dev-lang/perl:=
+	dev-libs/libconfig:=
+	dev-libs/libpcre2
 	dev-libs/libxml2:2=
+	dev-libs/jansson:=
+	>=dev-libs/yajl-2.0.4
+	net-libs/libtirpc:=
+	sys-libs/ncurses:0=
 	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
+	sys-apps/fakeroot
+	sys-apps/file
+	sys-devel/gettext
 	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	dev-libs/jansson:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
+	sys-libs/libcap
+	sys-libs/readline:=
+	virtual/acl
+	virtual/libcrypt:=
+	erlang? ( dev-lang/erlang )
 	perl? (
 		virtual/perl-ExtUtils-MakeMaker
 		>=dev-perl/Sys-Virt-0.2.4
@@ -65,38 +69,34 @@ COMMON_DEPEND="
 	)
 	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
 	introspection? (
 		>=dev-libs/glib-2.26:2
 		>=dev-libs/gobject-introspection-1.30.0:=
 	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
 	inspect-icons? (
 		media-libs/netpbm
 		media-gfx/icoutils
 	)
-	virtual/acl
-	sys-libs/libcap
+	libvirt? ( app-emulation/libvirt )
 	lua? ( ${LUA_DEPS} )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	selinux? (
+		sys-libs/libselinux:=
+		sys-libs/libsemanage
 	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
+	systemtap? ( dev-util/systemtap )
 "
 # Some OCaml is always required
 # bug #729674
 DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-util/gperf
 	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
 	ocaml? (
 		dev-ml/ounit2[ocamlopt]
 		|| (
@@ -104,13 +104,13 @@ DEPEND="${COMMON_DEPEND}
 			dev-ml/ocaml-gettext-stub[ocamlopt]
 		)
 	)
-	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
 "
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
+	acct-group/kvm
 "
 # Upstream build scripts compile and install Lua bindings for the ABI version
 # obtained by running 'lua' on the build host
@@ -119,7 +119,8 @@ BDEPEND="lua? ( ${LUA_DEPS} )"
 DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 
 PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
+	#"${FILESDIR}"/${MY_PV_1}/
+	"${FILESDIR}"/1.44/
 )
 
 pkg_setup() {
@@ -132,7 +133,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	xdg_environment_reset
+
 	eautoreconf
 }
 
@@ -154,33 +155,39 @@ src_configure() {
 	export vmchannel_test=no
 
 	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this doesn't become stale.
 	# bug #703118, bug #789354
-	append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
-	append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	# Avoid automagic SELinux dependency
+	export ac_cv_header_selinux_selinux_h=$(usex selinux)
 
 	econf \
-		$(use_with libvirt) \
 		--disable-appliance \
 		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		$(use_enable python) \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
 		--disable-haskell \
 		--disable-golang \
 		--disable-rust \
+		--disable-php \
+		--without-java \
+		--with-extra="-gentoo" \
+		--with-readline \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable erlang) \
+		$(use_enable fuse) \
 		$(use_enable introspection gobject) \
 		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
+		$(use_with libvirt) \
 		$(use_enable lua) \
-		$(usex doc '' PO4A=no)
+		$(use_enable python) \
+		$(use_enable perl) \
+		$(use_enable ruby) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap probes)
 }
 
 src_install() {
@@ -200,15 +207,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	einfo "Please ensure you are in the 'kvm' group for decent performance!"
+
 	if ! use gtk ; then
 		einfo "virt-p2v NOT installed"
 	fi
 
-	if ! use ocaml ; then
-		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
-	fi
-
-	if ! use perl ; then
-		einfo "Perl based tools NOT built"
-	fi
+	einfo "Note that common tools like virt-resize are now part of app-emulation/guestfs-tools"
 }