Adding metadata

4 files changed, 4 insertions, 85 deletions

diff --git a/phosh-base/phosh-shell/Manifest b/phosh-base/phosh-shell/Manifest
index 424f46923f5c..68a278a3d723 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 e108423c97343917b4be1827c44642e90738027b543bdc4bf2f45073101383227a157771a9efdf0b65a9adf30a09d1111210be21d35043ced8a9046fe70588e2
 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 8263db680b34..000000000000
--- 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"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
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 93cd4591f25d..a66f2fc31e6b 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/phosh-base/phosh/phosh-0.36.0.ebuild b/phosh-base/phosh/phosh-0.36.0-r1.ebuild
index b1e1533b4596..92781e301b71 100644
--- a/phosh-base/phosh/phosh-0.36.0.ebuild
+++ b/phosh-base/phosh/phosh-0.36.0-r1.ebuild
@@ -14,8 +14,9 @@ RDEPEND="
 	app-alternatives/phosh-keyboard
 	app-misc/geoclue:2.0
 	dev-libs/feedbackd[daemon]
-	>=gui-wm/phoc-${PV}
+	>=gui-wm/phoc-${PV}-r1
 	>=phosh-base/phosh-mobile-settings-${PV}
 	>=phosh-base/phosh-shell-${PV}
 	>=phosh-base/phosh-tour-${PV}
+	x11-themes/gnome-backgrounds
 "