From f67893a4b2939797bfd8284779cc3b6098316046 Mon Sep 17 00:00:00 2001
From: Patrick Nicolas <patricknicolas@laposte.net>
Date: Fri, 9 Jan 2026 18:08:39 +0100
Subject: [PATCH] app-misc/wayvr: rename app-misc/wlx-overlay-s

Signed-off-by: Patrick Nicolas <patricknicolas@laposte.net>
---
 app-misc/{wlx-overlay-s => wayvr}/Manifest    |  0
 .../files/wayvr-9999-devendor-openvr.patch}   |  0
 .../files/wayvr-9999-x11-pipewire.patch}      |  0
 .../{wlx-overlay-s => wayvr}/metadata.xml     |  0
 .../wayvr-25.4.2.ebuild}                      | 11 ++--
 .../wayvr-9999.ebuild}                        |  0
 .../wlx-overlay-s-0.6.0-devendor-openvr.patch | 53 -------------------
 ...wlx-overlay-s-0.6.0-fix-use-pipewire.patch | 21 --------
 profiles/updates/1Q-2026                      |  1 +
 9 files changed, 9 insertions(+), 77 deletions(-)
 rename app-misc/{wlx-overlay-s => wayvr}/Manifest (100%)
 rename app-misc/{wlx-overlay-s/files/wlx-overlay-s-9999-devendor-openvr.patch => wayvr/files/wayvr-9999-devendor-openvr.patch} (100%)
 rename app-misc/{wlx-overlay-s/files/wlx-overlay-s-9999-x11-pipewire.patch => wayvr/files/wayvr-9999-x11-pipewire.patch} (100%)
 rename app-misc/{wlx-overlay-s => wayvr}/metadata.xml (100%)
 rename app-misc/{wlx-overlay-s/wlx-overlay-s-25.4.2.ebuild => wayvr/wayvr-25.4.2.ebuild} (90%)
 rename app-misc/{wlx-overlay-s/wlx-overlay-s-9999.ebuild => wayvr/wayvr-9999.ebuild} (100%)
 delete mode 100644 app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch
 delete mode 100644 app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-fix-use-pipewire.patch
 create mode 100644 profiles/updates/1Q-2026

diff --git a/app-misc/wlx-overlay-s/Manifest b/app-misc/wayvr/Manifest
similarity index 100%
rename from app-misc/wlx-overlay-s/Manifest
rename to app-misc/wayvr/Manifest
diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-devendor-openvr.patch b/app-misc/wayvr/files/wayvr-9999-devendor-openvr.patch
similarity index 100%
rename from app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-devendor-openvr.patch
rename to app-misc/wayvr/files/wayvr-9999-devendor-openvr.patch
diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-x11-pipewire.patch b/app-misc/wayvr/files/wayvr-9999-x11-pipewire.patch
similarity index 100%
rename from app-misc/wlx-overlay-s/files/wlx-overlay-s-9999-x11-pipewire.patch
rename to app-misc/wayvr/files/wayvr-9999-x11-pipewire.patch
diff --git a/app-misc/wlx-overlay-s/metadata.xml b/app-misc/wayvr/metadata.xml
similarity index 100%
rename from app-misc/wlx-overlay-s/metadata.xml
rename to app-misc/wayvr/metadata.xml
diff --git a/app-misc/wlx-overlay-s/wlx-overlay-s-25.4.2.ebuild b/app-misc/wayvr/wayvr-25.4.2.ebuild
similarity index 90%
rename from app-misc/wlx-overlay-s/wlx-overlay-s-25.4.2.ebuild
rename to app-misc/wayvr/wayvr-25.4.2.ebuild
index 20864cd772..69ea1d3ab8 100644
--- a/app-misc/wlx-overlay-s/wlx-overlay-s-25.4.2.ebuild
+++ b/app-misc/wayvr/wayvr-25.4.2.ebuild
@@ -8,6 +8,9 @@ EAPI=8
 CRATES="
 "
 
