gentoo resync : 14.12.2020

5 files changed, 188 insertions, 6 deletions

diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 03afa63a8078..8a827f323225 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,7 +13,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13.ebuild 4168 BLAKE2B 4d34e2fb52fbdde82cc940ff8d87338ac0cf396b85eeff56779d9d4b12936401ec58b0c3ad37db5401656b8bb2b3cbe12d0dff6ad08683ab5d593e3f02dda1e6 SHA512 0fcb20ebd3d01b75596e52030e4446fe20802fb531f9f92c1d31b006dec8472c469f2341629adcb783213e45b4a119e128c675931efa78f6a6415bbdd61e47b8
-EBUILD libguestfs-1.36.15.ebuild 4372 BLAKE2B 85b8c472797be8c59dfed1d05e5f426b3fd653ddb4f7fdc96793680e7f43bcc090f673b678d28267ed46029600d08ae5aafb1f0f595f6d995d03661ed8f2e9e7 SHA512 70ee6b3ec17a9b18c30d2f33ce69ba704d42e271efdd1499a4b1705538ae470e0976618560ddbd0830cabd8c530983dc5b60a9d4ef135eb62c56bc9b0456e3ff
-EBUILD libguestfs-1.38.6.ebuild 4107 BLAKE2B 610925898f712f1eb42cdfdea89f7fbe39fc1945daadf524074d6099942358ddee5069728ef92f154c52903a0d3adbaa9d1bd71a936c0f64ed698768d56e92e2 SHA512 bf98c75ccf61b03a1acc1388a6542d58f2d9ed989419c106201e5e1bae1882fb67e94ae655f5b19bcec42020f6ef7ccc3baf6e6d241fa27223cbf755c41319c0
+EBUILD libguestfs-1.36.13.ebuild 4169 BLAKE2B 653bd435a28ae1fb1d31d5b41441f1b397795392a7e5ffc9bd3f6dc7c2b1092913a9d87e8eeb9d9aaed14c0790c336b3706c265b78c653c7acfebb69040d71df SHA512 eabf43897b781557e3dd9cacd95f6e1d219ff9c2c5190aa43b7744fb802c8f09e354c3c3e88d9753747996b31706df11cfcadcd73f17eb24b50795690d1642d0
+EBUILD libguestfs-1.36.15.ebuild 4373 BLAKE2B 568051405020f0e4f14364c13ad7d02c82f7b904652f5c85ed25fb285cffa03ee6a608cbfd4d2249c8b26639fdb6205e78e362c10fe6fd32ff27af5da3a1164a SHA512 5cc73e4bc948fccf00b19c3fc874aad22ca4e128dfb6d705bb0593d99de11f5060d34a194f1611ca029906d9c0034da60b8e3035faafb9c85e4c86bc4daa43b7
+EBUILD libguestfs-1.38.6-r100.ebuild 4346 BLAKE2B a55350a00df69723758b5e597ac5d5451d61bf07ce285c61464626dba64f7e7df82d617ed5c89e618a4c2d7d00ada45bdf7936032dda59b9be0ac5ace8a6c17a SHA512 fc61ec2a70964510ceb4b8f42750dc6ba8a10d5ae4ee6abb2537a18848d95855b1dcf30e114bb1723252abc091f094671d84ac4cd921f5cab46c9a641e79484c
+EBUILD libguestfs-1.38.6.ebuild 4108 BLAKE2B 3a771d3ad03b10698b9bec292aa90f079e046abd66555f35e59cce3cbb8619a3bca15d6250fb8d3782a171347fa6844f30001e2d474641993abbb0cf7948d9b4 SHA512 ce75e3702715d6a3deaa0cc561b9d5a65de5f77fb22c23ef43ab135d20007a0112681071b4de061423ba5098aa6c98479bbc8aefc0bd3a721ac90971dcce0fd1
 MISC metadata.xml 845 BLAKE2B 002345b189789a28d74b674c9f32cd5b6793cd84e50fa3f54212c0d05ba6463ffcf75629f2459979dd20a85312018054325660b16d4df04e87222b5ce9ac95c9 SHA512 c32515f853783a1935a2285305e1b54e7309be52b6ac3cd4084a26b28f2b53c4378faa95ae3e24e6b0349ed1e84c46df0a5337c258e3726870aa7d45e3ed5366
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index 21857f1bb62d..7d1a1bbe48bb 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -85,7 +85,7 @@ COMMON_DEPEND="
 	)
 	virtual/acl
 	sys-libs/libcap
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	>=app-shells/bash-completion-2.0
 	>=dev-libs/yajl-2.0.4
 	gtk? (
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index e2ae26f43a8f..8ec3e24990bf 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -83,7 +83,7 @@ COMMON_DEPEND="
 	)
 	virtual/acl
 	sys-libs/libcap
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	>=dev-libs/yajl-2.0.4
 	gtk? (
 		sys-apps/dbus
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
new file mode 100644
index 000000000000..833f7102526c
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils
+
+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="
+	sys-libs/ncurses:0=
+	sys-devel/gettext
+	>=app-misc/hivex-1.3.1
+	dev-libs/libpcre:3
+	app-arch/cpio
+	dev-lang/perl:=
+	virtual/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
+	>=dev-ml/ounit-2
+	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
+
+	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 (sysprep, ...) NOT installed"
+	fi
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 13777175b45e..15cebc77a632 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -78,7 +78,7 @@ COMMON_DEPEND="
 	)
 	virtual/acl
 	sys-libs/libcap
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	>=dev-libs/yajl-2.0.4
 	gtk? (
 		sys-apps/dbus