gentoo resync : 16.01.2021

12 files changed, 41 insertions, 127 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2d846219e132..577994c55abe 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 44f58c8e4810..357acb711050 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -5,6 +5,6 @@ AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50
 EBUILD kicad-5.1.12.ebuild 5198 BLAKE2B 3293a0a9b260c3a3bf635045a98977ae58b899402cb43e80c9d754df5d9d82859cefc6d56946e877ca10e32d1cde28b747c2fad43c52ae6e7997c8e510963abc SHA512 38c96f65d3f05610fefd77915d55619b86ebe5c508952138b28ac4da60dd3e98bb279a6d172d4b73466361aec16036cf96ff19af23a0555599e71c8c4e60bfc7
-EBUILD kicad-6.0.0.ebuild 4142 BLAKE2B 26ba3819428682a21221f9d588006cb8a08c51e9e928c2d23b9062d4a58aeff6a1588a787eba43b11bd3dda86d984ba177f5722386b84dbd6821e069a26e5477 SHA512 e78589c80532537a0cf4389d6641483fd49365cca16e102f45452f5268bb424b6d7c410653ae9254802c4e2bf2415e7c1c8eaaf5ff0e12f6b4fff34466e0d8a1
-EBUILD kicad-9999.ebuild 4142 BLAKE2B 26ba3819428682a21221f9d588006cb8a08c51e9e928c2d23b9062d4a58aeff6a1588a787eba43b11bd3dda86d984ba177f5722386b84dbd6821e069a26e5477 SHA512 e78589c80532537a0cf4389d6641483fd49365cca16e102f45452f5268bb424b6d7c410653ae9254802c4e2bf2415e7c1c8eaaf5ff0e12f6b4fff34466e0d8a1
-MISC metadata.xml 1100 BLAKE2B 0d7d4f0b90b243776a069fb7783f15a2cbedff807decfdae4dd0c3dbf1d75316a30e8e49c2b6c33b263dc47c7bd47606c628c14f7f5f1ee77eb0d2f0955ff239 SHA512 0b2978d4e5eee2e207133293822e3f6438a0554162ae972da88267d58fb9005ad0b3f69ab3f0228cca8976f93564a56c9b7ef32b94a54bb008144a6699888f53
+EBUILD kicad-6.0.0-r1.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb
+EBUILD kicad-9999.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb
+MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5
diff --git a/sci-electronics/kicad/kicad-6.0.0.ebuild b/sci-electronics/kicad/kicad-6.0.0-r1.ebuild
index 8840070ef1e9..ff3a92646a7e 100644
--- a/sci-electronics/kicad/kicad-6.0.0.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # Contains bundled pybind but it's patched for wx
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 COMMON_DEPEND="
+	!sci-electronics/kicad-i18n
 	>=dev-libs/boost-1.61:=[context,nls]
 	media-libs/freeglut
 	media-libs/glew:0=
@@ -94,6 +95,10 @@ src_configure() {
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
+		# Merged from separate -i18n package, bug #830274
+		-DKICAD_BUILD_I18N=ON
+		-DKICAD_I18N_UNIX_STRICT_PATH=ON
+
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
@@ -107,14 +112,9 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH="ON"
 	)
 
-	local OCC_P=$(best_version sci-libs/opencascade)
-	OCC_P=${OCC_P#sci-libs/}
-	OCC_P=${OCC_P%-r*}
-
 	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
 	)
 
 	cmake_src_configure
