gentoo resync : 15.01.2020

4 files changed, 27 insertions, 23 deletions

diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 640465fbb1a9..c2372cdb583f 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -2,7 +2,7 @@ AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be
 DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
 DIST uranium-4.2.0.tar.gz 711868 BLAKE2B 8098372704db0494519ab0a24046b72f2527695716286463e7ecffb776db351bfb4ffcd7b53276d59403b39e40ef605fb016e9ec57e18cd06e8f22f22d8ef732 SHA512 fab04efbb6337e366501ffc0336f208ddc0f9e568a2822363b84b6512268f2560a22bc71e745d30e66026d7a0bf9e150eda605ef8b511b59264407cab491eee1
 DIST uranium-4.3.0.tar.gz 899153 BLAKE2B 314dbeed1cce49d33439b2fa744d37e4b360edb041964d2c3336730295b88bb2af86df8eac8382a6696fbc9c1ba07fa0774089ec3aa7fd0f8fbb92c61ce2825b SHA512 eac28907ccd66e5a43012a6f5af2a97daea21f0e2832613562e848cca967e036fea117811d8a4cc519c1417a113449e7065233fc541347202c6a8ff85a9d60b7
-EBUILD uranium-3.6.0-r1.ebuild 1443 BLAKE2B 7bcc76856b0605e6274fa914dd6e30fe5769f62e4d85c3ea4748cffdff2a3f2287938a65ebf805af274d9aa5d594d157e5a4b1f16b02f3cdbcab4b2454944990 SHA512 43f9f8b9d4fcae3debf88e1074c90abc58a5c370c2e74ace8b9d721a7ae26c674c5c145770e6d533174bfe6cf55912631a89b69cab6ed6df81bb61b7668b813d
-EBUILD uranium-4.2.0.ebuild 1626 BLAKE2B 52962773da02a79ae87239f341c7672760eff3967091304af600b119180a83260eaa07e77fea0324dab5feede9470882ef53523f6350c0713fa8e10a2d535479 SHA512 2dc5594790bc7f976847573be4358a04e3e05c55451e5303d7e62766d1cfd4348ba8d2e43a3c04e5f69e3ca1bf5378579805baecdcba132e1212113f6924208c
-EBUILD uranium-4.3.0.ebuild 1665 BLAKE2B bb05bc2723c8f7eba32928c0ccc8295ca2f0574ff56ce23027c9bbf5f1d5a488ff8db3e0855b7e047701eac0a70aaceaddc6a99a9a0c11110b95d3622eb2974c SHA512 d3e08da60221ce5d5df9ecd280a0080b3b9e4791c0377109aecdc1d4127911bb5993535a82a596020f3cd3a54b912e6f1a9acd068b3678c6da33e2f1c4be05b6
+EBUILD uranium-3.6.0-r1.ebuild 1439 BLAKE2B de2da5441b945609c3abebff8e8e9299ac055afcd2397cab4767aa4cfc03ceac1a2853f3f18c108e648bae03e48808145fec79fb492290ad062914d522176b2b SHA512 57aaeeefe99a0af1aac710d3998f4d8b9f6804b9c45106e2aae449852d076180d275297a6bb3f9624f4e1d6164968c198c5388c4908f85ff0cdbd4bfbf20cdd2
+EBUILD uranium-4.2.0.ebuild 1594 BLAKE2B ba8d95279e4d97c56c180361d68134c62d608c4d0bfa55a9f8dfa920e96d0d64662342d60b0f9aab0b0d9368b516e81f57d3366f6d6b22ce68dd9fc97a067c9f SHA512 8d954206a0883ce24eb6937f238fdad437e9041c36e595a1254400bf98a3149861afbcf07f91348812fe7d5937fdbaf43152718ee0ce3d79139d0333cad30f6b
+EBUILD uranium-4.3.0.ebuild 1633 BLAKE2B 37084f7888d560a95461836fb333432ef607081f1adcbe45cb3bb84fbfd71937b02040f9b7e40a00a18fdd6071518cb52b91f0db3d69237db02b13e671cd9992 SHA512 11a980b42d45fbb724acb04e81b97b92b5d9e9e680ad9402bc567004a2f0b4abeda807e827853fe5c1dd75fff2c45c0903c5f841eead491227803a4c4cb6d83d
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
index 50fb43634038..fdbfe670aa9a 100644
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1
 
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
index d6cad85692f6..8b3f307a109c 100644
--- a/dev-python/uranium/uranium-4.2.0.ebuild
+++ b/dev-python/uranium/uranium-4.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_PN="Uranium"
 
@@ -17,9 +17,10 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc test"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
@@ -44,8 +45,9 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
 
 	if ! use debug; then
 		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
@@ -54,14 +56,14 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 		DOCS+=( html )
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${D}/usr/$(get_libdir)"
 }
diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0.ebuild
index 1024b2dba671..4ca593a01581 100644
--- a/dev-python/uranium/uranium-4.3.0.ebuild
+++ b/dev-python/uranium/uranium-4.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_PN="Uranium"
 
@@ -17,9 +17,10 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc test"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
@@ -47,8 +48,9 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
 
 	if ! use debug; then
 		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
@@ -57,14 +59,14 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
-		cmake-utils_src_compile doc
+		cmake_src_compile doc
 		DOCS+=( html )
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${D}/usr/$(get_libdir)"
 }