Merge updates from master

2026-07-14 01:23:23 -04:00 · 2024-08-07 23:48:53 +00:00
parent cb51818ef5 03feef1464
commit febbf6bdd6
16 changed files with 80 additions and 39 deletions
--- a/app-admin/pulumi-bin/Manifest
+++ b/app-admin/pulumi-bin/Manifest
@@ -1,3 +1,3 @@
-DIST pulumi-v3.122.0-linux-x64.tar.gz 161494939 BLAKE2B 70b169306fca878ebb3a7d29e7f7c8b285c1ab0af8696ae8ff4f0e4284bc1f176f190bc93784b6e39ab3f3c393bd2449ed682eda4e8e883573dcb21d776be563 SHA512 db638c2980d7405e6158a55e1eabc9dafe001cce35df87b44fa78f6ecbf1ffa878bfefd44a72437f156526c7402d8e869014f15858cf474bd2a6c405ed166843
 DIST pulumi-v3.124.0-linux-x64.tar.gz 161897373 BLAKE2B 2b3d1d07f3cb9e1ccc61433130f289af140a7283b75a8be818ca4e7096b6dac9570825dfbdb0e6177485e41f78d321a3d9b48f01042188e79e1d99eecb7fe39e SHA512 d008c7b34f3739c8f3962e8c4db2c83b06a30d19828bae47a9a5bb52629ab43b13bb0855380bfa44c35bba042656d2735f86b6e26dc2a56fdb4490af0a6e8ffd
 DIST pulumi-v3.127.0-linux-x64.tar.gz 161988518 BLAKE2B 413e9476288cb465a0db8863808b12378b7e52dc2a3b7657d3311dc077306d9863b1eb0f213dac71787d71521e043b43a12c4ecab3de0c3a9cedfd05ae9e0656 SHA512 b13843f3d0d8f9d3783827398fac4b095f8955334adcc21b8a996280f2be3610cedb95f8712fe4d8c2c9ceff74082146c8971d72a588abe224588894a5558675
+DIST pulumi-v3.128.0-linux-x64.tar.gz 162055509 BLAKE2B 630660eed429c6268f681aefdb3e16e7f2bf06bc1e491805e8cdbd18f4f4013307100a3709552c920cebb41bb5d9f1c6a037d9a3cd1d944cea33b7b2b7289e5d SHA512 1632ebcb9e7959b6fd144c283d1bea387e228998783696ee06e3a5e0ec2ef4447e1e809119967cea316412086b2036e6b0cd8c4e07f387dfb552f49221a91613
--- a/app-admin/pulumi-bin/pulumi-bin-3.128.0.ebuild
+++ b/app-admin/pulumi-bin/pulumi-bin-3.128.0.ebuild
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild
@@ -5,8 +5,6 @@

 EAPI=8

-CRATES=" "
-
 inherit cargo

 DESCRIPTION="A C ABI library which exposes Signal protocol logic"
@@ -22,7 +20,6 @@ LICENSE="AGPL-3"
 LICENSE+=" AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"

 BDEPEND="
 	dev-libs/protobuf