@@ -123,7 +123,7 @@ src_configure() {
 src_compile() {
 	cmake_src_compile
 	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
+		cmake_src_compile doxygen-docs
 	fi
 }
 
@@ -142,7 +142,7 @@ src_install() {
 	if use doc ; then
 		dodoc uncrustify.cfg
 		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
 	fi
 }
 
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 8840070ef1e9..ff3a92646a7e 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # Contains bundled pybind but it's patched for wx
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 COMMON_DEPEND="
+	!sci-electronics/kicad-i18n
 	>=dev-libs/boost-1.61:=[context,nls]
 	media-libs/freeglut
 	media-libs/glew:0=
@@ -94,6 +95,10 @@ src_configure() {
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
+		# Merged from separate -i18n package, bug #830274
+		-DKICAD_BUILD_I18N=ON
+		-DKICAD_I18N_UNIX_STRICT_PATH=ON
+
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
@@ -107,14 +112,9 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH="ON"
 	)
 
-	local OCC_P=$(best_version sci-libs/opencascade)
-	OCC_P=${OCC_P#sci-libs/}
-	OCC_P=${OCC_P%-r*}
-
 	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
 	)
 
 	cmake_src_configure
@@ -123,7 +123,7 @@ src_configure() {
 src_compile() {
 	cmake_src_compile
 	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
+		cmake_src_compile doxygen-docs
 	fi
 }
 
@@ -142,7 +142,7 @@ src_install() {
 	if use doc ; then
 		dodoc uncrustify.cfg
 		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
 	fi
 }
 
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 603e4e9f9662..09d8f72c361a 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -12,8 +12,8 @@
 	<use>
 		<flag name="github">Add github support into PCB editor</flag>
 		<flag name="ngspice">Enable circuit simulation</flag>
-		<flag name="occ">Enable viewing 3D rendering of designs via opencascade</flag>
-		<flag name="oce">Enable viewing 3D rendering of designs via OCE</flag>
+		<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
+		<flag name="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag>
 		<flag name="python">Enable python scripting support</flag>
 		<flag name="pcm">Enable plugin content manager</flag>
 	</use>
diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest
index a7a843c4efc2..3beedb34b520 100644
--- a/sci-electronics/pulseview/Manifest
+++ b/sci-electronics/pulseview/Manifest
@@ -1,6 +1,6 @@
 AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403
 AUX pulseview-0.4.2-qt-5.15.patch 5193 BLAKE2B ea81ba54ca1a8b9d76d2e7751940d7b4e509adb75f903e5e85be49976106eefe1745908fe55d2aa206402494cd636879c71fe811e7dde874ebc40174ea8727cd SHA512 66c1e00f9470d4384bfa5dda2db7ada9d1e86cee2b2cd2a8517b44c1d6ee310d2f9a930033a7c93a30e006675c738b7cf75d6ee22ee09c7b8b52e831ca6571d0
 DIST pulseview-0.4.2.tar.gz 1399718 BLAKE2B ebbefefa55bb7ce9d1bbdfa8ea44d9536fa4f9ca9f6f13175a5bb6122dcb431ddad7c668e631128ca57fd2231021f8ce1c686fac9fa746ace24cf69ef3d71e71 SHA512 79f653c9faad021c03b59b4a519b594190d5558dfb9be60cabcc2a35e991e66b733b337fec58a9248699e7aef0df3be1472c81f93274b25cec1fc6b73f8f033b
-EBUILD pulseview-0.4.2.ebuild 1480 BLAKE2B ce2c73658a9772747c25a520f40951ec5405ae8e2b1b8efab67926bb17db5e8d6cd4852bd86edcea9dc6dc00dd960b2d9a691ceefabaf5822c74ac052fbe40f9 SHA512 e9f5fb99535b6609bfcfbefb2f765204cf7ac742cff191304eadf075b140ea4a78ff00816211df438e90a50d03eb3571ee323245a67fef75281d1efad7bfaffc
-EBUILD pulseview-9999.ebuild 1390 BLAKE2B 3e1fa66fef132374204fe13d384ff6eeae42ca432a5de102728ae3abb0d01b1e80bfc2771223bc8577a541369f12712cba5cae238671ad588fe6d463e61bc14b SHA512 0ecf135b896b6a9bca05253b473bf1f93fe7a362b8734ae9ac76b33c2fd77be7c566e820d37c38e8247dd7ee4de9e381a0c1bcc5db80cccd8f1ce3001f9875ca
+EBUILD pulseview-0.4.2-r1.ebuild 1288 BLAKE2B 40005c2d1fadfb4b18e89068e9cc03b7adb20229b58a9702bc805a52670fb3223138ee2846caa99e80baf084bdb53b4683148dd715141d7dd1b2d829999e7991 SHA512 4b2665a461d6f9a0935f9623daf5bb69a6c10d8f3df64ce75b45f7130585a1d1c16eaee8fe1e6d6a9b5bcf03bc5ffcf8d17f4dadb60832d23514c63c224ec378
+EBUILD pulseview-9999.ebuild 1198 BLAKE2B 98659838ee543004b4d0baa4cb19137c0d862c71d41dbb70207396eaf98ba3ecce31f0591f19dfe863317accd4853ed1f75ff866e627fe5b88d25f01ccc819e2 SHA512 8022ee769dd32d54c46301bf3cfccd184936559b17bb8fe43ef75f54783a55d742b4aa5f00be7aa760ab73d73dd9764646c9a348431cf43f23ca3e393582eea1
 MISC metadata.xml 334 BLAKE2B 4b5f18089903f6ea4eed965b12843da3d32a72646831ec5a56d6fcd0c0beef5e574a85e16204b8210c6e1bc0ed2571352a6f9f1831e967b15f2f3fe085fd87a8 SHA512 9f93f66a742a6cd8afebdce63a9a9edacec75381bc846d0e71c6fece1af1f16c490721eff8cb9cc34b4b7ae0b226f42b7a1e166f9dd05921dd9d7b08408ea241
diff --git a/sci-electronics/pulseview/pulseview-0.4.2.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
index e96be770c575..a71826cfa065 100644
--- a/sci-electronics/pulseview/pulseview-0.4.2.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 xdg-utils
+inherit cmake xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,7 +19,6 @@ HOMEPAGE="https://sigrok.org/wiki/PulseView"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+decode static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -36,10 +33,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	>=sci-libs/libsigrok-0.5.1:=[cxx]
-	decode? (
-		${PYTHON_DEPS}
-		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}]
-	)
+	decode? ( >=sci-libs/libsigrokdecode-0.5.2:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -50,10 +44,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch
 )
 
