gentoo resync : 15.06.2021

3 files changed, 53 insertions, 10 deletions

diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index 76c98a96e10e..46ec1ff947e5 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,4 +1,6 @@
 AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
 DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082
-EBUILD libguestfs-appliance-1.38.0.ebuild 1059 BLAKE2B f1d9fc8b2aa64d04fb9d16533dbee9cd157b41cb514c8ffbae7e50b3b035c7ef91b2bcb4f55b95ba225e56b20e14f6f17adeaa620c168f80b24e911d7ec0b1bf SHA512 840969c47f6b36051a41d850a294ccee2c9c322a3907f911dd1d2b0dc8a0c481878ae9f3ce08db879c1f1a5399f0657200aa4209a82a96c568db770fc1bdf7f1
+DIST appliance-1.40.1.tar.xz 111566640 BLAKE2B b6ddd3b120a466ce343d67d9e058c201a78f5e605b8bbc2d47fc30c5eaaa874cc032b879a67c5f134b8fa65c58fc27893b062de0c3a21705b64766dd86df648f SHA512 2d63b2ce8850929b42ddc91518b0e2b37d13e358be94bb54899da6c310afa308d708a3443b9f3b3aa3c46f4f2079036a6a4b34027788f183c17a20b68fcf4e6e
+EBUILD libguestfs-appliance-1.38.0.ebuild 1060 BLAKE2B 410ffc74f5ca09546e6bb299915a36696a7f813a8b7e28236c074e04ed411359407d1822568fc8e69fdc5c62127c57736a715525ca0f745e801ec2f58dbb2083 SHA512 069e996f0e69e4dbcea8b7811cee8a53c087ada0bb2ca73f4a5feeb8ded3acd84aa719d0c48754a1491cfbbef8413dcde5a749da0a3cb22c061a0cfe2dd97a57
+EBUILD libguestfs-appliance-1.40.1.ebuild 1059 BLAKE2B 82f336d9ccbb6033a6d5b2335e409218c1ea8f5697d31e7bef2b7af60d3e2cce7ac3855edba758a5d7b656c344cba73fd59edaa370ade88de605d9ec7db19305 SHA512 c7e21c1dd6951c3566cefb5405779ea7d61095136db000772fac9361fadeb0dc938e99ee17bc567cae1d6315a22b34af0e37c859d4058990aa13cdf89df580d0
 MISC metadata.xml 357 BLAKE2B e7fb922cfe9b003b882889ca5d5eebb6a8040dc44ff1bb37920e7da9afd646ed82f9bb5d7c7b5e98b9bf35d2aa9f54e1e733bee7710acb7fb569d8c602fb8b14 SHA512 b02a037e3d73a13ac37529441a352dbab28ce0aa95a8209f701661400d0988b52a362ee4bf79355d0fdcbb042f5fc43976c51f4c3bdbad020d63e5ac8036bf02
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
index 31e8b16bfd51..91cac60c818c 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 CHECKREQS_DISK_USR=500M
 CHECKREQS_DISK_BUILD=500M
@@ -9,20 +9,18 @@ CHECKREQS_DISK_BUILD=500M
 inherit check-reqs
 
 DESCRIPTION="VM appliance disk image used in libguestfs package"
-HOMEPAGE="http://libguestfs.org/"
-SRC_URI="http://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 # Mixing libguestfs versions causes weird problems. #501588
 RDEPEND="!<app-emulation/libguestfs-${PV}"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	# We'll unpack the tarball directly into ${D} to speed up install.
 	# Otherwise we need to duplicate hundreds of data.
@@ -31,7 +29,7 @@ src_unpack() {
 
 src_install() {
 	dodir /usr/share/guestfs
-	cd "${ED}"/usr/share/guestfs
+	cd "${ED}"/usr/share/guestfs || die
 	unpack ${A}
 	cd appliance || die
 	dodoc README*
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild
new file mode 100644
index 000000000000..2e8d1b9eed95
--- /dev/null
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_USR=500M
+CHECKREQS_DISK_BUILD=500M
+
+inherit check-reqs
+
+DESCRIPTION="VM appliance disk image used in libguestfs package"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/xz-utils"
+# Mixing libguestfs versions causes weird problems. #501588
+RDEPEND="!<app-emulation/libguestfs-${PV}"
+
+src_unpack() {
+	# We'll unpack the tarball directly into ${D} to speed up install.
+	# Otherwise we need to duplicate hundreds of data.
+	:
+}
+
+src_install() {
+	dodir /usr/share/guestfs
+	cd "${ED}"/usr/share/guestfs || Die
+	unpack ${A}
+
+	cd appliance || die
+	dodoc README*
+	# Don't rm README.* here, at least README.fixed is needed for libguestfs, see
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1183780
+	chmod 755 . || die
+	chmod 644 * || die
+
+	newenvd "${FILESDIR}"/env.file 99${PN}
+}