[gentoo-commits] repo/proj/guru:dev commit in: gui-wm/phosh/

[Andrew Ammerlaan]

commit:     50be1110513b27c631a945ac7febea6888380fef
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 13:36:39 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 13:36:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50be1110

gui-wm/phosh: multiple fixes

- fix DeprecatedInsinto
- drop UnusedInherits
- default already calls eapply_user

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 gui-wm/phosh/phosh-0.15.0.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gui-wm/phosh/phosh-0.15.0.ebuild b/gui-wm/phosh/phosh-0.15.0.ebuild
index 68a68fcba..5604ab117 100644
--- a/gui-wm/phosh/phosh-0.15.0.ebuild
+++ b/gui-wm/phosh/phosh-0.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop gnome2-utils meson pam readme.gentoo-r1 vala systemd xdg
+inherit desktop gnome2-utils meson pam readme.gentoo-r1 systemd xdg
 
 MY_P="${PN}-v${PV}"
 LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
@@ -48,7 +48,6 @@ BDEPEND="
 
 src_prepare() {
        default
-       eapply_user
        rm -r "${S}"/subprojects/gvc || die
        mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}" 
"${S}"/subprojects/gvc || die
        rm -r "${S}"/subprojects/libcall-ui || die
@@ -60,8 +59,7 @@ src_install() {
        meson_src_install
        newpamd "${FILESDIR}"/pam_phosh 'phosh'
        systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
-       insinto /usr/share/applications/
-       doins "${FILESDIR}"/sm.puri.OSK0.desktop
+       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