gentoo resync : 10.02.2020

4 files changed, 27 insertions, 15 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index bc4c1f9ee2d7..85ca10735a45 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -30,7 +30,7 @@ DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
-EBUILD xen-tools-4.11.3.ebuild 13855 BLAKE2B 238160d48c54f0b87a3daac6da01a07c52cedd5baa1ab4f786015eecd15eb584bedfe48f7063f3d59af48919c719f3d7d1f59d790c7a0faa24f8e81449bd0344 SHA512 1a39d72ab79563e7097aa349d09376e15b64fc4f40a96639735cc734db2f48797d472c7b9ebb88709871c7d4145a5a9926cbc7d4f0875eaa59cce621b977977b
-EBUILD xen-tools-4.12.1-r1.ebuild 14581 BLAKE2B 2f1635d7037e9b099340c707231bfaca085dcd06b2d6da54683ecb4e8b5fd6580013cc748d650a1617f0af45e84bce7052992d46b6ecfc814acd6916dfd9ab89 SHA512 61a2a47a702d48508036c9e67815d366b4bd4eba897779d2e99fc6c3d474043566dc0156345dcc5cb85ba1330146b80e256553755c13529ff540b787423deabd
-EBUILD xen-tools-4.13.0.ebuild 15279 BLAKE2B c7d5925f3e0c382f6f857ae2057e8c052c2fdb0d9734f789549039cec4ec627c501b14941e6be73ca9f2cbdd3284ae16bba5addfa5a121859cedc2abe162dccb SHA512 fe96947c7d49ac216df25fd1bd419e64bd5a204c740e8ece769ee7cf1cb546beb9719d7c72e5dcd4c08a6b844e296df7018c338cd6246fe52bb44051df3fc503
+EBUILD xen-tools-4.11.3-r1.ebuild 13936 BLAKE2B d6a916f69d2cb3bf1c73361ddc89f8d241ee3e1411a48346b57a7a0b9d27799c01d57979d3a124e0101126c434c21ae5354af932f635a4e66c3b3dcc659fb989 SHA512 e1c04b9c7c01b5ef5c2b8c9a6967b4476930c424da101bab322bcb2188eec9c688c116e1398d422642e084dea2dea3c98cbdce051cdc9b59487f393bcaa08063
+EBUILD xen-tools-4.12.1-r2.ebuild 14662 BLAKE2B a3857abf9c1379eb2a402ea1c2cd4136ec5bb016f6bed34f514f87e94f17b01d5db3ddbb871ffcdb8dd57b390bc3a7e3240d92cfcdeb3a14674f9ee1221f412e SHA512 019819109ba8ddc1ceac050c4319e91122dacbfa4101b8dc0120b5e2a09eb33e00f9b10c47cdb0e92ec3172559d2021487c0aa56cb17c322d8cd23c8e2e065d8
+EBUILD xen-tools-4.13.0.ebuild 15360 BLAKE2B 967d3da94c2755ee8ec070777dddaedddfa5301f7941058562d226ad262edce8502b359c85f9627b07bac6fa26cad9aac844266c4c2aec138cf9babdf43ff6a6 SHA512 e3cbbe4e6a1e7164c423432442cdd5249a81c2b75dfb5e32e5bb810aec7cac5f01ce0d22aa7ce81be7fbfb7b09942862dbed47c2bac13f5bf4fc389cceae2810
 MISC metadata.xml 1707 BLAKE2B becd24142b3d885f0a26c1444e5191c3906c260ba57755257d04eee76be5a21aede5741ca0bea12a77e9c0c872cd5f8436fc5c11fec3f3f5f543f4fda75fb5be SHA512 137f36f883e4476f1820e630fa1f5feb52244cad235885bff09c838755feba1df8428f631e255de25b29ce7dac8aa62e0df37517875cce3a26e5114dee7a70f7
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
index a089de2905e2..72913356f070 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -81,11 +81,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		sys-firmware/ipxe[qemu]
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 	ovmf? (
@@ -103,7 +105,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)
diff --git a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
index 83c7552e06e4..86248c171f5c 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -87,11 +87,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 	ovmf? (
@@ -108,7 +110,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)
diff --git a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
index 0b4a116929ca..47d3fb3608e2 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -91,11 +91,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 
@@ -113,7 +115,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)