gentoo resync : 08.10.2021

5 files changed, 234 insertions, 19 deletions

diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index c993c95a469d..39120ef90464 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -3,6 +3,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1697 BLAKE2
 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
-EBUILD libguestfs-1.38.6-r103.ebuild 4678 BLAKE2B 5814cea0363f5da8073e999453ecaae15d757b2226d7ad649af381dc98a816514ba9b37ad6ab959d317c879dea0ab378285b8af371eb894dd28e522327b5da3b SHA512 f309897cfbaab4ec2e60d75a6c22710601fa49c9ba195ce8a4d3cc365a16a1dcf458d9fb390cbd7373fe8c5c0c8a9bba15154c2341ba05a5c65f394bd83c7408
-EBUILD libguestfs-1.44.1.ebuild 5009 BLAKE2B 18bc69f5f5226e0ff42b40a053ba927773daba0b1a0d706db02046850878f3252367acfbc58d157d5c2eb20f9aeabac701269746883e649cc1d8dadae845e118 SHA512 23ba4651454afe1bdcc2b92937473b5fca78958228b9a06fcd6ab807efa1ec7a22459c25bf8ac0f30ba41ccc48ce4c1fa54d169a5835ae682fb7e28242aeeede
-MISC metadata.xml 776 BLAKE2B 250160aed5c8e8eeae9ab42879e725e7a49bce2ddfb798013807955618cda163160cea671d199a946676b216b48be81093f10fa660922b33c0596ed3fe8666bd SHA512 1a14b857f9ff97d44fa00f708c9021cb1aa6c49ec7de1dd2c61b853709e0e879aeb8e15bf5d612d418d62f1405da625a37c7841122973de709a3e773ca85278f
+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-r1.ebuild 5496 BLAKE2B ea3b297973605ef8d617ce512f2a04e42efe319e3c3bc3c0151cbfed74d8371ab60b9414a2e1103a510e9920fd9dcff2a2c5f28aa28bf28a3c107bcf8332ce5d SHA512 62363a50410c784f3dd380d3af16705fad5a210c0f6e057c535abaf8ec4220143fbb9447d965fc49364b9d8cbd6456a467dca002e674ffceb22bcd5040002076
+MISC metadata.xml 612 BLAKE2B 434f61bf6376288a782f4d2781938b6d647b7c1fab5d598a8fdd96c380ecef5947bd326a2c4f0d09fa40b6d00b1d59b86b27bea92cef311d9eae411d31465c3c SHA512 3dc1ae8480b6d1c1e2a800d8f8bb0f4171f645c69a47c9319b6d7ccefc2434c2d57fbcd0b47d48008196d1d1835693ccef984219bf7a2b10c444ffd04ef55672
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild
index 12a00b8b9477..7556d8a8b6d4 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r104.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 
 # FIXME: selinux support is automagic
 COMMON_DEPEND="
+	!app-emulation/guestfs-tools
 	sys-libs/ncurses:0=
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
diff --git a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild
index a7311dc74bb0..845470ae27d0 100644
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-1 )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic
+inherit autotools linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -30,6 +30,7 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 
 # FIXME: selinux support is automagic
 COMMON_DEPEND="
+	!app-emulation/guestfs-tools
 	sys-libs/ncurses:0=
 	sys-devel/gettext
 	>=app-misc/hivex-1.3.1
diff --git a/app-emulation/libguestfs/libguestfs-1.46.0-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.46.0-r1.ebuild
new file mode 100644
index 000000000000..32fe3a85f203
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.46.0-r1.ebuild
@@ -0,0 +1,218 @@
+# 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_{8,9,10} )
+
+inherit 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://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+# Unkeyworded for testing guestfs-tools split, #816693
+#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-admin/augeas-1.8.0
+	app-arch/cpio
+	app-arch/lzma
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	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/libpcre:3
+	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/db-4.6:*
+	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 ) )
+"
+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
+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_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
+
+	# 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 \
+		--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_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
+}
+
+pkg_preinst() {
+	local libguestfs_depstring="<app-emulation/libguestfs-1.46.0-r1"
+
+	# Did we have a version of libguestfs before the split into guestfs-tools?
+	# (libguestfs used to install the tools too)
+	if has_version "${libguestfs_depstring}[ocaml]" || has_version "${libguestfs_depstring}[perl]" ; then
+		HAD_LIBGUESTFS_WITH_TOOLS=1
+	fi
+}
+
+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 [[ ${HAD_LIBGUESTFS_WITH_TOOLS} -eq 1 ]] ; then
+		ewarn "libguestfs' tools are now packaged as app-emulation/guestfs-tools from 1.46.0 onwards!"
+	fi
+}
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index 4f3be3f3c1c2..ddd4c20532b2 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<!--
-<maintainer type="person">
-	<email>rich@annexia.org</email>
-	<name>Richard Jones</name>
-	<description>Upstream - please CC on bugs that concerns upstream</description>
-</maintainer>
--->
-<use>
-	<flag name="erlang">Build Erlang bindings</flag>
-	<flag name="fuse">Enable image mount support via fuse</flag>
-	<flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for acces icon file in image and inspect it</flag>
-	<flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag>
-	<flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes" way</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="erlang">Build Erlang bindings</flag>
+		<flag name="fuse">Enable image mount support via <pkg>sys-fs/fuse</pkg></flag>
+		<flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for accessing/inspecting icon file within images</flag>
+		<flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag>
+		<flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes"</flag>
+	</use>
 </pkgmetadata>