gentoo auto-resync : 08:10:2023 - 06:02:21

7 files changed, 28 insertions, 412 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5eee89571a04..31dd12f693dd 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/guestfs-tools/Manifest b/app-emulation/guestfs-tools/Manifest
index 150369f9205d..cba9f7903084 100644
--- a/app-emulation/guestfs-tools/Manifest
+++ b/app-emulation/guestfs-tools/Manifest
@@ -1,5 +1,3 @@
-DIST guestfs-tools-1.48.0.tar.gz 12682919 BLAKE2B 27b4e5c47af222691b067c19e997112acaf0360cc9c089dedb0327959ff8d80ff929e2fea369f9895ed6e1fc80a339ca89db3b9eb32cf23328fc71972447a13e SHA512 8576ef0e283a02a112f785e8f1656b41c93be29e12617ee8c83033b90758736ea3c2d4ecfb446a86c7913e2c0b39a7c5666e8ad22682419cc877543a3825c489
 DIST guestfs-tools-1.48.2.tar.gz 12691067 BLAKE2B 305f281c19975f160c435b995d71ef2e18d09fc95f31e92efe8f79d811fc0a7efab27d14f766d5f6ee477fd43977167a3aabe5cc40498f125f925507fd2574d5 SHA512 e11cd5a38a1681e8b2fd56419d38ca0aaab659cb59d409b3572cadcd04fd4da3078fa33e7f21c99d11854ad08797ae24a8d71c041b1b7769fc36c1391b6eb162
-EBUILD guestfs-tools-1.48.0.ebuild 3904 BLAKE2B 4c40de32317f87d785b6872bc816e0dd72e1c4b232f51ff3bae6dfff9663e57be4e671d608a655b5753bd5eb5949adba02a303540adb15d96295d20bc5b5af11 SHA512 b578669bf72f27f069003ceff52334794216e143f1567ea327ff46f20022967442ac29ae709040cddb890fed6bc93c5334090efb3111f27255b7f7c88fcf41ee
-EBUILD guestfs-tools-1.48.2.ebuild 4009 BLAKE2B 970208dd5022a361b55ba8b69968e23a068ac081522d2db034257a95ce56423a90c3436cb30dfa87d5504f5d9b0e508a7f0bb3b81a91f855f6573b465388933e SHA512 022628b87da7898758fb631f0e129c52a6ae4613045b6d96f9152c689de051c33bd3f33406747f412455aedf9ff26e8a514815d7a7c7dd61bf2431b02ea3385f
+EBUILD guestfs-tools-1.48.2.ebuild 4124 BLAKE2B 5028332e1dce7aea575b8a23ceab35078eb414dfb9836b74ecf63e4d79603ccc8bef176697227cfc0c244cfe45af1f10a44df22256d8cd84a641b09db23a753c SHA512 35fd8bb591cd341f3ee97a85bb51e31f65af557a46aefaf335e7ce65b94ed78bd2c113347c7d824451cf33a840d0390f1abc5ca4ad37e9fc0ad29792ec5e6a8d
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
deleted file mode 100644
index 84ae94b176aa..000000000000
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Bump with app-emulation/libguestfs and app-emulation/libguestfs-appliance (if any new release there)
-
-inherit flag-o-matic linux-info perl-functions 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, inspecting, and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://download.libguestfs.org/${PN}/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/${MY_PV_1}"
-KEYWORDS="~amd64"
-IUSE="doc +ocaml +perl test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-COMMON_DEPEND="
-	!<app-emulation/libguestfs-1.46.0-r1
-	app-arch/cpio
-	app-arch/lzma
-	app-arch/unzip[natspec]
-	app-arch/xz-utils
-	app-crypt/gnupg
-	>=app-emulation/libguestfs-${MY_PV_1}:=[ocaml?,perl?]
-	app-emulation/libvirt:=
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,filecaps]
-	dev-lang/perl:=
-	dev-libs/libpcre2:=
-	dev-libs/libxml2:2
-	dev-libs/jansson:=
-	>=sys-apps/fakechroot-2.8
-	sys-fs/squashfs-tools:*
-	sys-libs/ncurses:=
-	sys-libs/libxcrypt:=
-	virtual/libcrypt:=
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	perl? (
-		virtual/perl-Data-Dumper
-		virtual/perl-Getopt-Long
-		dev-perl/Module-Build
-		dev-perl/libintl-perl
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		dev-perl/String-ShellQuote
-		test? ( virtual/perl-Test-Simple )
-	)
-"
-# Some OCaml is always required
-# bug #729674
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/ocaml-4.03:=[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	doc? ( app-text/po4a )
-	ocaml? (
-		dev-ml/ounit2[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-	)
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-#PATCHES=(
-#	"${FILESDIR}"/${MY_PV_1}/
-#)
-
-pkg_setup() {
-	CONFIG_CHECK="~KVM ~VIRTIO"
-	[[ -n "${CONFIG_CHECK}" ]] && check_extra_config
-}
-
-src_configure() {
-	# bug #794877
-	tc-export AR
-
-	if use test ; then
-		# Skip Bash test
-		# (See 13-test-suite.log in linked bug)
-		# bug #794874
-		export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
-
-		# This test requires libvirt support in libguestfs and it makes
-		# no difference at runtime. Just gracefully skip it to make life
-		# easier for e.g. arch testing.
-		if ! has_version 'app-emulation/libguestfs[libvirt]' ; then
-			export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
-		fi
-
-		# Needed for the inspector tests. Provided by libguestfs-appliance.
-		#export LIBGUESTFS_PATH="${BROOT}"/usr/share/guestfs/appliance/
-		# But the inspector tests seem fragile anyway...
-		export SKIP_TEST_VIRT_INSPECTOR_LUKS_SH=1
-		export SKIP_TEST_VIRT_INSPECTOR_SH=1
-	fi
-
-	# 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]
-	# We have a := dep on virtual/libcrypt to ensure this
-	# doesn't become stale.
-	# bug #703118, bug #789354
-	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
-
-	econf \
-		$(usex doc '' PO4A=no) \
-		$(use_enable ocaml) \
-		$(use_enable perl)
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use perl ; then
-		perl_delete_localpod
-	fi
-}
-
-pkg_postinst() {
-	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
-}
diff --git a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
index 6fe7b676fdfc..8521e3d06afd 100644
--- a/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
+++ b/app-emulation/guestfs-tools/guestfs-tools-1.48.2.ebuild
@@ -55,7 +55,8 @@ COMMON_DEPEND="
 "
 # Some OCaml is always required
 # bug #729674
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
 	dev-ml/findlib[ocamlopt]
 	doc? ( app-text/po4a )
@@ -67,8 +68,13 @@ DEPEND="${COMMON_DEPEND}
 		)
 	)
 "
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 "
 
