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

3 files changed, 13 insertions, 159 deletions

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)