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

[Haelwenn Monnier]

commit:     109805147f485e34cd304a70035870e73f2a5891
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Mon Dec 19 13:23:08 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Mon Dec 19 13:48:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10980514

app-emulation/waydroid: Updated waydroid dependencies, added basic 
clarifications about usage and caveats

Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

 ...id-1.3.4-r2.ebuild => waydroid-1.3.4-r3.ebuild} | 28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild 
b/app-emulation/waydroid/waydroid-1.3.4-r3.ebuild
similarity index 54%
rename from app-emulation/waydroid/waydroid-1.3.4-r2.ebuild
rename to app-emulation/waydroid/waydroid-1.3.4-r3.ebuild
index dfecb4019..d22bac703 100644
--- a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild
+++ b/app-emulation/waydroid/waydroid-1.3.4-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit linux-info python-single-r1
 
 DESCRIPTION="Container-based approach to boot a full Android system on Linux 
systems"
@@ -14,20 +14,23 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="systemd"
+IUSE="systemd apparmor"
 
 DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
 RDEPEND="
        systemd? ( sys-apps/systemd )
        app-containers/lxc[systemd?]
+       app-containers/lxc[apparmor?]
+       app-containers/lxc[seccomp]
        $(python_gen_cond_dep '
                dev-python/pygobject[${PYTHON_USEDEP}]
                >=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-               >=dev-libs/gbinder-1.1.21
+               dev-python/pyclip[${PYTHON_USEDEP}]
        ')
        net-firewall/nftables[modern-kernel]
        net-dns/dnsmasq
        >=dev-libs/libglibutil-1.0.67
+       >=dev-libs/gbinder-1.1.21
        ${PYTHON_DEPS}
 "
 
@@ -38,9 +41,26 @@ CONFIG_CHECK="
 "
 ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating 
Android-specific binder IPC channels"
 ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating 
Android-specific binder IPC channels"
-ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated 
ISHMEM drivers, therefore it's vital for android-specific memory management"
+ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated 
ISHMEM drivers,
+       therefore it's vital for android-specific memory management"
 
 src_install() {
        python_fix_shebang waydroid.py
        emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 
1 0)
 }
+
+pkg_postinst() {
+       if not use apparmor; then
+               ewarn "If you use app-containers/lxc without apparmor, make 
sure you deleted or commented out in waydroid LXC config"
+               ewarn "(generated after waydroid init) in 
/var/lib/waydroid/lxc/waydroid/config the following string:"
+               ewarn "lxc.apparmor.profile = unconfined"
+               ewarn "or waydroid experiences crash during launch"
+               ewarn "See also https://github.com/waydroid/waydroid/issues/652";
+       else
+               ewarn "Apparmor support has not been tested by package 
maintainer yet"
+       fi
+       ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+       ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+       einfo "Contact https://docs.waydro.id/usage/install-on-desktops for 
how-to guides"
+       einfo "(does not cover Gentoo-specific things sadly)"
+}