@@ -87,6 +93,9 @@ src_configure() {
 	# bug #794877
 	tc-export AR
 
+	# Needs both bison+flex (bug #915339, see configure too)
+	unset YACC LEX
+
 	if use test ; then
 		# Skip Bash test
 		# (See 13-test-suite.log in linked bug)
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index b9b89ecf3c0f..22b79f028e62 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,5 +1,3 @@
-DIST libguestfs-1.48.4.tar.gz 19189712 BLAKE2B 50a11254c21903caa62b40b43e3ab3cc9e740dd0c690055c245391d0a980279a897e727f0ff5b063b197b91a1e6fdadc08e257d5cd4ce3df254e5c42abc32ee3 SHA512 76b942de88fa6fb48db667054a2c4fc23dd17b0a6083cddd51f1a77fdac24c0c7acd6be5234ada955b4afa94b0d8023aab50aa152465a6bc65f0e21d4195d50c
 DIST libguestfs-1.48.6.tar.gz 19179600 BLAKE2B 22359ed4b55e29f985dbbbc4f0337eaec32f21a1413bd778656c3f0270891bec520a0b9590e104836eaf9367aeb9ac681b0bf85852fb7a2059da3f7062bc5111 SHA512 7d929db183fbb1d4d1c9159f28871ab4f1bd0be5b3d9fbc5137271666f50c067fd0906674cb1a52c1e070c11a18da4d2aa11bc64ddabda5cac54e72252c6abf2
-EBUILD libguestfs-1.48.4.ebuild 5841 BLAKE2B 6ee1cf5dabe962c710fad5ea3ca4faccbf70510cc74e1b60a6cc8ed13954948da2d1725fbe41342a9708b3c87f31f0ec53a0f277a3c2a75ab145ffeb77f5ad10 SHA512 9d6a85b6c695d5686bb7512fe333cf3c16533d88ccf735f0a5cd622f1b97337294cea92d3d3d9977c23a8254fe59bc0ebe6bc1e99c5f6621eae52a3ff314a3b9
-EBUILD libguestfs-1.48.6.ebuild 5863 BLAKE2B b5a34e457c919f9bfe46f9e21683e4a3e0987d581c8feca17e40d9a82ed1df3a78dcd6f2461bfb97bc60c827f9956359036ac611a288b2dd2eac9092eb33ba65 SHA512 e4ce9975e38ba4083f45cd846f2d63db1fcecd3f24a9d0747b80b62d20df17e31ddc964d53023bcce9911e1c617d59235e7d400c85ee6e7c736d2a896c279ba7
+EBUILD libguestfs-1.48.6.ebuild 5956 BLAKE2B 48d966959e82f08baa819a7cf91ba833c468cdc94f8ea9d5f787505d947494c63324d4d55fd9b5668b4f609453265cd5bd76717bb8a234c84019f5cfd6173799 SHA512 2a4bccea6f5b3b5f97c5973f529df62a3e12fbcff789cfac0e59050a48eaa8939ef52d5997f3191544b3115695a32b7295e147b76f75333644ac740d6f5dd27a
 MISC metadata.xml 698 BLAKE2B 2a0e16a1041be0a08e428e2fe3398d08623bfe1b16522b9f7e0e7e35a8b5a9c7c4c622d480c6d3c23a9c479c54cce41892b0af8dfa5c28c29fcc394950d73888 SHA512 8aed858a396c37c434fb21a0c3f1028a6bda8021c0ef3581a2c68d8fc8c3832ff2c9a44d14f80696cff4a783e787a647bee01e3770018090e67866f670fc9be7
diff --git a/app-emulation/libguestfs/libguestfs-1.48.4.ebuild b/app-emulation/libguestfs/libguestfs-1.48.4.ebuild
deleted file mode 100644
index 6f8436405aff..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.48.4.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-
-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, inspecting, and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://download.libguestfs.org/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/${MY_PV_1}"
-KEYWORDS="~amd64 ~x86"
-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
-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-forensics/yara
-	app-cdr/cdrtools
-	app-crypt/gnupg
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	>=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
-	sys-apps/fakeroot
-	sys-apps/file
-	sys-devel/gettext
-	sys-fs/squashfs-tools:*
-	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
-		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:= )
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	libvirt? ( app-emulation/libvirt )
-	lua? ( ${LUA_DEPS} )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	selinux? (
-		sys-libs/libselinux:=
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-"
-# Some OCaml is always required
-# bug #729674
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/ocaml-4.03:=[ocamlopt]
-	dev-util/gperf
-	dev-ml/findlib[ocamlopt]
-	doc? ( app-text/po4a )
-	ocaml? (
-		dev-ml/ounit2[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-	)
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-"
-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
-BDEPEND="
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	#"${FILESDIR}"/${MY_PV_1}/
-	#"${FILESDIR}"/1.44/
-)
-
-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
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug #794877
-	tc-export AR
-
-	# Skip Bash test
-	# (See 13-test-suite.log in linked bug)
-	# bug #794874
-	export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
-
-	# Need to investigate (fails w/ 1.48.4)
-	export SKIP_TEST_QEMU_DRIVE_SH=1
-	export SKIP_TEST_BIG_HEAP=1
-	export SKIP_TEST_NOEXEC_STACK_PL=1
-
-	# Need to be in KVM group
-	export SKIP_TEST_MOUNTABLE_INSPECT_SH=1
-
-	# Missing test data (Fedora image)
-	export SKIP_TEST_JOURNAL_PL=1
-
-	# 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]
-	# We have a := dep on virtual/libcrypt to ensure this doesn't become stale.
-	# bug #703118, bug #789354
-	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)
-
-	# Test suite at least has a bunch of bashisms
-	SHELL="${BROOT}"/bin/bash CONFIG_SHELL="${BROOT}"/bin/bash econf \
-		--disable-appliance \
-		--disable-daemon \
-		--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_with libvirt) \
-		$(use_enable lua) \
-		$(use_enable python) \
-		$(use_enable perl) \
-		$(use_enable ruby) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes)
-}
-
-src_test() {
-	local -x LIBGUESTFS_DEBUG=1
-	local -x LIBGUESTFS_TRACE=1
-	local -x LIBVIRT_DEBUG=1
-
-	# Try this?
-	#emake quickcheck
-
-	default
-}
-
-src_install() {
-	strip-linguas -i po
-
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-
-	find "${ED}" -name '*.la' -delete || die
-
-	if use perl ; then
-		perl_delete_localpod
-
-		# Workaround Build.PL for now
-		doman "${ED}"/usr/man/man3/Sys::Guestfs.3pm
-		rm -rf "${ED}"/usr/man || die
-	fi
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	einfo "Please ensure you are in the 'kvm' group for decent performance!"
-
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-
-	einfo "Note that common tools like virt-resize are now part of app-emulation/guestfs-tools"
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.48.6.ebuild b/app-emulation/libguestfs/libguestfs-1.48.6.ebuild
index 11b39fa23a18..8ae034c328ef 100644
--- a/app-emulation/libguestfs/libguestfs-1.48.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.48.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
 
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs
 
@@ -24,8 +24,10 @@ KEYWORDS="amd64 ~x86"
 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} )"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 # Failures - doc
 COMMON_DEPEND="
@@ -92,7 +94,8 @@ COMMON_DEPEND="
 "
 # Some OCaml is always required
 # bug #729674
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
 	dev-util/gperf
 	dev-ml/findlib[ocamlopt]
@@ -107,14 +110,16 @@ DEPEND="${COMMON_DEPEND}
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
 "
-RDEPEND="${COMMON_DEPEND}
+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
 BDEPEND="
-	app-alternatives/yacc
+	sys-devel/bison
+	sys-devel/flex
 	virtual/pkgconfig
 	lua? ( ${LUA_DEPS} )
 "
@@ -144,6 +149,9 @@ src_configure() {
 	# bug #794877
 	tc-export AR
 
+	# Needs both bison+flex (bug #915339, see configure too)
+	unset LEX YACC
+
 	# Skip Bash test
 	# (See 13-test-suite.log in linked bug)
 	# bug #794874