gentoo resync : 20.06.2021

3 files changed, 15 insertions, 9 deletions

diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index f777785ca02e..6435edffa532 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -3,6 +3,6 @@ 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 4500 BLAKE2B fd0a456bee5c143ff2e05208f5cfa4e9816bdc06ca93527c3ddfa43140c532067056c5800f1a1db397f9c29b16aaac07a3e16fe04c647fe6e7066aac52aae148 SHA512 3c4fa805e1e55dda3e53db238c08e8bb509b655d7542be7617258bb3ad5f8214659317860454925da1a2b8d2db3682a29fb8efe46c455881c55e1611d957257b
-EBUILD libguestfs-1.44.1.ebuild 4844 BLAKE2B c233d88dba9e9a3f9ecaf373125130e3e053b7132afbe72b8d3a393b4ac79a44a1036f03530af857335f90e0221f524b0eb7fd8f8cf16a35f25f5535faa12981 SHA512 eb2a47655a9b91a69f667f7e7d4cdb352f17589a520501841daa8ebaf855fc465cc512272dbf007ee9e13e1721edc0be71393812b724a55fcdf4396dba4850f4
+EBUILD libguestfs-1.38.6-r103.ebuild 4669 BLAKE2B cd7f749698ce04bec407f7da051d82a7a724b5d6278867cdf2cea079ce221aa5b08b62307afe3f0ed2e0feac3859a5c65d13d3131ab7a873d53b8ecf07fa99fb SHA512 ce6ab577f099a6db077d2c361fe3b542e06e35bbeeef2de9894e3752cd1cda8d6296f192cdee49bc5ce6c9f598ac497fc1b60ab4fd19306f1bf4f9541d71ba20
+EBUILD libguestfs-1.44.1.ebuild 5000 BLAKE2B ff08f89a0d825e1d80e355fc7fd6bce3da902e0b3a94d075757d26b9fce411a17e731e82daedbd9545bed05b6f6067241a958fbaf078dd2f5e3f7d434641170d SHA512 6619471eae5e040e778bb3ae61414f97cf35bcfd2d5c6f03c298bd7c8794bf8b834624c417a825c4e70a528a90f0c7abd323fb0daa927d255744729157a85ead
 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
index 718edf8e60d5..13ce7ab088ae 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
@@ -20,7 +20,7 @@ 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"
+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} )
@@ -138,8 +138,10 @@ src_configure() {
 	# configured kernel.
 	export vmchannel_test=no
 
-	# bug #703118
-	append-ldflags "-L/usr/$(get_libdir)/xcrypt"
+	# 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)" \
@@ -178,9 +180,11 @@ 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"
+		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.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
index d9e4983c5f5a..a82e43a0ab06 100644
--- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.44.1.ebuild
@@ -20,7 +20,7 @@ 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"
+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} )
@@ -152,8 +152,10 @@ src_configure() {
 	# configured kernel.
 	export vmchannel_test=no
 
-	# bug #703118
+	# 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 \
 		$(use_with libvirt) \
@@ -202,7 +204,7 @@ pkg_postinst() {
 	fi
 
 	if ! use ocaml ; then
-		einfo "OCaml based tools and bindings (sysprep, ...) NOT installed"
+		einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed"
 	fi
 
 	if ! use perl ; then