From 5202df7671609faba12a3f05b2da3c0f778e463d Mon Sep 17 00:00:00 2001 From: David Roman Date: Tue, 3 Jun 2025 12:52:25 +0200 Subject: [PATCH 01/25] profiles: remove scheduled removal for packages depending on qtwebengine:5 Multiple packages depends on qtwebengine:5 (removed from ::gentoo). As a result they should be masked. At the time of masking I scheduled a removal which now I believe was a mistake since the 4 packages have different maintainers and don't seems to be completely dead. Now, they are just masked. Signed-off-by: David Roman --- profiles/package.mask | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index e2599dd7e6..9ce31d8ff4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -49,7 +49,6 @@ x11-misc/pywal # David (stkw0) Roman (2025-04-30) # Depends on removed dev-qt/qtwebengine:5, they should be moved to qtwebengine:6 -# Removal on 2025-06-30 dev-vcs/gitqlient-gitserver-plugin dev-vcs/gitqlient-jenkins-plugin media-video/stremio From 75719f91a73d92d2980537b260cf2e75ca41df17 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Tue, 3 Jun 2025 22:55:17 +0900 Subject: [PATCH 02/25] dev-util/distribution-gpg-keys: add 1.111 Signed-off-by: Takuya Wakazono --- dev-util/distribution-gpg-keys/Manifest | 1 + .../distribution-gpg-keys-1.111.ebuild | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 dev-util/distribution-gpg-keys/distribution-gpg-keys-1.111.ebuild diff --git a/dev-util/distribution-gpg-keys/Manifest b/dev-util/distribution-gpg-keys/Manifest index 34fe8a93e7..8274104443 100644 --- a/dev-util/distribution-gpg-keys/Manifest +++ b/dev-util/distribution-gpg-keys/Manifest @@ -1 +1,2 @@ DIST distribution-gpg-keys-1.110-1.tar.gz 79336269 BLAKE2B 9051778906c42752428fdcb00f3dcf55d2c05cc5f9a976ef51a3cbf676337ddf42319a351ad2b7f56e10f03b3717b2dcefdcd847234300f24e7d3b9d56786c2a SHA512 b160cb542761c979f59c96bbea93525ce5f23a34784a1aeb732679b9f5938a287e30cd657d53b45a93122b56ae2b36030b11bd5dcd43b252859734950039ee1e +DIST distribution-gpg-keys-1.111-1.tar.gz 87182704 BLAKE2B 4ffbc1e73128a3dd351a45112cff625adc85c6cfdc574b98e4f472daac9ed4ad1505d7e278c9a2fe69630ea4ca14d99a8b3edee3e33f5549136b798eb73116aa SHA512 4aa5ef7996c9049dc2803117ab255167d1a87ca5380ac14a469b6560ee4ac0f84bde8bf39f87e867c17a5c473b78a0d6e6811ae8578412bb216c41bcbde31bde diff --git a/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.111.ebuild b/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.111.ebuild new file mode 100644 index 0000000000..12c96e17d7 --- /dev/null +++ b/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.111.ebuild @@ -0,0 +1,26 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${P}-1" + +DESCRIPTION="Collection of GPG keys used in Linux Distributions" +HOMEPAGE="https://github.com/rpm-software-management/distribution-gpg-keys" +SRC_URI="https://github.com/rpm-software-management/distribution-gpg-keys/archive/${MY_P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_P}" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="copr" + +src_prepare() { + default + use copr || rm -rf keys/copr || die +} + +src_install() { + insinto "/usr/share/${PN}" + doins -r keys/* +} From 94d5e3469d2822c68d1256b9af748cec3c2f2c93 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Tue, 3 Jun 2025 22:55:19 +0900 Subject: [PATCH 03/25] dev-util/distribution-gpg-keys: drop 1.110 Signed-off-by: Takuya Wakazono --- dev-util/distribution-gpg-keys/Manifest | 1 - .../distribution-gpg-keys-1.110.ebuild | 26 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 dev-util/distribution-gpg-keys/distribution-gpg-keys-1.110.ebuild diff --git a/dev-util/distribution-gpg-keys/Manifest b/dev-util/distribution-gpg-keys/Manifest index 8274104443..49872c51c4 100644 --- a/dev-util/distribution-gpg-keys/Manifest +++ b/dev-util/distribution-gpg-keys/Manifest @@ -1,2 +1 @@ -DIST distribution-gpg-keys-1.110-1.tar.gz 79336269 BLAKE2B 9051778906c42752428fdcb00f3dcf55d2c05cc5f9a976ef51a3cbf676337ddf42319a351ad2b7f56e10f03b3717b2dcefdcd847234300f24e7d3b9d56786c2a SHA512 b160cb542761c979f59c96bbea93525ce5f23a34784a1aeb732679b9f5938a287e30cd657d53b45a93122b56ae2b36030b11bd5dcd43b252859734950039ee1e DIST distribution-gpg-keys-1.111-1.tar.gz 87182704 BLAKE2B 4ffbc1e73128a3dd351a45112cff625adc85c6cfdc574b98e4f472daac9ed4ad1505d7e278c9a2fe69630ea4ca14d99a8b3edee3e33f5549136b798eb73116aa SHA512 4aa5ef7996c9049dc2803117ab255167d1a87ca5380ac14a469b6560ee4ac0f84bde8bf39f87e867c17a5c473b78a0d6e6811ae8578412bb216c41bcbde31bde diff --git a/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.110.ebuild b/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.110.ebuild deleted file mode 100644 index 12c96e17d7..0000000000 --- a/dev-util/distribution-gpg-keys/distribution-gpg-keys-1.110.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P="${P}-1" - -DESCRIPTION="Collection of GPG keys used in Linux Distributions" -HOMEPAGE="https://github.com/rpm-software-management/distribution-gpg-keys" -SRC_URI="https://github.com/rpm-software-management/distribution-gpg-keys/archive/${MY_P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_P}" - -LICENSE="CC0-1.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="copr" - -src_prepare() { - default - use copr || rm -rf keys/copr || die -} - -src_install() { - insinto "/usr/share/${PN}" - doins -r keys/* -} From ea79e62311c1e4643e74fb01262da3341098b0b6 Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Tue, 3 Jun 2025 16:57:15 +0200 Subject: [PATCH 04/25] net-p2p/yggdrasil-go: install genkeys tool Signed-off-by: Sergey Alirzaev --- net-p2p/yggdrasil-go/yggdrasil-go-0.5.12.ebuild | 4 ++-- net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-0.5.12.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-0.5.12.ebuild index 085b9db1d3..09454a92f4 100644 --- a/net-p2p/yggdrasil-go/yggdrasil-go-0.5.12.ebuild +++ b/net-p2p/yggdrasil-go/yggdrasil-go-0.5.12.ebuild @@ -64,13 +64,13 @@ src_compile() { local go_ldflags="-s -linkmode external -extldflags \"${LDFLAGS}\" ${custom_name_version_flags}" - for cmd in yggdrasil{,ctl}; do + for cmd in yggdrasil{,ctl} genkeys; do ego build ${GOFLAGS} -ldflags="${go_ldflags}" ./cmd/${cmd} done } src_install() { - dobin yggdrasil{,ctl} + dobin yggdrasil{,ctl} genkeys einstalldocs systemd_dounit "contrib/systemd/yggdrasil.service" diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild index 085b9db1d3..09454a92f4 100644 --- a/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild +++ b/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild @@ -64,13 +64,13 @@ src_compile() { local go_ldflags="-s -linkmode external -extldflags \"${LDFLAGS}\" ${custom_name_version_flags}" - for cmd in yggdrasil{,ctl}; do + for cmd in yggdrasil{,ctl} genkeys; do ego build ${GOFLAGS} -ldflags="${go_ldflags}" ./cmd/${cmd} done } src_install() { - dobin yggdrasil{,ctl} + dobin yggdrasil{,ctl} genkeys einstalldocs systemd_dounit "contrib/systemd/yggdrasil.service" From b2747731038154f1ecae296f9e4399bef0b61490 Mon Sep 17 00:00:00 2001 From: Vincent Ahluwalia Date: Tue, 3 Jun 2025 18:46:15 +0200 Subject: [PATCH 05/25] gui-apps/sfwbar: add 1.0_beta16_p1 Signed-off-by: Vincent Ahluwalia --- gui-apps/sfwbar/Manifest | 1 + gui-apps/sfwbar/sfwbar-1.0_beta15.ebuild | 2 +- gui-apps/sfwbar/sfwbar-1.0_beta16.ebuild | 2 +- gui-apps/sfwbar/sfwbar-1.0_beta16_p1.ebuild | 73 +++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 gui-apps/sfwbar/sfwbar-1.0_beta16_p1.ebuild diff --git a/gui-apps/sfwbar/Manifest b/gui-apps/sfwbar/Manifest index 010a75aa4e..ed4d94906d 100644 --- a/gui-apps/sfwbar/Manifest +++ b/gui-apps/sfwbar/Manifest @@ -1,2 +1,3 @@ DIST sfwbar-1.0_beta15.tar.gz 405881 BLAKE2B 01f8009bf5cc4d731749389d550347289ee346a1bd2a943e12845194fccc3133eff6a7418c6164b873f9fc291a9e8a19d144efaa9771c8a1738479aed62c26a9 SHA512 69828e9859c0dda88889195bc0d7932b37f9c09d9ff0f61ba3399821fe6002b6758d28a1231cf14de5e6460777eb5b1ce2871d8d7dc8655c0a38967bb017e8c5 DIST sfwbar-1.0_beta16.tar.gz 466212 BLAKE2B fccb76d8238014320a5f5852fc769001fa97a58e06ffbd6a2cfca91a4812ac6cebc2a18177b965362b96decc9b3d61b0baa5b899423def24dc661e1b103dfcf7 SHA512 feaaf993ed18be667d6e979be47721fc678aea79d408de98dff9adaf05e2aa7fd7d7a56e2dd59c24f4a63114b964353f72db0c9509c3c6202369a257569f8485 +DIST sfwbar-1.0_beta16_p1.tar.gz 466343 BLAKE2B a1a605ef1d3b6c6c471ae7852b610bd2e9b930f29caec5e378b3feb08b9a14bae422a0eba2bb8315061573724ef55dbdc67ba4cd20013c11eb957fba29089765 SHA512 f26d7ea743fbac1750fcd804b605d45239ab3935f0661b9affb4108cdc460e919e5720fedf94572cdc8d8f33391ad130ae9eb09300dc917f6f72ee8263204292 diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta15.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta15.ebuild index 9a8a249052..48a9f0f825 100644 --- a/gui-apps/sfwbar/sfwbar-1.0_beta15.ebuild +++ b/gui-apps/sfwbar/sfwbar-1.0_beta15.ebuild @@ -23,7 +23,7 @@ COMMON_DEPEND=" dev-libs/glib:2 dev-libs/json-c:= dev-libs/wayland - gui-libs/gtk-layer-shell + <=gui-libs/gtk-layer-shell-0.9.1 >=x11-libs/gtk+-3.22.0:3[introspection,wayland] X? ( x11-libs/libxkbcommon ) mpd? ( media-libs/libmpdclient ) diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta16.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta16.ebuild index 579799e603..4ac361684d 100644 --- a/gui-apps/sfwbar/sfwbar-1.0_beta16.ebuild +++ b/gui-apps/sfwbar/sfwbar-1.0_beta16.ebuild @@ -23,7 +23,7 @@ COMMON_DEPEND=" dev-libs/glib:2 dev-libs/json-c:= dev-libs/wayland - gui-libs/gtk-layer-shell + <=gui-libs/gtk-layer-shell-0.9.1 >=x11-libs/gtk+-3.22.0:3[introspection,wayland] X? ( x11-libs/libxkbcommon ) mpd? ( media-libs/libmpdclient ) diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta16_p1.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta16_p1.ebuild new file mode 100644 index 0000000000..cfd3016335 --- /dev/null +++ b/gui-apps/sfwbar/sfwbar-1.0_beta16_p1.ebuild @@ -0,0 +1,73 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="1.0_beta16.1" + +inherit meson xdg-utils + +DESCRIPTION="S* Floating Window Bar" +HOMEPAGE="https://github.com/LBCrion/sfwbar" +if [ "${PV}" == 9999 ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/LBCrion/${PN}" +else + SRC_URI="https://github.com/LBCrion/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi +LICENSE="GPL-3" +SLOT="0" + +IUSE="+menu X mpd pulseaudio alsa network networkmanager iwd bluetooth notification man idleinhibit bsdctl" + +COMMON_DEPEND=" + dev-libs/glib:2 + dev-libs/json-c:= + dev-libs/wayland + gui-libs/gtk-layer-shell + >=x11-libs/gtk+-3.22.0:3[introspection,wayland] + X? ( x11-libs/libxkbcommon ) + mpd? ( media-libs/libmpdclient ) + pulseaudio? ( media-libs/libpulse[glib] ) + alsa? ( media-libs/alsa-lib ) +" +RDEPEND="${COMMON_DEPEND} + virtual/freedesktop-icon-theme + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/pango +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/wayland-protocols-1.17 +" +BDEPEND="dev-util/wayland-scanner" + +src_configure() { + local emesonargs=( + $(meson_feature alsa) + $(meson_feature mpd) + $(meson_feature pulseaudio pulse) + $(meson_feature X xkb) + $(meson_feature network) + $(meson_feature networkmanager nm) + $(meson_feature iwd) + $(meson_feature menu appmenu) + $(meson_feature bluetooth bluez) + $(meson_feature bsdctl) + $(meson_feature notification ncenter) + $(meson_feature notification idle) + $(meson_feature man build-docs) + $(meson_feature idleinhibit) + ) + + meson_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} From 0a027c510340f4de847a9038d64d52d315ea6776 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 3 Jun 2025 14:11:33 +0200 Subject: [PATCH 06/25] profiles: mask app-misc/anki-bin for removal Signed-off-by: Lucio Sauer --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 9ce31d8ff4..efa73520a1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,12 @@ # New entries go on top. +# Lucio Sauer (2025-06-03) +# Superseded by app-misc/anki::gentoo and poses extra maintenance burden with +# little to no benefit. +# Removal on 2025-07-03 +app-misc/anki-bin + # David (stkw0) Roman (2025-06-03) # Unmaintained since 2021, fails to compile. Bug #859643 # Removal on 2025-07-30 From 099c2089574dff36811af2ab6080a2e72b182670 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 2 Jun 2025 16:04:19 +0200 Subject: [PATCH 07/25] dev-python/dataclasses-json: enable py3.13, up-blocker for marshmallow-4.0.0 Signed-off-by: Nicolas PARLANT --- dev-python/dataclasses-json/dataclasses-json-0.6.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/dataclasses-json/dataclasses-json-0.6.7.ebuild b/dev-python/dataclasses-json/dataclasses-json-0.6.7.ebuild index e69fce99cb..be62236dd1 100644 --- a/dev-python/dataclasses-json/dataclasses-json-0.6.7.ebuild +++ b/dev-python/dataclasses-json/dataclasses-json-0.6.7.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{11..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit distutils-r1 @@ -23,7 +23,7 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - dev-python/marshmallow[${PYTHON_USEDEP}] + Date: Mon, 2 Jun 2025 16:06:35 +0200 Subject: [PATCH 08/25] dev-python/json-schema-for-humans: add 1.4.1 Signed-off-by: Nicolas PARLANT --- dev-python/json-schema-for-humans/Manifest | 1 + .../json-schema-for-humans-1.4.1.ebuild | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 dev-python/json-schema-for-humans/json-schema-for-humans-1.4.1.ebuild diff --git a/dev-python/json-schema-for-humans/Manifest b/dev-python/json-schema-for-humans/Manifest index 774b4a406f..552963cd75 100644 --- a/dev-python/json-schema-for-humans/Manifest +++ b/dev-python/json-schema-for-humans/Manifest @@ -1 +1,2 @@ DIST json-schema-for-humans-1.3.4.gh.tar.gz 864919 BLAKE2B 5e70e1bcf08bc449d7a4948b9828eb825c2ab126dc6fe4c71c5b70f18f3961e55a45b9346d4d10169d42ef6dde728b042ca04669101482c9dc619a183ff6ed3c SHA512 fe9b0fb7ae9d9659d6d717ad5e21cd5605133a8fad3ec9448512b77156f9a4624c580eaa50469364fd2eb15f2b4d0a950d66f006641bbdfec21c3658554aaa75 +DIST json-schema-for-humans-1.4.1.gh.tar.gz 865045 BLAKE2B e40329657743ec38b0a9eabc97f90b81774208f1c975aeed9cc07c43e7e3ce70843a2e36e0dff19c39987f3bb7535f7f881fac6b3053479e1c0a7d16ae260eb2 SHA512 313f329e8451eb66170083beef1207112b984b233a3c83d46a9a15ad2251ceae91cbe0b69534d063e82d63dd1851ec9417e78706f1138bbb14a4ee1e7bee781d diff --git a/dev-python/json-schema-for-humans/json-schema-for-humans-1.4.1.ebuild b/dev-python/json-schema-for-humans/json-schema-for-humans-1.4.1.ebuild new file mode 100644 index 0000000000..c57f30ca9d --- /dev/null +++ b/dev-python/json-schema-for-humans/json-schema-for-humans-1.4.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{11..13} ) + +inherit distutils-r1 + +DESCRIPTION="Quickly generate HTML documentation from a JSON schema " +HOMEPAGE=" + https://github.com/coveooss/json-schema-for-humans/ + https://pypi.org/project/json-schema-for-humans/ +" +SRC_URI="https://github.com/coveooss/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-python/click[${PYTHON_USEDEP}] + dev-python/dataclasses-json[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] + dev-python/markdown2[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + ${DISTUTILS_DEPS} + ${PYTHON_DEPS} + test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] ) +" + +distutils_enable_tests pytest + +python_test(){ + local EPYTEST_DESELECT=( + # tests with network + 'tests/generate_test.py::test_references_url' + 'tests/test_md_generate.py::TestMdGenerate::test_basic[True-True-references_url' + 'tests/test_md_generate.py::TestMdGenerate::test_basic[True-False-references_url' + 'tests/test_md_generate.py::TestMdGenerate::test_basic[False-True-references_url' + 'tests/test_md_generate.py::TestMdGenerate::test_basic[False-False-references_url' + # tests with error when passed + 'tests/cli_test.py::test_config_parameters_with_nonexistent_output_path' + 'tests/cli_test.py::test_nonexistent_output_path' + ) + epytest +} From 730d13ec02416e229807a283c7044b9f5e182b68 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Wed, 4 Jun 2025 07:38:29 +0200 Subject: [PATCH 09/25] net-misc/wstunnel: add 10.4.1 Signed-off-by: Nicolas PARLANT --- net-misc/wstunnel/Manifest | 2 ++ net-misc/wstunnel/wstunnel-10.4.1.ebuild | 43 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 net-misc/wstunnel/wstunnel-10.4.1.ebuild diff --git a/net-misc/wstunnel/Manifest b/net-misc/wstunnel/Manifest index 1fb1ae32f4..fca1a35a3d 100644 --- a/net-misc/wstunnel/Manifest +++ b/net-misc/wstunnel/Manifest @@ -2,3 +2,5 @@ DIST wstunnel-10.3.0-crates.tar.xz 35231292 BLAKE2B a860070352142df33ef806d67b6f DIST wstunnel-10.3.0.tar.gz 291982 BLAKE2B ac157241c9d1b1758cee5937e90a20f4a116e9dd157d3341de50af29f217cc13bde2ac82aedec705fc6d38b97becca57e9d2f14b722aeb8918e2c2270d45ebe6 SHA512 3e3c4f36ae309a34bb15f2cccb2d857c31c6236ad2614a7262b879351d108b8e14b9f884e2f6bf37df986c9b348cc628f7c51ceeffd09787045616934ab21f68 DIST wstunnel-10.4.0-crates.tar.xz 35470060 BLAKE2B bc8efa3b930bd79d3cf59a7d8ebfd8c72371930eef6b580bb26a078fea9cb90fd229e6c137243d8390cace8f076fd1f1cd056d8e882d05150966d05373586412 SHA512 dc4fc2e397132dcb20fb7266378153a6f6ef96836efae181e93991b8141547d3366293b802123b9de4bcfcaef800158f4ea91eba4739322ef9f5c6d9e3f13b6f DIST wstunnel-10.4.0.tar.gz 1713437 BLAKE2B 7b251f869e177b59e0a5f8aa6df3cec05db670ac4d474d6846912d864db44b2647fe9ceab039316d73c32b82ff379a9c776738e73d1febf381d85b7353133e69 SHA512 1ee1065e9e859b1532af037720a824dd027ec03abdc5bb92e09d6c7269bc2d068f196d4eb56cfe2f5b46e4b553374f7b4c5c09502ac4b0b08078805e770c34ac +DIST wstunnel-10.4.1-crates.tar.xz 35470060 BLAKE2B bc8efa3b930bd79d3cf59a7d8ebfd8c72371930eef6b580bb26a078fea9cb90fd229e6c137243d8390cace8f076fd1f1cd056d8e882d05150966d05373586412 SHA512 dc4fc2e397132dcb20fb7266378153a6f6ef96836efae181e93991b8141547d3366293b802123b9de4bcfcaef800158f4ea91eba4739322ef9f5c6d9e3f13b6f +DIST wstunnel-10.4.1.tar.gz 1713902 BLAKE2B 8b987e2398eb52941a311ad2017e4e464a51b838a0ec028f01470d4260c658a0046d129c4c16f3e8d56defd9ed3cc6bc422804885a5a9ee0d11a08a5e09acf08 SHA512 94579ebb0f8a2065ce21524ff3c627f29fc51e03ae0ebcd2798878b53c92ee8a484a6fb55b2a98af7ff0ed393aaa3c31cee373c31bc1a3d220b890eab1881c18 diff --git a/net-misc/wstunnel/wstunnel-10.4.1.ebuild b/net-misc/wstunnel/wstunnel-10.4.1.ebuild new file mode 100644 index 0000000000..c57fe35d97 --- /dev/null +++ b/net-misc/wstunnel/wstunnel-10.4.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" +RUST_MIN_VER="1.85.0" + +inherit cargo + +DESCRIPTION="Tunnel all your traffic over Websocket or HTTP2 - Bypass firewalls/DPI" +HOMEPAGE="https://github.com/erebe/wstunnel/" +SRC_URI="https://github.com/erebe/wstunnel/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://raw.githubusercontent.com/PPN-SD/vendor/refs/tags/${P}/${P}-crates.tar.xz" + +LICENSE="BSD" +# Autogenerated by pycargoebuild +# Dependent crate licenses +LICENSE+=" + Apache-2.0 BSD CC0-1.0 CDLA-Permissive-2.0 ISC MIT openssl + Unicode-3.0 +" +SLOT="0" +KEYWORDS="~amd64" + +QA_FLAGS_IGNORED="usr/bin/wstunnel" + +src_compile() { + cargo_src_compile --package wstunnel-cli +} + +src_test() { + # skip test with network sandbox violations + cargo_src_test -- \ + --skip test_proxy_connection +} + +src_install() { + cargo_src_install --path wstunnel-cli + local DOCS+=( README.md docs/*.md ) + einstalldocs +} From 509db1085bd16ba6593d7fee3052b74acb215aea Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Wed, 4 Jun 2025 07:38:42 +0200 Subject: [PATCH 10/25] net-misc/wstunnel: drop 10.3.0 Signed-off-by: Nicolas PARLANT --- net-misc/wstunnel/Manifest | 2 -- net-misc/wstunnel/wstunnel-10.3.0.ebuild | 43 ------------------------ 2 files changed, 45 deletions(-) delete mode 100644 net-misc/wstunnel/wstunnel-10.3.0.ebuild diff --git a/net-misc/wstunnel/Manifest b/net-misc/wstunnel/Manifest index fca1a35a3d..f33477e8f6 100644 --- a/net-misc/wstunnel/Manifest +++ b/net-misc/wstunnel/Manifest @@ -1,5 +1,3 @@ -DIST wstunnel-10.3.0-crates.tar.xz 35231292 BLAKE2B a860070352142df33ef806d67b6ff11401de44691748de740b54f755edde39cca3ecb0c464b70f6d68214146f50df034b83759128e6bf2b5bf9573aebacabacd SHA512 917562a78210d7136ccaf357c6af8d5d30b394a029227b6be1f7be01e97cf0ff0b1c0b2e9a6adf9bbef68cc3b40431d2e9c4d77fabe684fd5ef9d7a26ac3d9f0 -DIST wstunnel-10.3.0.tar.gz 291982 BLAKE2B ac157241c9d1b1758cee5937e90a20f4a116e9dd157d3341de50af29f217cc13bde2ac82aedec705fc6d38b97becca57e9d2f14b722aeb8918e2c2270d45ebe6 SHA512 3e3c4f36ae309a34bb15f2cccb2d857c31c6236ad2614a7262b879351d108b8e14b9f884e2f6bf37df986c9b348cc628f7c51ceeffd09787045616934ab21f68 DIST wstunnel-10.4.0-crates.tar.xz 35470060 BLAKE2B bc8efa3b930bd79d3cf59a7d8ebfd8c72371930eef6b580bb26a078fea9cb90fd229e6c137243d8390cace8f076fd1f1cd056d8e882d05150966d05373586412 SHA512 dc4fc2e397132dcb20fb7266378153a6f6ef96836efae181e93991b8141547d3366293b802123b9de4bcfcaef800158f4ea91eba4739322ef9f5c6d9e3f13b6f DIST wstunnel-10.4.0.tar.gz 1713437 BLAKE2B 7b251f869e177b59e0a5f8aa6df3cec05db670ac4d474d6846912d864db44b2647fe9ceab039316d73c32b82ff379a9c776738e73d1febf381d85b7353133e69 SHA512 1ee1065e9e859b1532af037720a824dd027ec03abdc5bb92e09d6c7269bc2d068f196d4eb56cfe2f5b46e4b553374f7b4c5c09502ac4b0b08078805e770c34ac DIST wstunnel-10.4.1-crates.tar.xz 35470060 BLAKE2B bc8efa3b930bd79d3cf59a7d8ebfd8c72371930eef6b580bb26a078fea9cb90fd229e6c137243d8390cace8f076fd1f1cd056d8e882d05150966d05373586412 SHA512 dc4fc2e397132dcb20fb7266378153a6f6ef96836efae181e93991b8141547d3366293b802123b9de4bcfcaef800158f4ea91eba4739322ef9f5c6d9e3f13b6f diff --git a/net-misc/wstunnel/wstunnel-10.3.0.ebuild b/net-misc/wstunnel/wstunnel-10.3.0.ebuild deleted file mode 100644 index c57fe35d97..0000000000 --- a/net-misc/wstunnel/wstunnel-10.3.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" -" -RUST_MIN_VER="1.85.0" - -inherit cargo - -DESCRIPTION="Tunnel all your traffic over Websocket or HTTP2 - Bypass firewalls/DPI" -HOMEPAGE="https://github.com/erebe/wstunnel/" -SRC_URI="https://github.com/erebe/wstunnel/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://raw.githubusercontent.com/PPN-SD/vendor/refs/tags/${P}/${P}-crates.tar.xz" - -LICENSE="BSD" -# Autogenerated by pycargoebuild -# Dependent crate licenses -LICENSE+=" - Apache-2.0 BSD CC0-1.0 CDLA-Permissive-2.0 ISC MIT openssl - Unicode-3.0 -" -SLOT="0" -KEYWORDS="~amd64" - -QA_FLAGS_IGNORED="usr/bin/wstunnel" - -src_compile() { - cargo_src_compile --package wstunnel-cli -} - -src_test() { - # skip test with network sandbox violations - cargo_src_test -- \ - --skip test_proxy_connection -} - -src_install() { - cargo_src_install --path wstunnel-cli - local DOCS+=( README.md docs/*.md ) - einstalldocs -} From 0756f73e144a02ae05f28468063ec5d09498fdd5 Mon Sep 17 00:00:00 2001 From: Eric Joldasov Date: Wed, 4 Jun 2025 11:35:11 +0500 Subject: [PATCH 11/25] dev-zig/zls: move src_unpack block closer to other phases Signed-off-by: Eric Joldasov --- dev-zig/zls/zls-0.14.0.ebuild | 11 +++++++---- dev-zig/zls/zls-9999.ebuild | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dev-zig/zls/zls-0.14.0.ebuild b/dev-zig/zls/zls-0.14.0.ebuild index f8651590d4..179e69e765 100644 --- a/dev-zig/zls/zls-0.14.0.ebuild +++ b/dev-zig/zls/zls-0.14.0.ebuild @@ -17,10 +17,6 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/zigtools/zls" inherit git-r3 - src_unpack() { - git-r3_src_unpack - zig_live_fetch -Denable-tracy=false - } else # Should be the "minimum_build_zig_version" from upstream's "build.zig". ZIG_SLOT="$(ver_cut 1-2)" # works only for releases, but that's okay @@ -47,6 +43,13 @@ RDEPEND=" DOCS=( README.md ) +if [[ ${PV} == 9999 ]]; then + src_unpack() { + git-r3_src_unpack + zig_live_fetch -Denable-tracy=false + } +fi + src_configure() { local my_zbs_args=( -Dpie=true diff --git a/dev-zig/zls/zls-9999.ebuild b/dev-zig/zls/zls-9999.ebuild index 865faed72d..713d0b9f87 100644 --- a/dev-zig/zls/zls-9999.ebuild +++ b/dev-zig/zls/zls-9999.ebuild @@ -11,10 +11,6 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/zigtools/zls" inherit git-r3 - src_unpack() { - git-r3_src_unpack - zig_live_fetch -Denable-tracy=false - } else # Should be the "minimum_build_zig_version" from upstream's "build.zig". ZIG_SLOT="$(ver_cut 1-2)" # works only for releases, but that's okay @@ -41,6 +37,13 @@ RDEPEND=" DOCS=( README.md ) +if [[ ${PV} == 9999 ]]; then + src_unpack() { + git-r3_src_unpack + zig_live_fetch -Denable-tracy=false + } +fi + src_configure() { local my_zbs_args=( -Dpie=true From 3279c939a211bad2bcbf4b777cf12b599f108e2a Mon Sep 17 00:00:00 2001 From: Eric Joldasov Date: Wed, 4 Jun 2025 11:41:36 +0500 Subject: [PATCH 12/25] gui-wm/river: drop 0.3.6, 0.3.8 Signed-off-by: Eric Joldasov --- gui-wm/river/Manifest | 2 - gui-wm/river/river-0.3.6.ebuild | 75 --------------------------------- gui-wm/river/river-0.3.8.ebuild | 72 ------------------------------- 3 files changed, 149 deletions(-) delete mode 100644 gui-wm/river/river-0.3.6.ebuild delete mode 100644 gui-wm/river/river-0.3.8.ebuild diff --git a/gui-wm/river/Manifest b/gui-wm/river/Manifest index 66c4604382..d77ba6f2a9 100644 --- a/gui-wm/river/Manifest +++ b/gui-wm/river/Manifest @@ -1,7 +1,5 @@ DIST pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz 7966 BLAKE2B 8d6607e878b0bacc0fc16bcc2264ddd89e349b61a1b269e59b2e19b311064453a473f2401103b0e40906f7190d154d403b712e05fe937abe2f6253f7d8337820 SHA512 2eb43d460aff9ff2da015afc9230ca73588ada59df59465a3efa8f074d9d641fec4bf52ab3de475ec1a5ba2f04afc59221f231af5e2cf5aba7252bbde6be35a5 -DIST river-0.3.6.tar.gz 171853 BLAKE2B ffa66b698a250eeaef6034ce7f58175d99ae93b644525b30e192938620410efe494bf8bbf0dc6885d784d1566c26a13e026a490ec21db8e664d42a1ddb5eb222 SHA512 62a7a39a697507813018e02d7d05374dfdab2bbd531623b870b1ea75d34a4bd3dea55146fb6b37620ee4633d5a1fd011461de097bc1fd4db6c6ca95251033f27 DIST river-0.3.7.tar.gz 172036 BLAKE2B d428ec0abf562c0b0ef153499862e0c0c32b37721c870c7f0d54599634fccd5339595eb51e34d401e877378b10c945ad7e0fbf73a90c27c3a1c9eb0883ca88df SHA512 4297b2bd566a3f87fd0c158affd8573661d722ebb7e795356040b15185f09e67dcfac938fa26757d683a274dc08781559b059584dc4934c1d6f51666bf8cb9ec -DIST river-0.3.8.tar.gz 173936 BLAKE2B 33986135b3425310c441a10e656faf0263befc341348de81c3fd258d00224e214464cf69021671137040d1b7a5a2d3c0168f2602528f6edb92e3d4519b28655a SHA512 2182df2dcd18bc1258d3b7ded3d2ae243686962adec9749677c3799717d61ad74d298e9e8297fb04d1aa70179f8a6f4cccf1425a02581f1783e18c7064e70cf0 DIST river-0.3.9.tar.gz 174866 BLAKE2B fcadce04c095629c5b44a8f3aa38cd00038aa11e5e6a7f863e9ff6516191ee83b3cd805d88e4457c0acf471853701f1e0a71d1bae30921e37e1bd7ee7aee924f SHA512 1c69d07bdb0e16e2ae31afd1af39739b23f0ab070a70afcef86757bb3de5d44058711b860bf2936dca7d7589d8a5074e50edf19e8ea33abbf36418b838f71ffa DIST wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl.tar.gz 74934 BLAKE2B 8dda2bae62c65068825068dbe91e701ad4a71685d2209bb703d0e8b71b75f1546690b83fc66e9b81de59e26c9e5a9d8d5cfa3f2098cd16a3f13ada7f38fb94ce SHA512 436c7104c41bb3c26bedc3491d887293fa0a40c11a14bc0973a1fa873c5161a05c9681a857f6cf89c9b34106e2b9e92b4f67eebabaf16836cb99a459ad11d20e DIST wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk.tar.gz 58688 BLAKE2B 744c6305c9593fc21d6c00973adfa84f28e153e2fcac8652590d4ecadc0051f3a496997f2d1ab6256136530b4fc50cfbca876020ec5f9ec0c93c9447b2a53639 SHA512 e41e14f90f6b8e760450eae74d5ed1396646a4af2b373347b0bb3d22ba27d6e22b9d4786e76025fc1127a270cafc12f5505770f8ae13202aba9ff1b01b4047f2 diff --git a/gui-wm/river/river-0.3.6.ebuild b/gui-wm/river/river-0.3.6.ebuild deleted file mode 100644 index 6ddf852d66..0000000000 --- a/gui-wm/river/river-0.3.6.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -declare -r -A ZBS_DEPENDENCIES=( - [zig-pixman-12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56.tar.gz]='https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz' - [zig-wayland-1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz' - [zig-wlroots-122083317b028705b5d27be12976feebf17066a4e51802b3b5e9f970bec580e433e1.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.1.tar.gz' - [zig-xkbcommon-1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz' -) - -ZIG_SLOT="0.13" -inherit zig - -DESCRIPTION="A dynamic tiling Wayland compositor" -HOMEPAGE="https://isaacfreund.com/software/river/ https://codeberg.org/river/river" -# TODO verify-sig support -SRC_URI=" - https://codeberg.org/river/river/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${ZBS_DEPENDENCIES_SRC_URI} -" -S="${WORKDIR}/${PN}" - -# river: GPL-3-or-later -# zig-pixman, zig-wayland, zig-wlroots, zig-xkbcommon: MIT -LICENSE="GPL-3+ MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="X +llvm man" - -BDEPEND=" - dev-libs/wayland-protocols - dev-util/wayland-scanner - man? ( app-text/scdoc ) - || ( - dev-lang/zig:${ZIG_SLOT}[llvm(+)?] - dev-lang/zig-bin:${ZIG_SLOT} - ) -" -DEPEND=" - dev-libs/libevdev - dev-libs/libinput:= - dev-libs/wayland - gui-libs/wlroots:0.18[X?] - x11-libs/libxkbcommon[wayland,X?] - x11-libs/pixman -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-fix-no-lazypath.patch" ) - -DOCS=( "README.md" ) - -src_configure() { - local my_zbs_args=( - -Dstrip=false # Let Portage control this - -Dpie=true - -Dno-llvm=$(usex llvm false true) - -Dman-pages=$(usex man true false) - -Dxwayland=$(usex X true false) - ) - - zig_src_configure -} - -src_install() { - zig_src_install - - insinto /usr/share/wayland-sessions/ - doins contrib/river.desktop - - insinto /usr/share/river/ - doins -r example/ -} diff --git a/gui-wm/river/river-0.3.8.ebuild b/gui-wm/river/river-0.3.8.ebuild deleted file mode 100644 index 005618f415..0000000000 --- a/gui-wm/river/river-0.3.8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A dynamic tiling Wayland compositor" -HOMEPAGE="https://isaacfreund.com/software/river/ https://codeberg.org/river/river" - -declare -g -r -A ZBS_DEPENDENCIES=( - [pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX.tar.gz]='https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz' - [wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl.tar.gz]='https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz' - [wlroots-0.18.2-jmOlchnIAwBq45_cxU1V3OWErxxJjQZlc9PyJfR-l3uk.tar.gz]='https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.2.tar.gz' - [xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr.tar.gz]='https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz' -) - -ZIG_SLOT="0.14" -inherit zig -# TODO verify-sig support -SRC_URI=" - https://codeberg.org/river/river/releases/download/v${PV}/${P}.tar.gz - ${ZBS_DEPENDENCIES_SRC_URI} -" - -# river: GPL-3-or-later -# zig-pixman, zig-wayland, zig-wlroots, zig-xkbcommon: MIT -LICENSE="GPL-3+ MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="X +llvm man" - -BDEPEND=" - dev-libs/wayland-protocols - dev-util/wayland-scanner - man? ( app-text/scdoc ) - || ( - dev-lang/zig:${ZIG_SLOT}[llvm(+)?] - dev-lang/zig-bin:${ZIG_SLOT} - ) -" -DEPEND=" - dev-libs/libevdev - dev-libs/libinput:= - dev-libs/wayland - gui-libs/wlroots:0.18[X?] - x11-libs/libxkbcommon[wayland,X?] - x11-libs/pixman -" -RDEPEND="${DEPEND}" - -DOCS=( "README.md" ) - -src_configure() { - local my_zbs_args=( - -Dstrip=false # Let Portage control this - -Dpie=true - -Dno-llvm=$(usex llvm false true) - -Dman-pages=$(usex man true false) - -Dxwayland=$(usex X true false) - ) - - zig_src_configure -} - -src_install() { - zig_src_install - - insinto /usr/share/wayland-sessions/ - doins contrib/river.desktop - - insinto /usr/share/river/ - doins -r example/ -} From 74c1390189ca9268bfbfabb1d9fd319a93574975 Mon Sep 17 00:00:00 2001 From: Itai Ferber Date: Wed, 4 Jun 2025 07:06:09 -0400 Subject: [PATCH 13/25] net-vpn/mullvadvpn-app: add 2025.7_beta1 Signed-off-by: Itai Ferber --- net-vpn/mullvadvpn-app/Manifest | 2 + .../mullvadvpn-app-2025.7_beta1.ebuild | 152 ++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild diff --git a/net-vpn/mullvadvpn-app/Manifest b/net-vpn/mullvadvpn-app/Manifest index ba29774714..275485001b 100644 --- a/net-vpn/mullvadvpn-app/Manifest +++ b/net-vpn/mullvadvpn-app/Manifest @@ -1,2 +1,4 @@ DIST MullvadVPN-2025.6_aarch64.rpm 84081953 BLAKE2B 73219680ff5ed792d54af3003a8ccec4995879bf945250e91ffce807e2cdca26867f66d0ae13115fd995b4d6009e0c840649a6f3f6b77301bb495d029df46fbb SHA512 dc6ef9f30b752a451dc011b33dbd49073627f621994b51d85396bf76f457ecf4589dedf36684d6c75c3908869604fb3ccf113fad9a8935e41f516680c7b82fcd DIST MullvadVPN-2025.6_x86_64.rpm 89423673 BLAKE2B 6c8fcd6a9a05f1ba3ef31c6b9421398b21f8649484337a425168abe01e954cdd01e7b85c8a54b6839ddae712dd4e8b5b66767b1647b7faa9ca642ab4cebb8753 SHA512 6bec6a3116d21f0dd3185c21a5ae14bec5c969ea1e4472d41a7761fcce918bb689e913c822c2eeb6f55c077c048bd95a561a77e9dacac570e0fd09da24c6829d +DIST MullvadVPN-2025.7-beta1_aarch64.rpm 84695385 BLAKE2B 7948b360f51bafc8295bda07502ab29cdc7c4d7560ec2f1677d992afc4ab4be8e71caf8badd1bfd8ab90c76a9d905d58881f7eb9cabcf0ef74010e406655c6e7 SHA512 30c5c48d5dc88f8113e70809f9c6905830707f08dc0f6059e625e530190e3a967fe7c34edd8b27ec4ee456cfc14b7e023e0175c270242a21d014349f8ab58b63 +DIST MullvadVPN-2025.7-beta1_x86_64.rpm 90089637 BLAKE2B 9c4345b72fe117bb1d573a0879f1bd2221ecf363b8078af9b731315fc9c5afff3a6e16e55ec089908c9edfbcb5881c77b8eb21ff158a2a0761edd594a51f903b SHA512 21143c9784fcc74890217d53eaba2f29bebc751c611e4c3a17ed089501fa404533cd5e6b37eab3d02ead71d4275718b22f411703252fa06a9f74525ec3b766c5 diff --git a/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild new file mode 100644 index 0000000000..8d1312be68 --- /dev/null +++ b/net-vpn/mullvadvpn-app/mullvadvpn-app-2025.7_beta1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop rpm systemd shell-completion xdg + +MYPV="${PV/_beta/-beta}" +DESCRIPTION="Tool used to manage daemon setup" +HOMEPAGE="https://github.com/mullvad/mullvadvpn-app https://mullvad.net/" +SRC_URI=" + amd64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_x86_64.rpm ) + arm64? ( https://github.com/mullvad/mullvadvpn-app/releases/download/${MYPV}/MullvadVPN-${MYPV}_aarch64.rpm ) +" + +S="${WORKDIR}" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64" + +RESTRICT="bindist mirror strip" + +RDEPEND=" + app-accessibility/at-spi2-core:2 + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/pango +" + +QA_PREBUILT="*" + +src_install() { + sed -i "s|SCRIPT_DIR=.*|SCRIPT_DIR=\"/opt/Mullvad VPN/\"|g" "${S}/opt/Mullvad VPN/mullvad-vpn" || die + + # Using doins -r would strip executable bits from all binaries + cp -pPR opt "${D}"/ || die "Failed to copy files" + fperms +x "/opt/Mullvad VPN/chrome_crashpad_handler" + fperms 4755 "/opt/Mullvad VPN/chrome-sandbox" + + dobin ./usr/bin/mullvad + dobin ./usr/bin/mullvad-daemon + dobin ./usr/bin/mullvad-exclude + dosym -r "/opt/Mullvad VPN/mullvad-vpn" /usr/bin/mullvad-vpn + dosym -r "/opt/Mullvad VPN/resources/mullvad-problem-report" /usr/bin/mullvad-problem-report + + # mullvad-exclude uses cgroups to manage exclusions, which requires root permissions, but is + # also most often used to exclude graphical applications which can't or shouldn't run as root + # (i.e., can't be run under `sudo/doas /usr/bin/mullvad-exclude ...`, because `sudo`/`doas` + # change user). The setuid bit allows any user to exclude executables under their own UID. + fperms 4755 /usr/bin/mullvad-exclude + + newinitd "${FILESDIR}"/mullvad-daemon.initd mullvad-daemon + + systemd_newunit ./usr/lib/systemd/system/mullvad-daemon.service mullvad-daemon.service + systemd_newunit ./usr/lib/systemd/system/mullvad-early-boot-blocking.service mullvad-early-boot-blocking.service + + newbashcomp ./usr/share/bash-completion/completions/mullvad mullvad + newfishcomp ./usr/share/fish/vendor_completions.d/mullvad.fish mullvad + newzshcomp ./usr/share/zsh/site-functions/_mullvad _mullvad + + domenu ./usr/share/applications/mullvad-vpn.desktop + local x + for x in 16 32 48 64 128 256 512 1024; do + doicon -s "${x}" "./usr/share/icons/hicolor/${x}x${x}/apps/mullvad-vpn.png" + done +} + +MULLVAD_IS_BEING_UPDATED=false + +pkg_preinst() { + xdg_pkg_preinst + + [[ -n "$(best_version "${CATEGORY}/${PN}")" ]] && MULLVAD_IS_BEING_UPDATED=true +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ ${MULLVAD_IS_BEING_UPDATED} = "false" ]]; then + if ! command -v pgrep &>/dev/null || pgrep -f "mullvad-(daemon|gui)"; then + elog "Mullvad has been uninstalled. To stop the service," + elog "1. Quit the Mullvad app" + elog " * Manually: 'Disconnect & quit' from the Mullvad menu" + elog " OR" + elog " * Command line: pkill -f mullvad-gui" + elog "2. Stop the daemon" + elog " * OpenRC: rc-service mullvad-daemon stop" + elog " OR" + elog " * systemd: systemctl stop mullvad-daemon" + elog " OR" + elog " * other: pkill -f mullvad-daemon" + fi + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ ${MULLVAD_IS_BEING_UPDATED} = "true" ]]; then + if command -v pgrep &>/dev/null && pgrep -f "mullvad-(daemon|gui)" &>/dev/null; then + elog "Mullvad has been updated. To restart the service," + elog "1. Restart the daemon" + elog " * OpenRC: rc-service mullvad-daemon restart" + elog " OR" + elog " * systemd: systemctl restart mullvad-daemon" + elog "2. Restart the app" + elog " * Manually: 'Disconnect & quit' from the Mullvad menu and relaunch using" + elog " your preferred desktop launcher" + elog " OR" + elog " * Command line: pkill -f mullvad-gui && '/opt/Mullvad VPN/mullvad-vpn' & disown" + else + elog "Mullvad has been updated. To start the service," + elog "1. Start the daemon" + elog " * OpenRC: rc-service mullvad-daemon start" + elog " OR" + elog " * systemd: systemctl start mullvad-daemon" + elog "2. Launch the app" + elog " * Manually: use your preferred desktop launcher" + elog " OR" + elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown" + fi + else + elog "Mullvad has been installed. To start the service," + elog "1. Enable and start the daemon" + elog " * OpenRC: rc-update add mullvad-daemon default" + elog " rc-service mullvad-daemon start" + elog " OR" + elog " * systemd: systemctl enable mullvad-daemon" + elog " systemctl start mullvad-daemon" + elog "2. Launch the app" + elog " * Manually: use your preferred desktop launcher" + elog " OR" + elog " * Command line: '/opt/Mullvad VPN/mullvad-vpn' & disown" + fi +} From 99e357fdb995235a9fbecc59b7579148218f411b Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:10:47 +0200 Subject: [PATCH 14/25] dev-python/phx-class-registry: update to EAPI 8 Signed-off-by: Lucio Sauer --- .../phx-class-registry/phx-class-registry-4.1.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/phx-class-registry/phx-class-registry-4.1.0-r1.ebuild b/dev-python/phx-class-registry/phx-class-registry-4.1.0-r1.ebuild index 325c368d4d..af9655d146 100644 --- a/dev-python/phx-class-registry/phx-class-registry-4.1.0-r1.ebuild +++ b/dev-python/phx-class-registry/phx-class-registry-4.1.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) DISTUTILS_USE_PEP517=setuptools From 8db88f73cf8046927b4a37f592a4c11a3ed5bd83 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:18:12 +0200 Subject: [PATCH 15/25] app-backup/b2: update to EAPI 8 Signed-off-by: Lucio Sauer --- app-backup/b2/b2-4.0.1.ebuild | 4 ++-- app-backup/b2/b2-4.3.2.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-backup/b2/b2-4.0.1.ebuild b/app-backup/b2/b2-4.0.1.ebuild index 8604825838..3bcf93f3d7 100644 --- a/app-backup/b2/b2-4.0.1.ebuild +++ b/app-backup/b2/b2-4.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517="pdm-backend" diff --git a/app-backup/b2/b2-4.3.2.ebuild b/app-backup/b2/b2-4.3.2.ebuild index a71fff66b6..4b1f3224d0 100644 --- a/app-backup/b2/b2-4.3.2.ebuild +++ b/app-backup/b2/b2-4.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) DISTUTILS_USE_PEP517="pdm-backend" From b282b8ecf82052f0b11614833f0732980b666a84 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:21:06 +0200 Subject: [PATCH 16/25] dev-python/iOSbackup: update to EAPI 8 Signed-off-by: Lucio Sauer --- dev-python/iOSbackup/iOSbackup-0.9.925.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/iOSbackup/iOSbackup-0.9.925.ebuild b/dev-python/iOSbackup/iOSbackup-0.9.925.ebuild index 52179e724c..2b10b76a12 100644 --- a/dev-python/iOSbackup/iOSbackup-0.9.925.ebuild +++ b/dev-python/iOSbackup/iOSbackup-0.9.925.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYPI_NO_NORMALIZE=1 DISTUTILS_USE_PEP517=setuptools From 947e214b746dc81e702866d951f9025a5ede4911 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:23:52 +0200 Subject: [PATCH 17/25] dev-python/pymorphy3-dicts-ru: update to EAPI 8 Signed-off-by: Lucio Sauer --- .../pymorphy3-dicts-ru-2.4.417150.4580142.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/pymorphy3-dicts-ru/pymorphy3-dicts-ru-2.4.417150.4580142.ebuild b/dev-python/pymorphy3-dicts-ru/pymorphy3-dicts-ru-2.4.417150.4580142.ebuild index 4adfd231d7..8f4fcc534a 100644 --- a/dev-python/pymorphy3-dicts-ru/pymorphy3-dicts-ru-2.4.417150.4580142.ebuild +++ b/dev-python/pymorphy3-dicts-ru/pymorphy3-dicts-ru-2.4.417150.4580142.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools From c9716166a459837a233b2fc53053f786fee8df8f Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:24:56 +0200 Subject: [PATCH 18/25] dev-python/pymorphy3: update to EAPI 8 Signed-off-by: Lucio Sauer --- dev-python/pymorphy3/pymorphy3-1.2.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/pymorphy3/pymorphy3-1.2.0.ebuild b/dev-python/pymorphy3/pymorphy3-1.2.0.ebuild index 8943ae82bc..c678fb39ec 100644 --- a/dev-python/pymorphy3/pymorphy3-1.2.0.ebuild +++ b/dev-python/pymorphy3/pymorphy3-1.2.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools From 8a7dee6c7cf866b34afff441021e891a2743a995 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:26:30 +0200 Subject: [PATCH 19/25] dev-python/pymorphy3-dicts-uk: update to EAPI 8 Signed-off-by: Lucio Sauer --- .../pymorphy3-dicts-uk-2.4.1.1.1663094765.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/pymorphy3-dicts-uk/pymorphy3-dicts-uk-2.4.1.1.1663094765.ebuild b/dev-python/pymorphy3-dicts-uk/pymorphy3-dicts-uk-2.4.1.1.1663094765.ebuild index c38f8fdb40..3bdd5153c7 100644 --- a/dev-python/pymorphy3-dicts-uk/pymorphy3-dicts-uk-2.4.1.1.1663094765.ebuild +++ b/dev-python/pymorphy3-dicts-uk/pymorphy3-dicts-uk-2.4.1.1.1663094765.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools From f63e217cf998ef4f952858d9dbd78822c1adf7b7 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:27:38 +0200 Subject: [PATCH 20/25] dev-python/pyqtdarktheme: update to EAPI 8 Signed-off-by: Lucio Sauer --- dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild b/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild index 895ec0e7a3..c72841bad2 100644 --- a/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild +++ b/dev-python/pyqtdarktheme/pyqtdarktheme-2.1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=poetry From f9795e917d5a5bd65d9887f45aabfa3f1f9ea847 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:30:17 +0200 Subject: [PATCH 21/25] gui-apps/nwg-icon-picker: update to EAPI 8 Signed-off-by: Lucio Sauer --- gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1-r1.ebuild | 2 +- gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1.ebuild | 4 ++-- gui-apps/nwg-icon-picker/nwg-icon-picker-9999.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1-r1.ebuild b/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1-r1.ebuild index 8068f25d75..26078a6999 100644 --- a/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1-r1.ebuild +++ b/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) DISTUTILS_USE_PEP517=setuptools diff --git a/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1.ebuild b/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1.ebuild index d48f280123..e4b7677363 100644 --- a/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1.ebuild +++ b/gui-apps/nwg-icon-picker/nwg-icon-picker-0.1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..12} ) DISTUTILS_USE_PEP517=setuptools diff --git a/gui-apps/nwg-icon-picker/nwg-icon-picker-9999.ebuild b/gui-apps/nwg-icon-picker/nwg-icon-picker-9999.ebuild index a150a54e2e..26078a6999 100644 --- a/gui-apps/nwg-icon-picker/nwg-icon-picker-9999.ebuild +++ b/gui-apps/nwg-icon-picker/nwg-icon-picker-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) DISTUTILS_USE_PEP517=setuptools From 8f9433c0b30ad52d72da88a2c76686a140d30c8b Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 14:37:01 +0200 Subject: [PATCH 22/25] app-backup/b2: drop 4.0.1 Has no py3_13 compat and superseded by 4.3.2 Signed-off-by: Lucio Sauer --- app-backup/b2/Manifest | 1 - app-backup/b2/b2-4.0.1.ebuild | 72 ----------------------------------- 2 files changed, 73 deletions(-) delete mode 100644 app-backup/b2/b2-4.0.1.ebuild diff --git a/app-backup/b2/Manifest b/app-backup/b2/Manifest index 53169df523..d6979c754d 100644 --- a/app-backup/b2/Manifest +++ b/app-backup/b2/Manifest @@ -1,2 +1 @@ -DIST b2-4.0.1.gh.tar.gz 201737 BLAKE2B 74fb1dd52c8592816c2f2680469c2dd08910f8c25d4a923dd53258f63dd4c38ef77855e6845c41572b8fe52d33ee390a2fac6555016663c450feeb6ff89ed09e SHA512 02a14c2c78fecd1dda536539b5977d6ff45892db0355575209417d7f8471a45ace0d4766dd454c0ba0a65a1ae44e0c698cca38814b0bf36ca5e7a69efec9149a DIST b2-4.3.2.gh.tar.gz 219545 BLAKE2B 2d644e0b3fd8fff18c66d981e1a005590f248d5e2f3e6d41dbed9440c7ae85715c055e334786a0e45eec5de5f0a0d8a730daabc1738e30624f87209ddd3d40d3 SHA512 d2feea3b5521fd7211efa48d50e66c1e603001986e33adacdd64618d25e1e4efb8d86377c4dff243d8c584bde2bfb1648243834194dfc0b3cdde5cebe6633194 diff --git a/app-backup/b2/b2-4.0.1.ebuild b/app-backup/b2/b2-4.0.1.ebuild deleted file mode 100644 index 3bcf93f3d7..0000000000 --- a/app-backup/b2/b2-4.0.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2020-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..12} ) -DISTUTILS_USE_PEP517="pdm-backend" -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 pypi - -DESCRIPTION="Command-line tool for BackBlaze's B2 product" -HOMEPAGE="https://github.com/Backblaze/B2_Command_Line_Tool" -SRC_URI="https://github.com/Backblaze/B2_Command_Line_Tool/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -S="${WORKDIR}/B2_Command_Line_Tool-${PV}" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}/${P}-nameclash.patch" -) - -export PDM_BUILD_SCM_VERSION=${PV} - -RDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/argcomplete-2.1.2[${PYTHON_USEDEP}] - >=dev-python/arrow-1.3.0[${PYTHON_USEDEP}] - >=dev-python/b2sdk-2.3.0[${PYTHON_USEDEP}] - >=dev-python/docutils-0.19[${PYTHON_USEDEP}] - >=dev-python/phx-class-registry-4.0.6[${PYTHON_USEDEP}] - >=dev-python/rst2ansi-0.1.5[${PYTHON_USEDEP}] - >=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}] - >=dev-python/tqdm-4.65.0[${PYTHON_USEDEP}] - ') -" - -DEPEND=" - test? ( - $(python_gen_cond_dep ' - >=dev-python/backoff-2.2.1[${PYTHON_USEDEP}] - >=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}] - ') - ) -" - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # fixture 'worker_id' not found - "test/integration/test_b2_command_line.py" - "test/integration/test_help.py::test_help" - "test/integration/test_autocomplete.py" - - # Timeout exceeded - # I think this is trying to access files outside of the sandbox - "test/unit/console_tool/test_install_autocomplete.py::test_install_autocomplete" - - # TypeError: super(type, obj): obj must be an instance or subtype of type - # This test itself does not fail, but running it causes subsequent test to - # fail, which otherwise pass. Not really sure why (I assume this test is - # somehow polluting the test fixture?) but disabling causes the other tests - # to pass - "test/unit/_cli/test_autocomplete_cache.py" -) - -pkg_postinst() { - elog "The b2 executable has been renamed to backblaze2 in order to" - elog "avoid a name clash with b2 from boost-build" -} From d97e7e0dc07e0f186e65342229a011e040ddc5fa Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 19:12:29 +0200 Subject: [PATCH 23/25] phosh-base/phosh-shell: mask on split-usr profiles The systemd USE flag (and sys-apps/systemd) is masked on profiles with feature split-usr. Replace the elogind USE flag with systemd to ensure that this package also gets masked when it would depend on sys-apps/systemd. Signed-off-by: Lucio Sauer --- phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild b/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild index 257395f002..8d09302fc2 100644 --- a/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild +++ b/phosh-base/phosh-shell/phosh-shell-0.42.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="CC0-1.0 CC-BY-SA-4.0 GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+ MIT" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="elogind gtk-doc introspection +lockscreen-plugins man test test-full" +IUSE="gtk-doc introspection +lockscreen-plugins man systemd test test-full" REQUIRED_USE=" gtk-doc? ( introspection ) test? ( lockscreen-plugins ) @@ -50,8 +50,8 @@ COMMON_DEPEND=" x11-libs/gdk-pixbuf x11-libs/pango >=x11-libs/gtk+-3.22:3[introspection?,wayland] - elogind? ( >=sys-auth/elogind-241 ) - !elogind? ( >=sys-apps/systemd-241:= ) + systemd? ( >=sys-apps/systemd-241:= ) + !systemd? ( >=sys-auth/elogind-241 ) lockscreen-plugins? ( app-text/evince:= >=gui-libs/gtk-4.12:4 @@ -72,7 +72,7 @@ DEPEND=" RDEPEND=" ${COMMON_DEPEND:?} ${RUNTIME_DEPEND:?} - !elogind? ( sys-libs/libcap ) + systemd? ( sys-libs/libcap ) " BDEPEND=" dev-libs/glib:2 From b5e945a32cc9b9f46ba9efde4d097362c523021f Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 19:23:24 +0200 Subject: [PATCH 24/25] phosh-base/phosh-osk-stub: mask on split-usr profiles The systemd USE flag (and sys-apps/systemd) is masked on profiles with feature split-usr. Replace the elogind USE flag with systemd to ensure that this package also gets masked when it would depend on sys-apps/systemd. Signed-off-by: Lucio Sauer --- phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild | 8 ++++---- phosh-base/phosh-osk-stub/phosh-osk-stub-0.47.0.ebuild | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild b/phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild index d7eb6f90e4..ec8157d8be 100644 --- a/phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild +++ b/phosh-base/phosh-osk-stub/phosh-osk-stub-0.42.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="elogind gtk-doc man test" +IUSE="gtk-doc man systemd test" RESTRICT="!test? ( test )" # TODO: package govarnam @@ -32,8 +32,8 @@ COMMON_DEPEND=" >=x11-libs/gtk+-3.22:3[wayland] x11-libs/libxkbcommon[wayland] x11-libs/pango - elogind? ( >=sys-auth/elogind-241 ) - !elogind? ( >=sys-apps/systemd-241:= ) + systemd? ( >=sys-apps/systemd-241:= ) + !systemd? ( >=sys-auth/elogind-241 ) " DEPEND="${COMMON_DEPEND} >=dev-libs/wayland-protocols-1.12 diff --git a/phosh-base/phosh-osk-stub/phosh-osk-stub-0.47.0.ebuild b/phosh-base/phosh-osk-stub/phosh-osk-stub-0.47.0.ebuild index 0e9886d3ce..fcf5a48377 100644 --- a/phosh-base/phosh-osk-stub/phosh-osk-stub-0.47.0.ebuild +++ b/phosh-base/phosh-osk-stub/phosh-osk-stub-0.47.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://sources.phosh.mobi/releases/${PN}/${P}.tar.xz LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="elogind gtk-doc man test" +IUSE="gtk-doc man systemd test" RESTRICT="!test? ( test )" # TODO: package govarnam @@ -30,8 +30,8 @@ RDEPEND=" x11-libs/cairo >=x11-libs/gtk+-3.22:3[wayland] x11-libs/pango - elogind? ( >=sys-auth/elogind-241 ) - !elogind? ( >=sys-apps/systemd-241:= ) + systemd? ( >=sys-apps/systemd-241:= ) + !systemd? ( >=sys-auth/elogind-241 ) " DEPEND="${RDEPEND} >=dev-libs/gmobile-0.2.0 From f86df2720112caf22d583546b5223fa4fd997c26 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Wed, 4 Jun 2025 19:33:04 +0200 Subject: [PATCH 25/25] profiles: mask app-mobilephone/usb-tethering for removal Signed-off-by: Lucio Sauer --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index efa73520a1..b752fcb6c7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,12 @@ # New entries go on top. +# Lucio Sauer (2025-06-04) +# Ebuild effectively unmaintained since 2021. I was unable to find the origin +# of the installed files, so I don't see a reason to keep this. +# Removal on 2025-07-04 +app-mobilephone/usb-tethering + # Lucio Sauer (2025-06-03) # Superseded by app-misc/anki::gentoo and poses extra maintenance burden with # little to no benefit.