diff --git a/gui-wm/river/files/river-0.3.5-zig-0.12.0.patch b/gui-wm/river/files/river-0.3.5-zig-0.12.0.patch
deleted file mode 100644
index d974d9b679..0000000000
--- a/gui-wm/river/files/river-0.3.5-zig-0.12.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-zig-wayland-0.2.0
---- a/deps/p/1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242/src/scanner.zig
-+++ b/deps/p/1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242/src/scanner.zig
-@@ -528,7 +528,7 @@
- // These interfaces are special in that their version may never be increased.
- // That is, they are pinned to version 1 forever. They also may break the
- // normally required tree object creation hierarchy.
-- const version_locked_interfaces = std.StaticStringMap(void).initComptime(.{
-+ const version_locked_interfaces = std.ComptimeStringMap(void, .{
- .{"wl_display"},
- .{"wl_registry"},
- .{"wl_callback"},
-
-river-0.3.5
---- a/river/command.zig
-+++ b/river/command.zig
-@@ -36,9 +36,8 @@
- vertical,
- };
-
--const command_impls = std.StaticStringMap(
-+const command_impls = std.ComptimeStringMap(
- *const fn (*Seat, []const [:0]const u8, *?[]const u8) Error!void,
--).initComptime(
- .{
- // zig fmt: off
- .{ "attach-mode", @import("command/attach_mode.zig").defaultAttachMode },
diff --git a/gui-wm/river/river-0.3.5.ebuild b/gui-wm/river/river-0.3.5.ebuild
deleted file mode 100644
index 65e6d43736..0000000000
--- a/gui-wm/river/river-0.3.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo
-
-DESCRIPTION="A dynamic tiling Wayland compositor"
-HOMEPAGE="https://isaacfreund.com/software/river/"
-
-SRC_URI="
- https://codeberg.org/river/river/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz -> zig-pixman-0.2.0.tar.gz
- https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz -> zig-wayland-0.2.0.tar.gz
- https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.0.tar.gz -> zig-wlroots-0.18.0.tar.gz
- https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz -> zig-xkbcommon-0.2.0.tar.gz
-"
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}/${P}-zig-0.12.0.patch"
-)
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+X +llvm +man pie"
-
-EZIG_MIN="0.12"
-EZIG_MAX_EXCLUSIVE="0.13"
-
-DEPEND="
- dev-libs/libevdev
- dev-libs/wayland
- dev-libs/wayland-protocols
- gui-libs/wlroots:0.18=[X?]
- x11-libs/libxkbcommon:=[X?]
- x11-libs/pixman
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- || ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
- man? ( app-text/scdoc )
- virtual/pkgconfig
-"
-
-DOCS=( README.md )
-
-# https://github.com/ziglang/zig/issues/3382
-QA_FLAGS_IGNORED="usr/bin/*"
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
- [[ -n ${EZIG} ]] && return
-
- local candidate selected selected_ver ver
-
- for candidate in "${BROOT}"/usr/bin/zig-*; do
- if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
- continue
- fi
-
- ver=${candidate##*-}
-
- if [[ -n ${EZIG_EXACT_VER} ]]; then
- ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
- selected="${candidate}"
- selected_ver="${ver}"
- break
- fi
-
- if [[ -n ${EZIG_MIN} ]] \
- && ver_test "${ver}" -lt "${EZIG_MIN}"; then
- # Candidate does not satisfy EZIG_MIN condition.
- continue
- fi
-
- if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
- && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
- # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
- continue
- fi
-
- if [[ -n ${selected_ver} ]] \
- && ver_test "${selected_ver}" -gt "${ver}"; then
- # Candidate is older than the currently selected candidate.
- continue
- fi
-
- selected="${candidate}"
- selected_ver="${ver}"
- done
-
- if [[ -z ${selected} ]]; then
- die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
- fi
-
- export EZIG="${selected}"
- export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
- zig-set_EZIG
-
- edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
- default
-
- # unpacking into ${S} to patch zig-wayland-0.2.0
- # without patches, it would be better using ${WORKDIR}/deps
- mkdir "${S}/deps" || die
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-pixman-0.2.0.tar.gz"
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-wayland-0.2.0.tar.gz"
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-wlroots-0.18.0.tar.gz"
- ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-xkbcommon-0.2.0.tar.gz"
-}
-
-src_configure() {
- export ZBS_ARGS=(
- --prefix usr/
- --system "${S}/deps/p"
- -Doptimize=ReleaseSafe
-
- -Dpie=$(usex pie true false)
- -Dno-llvm=$(usex llvm false true)
- -Dman-pages=$(usex man true false)
- -Dxwayland=$(usex X true false)
- )
-}
-
-src_compile() {
- ezig build "${ZBS_ARGS[@]}"
-}
-
-src_test() {
- ezig build test "${ZBS_ARGS[@]}"
-}
-
-src_install() {
- DESTDIR="${ED}" ezig build install "${ZBS_ARGS[@]}"
- einstalldocs
-
- insinto /usr/share/wayland-sessions
- doins contrib/river.desktop
-
- insinto /usr/share/${PN}
- doins -r example
-}
diff --git a/mail-client/proton-mail-bin/Manifest b/mail-client/proton-mail-bin/Manifest
index 1f812fff93..2439d4f957 100644
--- a/mail-client/proton-mail-bin/Manifest
+++ b/mail-client/proton-mail-bin/Manifest
@@ -1 +1 @@
-DIST proton-mail-bin-5.0.157.4.rpm 83048897 BLAKE2B a75c8d5067e19fcaa2d05775bfd1328522a3c9248e3896c98999458924206027d838c984912bcf2fc51beb110268ad99501568347b509c8b0265de2be3956c73 SHA512 ac294dabfd3150c26acf46d9988942778076191d4b1b100798de06d6fbaececa87083d72c6e717259969250a711ef7559e20cb6d862b890244cc34d917b86e6e
+DIST proton-mail-1.0.6-1.x86_64.rpm 83048897 BLAKE2B a75c8d5067e19fcaa2d05775bfd1328522a3c9248e3896c98999458924206027d838c984912bcf2fc51beb110268ad99501568347b509c8b0265de2be3956c73 SHA512 ac294dabfd3150c26acf46d9988942778076191d4b1b100798de06d6fbaececa87083d72c6e717259969250a711ef7559e20cb6d862b890244cc34d917b86e6e
diff --git a/mail-client/proton-mail-bin/metadata.xml b/mail-client/proton-mail-bin/metadata.xml
new file mode 100644
index 0000000000..41103b1307
--- /dev/null
+++ b/mail-client/proton-mail-bin/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+ ProtonMail/inbox-desktop
+
+
diff --git a/mail-client/proton-mail-bin/proton-mail-bin-5.0.157.4.ebuild b/mail-client/proton-mail-bin/proton-mail-bin-1.0.6.ebuild
similarity index 56%
rename from mail-client/proton-mail-bin/proton-mail-bin-5.0.157.4.ebuild
rename to mail-client/proton-mail-bin/proton-mail-bin-1.0.6.ebuild
index 626170dac1..d9729c83c3 100644
--- a/mail-client/proton-mail-bin/proton-mail-bin-5.0.157.4.ebuild
+++ b/mail-client/proton-mail-bin/proton-mail-bin-1.0.6.ebuild
@@ -5,20 +5,40 @@ EAPI=8
inherit rpm xdg-utils
+MY_PN="${PN%-bin}"
+
DESCRIPTION="Beta Client for Proton Mail"
HOMEPAGE="https://proton.me/mail"
-SRC_URI="https://proton.me/download/mail/linux/ProtonMail-desktop-beta.rpm -> ${P}.rpm"
-
+SRC_URI="https://github.com/ProtonMail/inbox-desktop/releases/download/${PV}/${MY_PN}-${PV}-1.x86_64.rpm"
S="${WORKDIR}"
-LICENSE="freedist"
+# https://github.com/NixOS/nixpkgs/pull/296127#discussion_r1528184212
+LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
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/libXcomposite
+ x11-libs/libXdamage
x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
x11-libs/libxcb
+ x11-libs/libxkbcommon
+ x11-libs/pango
"
QA_PREBUILT="opt/proton-mail/*"
diff --git a/net-proxy/byedpi/Manifest b/net-proxy/byedpi/Manifest
index 663329128a..df7081a7f9 100644
--- a/net-proxy/byedpi/Manifest
+++ b/net-proxy/byedpi/Manifest
@@ -1 +1,2 @@
DIST byedpi-0.12.tar.gz 33283 BLAKE2B da1d9bbc80c868fb16c4f6e24c3fe00d5d03d5bb0a6d71dac16999b652e81fc9c2a5f0f57e350260b9295d953cb0c3fe316440279dd26b09ee895bf81771cc2b SHA512 9f15afc821b53bd1fba71ab9a37640c8f35f22efcfc6cd079800f9abd4286232fb29850aebe9168e54396f912362e012448940d32471bfe0586600fcd2591e22
+DIST byedpi-0.13.tar.gz 35108 BLAKE2B 502202e8ed76942522d551b41b9057e9dd617c8b67029c00c7c2be391907b9c853f4ebc678eff32d122bf4546375dc8839edab8bc3d7c031859fae7e10ce807c SHA512 4c9c692fc2d7f328bb9bec823aed2d733adfecf03953e1e669fa4fc55aaa6234e86a768abc690c876a47c58e374fa909e8132794adabd2f24081abb8fa7ba2d6
diff --git a/net-proxy/byedpi/byedpi-0.13.ebuild b/net-proxy/byedpi/byedpi-0.13.ebuild
new file mode 100644
index 0000000000..9151a21448
--- /dev/null
+++ b/net-proxy/byedpi/byedpi-0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Bypass DPI SOCKS proxy"
+HOMEPAGE="https://github.com/hufrea/byedpi/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+else
+ SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+ default
+
+ # respect optimization level
+ sed -i 's/ -O.\b/ /' Makefile || die
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin ciadpi
+ einstalldocs
+
+ newinitd "${FILESDIR}"/byedpi.initd byedpi
+ newconfd "${FILESDIR}"/byedpi.confd byedpi
+ systemd_dounit "${FILESDIR}"/byedpi.service
+}
diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index aedab7b2d2..9151a21448 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -2,25 +2,39 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit git-r3 systemd toolchain-funcs
+
+inherit systemd toolchain-funcs
DESCRIPTION="Bypass DPI SOCKS proxy"
HOMEPAGE="https://github.com/hufrea/byedpi/"
-EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+else
+ SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
LICENSE="MIT"
SLOT="0"
-src_compile() {
- tc-export CC
- export CFLAGS LDFLAGS
- sed -i 's/ -O.\b/ /' Makefile || die
-
+src_prepare() {
default
+
+ # respect optimization level
+ sed -i 's/ -O.\b/ /' Makefile || die
+}
+
+src_configure() {
+ tc-export CC
}
src_install() {
dobin ciadpi
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
+ einstalldocs
+ newinitd "${FILESDIR}"/byedpi.initd byedpi
+ newconfd "${FILESDIR}"/byedpi.confd byedpi
+ systemd_dounit "${FILESDIR}"/byedpi.service
+}
diff --git a/net-proxy/byedpi/files/byedpi.confd b/net-proxy/byedpi/files/byedpi.confd
new file mode 100644
index 0000000000..e25b7a4264
--- /dev/null
+++ b/net-proxy/byedpi/files/byedpi.confd
@@ -0,0 +1,8 @@
+# IP address SOCKS proxy will listen on
+#BYEDPI_BIND_IP="0.0.0.0"
+
+# Port number SOCKS proxy will listen on
+#BYEDPI_BIND_PORT=1080
+
+# Additional command-line options for ciadpi
+#BYEDPI_OPTS="--disorder 1 --auto=torst --tlsrec 1+s"
diff --git a/net-proxy/byedpi/files/byedpi.initd b/net-proxy/byedpi/files/byedpi.initd
new file mode 100644
index 0000000000..979beea391
--- /dev/null
+++ b/net-proxy/byedpi/files/byedpi.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# shellcheck shell=sh
+#
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: "${BYEDPI_BIND_IP:=0.0.0.0}"
+: "${BYEDPI_BIND_PORT:=1080}"
+: "${BYEDPI_OPTS:=--disorder 1 --auto=torst --tlsrec 1+s}"
+
+command="/usr/bin/ciadpi"
+command_args="--ip ${BYEDPI_BIND_IP} --port ${BYEDPI_BIND_PORT} ${BYEDPI_OPTS}"
+command_user="nobody:nobody"
+command_background=1
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+ need net
+}
diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
deleted file mode 100644
index 443cd62454..0000000000
--- a/net-vpn/candy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST candy-5.10.3.tar.gz 115258 BLAKE2B 70d698d69fbb0a28adeb1ba515a1a1f6986c083d3a04b688bfd5b7ead98941bac46af47cd745b74928fc56466ebe3fa7d570f7ecaa1716b2eac948d9eaf52fe2 SHA512 c56ab81f599c5fbf72c509265b3fc0189a17e36b8738e536f21702585e7994c706a277d8c1dbf8b68e7f3609518fec0b4daccc0b180d375463e898bb7d41bbdc
diff --git a/net-vpn/candy/candy-5.10.3.ebuild b/net-vpn/candy/candy-5.10.3.ebuild
deleted file mode 100644
index 7617d7a9e2..0000000000
--- a/net-vpn/candy/candy-5.10.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd readme.gentoo-r1
-
-DESCRIPTION="A reliable, low-latency, and anti-censorship virtual private network"
-HOMEPAGE="https://github.com/lanthora/candy"
-SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips"
-
-DEPEND="
- dev-libs/poco
- dev-libs/openssl
- dev-libs/spdlog
-"
-RDEPEND="
- ${DEPEND}
- dev-libs/libfmt
-"
-
-src_install(){
- cmake_src_install
- default
-
- insinto /etc
- doins candy.cfg
- fperms 0644 /etc/candy.cfg
-
- systemd_dounit candy.service
- systemd_dounit candy@.service
- newinitd candy.initd candy
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/net-vpn/candy/files/README.gentoo b/net-vpn/candy/files/README.gentoo
deleted file mode 100644
index 810d833321..0000000000
--- a/net-vpn/candy/files/README.gentoo
+++ /dev/null
@@ -1,10 +0,0 @@
-Notes:
- Running candy with multi instances
-
- 1) Using OpenRC
- Prepare /etc/candy.d/${foo}.cfg first
- # ln -s /etc/init.d/candy{,.${foo}}
- # rc-update add candy.${foo} default
-
- 2) Using Systemd
- # systemctl enable candy@${foo}
diff --git a/net-vpn/candy/metadata.xml b/net-vpn/candy/metadata.xml
deleted file mode 100644
index 67deff1aff..0000000000
--- a/net-vpn/candy/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- yangmame@icloud.com
- Xin Yang
-
-
- lanthora/candy
-
- lanthora
- lanthora@outlook.com
-
-
-
diff --git a/x11-misc/ly/files/ly-1.0.2-update-to-zig-0.13.0.patch b/x11-misc/ly/files/ly-1.0.2-update-to-zig-0.13.0.patch
new file mode 100644
index 0000000000..7bb21a82cd
--- /dev/null
+++ b/x11-misc/ly/files/ly-1.0.2-update-to-zig-0.13.0.patch
@@ -0,0 +1,122 @@
+From: Eric Joldasov
+
+Update ly source code and dependencies to Zig 0.13.0.
+
+diff --git a/build.zig b/build.zig
+index 083bd2a..720a4a5 100644
+--- a/build.zig
++++ b/build.zig
+@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) !void {
+
+ const exe = b.addExecutable(.{
+ .name = "ly",
+- .root_source_file = .{ .path = "src/main.zig" },
++ .root_source_file = b.path("src/main.zig"),
+ .target = target,
+ .optimize = optimize,
+ });
+@@ -38,14 +38,14 @@ pub fn build(b: *std.Build) !void {
+ const clap = b.dependency("clap", .{ .target = target, .optimize = optimize });
+ exe.root_module.addImport("clap", clap.module("clap"));
+
+- exe.addIncludePath(.{ .path = "include" });
++ exe.addIncludePath(b.path("include"));
+ exe.linkSystemLibrary("pam");
+ exe.linkSystemLibrary("xcb");
+ exe.linkLibC();
+
+ // HACK: Only fails with ReleaseSafe, so we'll override it.
+ const translate_c = b.addTranslateC(.{
+- .root_source_file = .{ .path = "include/termbox2.h" },
++ .root_source_file = b.path("include/termbox2.h"),
+ .target = target,
+ .optimize = if (optimize == .ReleaseSafe) .ReleaseFast else optimize,
+ });
+@@ -94,7 +94,7 @@ pub fn build(b: *std.Build) !void {
+
+ pub fn ExeInstaller(install_conf: bool) type {
+ return struct {
+- pub fn make(step: *std.Build.Step, progress: *std.Progress.Node) !void {
++ pub fn make(step: *std.Build.Step, progress: std.Progress.Node) !void {
+ _ = progress;
+ try install_ly(step.owner.allocator, install_conf);
+ }
+@@ -108,7 +108,7 @@ const InitSystem = enum {
+ };
+ pub fn ServiceInstaller(comptime init_system: InitSystem) type {
+ return struct {
+- pub fn make(step: *std.Build.Step, progress: *std.Progress.Node) !void {
++ pub fn make(step: *std.Build.Step, progress: std.Progress.Node) !void {
+ _ = progress;
+ const allocator = step.owner.allocator;
+ switch (init_system) {
+@@ -220,7 +220,7 @@ fn install_ly(allocator: std.mem.Allocator, install_config: bool) !void {
+ }
+ }
+
+-pub fn uninstallall(step: *std.Build.Step, progress: *std.Progress.Node) !void {
++pub fn uninstallall(step: *std.Build.Step, progress: std.Progress.Node) !void {
+ _ = progress;
+ try std.fs.cwd().deleteTree(data_directory);
+ const allocator = step.owner.allocator;
+diff --git a/deps/p/122014e73fd712190e109950837b97f6143f02d7e2b6986e1db70b6f4aadb5ba6a0d/build.zig b/deps/p/122014e73fd712190e109950837b97f6143f02d7e2b6986e1db70b6f4aadb5ba6a0d/build.zig
+index 53e5f90..0e35a04 100644
+--- a/deps/p/122014e73fd712190e109950837b97f6143f02d7e2b6986e1db70b6f4aadb5ba6a0d/build.zig
++++ b/deps/p/122014e73fd712190e109950837b97f6143f02d7e2b6986e1db70b6f4aadb5ba6a0d/build.zig
+@@ -1,14 +1,14 @@
+ const std = @import("std");
+
+ pub fn build(b: *std.Build) void {
+- const clap_mod = b.addModule("clap", .{ .root_source_file = .{ .path = "clap.zig" } });
++ const clap_mod = b.addModule("clap", .{ .root_source_file = b.path("clap.zig") });
+
+ const optimize = b.standardOptimizeOption(.{});
+ const target = b.standardTargetOptions(.{});
+
+ const test_step = b.step("test", "Run all tests in all modes.");
+ const tests = b.addTest(.{
+- .root_source_file = .{ .path = "clap.zig" },
++ .root_source_file = b.path("clap.zig"),
+ .target = target,
+ .optimize = optimize,
+ });
+@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) void {
+ }) |example_name| {
+ const example = b.addExecutable(.{
+ .name = example_name,
+- .root_source_file = .{ .path = b.fmt("example/{s}.zig", .{example_name}) },
++ .root_source_file = b.path(b.fmt("example/{s}.zig", .{example_name})),
+ .target = target,
+ .optimize = optimize,
+ });
+@@ -63,7 +63,7 @@ fn readMeStep(b: *std.Build) *std.Build.Step {
+ .name = "ReadMeStep",
+ .owner = b,
+ .makeFn = struct {
+- fn make(step: *std.Build.Step, _: *std.Progress.Node) anyerror!void {
++ fn make(step: *std.Build.Step, _: std.Progress.Node) anyerror!void {
+ @setEvalBranchQuota(10000);
+ _ = step;
+ const file = try std.fs.cwd().createFile("README.md", .{});
+diff --git a/src/main.zig b/src/main.zig
+index ddee718..022ff54 100644
+--- a/src/main.zig
++++ b/src/main.zig
+@@ -512,7 +512,7 @@ pub fn main() !void {
+ run = false;
+ } else if (pressed_key == sleep_key) {
+ if (config.sleep_cmd) |sleep_cmd| {
+- var sleep = std.ChildProcess.init(&[_][]const u8{ "/bin/sh", "-c", sleep_cmd }, allocator);
++ var sleep = std.process.Child.init(&[_][]const u8{ "/bin/sh", "-c", sleep_cmd }, allocator);
+ _ = sleep.spawnAndWait() catch .{};
+ }
+ }
+@@ -617,7 +617,7 @@ pub fn main() !void {
+
+ update = true;
+
+- var restore_cursor = std.ChildProcess.init(&[_][]const u8{ "/bin/sh", "-c", config.term_restore_cursor_cmd }, allocator);
++ var restore_cursor = std.process.Child.init(&[_][]const u8{ "/bin/sh", "-c", config.term_restore_cursor_cmd }, allocator);
+ _ = restore_cursor.spawnAndWait() catch .{};
+ },
+ else => {
diff --git a/x11-misc/ly/ly-1.0.2.ebuild b/x11-misc/ly/ly-1.0.2.ebuild
index bd378ed693..b2bc90a1e4 100644
--- a/x11-misc/ly/ly-1.0.2.ebuild
+++ b/x11-misc/ly/ly-1.0.2.ebuild
@@ -23,8 +23,8 @@ LICENSE="WTFPL-2"
SLOT="0"
KEYWORDS="~amd64"
-EZIG_MIN="0.12"
-EZIG_MAX_EXCLUSIVE="0.13"
+EZIG_MIN="0.13"
+EZIG_MAX_EXCLUSIVE="0.14"
DEPEND="
|| ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
@@ -44,6 +44,10 @@ QA_FLAGS_IGNORED="usr/bin/ly"
RES="${S}/res"
+PATCHES=(
+ "${FILESDIR}/ly-1.0.2-update-to-zig-0.13.0.patch"
+)
+
# copied from sys-fs/ncdu::gentoo
# Many thanks to Florian Schmaus (Flowdalic)!
# Adapted from https://github.com/gentoo/gentoo/pull/28986
@@ -111,10 +115,10 @@ ezig() {
src_unpack() {
default
- mkdir "${WORKDIR}/deps" || die
- ezig fetch --global-cache-dir "${WORKDIR}/deps" "${DISTDIR}/zig-clap-${CLAP}.tar.gz"
- ezig fetch --global-cache-dir "${WORKDIR}/deps" "${DISTDIR}/zigini-${ZIGINI}.tar.gz"
- ezig fetch --global-cache-dir "${WORKDIR}/deps" "${DISTDIR}/ziglibini-${ZIGLIBINI}.tar.gz"
+ mkdir "${S}/deps" || die
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zig-clap-${CLAP}.tar.gz"
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/zigini-${ZIGINI}.tar.gz"
+ ezig fetch --global-cache-dir "${S}/deps" "${DISTDIR}/ziglibini-${ZIGLIBINI}.tar.gz"
}
src_prepare(){
@@ -125,7 +129,7 @@ src_prepare(){
src_compile() {
# Building ly & accomodate for prefixed environment
- ezig build --system "${WORKDIR}/deps/p" -Doptimize=ReleaseSafe -Ddata_directory="${EPREFIX}/etc/ly"
+ ezig build --system "${S}/deps/p/" -Doptimize=ReleaseSafe -Ddata_directory="${EPREFIX}/etc/ly"
}
src_install() {
diff --git a/x11-misc/ly/ly-9999.ebuild b/x11-misc/ly/ly-9999.ebuild
index a0a1dcdafe..446ba354d0 100644
--- a/x11-misc/ly/ly-9999.ebuild
+++ b/x11-misc/ly/ly-9999.ebuild
@@ -14,8 +14,8 @@ LICENSE="WTFPL-2"
SLOT="0"
# Specify the required Zig version range
-EZIG_MIN="0.12"
-EZIG_MAX_EXCLUSIVE="0.13"
+EZIG_MIN="0.13"
+EZIG_MAX_EXCLUSIVE="0.14"
DEPEND="
|| ( dev-lang/zig-bin:${EZIG_MIN} dev-lang/zig:${EZIG_MIN} )
diff --git a/x11-themes/pop-icon-theme/metadata.xml b/x11-themes/pop-icon-theme/metadata.xml
index 34cca77262..ba545196be 100644
--- a/x11-themes/pop-icon-theme/metadata.xml
+++ b/x11-themes/pop-icon-theme/metadata.xml
@@ -5,7 +5,6 @@
dev@dyama.net
Daichi Yamamoto
-
pop-os/icon-theme