[gentoo-commits] repo/proj/guru:master commit in: phosh-base/phosh-shell/
commit: 603c48d2625bc05c051bd76d37e667db0b9ff6d0
Author: Anna (cybertailor) Vyalkova sysrq in>
AuthorDate: Tue Apr 9 02:34:39 2024 +
Commit: Julien Roy jroy ca>
CommitDate: Tue Apr 9 03:27:58 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=603c48d2
phosh-base/phosh-shell: add 0.38.0
Bug: https://bugs.gentoo.org/927033
Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in>
phosh-base/phosh-shell/Manifest| 2 ++
phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild | 4 ++--
.../{phosh-shell-0.36.0.ebuild => phosh-shell-0.38.0.ebuild} | 10 ++
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest
index 68a278a3d7..152606f5d2 100644
--- a/phosh-base/phosh-shell/Manifest
+++ b/phosh-base/phosh-shell/Manifest
@@ -1,2 +1,4 @@
DIST phosh-0.36.0.tar.xz 839440 BLAKE2B
a6aa1c6fc2356055b0a451cb66fcfcbf3329059ab620aa56122e63e5eafc7f43ff1b1e4842fcadd7506f4724dbbab6e4785c6fb9b9e669e888c427be9163f0ab
SHA512
e108423c97343917b4be1827c44642e90738027b543bdc4bf2f45073101383227a157771a9efdf0b65a9adf30a09d210be21d35043ced8a9046fe70588e2
DIST phosh-0.36.0.tar.xz.asc 833 BLAKE2B
1dcdfd6cd0708f60408a34bd2df891db4050de02c9349d5517fe23b2e17e0fb0fdfe97e3f86f5b30fb47c871932bd67310b889ce4d03b32408c7704d7ea31ce4
SHA512
c1ceac2eaad073b79f342915205f0539454f789eb6cb8aaae5fa4847bfac60641822796ee0adc83970af7ee6d6e57248bba48a718a05da1d2123984c4a3c9b91
+DIST phosh-0.38.0.tar.xz 866816 BLAKE2B
22be8e8a673494da7795270d7fb7fff2bfb87762b8cce9540d2f8644ded760ee2ac8a75d8052eb46172d6f5764e020ef949330ed14f5cc645cef586e26b5a398
SHA512
dfde54b64ea6edba2b66dfe2f5ff0f4b3edbb192b1a37fbc8c98d9365bdedc5d19ddb1464673e516cb8e436a6c0ea00c84087cc6431b6c1862019f90e02b73ce
+DIST phosh-0.38.0.tar.xz.asc 833 BLAKE2B
d9c49a42bc5083678e3195eb6fded80455312887b0c0f99dd03c6662d3c01bec228b0c68f7044dfe86fe1473b8ddbaf797729a5a92f5c8d18302149376dd
SHA512
8007c2f58c311659310d06962ad825c51fb90f4da864f110db5b1f0f5d7c70b0ef69ddbfa169489657b3088ed6b89dbdf7e910101267ccd307578d75f9301b46
diff --git a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
b/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
index a66f2fc31e..46756454d2 100644
--- a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
+++ b/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
@@ -13,9 +13,9 @@
SRC_URI="https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz
verify-sig? (
https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz.asc )"
S="${WORKDIR}/${MY_P}"
-KEYWORDS="~amd64 ~arm64"
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 +lockscreen-plugins man test test-full"
REQUIRED_USE="test? ( lockscreen-plugins )"
@@ -77,7 +77,7 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-phosh )
"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/phosh.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
src_configure() {
local emesonargs=(
diff --git a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
b/phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild
similarity index 94%
copy from phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
copy to phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild
index a66f2fc31e..8a824cb298 100644
--- a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
+++ b/phosh-base/phosh-shell/phosh-shell-0.38.0.ebuild
@@ -13,9 +13,9 @@
SRC_URI="https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz
verify-sig? (
https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz.asc )"
S="${WORKDIR}/${MY_P}"
-KEYWORDS="~amd64 ~arm64"
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 +lockscreen-plugins man test test-full"
REQUIRED_USE="test? ( lockscreen-plugins )"
@@ -34,6 +34,7 @@ COMMON_DEPEND="
>=gui-libs/libhandy-1.1.90:1
media-libs/libpulse[glib]
media-sound/callaudiod
+ net-libs/libsoup:3.0
>=net-misc/networkmanager-1.14
sys-apps/dbus
>=sys-auth/polkit-0.105
@@ -77,13 +78,14 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-phosh )
"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/phosh.asc"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/phosh.asc"
src_configure() {
local emesonargs=(
-Dcompositor="${EPREFIX}"/usr/bin/phoc
- -Dsystemd=true
-Dtools=true
+ -Dquick-setting-plugins=true
+ $(meson_use !elogind systemd)
$(meson_use gtk-doc gtk_doc)
$(meson_use lockscreen-plugins)
$(meson_use man)
@@ -104,7 +106,7 @@ src_test() {
}
src_install() {
- meson_src_install
+ meson_src_install --skip-subprojects gmobile
pamd_mimic
[gentoo-commits] repo/proj/guru:master commit in: phosh-base/phosh-shell/, profiles/
commit: e01e4ebd9667031cf574d29a94c6c2ec6c0f85df Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Feb 11 11:30:26 2024 + Commit: David Roman gmail com> CommitDate: Sun Feb 11 16:35:35 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e01e4ebd phosh-base/phosh-shell: bump phoc version for tests Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild | 4 ++-- profiles/package.use.mask| 4 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild b/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild index 93cd4591f2..a66f2fc31e 100644 --- a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild +++ b/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm64" LICENSE="CC0-1.0 CC-BY-SA-4.0 GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+ MIT" SLOT="0" IUSE="elogind gtk-doc +lockscreen-plugins man test test-full" -REQUIRED_USE="test-full? ( lockscreen-plugins )" +REQUIRED_USE="test? ( lockscreen-plugins )" COMMON_DEPEND=" >=app-crypt/gcr-3.7.5:0 @@ -73,7 +73,7 @@ BDEPEND=" sys-devel/gettext gtk-doc? ( dev-util/gi-docgen ) man? ( dev-python/docutils ) - test-full? ( gui-wm/phoc ) + test-full? ( >=gui-wm/phoc-0.36.0-r1 ) verify-sig? ( sec-keys/openpgp-keys-phosh ) " diff --git a/profiles/package.use.mask b/profiles/package.use.mask index e83680ac1a..6329d2d591 100644 --- a/profiles/package.use.mask +++ b/profiles/package.use.mask @@ -3,10 +3,6 @@ # New entries go on top. -# Anna Vyalkova (2024-02-04) -# "/phosh/drag-surface" fails in our test environment. -phosh-base/phosh-shell test-full - # Anna Vyalkova (2023-11-21) # Build failure. # https://gitlab.com/famedly/conduit/-/issues/385
[gentoo-commits] repo/proj/guru:master commit in: phosh-base/phosh-shell/
commit: b5e5ececeb2d20faa229fcecd2e74c12ef2aae21
Author: Anna (cybertailor) Vyalkova sysrq in>
AuthorDate: Sun Feb 11 11:25:18 2024 +
Commit: David Roman gmail com>
CommitDate: Sun Feb 11 16:35:35 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b5e5ecec
phosh-base/phosh-shell: drop 0.17.0
Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in>
phosh-base/phosh-shell/Manifest | 3 -
phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild | 79
2 files changed, 82 deletions(-)
diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest
index 424f46923f..68a278a3d7 100644
--- a/phosh-base/phosh-shell/Manifest
+++ b/phosh-base/phosh-shell/Manifest
@@ -1,5 +1,2 @@
-DIST libcall-ui-acfbb136bbf74514e0b9801ce6c1e8acf36350b6.tar.gz 159337 BLAKE2B
47cd388043514baf568914adea281e884d0fa04375d8cc116cabd6a1061fcfb5e224a8065afffd2957513657ff5970d1dead33cea99f36117bb80b35d6f34513
SHA512
b79e3d8ac9889109e0fe20f149ffb14bde198f7a364152a60c7175228c283f18a7abe2049b01935d11fd005e14ef4da9c23ada6c651801364c79bc2dca1e71f2
-DIST libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz
45164 BLAKE2B
c6807f855e7d4f45b58c7776cd497077b4adf8d577f9af014a8631a054c47374dfe5caa5652be208c6e566bfb8af70a0bb5e164f345b7612cb8786039625a191
SHA512
723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21
DIST phosh-0.36.0.tar.xz 839440 BLAKE2B
a6aa1c6fc2356055b0a451cb66fcfcbf3329059ab620aa56122e63e5eafc7f43ff1b1e4842fcadd7506f4724dbbab6e4785c6fb9b9e669e888c427be9163f0ab
SHA512
e108423c97343917b4be1827c44642e90738027b543bdc4bf2f45073101383227a157771a9efdf0b65a9adf30a09d210be21d35043ced8a9046fe70588e2
DIST phosh-0.36.0.tar.xz.asc 833 BLAKE2B
1dcdfd6cd0708f60408a34bd2df891db4050de02c9349d5517fe23b2e17e0fb0fdfe97e3f86f5b30fb47c871932bd67310b889ce4d03b32408c7704d7ea31ce4
SHA512
c1ceac2eaad073b79f342915205f0539454f789eb6cb8aaae5fa4847bfac60641822796ee0adc83970af7ee6d6e57248bba48a718a05da1d2123984c4a3c9b91
-DIST phosh-v0.17.0.tar.gz 726863 BLAKE2B
6a4c6bc6b3f645b7805445be21a4d8df13b786ee8cf104cf202a88a8333c5123cf34e5c136fa21d13476c71a51240d87388587bca84a37487e4984434fd32c53
SHA512
020a0cc5659d5c1a5f4291baed231f3f7b698dc41f027173cc59f3429a1a43bbf6f2213f2fb79d7d2c175518cb6a892c419a3b0ad902e51cca2c313f5bbc84bf
diff --git a/phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild
b/phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild
deleted file mode 100644
index 8263db680b..00
--- a/phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop gnome2-utils meson pam readme.gentoo-r1 systemd xdg
-
-MY_P="phosh-v${PV}"
-LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
-LCU_COMMIT="acfbb136bbf74514e0b9801ce6c1e8acf36350b6"
-
-DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
-HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/;
-SRC_URI="
-
https://gitlab.gnome.org/World/Phosh/phosh/-/archive/v${PV}/${MY_P}.tar.gz
-
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${LVC_COMMIT}/libgnome-volume-control-${LVC_COMMIT}.tar.gz
-
https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="~amd64 ~arm64"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+systemd"
-
-DEPEND="
- app-crypt/gcr
- dev-libs/feedbackd
- media-sound/pulseaudio
- >=gui-libs/libhandy-1.1.90
- net-misc/networkmanager
- gnome-base/gnome-control-center
- gnome-base/gnome-desktop
- gnome-base/gnome-session
- x11-themes/gnome-backgrounds
- gnome-base/gnome-keyring
- gnome-base/gnome-shell
- gui-wm/phoc
- systemd? ( sys-apps/systemd )
- sys-power/upower
- app-misc/geoclue
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-util/ctags
- dev-build/meson
-"
-
-src_prepare() {
- default
- rm -r "${S}"/subprojects/gvc || die
- mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}"
"${S}"/subprojects/gvc || die
- rm -r "${S}"/subprojects/libcall-ui || die
- mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}"
"${S}"/subprojects/libcall-ui || die
-}
-
-src_install() {
- default
- meson_src_install
- newpamd "${FILESDIR}"/pam_phosh 'phosh'
- systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
- domenu "${FILESDIR}"/sm.puri.OSK0.desktop
-
- DOC_CONTENTS="To amend the existing password policy please see the man
5 passwdqc.conf
- page and then edit the
/etc/security/passwdqc.conf file to change enforce=none
- to allow use digit only password as phosh only
support passcode for now"
-
[gentoo-commits] repo/proj/guru:master commit in: phosh-base/phosh-shell/
commit: 5cac954df6a7bcdf47502db1db74118afdb09e15
Author: Anna (cybertailor) Vyalkova sysrq in>
AuthorDate: Sun Feb 4 19:20:45 2024 +
Commit: David Roman gmail com>
CommitDate: Sun Feb 4 19:21:21 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5cac954d
phosh-base/phosh-shell: add verify-sig
Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in>
phosh-base/phosh-shell/Manifest | 1 +
phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild | 8 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest
index fc2bcfea44..424f46923f 100644
--- a/phosh-base/phosh-shell/Manifest
+++ b/phosh-base/phosh-shell/Manifest
@@ -1,4 +1,5 @@
DIST libcall-ui-acfbb136bbf74514e0b9801ce6c1e8acf36350b6.tar.gz 159337 BLAKE2B
47cd388043514baf568914adea281e884d0fa04375d8cc116cabd6a1061fcfb5e224a8065afffd2957513657ff5970d1dead33cea99f36117bb80b35d6f34513
SHA512
b79e3d8ac9889109e0fe20f149ffb14bde198f7a364152a60c7175228c283f18a7abe2049b01935d11fd005e14ef4da9c23ada6c651801364c79bc2dca1e71f2
DIST libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz
45164 BLAKE2B
c6807f855e7d4f45b58c7776cd497077b4adf8d577f9af014a8631a054c47374dfe5caa5652be208c6e566bfb8af70a0bb5e164f345b7612cb8786039625a191
SHA512
723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21
DIST phosh-0.36.0.tar.xz 839440 BLAKE2B
a6aa1c6fc2356055b0a451cb66fcfcbf3329059ab620aa56122e63e5eafc7f43ff1b1e4842fcadd7506f4724dbbab6e4785c6fb9b9e669e888c427be9163f0ab
SHA512
e108423c97343917b4be1827c44642e90738027b543bdc4bf2f45073101383227a157771a9efdf0b65a9adf30a09d210be21d35043ced8a9046fe70588e2
+DIST phosh-0.36.0.tar.xz.asc 833 BLAKE2B
1dcdfd6cd0708f60408a34bd2df891db4050de02c9349d5517fe23b2e17e0fb0fdfe97e3f86f5b30fb47c871932bd67310b889ce4d03b32408c7704d7ea31ce4
SHA512
c1ceac2eaad073b79f342915205f0539454f789eb6cb8aaae5fa4847bfac60641822796ee0adc83970af7ee6d6e57248bba48a718a05da1d2123984c4a3c9b91
DIST phosh-v0.17.0.tar.gz 726863 BLAKE2B
6a4c6bc6b3f645b7805445be21a4d8df13b786ee8cf104cf202a88a8333c5123cf34e5c136fa21d13476c71a51240d87388587bca84a37487e4984434fd32c53
SHA512
020a0cc5659d5c1a5f4291baed231f3f7b698dc41f027173cc59f3429a1a43bbf6f2213f2fb79d7d2c175518cb6a892c419a3b0ad902e51cca2c313f5bbc84bf
diff --git a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
b/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
index ea8fd4b3cb..93cd4591f2 100644
--- a/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
+++ b/phosh-base/phosh-shell/phosh-shell-0.36.0.ebuild
@@ -3,13 +3,14 @@
EAPI=8
-inherit gnome2-utils meson pam systemd virtualx xdg
+inherit gnome2-utils meson pam systemd verify-sig virtualx xdg
MY_PN="${PN%-shell}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Pure Wayland shell for mobile devices"
HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/;
-SRC_URI="https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz;
+SRC_URI="https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz
+ verify-sig? (
https://sources.phosh.mobi/releases/${MY_PN}/${MY_P}.tar.xz.asc )"
S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~arm64"
@@ -73,8 +74,11 @@ BDEPEND="
gtk-doc? ( dev-util/gi-docgen )
man? ( dev-python/docutils )
test-full? ( gui-wm/phoc )
+ verify-sig? ( sec-keys/openpgp-keys-phosh )
"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/phosh.asc"
+
src_configure() {
local emesonargs=(
-Dcompositor="${EPREFIX}"/usr/bin/phoc
[gentoo-commits] repo/proj/guru:master commit in: phosh-base/phosh-shell/, phosh-base/phosh-shell/files/, gui-wm/phosh/files/, ...
commit: d35b177204ed06b392a62e06d9630f8dc0aee3b1
Author: Anna (cybertailor) Vyalkova sysrq in>
AuthorDate: Sun Feb 4 07:19:39 2024 +
Commit: David Roman gmail com>
CommitDate: Sun Feb 4 19:11:01 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d35b1772
phosh-base/phosh-shell: rename gui-wm/phosh
It's not a window manager but a GNOME shell.
Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in>
{gui-wm/phosh => phosh-base/phosh-shell}/Manifest | 0
{gui-wm/phosh => phosh-base/phosh-shell}/files/pam_phosh| 0
{gui-wm/phosh => phosh-base/phosh-shell}/files/phosh.service| 0
{gui-wm/phosh => phosh-base/phosh-shell}/files/sm.puri.OSK0.desktop | 0
{gui-wm/phosh => phosh-base/phosh-shell}/metadata.xml | 0
.../phosh-shell/phosh-shell-0.17.0.ebuild | 2 +-
profiles/updates/1Q-2024| 1 +
7 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gui-wm/phosh/Manifest b/phosh-base/phosh-shell/Manifest
similarity index 100%
rename from gui-wm/phosh/Manifest
rename to phosh-base/phosh-shell/Manifest
diff --git a/gui-wm/phosh/files/pam_phosh
b/phosh-base/phosh-shell/files/pam_phosh
similarity index 100%
rename from gui-wm/phosh/files/pam_phosh
rename to phosh-base/phosh-shell/files/pam_phosh
diff --git a/gui-wm/phosh/files/phosh.service
b/phosh-base/phosh-shell/files/phosh.service
similarity index 100%
rename from gui-wm/phosh/files/phosh.service
rename to phosh-base/phosh-shell/files/phosh.service
diff --git a/gui-wm/phosh/files/sm.puri.OSK0.desktop
b/phosh-base/phosh-shell/files/sm.puri.OSK0.desktop
similarity index 100%
rename from gui-wm/phosh/files/sm.puri.OSK0.desktop
rename to phosh-base/phosh-shell/files/sm.puri.OSK0.desktop
diff --git a/gui-wm/phosh/metadata.xml b/phosh-base/phosh-shell/metadata.xml
similarity index 100%
rename from gui-wm/phosh/metadata.xml
rename to phosh-base/phosh-shell/metadata.xml
diff --git a/gui-wm/phosh/phosh-0.17.0.ebuild
b/phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild
similarity index 99%
rename from gui-wm/phosh/phosh-0.17.0.ebuild
rename to phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild
index d2af27daff..8263db680b 100644
--- a/gui-wm/phosh/phosh-0.17.0.ebuild
+++ b/phosh-base/phosh-shell/phosh-shell-0.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit desktop gnome2-utils meson pam readme.gentoo-r1 systemd xdg
-MY_P="${PN}-v${PV}"
+MY_P="phosh-v${PV}"
LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
LCU_COMMIT="acfbb136bbf74514e0b9801ce6c1e8acf36350b6"
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index c1748ce8c7..3067976259 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -7,3 +7,4 @@ move dev-util/FoBiS dev-build/FoBiS
move dev-util/fypp dev-build/fypp
move dev-python/pifpaf dev-util/pifpaf
move x11-wm/phoc gui-wm/phoc
+move gui-wm/phosh phosh-base/phosh-shell