-pkg_setup() {
-	use decode && python_setup
-}
-
 src_prepare() {
 	cmake_src_prepare
 	cmake_comment_add_subdirectory manual
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index 1b2ea98c17f8..330e533dbf89 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 xdg-utils
+inherit cmake xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,7 +19,6 @@ HOMEPAGE="https://sigrok.org/wiki/PulseView"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+decode static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -36,19 +33,12 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	>=sci-libs/libsigrok-0.6.0:=[cxx]
-	decode? (
-		${PYTHON_DEPS}
-		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
-	)
+	decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
 "
 DEPEND="${RDEPEND}"
 
 DOCS=( HACKING NEWS README )
 
-pkg_setup() {
-	use decode && python_setup
-}
-
 src_prepare() {
 	cmake_src_prepare
 	cmake_comment_add_subdirectory manual
diff --git a/sci-electronics/sigrok-cli/Manifest b/sci-electronics/sigrok-cli/Manifest
index dee6aea01438..cd1de75253e2 100644
--- a/sci-electronics/sigrok-cli/Manifest
+++ b/sci-electronics/sigrok-cli/Manifest
@@ -1,6 +1,4 @@
-DIST sigrok-cli-0.7.1.tar.gz 221754 BLAKE2B a2edd3ef990c484660dd3fa6f8b8f2ca3eb500a39ac66da1ce9b95c7dd6bfbc5f39b7e5a28872bc8b4c6b7e6282919bbb22f71796ad8e16f3549ef2e4674f02e SHA512 a56d9439efca74f8362ed225d8fa92adfaee053470b166629ad2d8f3ebf5bea05a37782750c9321aabd3b47e634734fa5e5b0cc5353bf49dd1629cdcdb98aef5
 DIST sigrok-cli-0.7.2.tar.gz 230354 BLAKE2B a026f1305391d8c29e13dd0e88ee2e4ec3f8991aad728749bf2d74a0380b994341a056e227c8762dda75a409383fba53050739fe8fc55282b925791af72dfb72 SHA512 5862aa11a586ebb3acf9bffd1d2686cb5b3c3622b436080e05e2fc826a4814cf4746f128c01764f8dc664c5fc1a1e8c6ef66e548770278cc6ea99353d2173143
-EBUILD sigrok-cli-0.7.1-r1.ebuild 1061 BLAKE2B fcef066c915f8c6e8369f88b44050ee799c6615ab21897bbe53dcb19a4292ec7da18caafd3350fd89bcc38f4f6b3024e4807238b10befecc0881be6c6b8917db SHA512 545b93c9066e09b024cfd40f6543402011b2e5469202d7cc5e3c15fe52909509809c460bb69f3599cad74bc85c1d7a89ada62f35a228a85fa34a97d9b1665af2
-EBUILD sigrok-cli-0.7.2.ebuild 1061 BLAKE2B fadda00532ae194d410addcd794e7b3412965ceb0e0955294b103683f03b7f8a9b1dfcc7916bbf44f1edcd572916776a53576f1461a9afd0665b4f0c9d40d93d SHA512 5d9c741891839a537bb5a19f44727065de5ed90c61bf9f6b8e74a1614541314cd120bf51bcd3534c0a7a0a50b2cb4e58e2d69efd5c62de97eb1d22239300432a
-EBUILD sigrok-cli-9999.ebuild 1061 BLAKE2B fcef066c915f8c6e8369f88b44050ee799c6615ab21897bbe53dcb19a4292ec7da18caafd3350fd89bcc38f4f6b3024e4807238b10befecc0881be6c6b8917db SHA512 545b93c9066e09b024cfd40f6543402011b2e5469202d7cc5e3c15fe52909509809c460bb69f3599cad74bc85c1d7a89ada62f35a228a85fa34a97d9b1665af2
+EBUILD sigrok-cli-0.7.2-r1.ebuild 914 BLAKE2B 28284cd80342d3d9b09eb235a2ce48f4378439dab091f7e8d8502f458acff21212c9fab0ad0d9ab2e5e56bfdfbaeb33d164b789da083a3f83b5e76c8abbd7f51 SHA512 693b8d20435383047711018dbae5315bfb492a75055545b326c22e4bfc342ccc355fd250fa744377486890d92fbc7f314b6a94e1b6fa4e0bace88818c3780214
+EBUILD sigrok-cli-9999.ebuild 914 BLAKE2B 28284cd80342d3d9b09eb235a2ce48f4378439dab091f7e8d8502f458acff21212c9fab0ad0d9ab2e5e56bfdfbaeb33d164b789da083a3f83b5e76c8abbd7f51 SHA512 693b8d20435383047711018dbae5315bfb492a75055545b326c22e4bfc342ccc355fd250fa744377486890d92fbc7f314b6a94e1b6fa4e0bace88818c3780214
 MISC metadata.xml 334 BLAKE2B 4b5f18089903f6ea4eed965b12843da3d32a72646831ec5a56d6fcd0c0beef5e574a85e16204b8210c6e1bc0ed2571352a6f9f1831e967b15f2f3fe085fd87a8 SHA512 9f93f66a742a6cd8afebdce63a9a9edacec75381bc846d0e71c6fece1af1f16c490721eff8cb9cc34b4b7ae0b226f42b7a1e166f9dd05921dd9d7b08408ea241
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
index 98082389e4df..730463965c90 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg-utils
+inherit xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,14 +19,10 @@ HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/glib-2.32.0
 	>=sci-libs/libsigrok-0.5.0:=
-	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
-		${PYTHON_DEPS}
-	)"
+	decode? ( >=sci-libs/libsigrokdecode-0.5.0:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild
deleted file mode 100644
index 7033695a6683..000000000000
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Command-line client for the sigrok logic analyzer software"
-HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.32.0
-	>=sci-libs/libsigrok-0.5.0:=
-	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with decode libsigrokdecode)
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index 98082389e4df..730463965c90 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg-utils
+inherit xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,14 +19,10 @@ HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/glib-2.32.0
 	>=sci-libs/libsigrok-0.5.0:=
-	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
-		${PYTHON_DEPS}
-	)"
+	decode? ( >=sci-libs/libsigrokdecode-0.5.0:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"