[gentoo-commits] repo/proj/guru:master commit in: app-containers/waydroid/

[Julien Roy]

commit:     f235c2515d3f4305d97f39de4cc0794057f02546
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Mar 21 18:22:56 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Mar 21 22:10:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f235c251

app-containers/waydroid: Minor improvements

Use xdg.eclass instead of calling the functions individually, support
Gentoo Prefix by using EROOT.

Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>

 app-containers/waydroid/waydroid-1.4.0.ebuild | 12 +++---------
 app-containers/waydroid/waydroid-1.4.2.ebuild | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app-containers/waydroid/waydroid-1.4.0.ebuild 
b/app-containers/waydroid/waydroid-1.4.0.ebuild
index 17e3547703..64f69da5d3 100644
--- a/app-containers/waydroid/waydroid-1.4.0.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit linux-info xdg-utils python-single-r1
+inherit linux-info xdg python-single-r1
 
 DESCRIPTION="Container-based approach to boot a full Android system on Linux 
systems"
 HOMEPAGE="https://waydro.id";
@@ -57,8 +57,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
+       xdg_pkg_postinst
 
        elog "After package installation run either 'emerge --config 
app-containers/waydroid'"
        elog "or 'waydroid init' from root shell to install android container 
runtime"
@@ -83,11 +82,6 @@ pkg_postinst() {
        fi
 }
 
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
-}
-
 pkg_config() {
-       "${ROOT}"/usr/bin/waydroid init
+       "${EROOT}"/usr/bin/waydroid init
 }

diff --git a/app-containers/waydroid/waydroid-1.4.2.ebuild 
b/app-containers/waydroid/waydroid-1.4.2.ebuild
index 5d5b8a91f8..10bd38daf4 100644
--- a/app-containers/waydroid/waydroid-1.4.2.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit linux-info xdg-utils python-single-r1
+inherit linux-info xdg python-single-r1
 
 DESCRIPTION="Container-based approach to boot a full Android system on Linux 
systems"
 HOMEPAGE="https://waydro.id";
@@ -57,8 +57,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
+       xdg_pkg_postinst
 
        elog "After package installation run either 'emerge --config 
app-containers/waydroid'"
        elog "or 'waydroid init' from root shell to install android container 
runtime"
@@ -83,11 +82,6 @@ pkg_postinst() {
        fi
 }
 
-pkg_postrm() {
-       xdg_desktop_database_update
-       xdg_mimeinfo_database_update
-}
-
 pkg_config() {
-       "${ROOT}"/usr/bin/waydroid init
+       "${EROOT}"/usr/bin/waydroid init
 }