+# Name before the move
+MY_PN="wlx-overlay-s"
+
 declare -A GIT_CRATES=(
 	[libmonado]='https://github.com/technobaboo/libmonado-rs;256895b18c8f9368174fad8a6232ff07764eeacb;libmonado-rs-%commit%'
 	[libspa-sys]='https://gitlab.freedesktop.org/galister/pipewire-rs;ba32202c3c391004c3bb533b58fa75a50e47ff57;pipewire-rs-%commit%/libspa-sys;gitlab'
@@ -27,13 +30,15 @@ LLVM_COMPAT=({15..19})
 inherit cargo llvm-r2 desktop
 
 DESCRIPTION="A lightweight OpenXR/OpenVR overlay for Wayland and X11 desktops"
-HOMEPAGE="https://github.com/galister/wlx-overlay-s"
+HOMEPAGE="https://github.com/wlx-team/wayvr"
 SRC_URI="
 	${CARGO_CRATE_URIS}
-	https://github.com/galister/wlx-overlay-s/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/galister/wlx-overlay-s/releases/download/v${PV}/WlxOverlay-S-v${PV}-crates.tar.xz
+	https://github.com/wlx-team/wayvr/archive/refs/tags/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
+	https://github.com/wlx-team/wayvr/releases/download/v${PV}/WlxOverlay-S-v${PV}-crates.tar.xz
 "
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="GPL-3"
 # Dependent crate licenses
 LICENSE+="
diff --git a/app-misc/wlx-overlay-s/wlx-overlay-s-9999.ebuild b/app-misc/wayvr/wayvr-9999.ebuild
similarity index 100%
rename from app-misc/wlx-overlay-s/wlx-overlay-s-9999.ebuild
rename to app-misc/wayvr/wayvr-9999.ebuild
diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch b/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch
deleted file mode 100644
index ba4540ba65..0000000000
--- a/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-devendor-openvr.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index ed12ab5..df44d5f 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2727,7 +2727,7 @@ dependencies = [
- [[package]]
- name = "ovr_overlay"
- version = "0.0.0"
--source = "git+https://github.com/galister/ovr_overlay_oyasumi#bd03e5bf886f84d438aad95da5c5cc28725013a8"
-+source = "git+https://github.com/galister/ovr_overlay_oyasumi?rev=5b5b8bbfdd6d9059f79b2847d8f657e093f2b120#5b5b8bbfdd6d9059f79b2847d8f657e093f2b120"
- dependencies = [
-  "byteorder",
-  "derive_more",
-@@ -2742,12 +2742,13 @@ dependencies = [
- [[package]]
- name = "ovr_overlay_sys"
- version = "0.0.0"
--source = "git+https://github.com/galister/ovr_overlay_oyasumi#bd03e5bf886f84d438aad95da5c5cc28725013a8"
-+source = "git+https://github.com/galister/ovr_overlay_oyasumi?rev=5b5b8bbfdd6d9059f79b2847d8f657e093f2b120#5b5b8bbfdd6d9059f79b2847d8f657e093f2b120"
- dependencies = [
-  "autocxx",
-  "autocxx-build",
-  "cxx",
-  "normpath",
-+ "pkg-config",
- ]
- 
- [[package]]
-@@ -2965,9 +2966,9 @@ dependencies = [
- 
- [[package]]
- name = "pkg-config"
--version = "0.3.30"
-+version = "0.3.31"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
- 
- [[package]]
- name = "polling"
-diff --git a/Cargo.toml b/Cargo.toml
-index d0690b7..721861c 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -39,7 +39,7 @@ openxr = { git = "https://github.com/galister/openxrs", rev = "af4a55d", feature
- ovr_overlay = { features = [
-   "ovr_input",
-   "ovr_system",
--], git = "https://github.com/galister/ovr_overlay_oyasumi", optional = true }
-+], git = "https://github.com/galister/ovr_overlay_oyasumi", rev = "5b5b8bbfdd6d9059f79b2847d8f657e093f2b120", optional = true }
- regex = "1.10.4"
- rodio = { version = "0.19.0", default-features = false, features = [
-   "wav",
diff --git a/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-fix-use-pipewire.patch b/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-fix-use-pipewire.patch
deleted file mode 100644
index aae16ba573..0000000000
--- a/app-misc/wlx-overlay-s/files/wlx-overlay-s-0.6.0-fix-use-pipewire.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/overlays/screen.rs b/src/overlays/screen.rs
-index 8dc0336..6bef238 100644
---- a/src/overlays/screen.rs
-+++ b/src/overlays/screen.rs
-@@ -18,7 +18,6 @@ use wlx_capture::{
-         DrmFormat, FrameFormat, MouseMeta, WlxFrame, DRM_FORMAT_ABGR2101010, DRM_FORMAT_ABGR8888,
-         DRM_FORMAT_ARGB8888, DRM_FORMAT_XBGR2101010, DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888,
-     },
--    pipewire::PipewireSelectScreenResult,
-     WlxCapture,
- };
- 
-@@ -27,7 +26,7 @@ use {
-     crate::config_io,
-     std::error::Error,
-     std::{ops::Deref, path::PathBuf, task},
--    wlx_capture::pipewire::PipewireCapture,
-+    wlx_capture::pipewire::{PipewireCapture, PipewireSelectScreenResult},
- };
- 
- #[cfg(all(feature = "x11", feature = "pipewire"))]
diff --git a/profiles/updates/1Q-2026 b/profiles/updates/1Q-2026
new file mode 100644
index 0000000000..c4e5345275
--- /dev/null
+++ b/profiles/updates/1Q-2026
@@ -0,0 +1 @@
+move app-misc/wlx-overlay-s app-misc/wayvr