From 7a420d1db67aca7f968df339d4f5f19583529866 Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Thu, 16 Nov 2023 21:57:17 +0900 Subject: [PATCH 1/5] dev-util/rye: fix QA_FLAGS_IGNORED & cargo test Closes: https://bugs.gentoo.org/917415 Closes: https://bugs.gentoo.org/917417 Signed-off-by: Daichi Yamamoto --- .../rye/{rye-0.15.2.ebuild => rye-0.15.2-r1.ebuild} | 10 ++++++++++ 1 file changed, 10 insertions(+) rename dev-util/rye/{rye-0.15.2.ebuild => rye-0.15.2-r1.ebuild} (97%) diff --git a/dev-util/rye/rye-0.15.2.ebuild b/dev-util/rye/rye-0.15.2-r1.ebuild similarity index 97% rename from dev-util/rye/rye-0.15.2.ebuild rename to dev-util/rye/rye-0.15.2-r1.ebuild index 0fc649d1d7..358d14dce5 100644 --- a/dev-util/rye/rye-0.15.2.ebuild +++ b/dev-util/rye/rye-0.15.2-r1.ebuild @@ -304,6 +304,16 @@ LICENSE+=" 0BSD Apache-2.0 BSD MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" +QA_FLAGS_IGNORED=".*" + +src_test() { + local mytestargs=( + --skip utils::test_is_inside_git_work_tree::test_is_inside_git_work_tree_true + ) + + cargo_src_test -- "${mytestargs[@]}" +} + src_install() { cargo_src_install --path rye } From 97067cdecfdf955b741bf067fa5c6d69727ba797 Mon Sep 17 00:00:00 2001 From: David Roman Date: Thu, 16 Nov 2023 14:24:08 +0100 Subject: [PATCH 2/5] Revert "profiles: mask dev-python/webrtcvad" This reverts commit 11249ac15413604fc5e247ba5466b2df44e97914. Signed-off-by: David Roman --- profiles/package.mask | 6 ------ 1 file changed, 6 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 5d530b25d9..0e5096eeda 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -14,12 +14,6 @@ # New entries go on top. -# David Roman (2023-11-16) -# Requires package removed from ::gentoo -# No release since 2017, package seems broken -# Removal in +30 days -dev-python/webrtcvad - # David Roman (2023-11-16) # Redundant package, mpv[lua] also provide this. # See https://bugs.gentoo.org/917411 From 29dff2b2d12a06240bddc630778c5cc80de4d36b Mon Sep 17 00:00:00 2001 From: David Roman Date: Thu, 16 Nov 2023 14:49:56 +0100 Subject: [PATCH 3/5] dev-python/webrtcvad: patch for oob and mem leak + update webrtc Signed-off-by: David Roman --- dev-python/webrtcvad/Manifest | 1 + .../webrtcvad/webrtcvad-2.0.10-r1.ebuild | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 dev-python/webrtcvad/webrtcvad-2.0.10-r1.ebuild diff --git a/dev-python/webrtcvad/Manifest b/dev-python/webrtcvad/Manifest index 6c9714040b..f7a5e1f0f4 100644 --- a/dev-python/webrtcvad/Manifest +++ b/dev-python/webrtcvad/Manifest @@ -1 +1,2 @@ +DIST webrtcvad-2.0.10-patches.tar.xz 36072 BLAKE2B efe6cfccfae8c2706e4c85d47fcf6cf91135ae85dfb59aec9d61457fa3f2856ea2e51c2df9b12dd0fc79d0484f56f56277e7782faf3564931d75e252b3ebbd3c SHA512 0f18dfe92d767cf16c49677a88089f5b3a44b9e2e593d89cbcd145c23a0d049f09eb720ccc5b13a464943e9b68f1a5e741a40ed300a9a28a0eee33277ca19bfb DIST webrtcvad-2.0.10.tar.gz 183166 BLAKE2B aa36c895c23cb9d4ea9679c3a7231abac7ef5be4adf61f06fc557fff69ab84181cabf737d4c0a7255d518454a94ca3c4c0fc969405777f02ab3c1a7c0403eac2 SHA512 ce414e39c3128e22495e8e21e46d09485952168ca763937cebb654dab87ffcfecea8198c74c009a47d8caed2a8ebc22572036fda4be36597d82e6e7057f80ae2 diff --git a/dev-python/webrtcvad/webrtcvad-2.0.10-r1.ebuild b/dev-python/webrtcvad/webrtcvad-2.0.10-r1.ebuild new file mode 100644 index 0000000000..c57a1d8db6 --- /dev/null +++ b/dev-python/webrtcvad/webrtcvad-2.0.10-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 + +DESCRIPTION="Python interface to the Google WebRTC Voice Activity Detector (VAD)" +HOMEPAGE="https://github.com/wiseman/py-webrtcvad" +SRC_URI="https://github.com/wiseman/py-${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://gentoo.kropotkin.rocks/distfiles/${P}-patches.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +# Depends on a package removed from ::gento (bug #915162) +RESTRICT="test" + +S="${WORKDIR}/py-${P}" + +PATCHES=( "${WORKDIR}/${PN}-update-webrtc.patch" "${WORKDIR}/${PN}-fix-mem-leak.patch" "${WORKDIR}/${PN}-fix-oob.patch" ) + From fb7e583cde8f78e63263614abc88cb53156664ae Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Thu, 16 Nov 2023 22:55:06 +0900 Subject: [PATCH 4/5] gui-apps/xremap: fix cargo myfeatures var Signed-off-by: Daichi Yamamoto --- .../xremap/{xremap-0.8.11.ebuild => xremap-0.8.11-r1.ebuild} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename gui-apps/xremap/{xremap-0.8.11.ebuild => xremap-0.8.11-r1.ebuild} (98%) diff --git a/gui-apps/xremap/xremap-0.8.11.ebuild b/gui-apps/xremap/xremap-0.8.11-r1.ebuild similarity index 98% rename from gui-apps/xremap/xremap-0.8.11.ebuild rename to gui-apps/xremap/xremap-0.8.11-r1.ebuild index c645b51f4b..5002e14961 100644 --- a/gui-apps/xremap/xremap-0.8.11.ebuild +++ b/gui-apps/xremap/xremap-0.8.11-r1.ebuild @@ -231,9 +231,11 @@ KEYWORDS="~amd64" IUSE="x11 gnome kde wlroots" REQUIRED_USE="?? ( x11 gnome kde wlroots )" +RDEPEND="x11? ( x11-libs/libX11 )" + src_configure() { local myfeatures=( - $(usex x11) + $(usev x11) $(usev gnome) $(usev kde) $(usev wlroots) From 61282c8b870bfd8a3982d0c7c7c212b59d7e2299 Mon Sep 17 00:00:00 2001 From: David Roman Date: Thu, 16 Nov 2023 14:58:43 +0100 Subject: [PATCH 5/5] dev-python/webrtcvad: drop 2.0.10 Signed-off-by: David Roman --- dev-python/webrtcvad/webrtcvad-2.0.10.ebuild | 27 -------------------- 1 file changed, 27 deletions(-) delete mode 100644 dev-python/webrtcvad/webrtcvad-2.0.10.ebuild diff --git a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild deleted file mode 100644 index 051d7c142b..0000000000 --- a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -DESCRIPTION="Python interface to the Google WebRTC Voice Activity Detector (VAD)" -HOMEPAGE="https://github.com/wiseman/py-webrtcvad" -SRC_URI="https://github.com/wiseman/py-${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -S="${WORKDIR}/py-${P}" - -distutils_enable_tests nose - -DEPEND=" - test? ( - dev-python/memory-profiler[${PYTHON_USEDEP}] - ) - "