gentoo resync : 10.02.2020

3 files changed, 22 insertions, 8 deletions

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 5a5d31b8c12c..ceeb4e5429b9 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -5,8 +5,8 @@ DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183
 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.3.0.ebuild 1724 BLAKE2B 1c426bf94a8f83078ea74d094c8c43ce044ac6fe6c94548f47a15c203cc06295de43b6e72d97cffcb4a7a0ec11fecda611217e5d04541ec108f0a4d647773838 SHA512 e6ff926a3e3b0b4e753969c734603d934844c3099a3ba6eb6b81b5e938fa3e113014d46b1ce2cff977940a2099920d30e41f9a3bad5eea4ba41454196f801829
-EBUILD libsigrok-0.4.0.ebuild 2127 BLAKE2B d28aace671a55a8d7768000a60b44138cb544040326f13ddecca73a202c4762121d84edea1e4fca6fedb4da3c173f2cb9bcb0754bd390e977d473b11ac110984 SHA512 6cc9462fb911834725191f5e50d91ed2fe960a76cff80d273e675bad47709eb47b033d97c3622bf379156a76e9ee93f9d932cc1b61dc847c129524cfcf682e66
-EBUILD libsigrok-0.5.1.ebuild 2357 BLAKE2B a27237212510729f4860e4d33ba5cfa8a6b6c2fc802adaec0e0875bdb617d1aaf08b3769f9959ab8fedd2848b7d3d84256d24f0d0c4d55725e9674f370c505ae SHA512 bbbcbb78bcd1d7d0e822babdeba4ee772f0cb228104d5cf1c931b88bbdf29c89119dca064e4d0fedc24238e4f52904bac1a1e19719748a6ba662b093e3d69fda
+EBUILD libsigrok-0.4.0.ebuild 2215 BLAKE2B b5bb79ab807a3200cf285bc14a7662a375df98d41b03d04280e4bc543e9b6897366c140873a06cf584a38af8f2a9c20e8641a607e2dab001c4094a6a964f2c83 SHA512 92c4d90312c108f2851567564324f7f63b2f9aaa90db6393eea3c92be1401a0ae03687ed8e291d7e40ad4cfe44b314cb2abc4041fbc0d66c07f34c43cccbf1a5
+EBUILD libsigrok-0.5.1.ebuild 2445 BLAKE2B 721c22b8b51eaba8d46604916e889532da671c10dfc30123fda693c4918433e43148fe89e57ab0f24500950f29e672ad036263f211534428263693e5370416a9 SHA512 9e2b6308185b3a3dd5c3cacf62c514e109ffd32c5930fee2f307cbbb27cbb3d0ba083c71180b71d27d9793fd23f58dc79b11a3f96925df547c5a6e5c4fbc4d0c
 EBUILD libsigrok-0.5.2.ebuild 3635 BLAKE2B 5637df8ea689134f99932323b0d5fd263bf8396d953bf66854861376b43092fbbf9c1f7c007170085526080fb5db2e5c6faa4b41db7f705ecf33ed162a360806 SHA512 da7090c8e11ff3b3a93d783e2606523e9af44861f4a046bc3fa59049626a3452d906a7adb898608d290f5e1647b13cc7d2515baeae31295b134b8f001166e4ba
 EBUILD libsigrok-9999.ebuild 3638 BLAKE2B 4e8e61244cc1f9c0544a31e3e765c72b98cca2c03be5eac3da627ffb936a852777f4ac613683d460e6df8b7d4655380d0213c89604a9c3e8096905159406070b SHA512 8948066e791b410135950044f564a4f37593e67358e45efc67d28dc98024fd6a938ad7e4de242c0124a2318fdb3445c0407f327bba29d218152af432358f3400
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 4b21e16866f8..a1816ed7b3c5 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 		>=dev-lang/swig-3.0.6
 	)
 	virtual/pkgconfig"
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index af1e257b9010..de2b5e3a0cee 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 		>=dev-lang/swig-3.0.6
 	)
 	virtual/pkgconfig"