gentoo resync : 25.04.2020

5 files changed, 20 insertions, 7 deletions

diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 9efceac0a8e6..88769010af55 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -4,11 +4,12 @@ AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a61
 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
+AUX qemu-guest-agent-4.2.0-fix-shutdown.patch 515 BLAKE2B b70f9f67464b91042ced22a2e3e9712c62d51d5f7bb2a6e1579f44efbf877a0e4accf1b6af0e7f87cedc05bc3059ff5318524f9d00e7c513147b4d24348d6724 SHA512 d286c115f7be53f5de35068c6f2925323dde7f034f32c9e993929111591068236e21c9d85b1e9b727077f38a773b978b71a6a851dd1ff8f3b4a9d32b9b9f333a
 AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd37218f8e61d5a2e245ba3908f054891420c7626a8df7ecd0329edf1d11246d38e5591cb4530d63969134a34a5065c5ef041004b4 SHA512 41cb67cb02cf5a8eb5a5b929e2a6adcb6dfe376d6ea512d404edf18d0ca85fbec93140f83ee5d8f4980095fc46040cfd27b22f378cc61dcd6e147badd8b1a045
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
-EBUILD qemu-guest-agent-3.1.0.ebuild 1717 BLAKE2B 873d1d238f306636907e39ebd90e9029ceb74cb2219b8ba7fb844da28abafa72e9d8e2065690c5ac6a1890fdf8414600f354295dadbd37af07b29e3dba048d62 SHA512 bee6c955a0eb63de22cd54fa6c15bbe4002f462453933cd53e70853be2c8106ff60e5217733f79c6bc6e786e04b6a24e64f8514877323f59b0f02a59299bd44f
-EBUILD qemu-guest-agent-4.0.0.ebuild 1717 BLAKE2B 873d1d238f306636907e39ebd90e9029ceb74cb2219b8ba7fb844da28abafa72e9d8e2065690c5ac6a1890fdf8414600f354295dadbd37af07b29e3dba048d62 SHA512 bee6c955a0eb63de22cd54fa6c15bbe4002f462453933cd53e70853be2c8106ff60e5217733f79c6bc6e786e04b6a24e64f8514877323f59b0f02a59299bd44f
-EBUILD qemu-guest-agent-4.2.0.ebuild 1719 BLAKE2B 625c51cedfdd48036d1f703a72256748c902bd335b85ed9af28df520cc5858655ab8b2e09aa5eae795258b8365f7e982f2c8047e70453a8a33269d5cbf550712 SHA512 f8d0177c2ddbb78a5380b2a57ae67c47976ee335fb9c7ebe0a77beb1cecc01e79455d79a5d8c3522ca97720d85062c0117a051569e172a8c358abaf6c40732cb
+EBUILD qemu-guest-agent-3.1.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
+EBUILD qemu-guest-agent-4.0.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
+EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1778 BLAKE2B 7c4d7f058efcdbb4e3c047babe19602c74e2242f0d6954d630b89f917d6e0fe9c7e2c44ac71018c3ebf756a5078f51aa2e386f7e41b81333638f4ecdd10eeb50 SHA512 ecbe35457a6f0d4b15c323c68f620aeeff1b9586412c18b18b3f06cf0f7a541e5344fa540e087f295121446130f29381042d4e5c5d41132f5e02fbab13f3b986
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
new file mode 100644
index 000000000000..f69781694f1d
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-4.2.0-fix-shutdown.patch
@@ -0,0 +1,11 @@
+--- qemu-4.2.0/qga/commands-posix.c.orig	2020-03-23 11:15:05.972610989 +0300
++++ qemu-4.2.0/qga/commands-posix.c	2020-03-23 11:15:39.676015087 +0300
+@@ -108,7 +108,7 @@
+         reopen_fd_to_null(1);
+         reopen_fd_to_null(2);
+ 
+-        execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
++        execle("/sbin/shutdown", "shutdown", "-h", "now", shutdown_flag, "+0",
+                "hypervisor initiated shutdown", (char*)NULL, environ);
+         _exit(EXIT_FAILURE);
+     } else if (pid < 0) {
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index 9f59a9fcd2f8..bef260b3de02 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export AR LD OBJCOPY
+	tc-export AR LD OBJCOPY RANLIB
 
 	local myconf=(
 		--prefix=/usr
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index 9f59a9fcd2f8..bef260b3de02 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export AR LD OBJCOPY
+	tc-export AR LD OBJCOPY RANLIB
 
 	local myconf=(
 		--prefix=/usr
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
index 27782cf6ca5a..ec59e153ca27 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
 HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
@@ -29,10 +29,11 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924
+	"${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874
 )
 
 src_configure() {
-	tc-export AR LD OBJCOPY
+	tc-export AR LD OBJCOPY RANLIB
 
 	local myconf=(
 		--prefix=/usr