From 8fd6aebba43a741f588814951e6150d4f1ebb4d5 Mon Sep 17 00:00:00 2001 From: Andrea Postiglione Date: Fri, 21 Jan 2022 13:28:32 +0100 Subject: [PATCH 1/6] sys-cluster/pcs-0.10.8-r3: depend on pacemaker <2.1.0 Signed-off-by: Andrea Postiglione --- sys-cluster/pcs/pcs-0.10.8-r3.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild index 4c14ae9700..68eccd9f16 100644 --- a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild +++ b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild @@ -39,7 +39,8 @@ RDEPEND=" ') dev-libs/openssl >=sys-cluster/corosync-3.0 - >=sys-cluster/pacemaker-2.0 + >=sys-cluster/pacemaker-2.0.0 + Date: Fri, 21 Jan 2022 13:34:18 +0100 Subject: [PATCH 2/6] sys-cluster/pcs-0.10.8-r3: add ruby27 Signed-off-by: Andrea Postiglione --- sys-cluster/pcs/pcs-0.10.8-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild index 68eccd9f16..c415a60fac 100644 --- a/sys-cluster/pcs/pcs-0.10.8-r3.ebuild +++ b/sys-cluster/pcs/pcs-0.10.8-r3.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{8..10} ) -USE_RUBY="ruby26" +USE_RUBY="ruby26 ruby27" inherit python-single-r1 ruby-ng systemd From f5a14526da81d59ee7ae943bca7a5861f855150a Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 21 Jan 2022 14:19:46 +0100 Subject: [PATCH 3/6] media-gfx/fontbakery: temp disable doc building, --- media-gfx/fontbakery/fontbakery-0.7.38.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-gfx/fontbakery/fontbakery-0.7.38.ebuild b/media-gfx/fontbakery/fontbakery-0.7.38.ebuild index 21e8429ffe..38edfea429 100644 --- a/media-gfx/fontbakery/fontbakery-0.7.38.ebuild +++ b/media-gfx/fontbakery/fontbakery-0.7.38.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=8 @@ -47,10 +47,10 @@ DEPEND=" " distutils_enable_tests pytest -distutils_enable_sphinx docs/source \ - " Date: Fri, 21 Jan 2022 14:24:22 +0100 Subject: [PATCH 4/6] package.mask: mask packages with unavailable dependencies Signed-off-by: Andrew Ammerlaan --- profiles/package.mask | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 203fae645e..143a449a7f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -12,3 +12,13 @@ # Anna (cybertailor) Vyalkova (2022-01-09) # Depends on masked libhandy 1.5.0 >=app-text/komikku-0.36.0 + +# Andrew Ammerlaan (2022-01-21) +# Unavailable dep Date: Fri, 21 Jan 2022 14:25:13 +0100 Subject: [PATCH 5/6] media-libs/alsa-ucm-pinephone: remove trailing whitespaces Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- .../alsa-ucm-pinephone-1.2.6.3.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild index 79612e7269..66a0c6a727 100644 --- a/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild +++ b/media-libs/alsa-ucm-pinephone/alsa-ucm-pinephone-1.2.6.3.ebuild @@ -32,32 +32,32 @@ src_install() { insinto /usr/share/alsa/ucm2/PinePhone/ insopts -m644 doins "${S}"/ucm2/PinePhone/HiFi.conf - + insinto /usr/share/alsa/ucm2/PinePhone/ insopts -m644 doins "${S}"/ucm2/PinePhone/VoiceCall.conf - + insinto /usr/share/alsa/ucm2/PinePhone/ insopts -m644 doins "${FILESDIR}"/PinePhone.conf - - #PinePhone Pro Configs + + #PinePhone Pro Configs insinto /usr/share/alsa/ucm2/PinePhonePro/ insopts -m644 doins "${S}"/ucm2/PinePhonePro/HiFi.conf - + insinto /usr/share/alsa/ucm2/PinePhonePro/ insopts -m644 doins "${S}"/ucm2/PinePhonePro/VoiceCall.conf - + insinto /usr/share/alsa/ucm2/PinePhonePro/ insopts -m644 doins "${FILESDIR}"/PinePhonePro.conf - + #Create Symlinks dosym /usr/share/alsa/ucm2/PinePhone/PinePhone.conf \ /usr/share/alsa/ucm2/conf.d/simple-card/PinePhone.conf - + dosym /usr/share/alsa/ucm2/PinePhonePro/PinePhonePro.conf \ /usr/share/alsa/ucm2/conf.d/simple-card/PinePhonePro.conf From e4a729fb24dbd6cc819635ff3323b7fc6f5d619f Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 21 Jan 2022 14:26:38 +0100 Subject: [PATCH 6/6] app-misc/ssmtool: drop unused inherit Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- app-misc/ssmtool/ssmtool-0.6.2.ebuild | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app-misc/ssmtool/ssmtool-0.6.2.ebuild b/app-misc/ssmtool/ssmtool-0.6.2.ebuild index 4635510992..c20470c0a1 100644 --- a/app-misc/ssmtool/ssmtool-0.6.2.ebuild +++ b/app-misc/ssmtool/ssmtool-0.6.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=pyproject.toml -inherit distutils-r1 desktop +inherit distutils-r1 DESCRIPTION="A simple sentence mining tool written in PyQt5" HOMEPAGE="https://github.com/FreeLanguageTools/ssmtool/ https://pypi.org/project/ssmtool/" @@ -34,11 +34,3 @@ RDEPEND=" dev-python/mobi[${PYTHON_USEDEP}] dev-python/SLPP[${PYTHON_USEDEP}] " - -python_prepare_all () { - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install -}