gentoo resync : 10.02.2020

4 files changed, 19 insertions, 13 deletions

diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 6b84b515cd53..952591d495a8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,7 +2,7 @@ AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409d
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
 DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
 DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
-EBUILD fwupd-1.2.11.ebuild 3791 BLAKE2B f3451bde6287c540e43ec0903c060caf19f27c0f60b190e7bee5c5da66663a0c461488b1f649e7c0cdaf7f1c97169cc629b20f2e383a1c05336677829a3beeb8 SHA512 cd0af110d7bd7f8941c473bbd576a4d8df7d3b51bdb76dca1dfacf63304f9649886151dfc478800ed21ce311e1a0cce16e1c4735178f6c1748ca93de34d59a36
-EBUILD fwupd-1.3.6.ebuild 4024 BLAKE2B 8eecd7d737f0fa364c55da844a3d85dc632a568e65dbf3c49b98ad3aaf1b9f026a26e374008ce16ede3faeefb1e137743df8b058d04fe43d4e1363a15360b103 SHA512 b924fc66266c20e4abdcfc41c159c2bc9eddb5095dc94e31b967fc309872c3ec5040b12011d21ba6320264e4f4c0e446f3364795ec461f50eb8dfd9d73ae318c
-EBUILD fwupd-1.3.7.ebuild 4046 BLAKE2B dbb75b4c53bf25c6717547e99b06e8954d35a96a11fbc0724791cce65f174183d4e6c3e2bc3a80d21443305d22a7c3fc41820fe9ba5988d2cd2b66b9acf71882 SHA512 191878ecd30802ac3b71f75575635f51a5d3ed03fe96452b8eeb8735e86121b98bd849e1102d392bd960e1c4f898f94323ccbedc6edcabfdf09f30e8eb905fe1
+EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5
+EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343
+EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f
 MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild
index 8bad64accc42..345dba19aaac 100644
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild
@@ -32,9 +32,11 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
 	>=dev-libs/libxmlb-0.1.7
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection]
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
diff --git a/sys-apps/fwupd/fwupd-1.3.6.ebuild b/sys-apps/fwupd/fwupd-1.3.6.ebuild
index a0a687b89dc4..a9c5006ef34e 100644
--- a/sys-apps/fwupd/fwupd-1.3.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.6.ebuild
@@ -45,9 +45,11 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libxmlb-0.1.13
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
diff --git a/sys-apps/fwupd/fwupd-1.3.7.ebuild b/sys-apps/fwupd/fwupd-1.3.7.ebuild
index 86067acbc0c6..becbfc3095f6 100644
--- a/sys-apps/fwupd/fwupd-1.3.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.7.ebuild
@@ -45,9 +45,11 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libxmlb-0.1.13
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
@@ -84,7 +86,7 @@ DEPEND="${PYTHON_DEPS}
 "
 # Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
-	!sci-chemistry/chemical-mime-data
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
 	${DEPEND}
 	sys-apps/dbus
 "