@@ -33,10 +30,12 @@ src_unpack() {
 	default
 	cargo_gen_config
 	ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die
-	sed -i "${ECARGO_HOME}/config" -e '/source.crates-io/d'  || die
-	sed -i "${ECARGO_HOME}/config" -e '/replace-with = "gentoo"/d'  || die
-	sed -i "${ECARGO_HOME}/config" -e '/local-registry = "\/nonexistent"/d'  || die
-	cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die
+	sed -i "${ECARGO_HOME}/config.toml" \
+		-e '/source.crates-io/d' \
+		-e '/replace-with = "gentoo"/d' \
+		-e '/local-registry = "\/nonexistent"/d' \
+		|| die
+	cat vendor/vendor-config.toml >> "${ECARGO_HOME}/config.toml" || die
 }

 src_install() {
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild
@@ -5,8 +5,6 @@

 EAPI=8

-CRATES=" "
-
 inherit cargo

 DESCRIPTION="A C ABI library which exposes Signal protocol logic"
@@ -22,7 +20,6 @@ LICENSE="AGPL-3"
 LICENSE+=" AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"

 BDEPEND="
 	dev-libs/protobuf
@@ -33,10 +30,12 @@ src_unpack() {
 	default
 	cargo_gen_config
 	ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die
-	sed -i "${ECARGO_HOME}/config" -e '/source.crates-io/d'  || die
-	sed -i "${ECARGO_HOME}/config" -e '/replace-with = "gentoo"/d'  || die
-	sed -i "${ECARGO_HOME}/config" -e '/local-registry = "\/nonexistent"/d'  || die
-	cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die
+	sed -i "${ECARGO_HOME}/config.toml" \
+		-e '/source.crates-io/d' \
+		-e '/replace-with = "gentoo"/d' \
+		-e '/local-registry = "\/nonexistent"/d' \
+		|| die
+	cat vendor/vendor-config.toml >> "${ECARGO_HOME}/config.toml" || die
 }

 src_install() {
--- a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild
+++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild
@@ -30,12 +30,12 @@ src_unpack() {
 	default
 	cargo_gen_config
 	ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die
-	sed -i "${ECARGO_HOME}/config" \
+	sed -i "${ECARGO_HOME}/config.toml" \
 		-e '/source.crates-io/d' \
 		-e '/replace-with = "gentoo"/d' \
 		-e '/local-registry = "\/nonexistent"/d' \
 		|| die
-	cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die
+	cat vendor/vendor-config.toml >> "${ECARGO_HOME}/config.toml" || die
 }

 src_install() {
--- a/dev-python/http-ece/Manifest
+++ b/dev-python/http-ece/Manifest
@@ -1,2 +1,2 @@
-DIST http-ece-1.1.0.gh.tar.gz 19406 BLAKE2B 3347d318ac30c14d6d0b6149746c6dd8ad1681664c165a1dd89858cc50b04452db1576841280f44fe701ca0cb662dad6cbf4c44188b24dad9863185f76e0839d SHA512 22e5d23258c8a4216d63ee0c0e2765dfc742a1887baddca337cce090213e78c8849de01e3bd83c92628eb85ecdbcd6ad4e0462a47fde741028b83cb972865908
+DIST http-ece-1.2.1.gh.tar.gz 19876 BLAKE2B 71955d47e68dca11b1b4b5bd73f5808369a2e3a95c71b250561ce0ab109ecf4b57dce6a80f750ab23c580ee855e95bf6798f612975c6b4fb8632ae392e34255b SHA512 362ffc15a5cd320c01b49ca6ffbe3e23abb12996b689750052d2fa77f6d17bcb0a736c9dccd08983d39daef487879e13ec874d4fa6b266aa57edccadfeb2565a
 DIST http_ece-1.2.0.tar.gz 8771 BLAKE2B 378c82356b4cc754485a830b44e4dd67e7bc3ccab0b1d6ab786b35c7c9529cf621c3a285cdcee9750803367567cb0387a9c7318296e1b401fee317b0ccf057a5 SHA512 84173c190798c1706eda826b49efbe5db394d4216a236df9265c7995cf7baf151d653c6ff34d4fd981513303808062bdebf7cc1d98bc7543bc352a11631f3180
--- a/dev-python/http-ece/http-ece-1.2.1.ebuild
+++ b/dev-python/http-ece/http-ece-1.2.1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+# TODO re-enable pypi when it is available on there
+# <https://github.com/web-push-libs/encrypted-content-encoding/issues/79>
 inherit distutils-r1

 MY_PN="encrypted-content-encoding"
@@ -13,16 +15,15 @@ HOMEPAGE="
 	https://pypi.org/project/http-ece/
 	https://github.com/web-push-libs/encrypted-content-encoding
 "
-SRC_URI="https://github.com/martinthomson/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}/python"
+SRC_URI="https://github.com/web-push-libs/encrypted-content-encoding/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/encrypted-content-encoding-${PV}/python"

 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"

-# v1.1.0 is incompatible with latest 'cryptography'
-RESTRICT="test"
-
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]"

+RESTRICT="test" # tests seem to be broken, further investigation advised
+
 distutils_enable_tests pytest
--- a/dev-ruby/prawn-svg/Manifest
+++ b/dev-ruby/prawn-svg/Manifest
@@ -1 +1 @@
-DIST prawn-svg-0.34.2.gem 282624 BLAKE2B 7802ace3910ef7f24e32a3e2412ca8467baa496c198940f5287c4e0a7859154df1d159a39a0f1d269143c3d1f7f6b8666097fa1a738052fa15551e026b721796 SHA512 ee708156fcce4d855d306462f3ea2bca2d657e0f418eb3bb64041a7fb5c1c99a25ac574acfb05f001ed39060225a1973d26b69c8f2989478b22070b3ff13b29a
+DIST prawn-svg-0.35.1.gem 285696 BLAKE2B 7fb6b8051f43bdf7f887a535b98dff9b4fc45793ca4383aef0150c58816357b3f6568e2ad28d28454165c059ebb5a0b8eaf938ed3f50c35d167c50aad934d450 SHA512 d4511d702d252a785f17ccf1c4d5e0b15952f17266c0e14d56ed51ac79345032638d9adca0704e034341c09ece0845c6e779ee62988d611ed02108c3635fdaff
--- a/dev-ruby/prawn-svg/files/prawn-svg-0.35.1-rexml.patch
+++ b/dev-ruby/prawn-svg/files/prawn-svg-0.35.1-rexml.patch
@@ -0,0 +1,24 @@
+Raised error have changed since rexml 3.3.3. Expect any errors to make the test work.
+https://github.com/mogest/prawn-svg/pull/169
+https://bugs.gentoo.org/937362
+--- a/spec/prawn/svg/document_spec.rb
+++ b/spec/prawn/svg/document_spec.rb
+@@ -28,7 +28,7 @@ describe Prawn::SVG::Document do
+       it 'raises an exception' do
+         expect do
+           Prawn::SVG::Document.new(svg, bounds, options)
+-        end.to raise_error Prawn::SVG::Document::InvalidSVGData, 'The data supplied is not a valid SVG document.'
+        end.to raise_error
+       end
+     end
+ 
+@@ -38,8 +38,7 @@ describe Prawn::SVG::Document do
+       it "raises an exception letting them know what they've done" do
+         expect do
+           Prawn::SVG::Document.new(svg, bounds, options)
+-        end.to raise_error Prawn::SVG::Document::InvalidSVGData,
+-          "The data supplied is not a valid SVG document.  It looks like you've supplied a filename instead; use IO.read(filename) to get the data before you pass it to prawn-svg."
+        end.to raise_error
+       end
+     end
+   end
--- a/dev-ruby/prawn-svg/prawn-svg-0.35.1.ebuild
+++ b/dev-ruby/prawn-svg/prawn-svg-0.35.1.ebuild
@@ -21,3 +21,14 @@ ruby_add_rdepend "
 	>=dev-ruby/prawn-0.11.1
 	>=dev-ruby/rexml-3.2.0
 	"
+
+PATCHES=(
+	# adapt to >=dev-ruby/rexml-3.3.3
+	"${FILESDIR}/${P}-rexml.patch"
+)
+
+all_ruby_prepare() {
+	# avoid useless dependencies
+	sed -i '/rubocop/d' Gemfile || die
+	rm -f Gemfile.lock || die
+}
--- a/dev-util/shellspec/files/shellspec-0.28.1-fix-tests.patch
+++ b/dev-util/shellspec/files/shellspec-0.28.1-fix-tests.patch
@@ -1,4 +1,4 @@
-From 7d89f9fa59f64aba911c57a8bd5e9da54a22f14b Mon Sep 17 00:00:00 2001
+From 084d6cf54ce9acda6d2e296a2ba2c99f1cf8807c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?=
 <beatussum@protonmail.com>
 Date: Wed, 7 Aug 2024 12:10:47 +0200
@@ -7,7 +7,10 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-This commit fixes warnings that occurs during tests.
+This commit fixes warnings that occur during tests.
+
+This commit is based on 699ebb52a569311a55b45f1bc4038d37b9a1de8e and was created
+using `git bisect`.

 See-also: 699ebb52a569311a55b45f1bc4038d37b9a1de8e
 Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com>
--- a/gui-apps/riverguile/riverguile-0.1.0-r1.ebuild
+++ b/gui-apps/riverguile/riverguile-0.1.0-r1.ebuild
@@ -18,12 +18,12 @@ fi
 LICENSE="GPL-3"
 SLOT="0"

-DEPEND="dev-libs/wayland"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	>=dev-scheme/guile-3.0.9
+RDEPEND="
+	~dev-scheme/guile-3.0.9
+	>=dev-libs/wayland-1.22.0
 "
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-libs/wayland-protocols-1.36"

 src_install() {
 	# Need to install to /usr instead of /usr/local
--- a/gui-apps/riverguile/riverguile-9999.ebuild
+++ b/gui-apps/riverguile/riverguile-9999.ebuild
@@ -18,12 +18,12 @@ fi
 LICENSE="GPL-3"
 SLOT="0"

-DEPEND="dev-libs/wayland"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/wayland-protocols
-	>=dev-scheme/guile-3.0.9
+RDEPEND="
+	~dev-scheme/guile-3.0.9
+	>=dev-libs/wayland-1.22.0
 "
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-libs/wayland-protocols-1.36"

 src_install() {
 	# Need to install to /usr instead of /usr/local
--- a/net-irc/halloy/halloy-2024.8.ebuild
+++ b/net-irc/halloy/halloy-2024.8.ebuild
@@ -621,7 +621,8 @@ src_configure() {
 	if [[ ${PV} != *9999* ]] ; then
 		# Fix cargo.eclass handling of patched dependencies
 		# https://github.com/squidowl/halloy/blob/2024.7/Cargo.toml#L53-L54
-		sed -i "s,'https://github.com/iced-rs/iced',crates-io,g" "${ECARGO_HOME}/config" || die
+		sed -i "s,'https://github.com/iced-rs/iced',crates-io,g" \
+			"${ECARGO_HOME}/config.toml" || die
 	fi
 	cargo_src_configure
 }
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.8.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.8.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 "

 RDEPEND="${DEPEND}
+	dev-cpp/abseil-cpp
 	cpu_flags_x86_avx2? (
 		intel-avx2? ( ~app-crypt/intel-ipsec-mb-1.3 )
 	)
--- a/net-wireless/btscreenlocker/btscreenlocker-1.7.0-r1.ebuild
+++ b/net-wireless/btscreenlocker/btscreenlocker-1.7.0-r1.ebuild
@@ -21,7 +21,9 @@ dev-qt/qtdbus:5
 dev-qt/qtwidgets:5
 >=net-wireless/bluez-5.76
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+dev-qt/qtcore:5
+dev-qt/qtgui:5"
 BDEPEND="
 >=dev-build/cmake-3.28
 virtual/pkgconfig