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

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

[Florian Schmaus]

commit:     d447ef923f591be95745ee2b33757c363bfc14d5
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 11:28:26 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 11:28:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d447ef92

app-containers/waydroid: apply idomatic empty src_compile()

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-containers/waydroid/waydroid-1.3.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/waydroid/waydroid-1.3.4-r6.ebuild b/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
index d38d51203..9849e1641 100644
--- a/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
+++ b/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
@@ -44,7 +44,7 @@ ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHME
 
 
 src_compile(){
-	einfo "Nothing to compile"
+	:;
 }
 
 src_install() {

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

[Florian Schmaus]

commit:     a62bea21bd3362a6e602ae7e5a86c7a0afd10c1c
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 11:33:25 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 11:33:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a62bea21

app-containers/waydroid: fix duplicate newline

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-containers/waydroid/waydroid-1.3.4-r6.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-containers/waydroid/waydroid-1.3.4-r6.ebuild b/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
index a77b4df51..c23090502 100644
--- a/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
+++ b/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
@@ -42,7 +42,6 @@ ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-s
 ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
 	therefore it's vital for android-specific memory management"
 
-
 src_compile(){
 	:;
 }

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

[Florian Schmaus]

commit:     ed1db18fcebcfca86ee2581a97fcf5dc9872e252
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 11:30:33 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 11:30:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed1db18f

app-containers/waydroid: fix copyright header

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-containers/waydroid/waydroid-1.3.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/waydroid/waydroid-1.3.4-r6.ebuild b/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
index 9849e1641..a77b4df51 100644
--- a/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
+++ b/app-containers/waydroid/waydroid-1.3.4-r6.ebuild
@@ -1,4 +1,4 @@
-#Relaismatrix/ Messung Copyright 2020-2022 Gentoo Authors
+# Copyright 2022-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

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

[David Roman]

commit:     ed7c55996e086a57736e7aa0c7a641f6fd291acb
Author:     Sebastian France <MagelessMayhem <AT> protonmail <DOT> com>
AuthorDate: Mon Oct 23 21:34:09 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Oct 30 11:29:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed7c5599

app-containers/waydroid: Add new runtime dependency

Fixes a ModuleNotFoundError seen when attempting to initialze Waydroid.

Closes: https://github.com/gentoo/guru/pull/115
Signed-off-by: Sebastian France <MagelessMayhem <AT> protonmail.com>
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 app-containers/waydroid/waydroid-1.4.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-containers/waydroid/waydroid-1.4.0.ebuild b/app-containers/waydroid/waydroid-1.4.0.ebuild
index 3ea190f866..4d5fdc2efb 100644
--- a/app-containers/waydroid/waydroid-1.4.0.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 		dev-python/pygobject[${PYTHON_USEDEP}]
 		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
 		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
 	')
 	net-firewall/nftables[modern-kernel]
 	net-dns/dnsmasq

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

[Julien Roy]

commit:     f352d1d63946ce136a903566ce4b3914e356b74e
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Feb 18 19:02:51 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun Feb 18 19:02:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f352d1d6

app-containers/waydroid: fix net-firewall/nftables USE flag

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-containers/waydroid/waydroid-1.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-containers/waydroid/waydroid-1.4.0.ebuild b/app-containers/waydroid/waydroid-1.4.0.ebuild
index 4d5fdc2efb..25f3025a5d 100644
--- a/app-containers/waydroid/waydroid-1.4.0.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ RDEPEND="
 		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 	')
-	net-firewall/nftables[modern-kernel]
+	net-firewall/nftables
 	net-dns/dnsmasq
 	>=dev-libs/libglibutil-1.0.67
 	>=dev-libs/gbinder-1.1.21

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

[Julien Roy]

commit:     849ec8f7d6ccfbf42640f4b47a69103b0eb0f323
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sun Feb 18 19:02:31 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun Feb 18 19:02:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=849ec8f7

app-containers/waydroid: add 1.4.2

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-containers/waydroid/Manifest              |  1 +
 app-containers/waydroid/waydroid-1.4.2.ebuild | 89 +++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/app-containers/waydroid/Manifest b/app-containers/waydroid/Manifest
index 249078cee4..59ad458dab 100644
--- a/app-containers/waydroid/Manifest
+++ b/app-containers/waydroid/Manifest
@@ -1 +1,2 @@
 DIST waydroid-1.4.0.tar.gz 237562 BLAKE2B 28f711bf0fe8b5254739d1a6769f466bcc593f3c61df1bef9e2a3fab80a97fe44b9509907c100e3178e343fd264955894b38ee1be5b6ce0c6ea5d473b6958a7f SHA512 2f1e4c112dbe68ad15d69441a37ba631d148c95810f0ca1e6e1c45461089d5f5e0990a58c2324449b69199b6b24d32c110063c4dfaf89b537779915ec3f3b69d
+DIST waydroid-1.4.2.tar.gz 242536 BLAKE2B 77a6ba3a00bc2c95f767bec9ec93d1e4dcd3e20cf39d8c3ce0dea00f6c1c2a1eb6399f2ef0d8017958584205d067646d0e50d0f865c954284b7384f4a492a084 SHA512 0d3eba799895c853545b7087e3c07160d593d4a3166822039973669bc0ee93a8a6b9c394a7d982e57cfbbfbd8df1ba7991dd33b1b1517d79fcbe191d8a86890a

diff --git a/app-containers/waydroid/waydroid-1.4.2.ebuild b/app-containers/waydroid/waydroid-1.4.2.ebuild
new file mode 100644
index 0000000000..25f3025a5d
--- /dev/null
+++ b/app-containers/waydroid/waydroid-1.4.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit linux-info xdg-utils python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="systemd apparmor"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	app-containers/lxc[systemd?,apparmor?,seccomp]
+	$(python_gen_cond_dep '
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	')
+	net-firewall/nftables
+	net-dns/dnsmasq
+	>=dev-libs/libglibutil-1.0.67
+	>=dev-libs/gbinder-1.1.21
+	${PYTHON_DEPS}
+"
+
+CONFIG_CHECK="
+	~ANDROID_BINDER_IPC
+	~ANDROID_BINDERFS
+	~MEMFD_CREATE
+"
+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"
+
+src_compile(){
+	:;
+}
+
+src_install() {
+	python_fix_shebang waydroid.py
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+	if ! use systemd; then
+		elog "Installing waydroid OpenRC daemon"
+		doinitd "${FILESDIR}"/waydroid
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! 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 "After package installation run ether 'emerge --config app-containers/waydroid'"
+	einfo "or 'waydroid init' from root shell to install android container runtime"
+	einfo "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	einfo "2. start wayland channel (from user shell) 'waydroid session start'"
+	einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	einfo "(does not cover Gentoo-specific things sadly)"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_config() {
+	"${ROOT}"/usr/bin/waydroid init
+}

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

[Julien Roy]

commit:     646870cf4b412e6623dde83a80613b55a983283e
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Feb 19 21:46:19 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Feb 19 21:46:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=646870cf

app-containers/waydroid: enable py3.12

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-containers/waydroid/waydroid-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/waydroid/waydroid-1.4.2.ebuild b/app-containers/waydroid/waydroid-1.4.2.ebuild
index 25f3025a5d..9a495dd85c 100644
--- a/app-containers/waydroid/waydroid-1.4.2.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit linux-info xdg-utils python-single-r1
 
 DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"

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

[Julien Roy]

commit:     4d3ef84881cb7705770020ff2a2634fa318f6823
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 14:02:45 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Feb 19 14:02:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d3ef848

app-containers/waydroid: added python3.12 support

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

 app-containers/waydroid/waydroid-1.4.2-r1.ebuild | 89 ++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
new file mode 100644
index 0000000000..9a495dd85c
--- /dev/null
+++ b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit linux-info xdg-utils python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="systemd apparmor"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	app-containers/lxc[systemd?,apparmor?,seccomp]
+	$(python_gen_cond_dep '
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	')
+	net-firewall/nftables
+	net-dns/dnsmasq
+	>=dev-libs/libglibutil-1.0.67
+	>=dev-libs/gbinder-1.1.21
+	${PYTHON_DEPS}
+"
+
+CONFIG_CHECK="
+	~ANDROID_BINDER_IPC
+	~ANDROID_BINDERFS
+	~MEMFD_CREATE
+"
+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"
+
+src_compile(){
+	:;
+}
+
+src_install() {
+	python_fix_shebang waydroid.py
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+	if ! use systemd; then
+		elog "Installing waydroid OpenRC daemon"
+		doinitd "${FILESDIR}"/waydroid
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! 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 "After package installation run ether 'emerge --config app-containers/waydroid'"
+	einfo "or 'waydroid init' from root shell to install android container runtime"
+	einfo "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	einfo "2. start wayland channel (from user shell) 'waydroid session start'"
+	einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	einfo "(does not cover Gentoo-specific things sadly)"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_config() {
+	"${ROOT}"/usr/bin/waydroid init
+}

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

[Julien Roy]

commit:     646870cf4b412e6623dde83a80613b55a983283e
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Feb 19 21:46:19 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Feb 19 21:46:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=646870cf

app-containers/waydroid: enable py3.12

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-containers/waydroid/waydroid-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-containers/waydroid/waydroid-1.4.2.ebuild b/app-containers/waydroid/waydroid-1.4.2.ebuild
index 25f3025a5d..9a495dd85c 100644
--- a/app-containers/waydroid/waydroid-1.4.2.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit linux-info xdg-utils python-single-r1
 
 DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"

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

[Julien Roy]

commit:     1148a0ffcad0d233b23d5f31580fc77c70bb38dc
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Mon Feb 19 21:45:56 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Feb 19 21:46:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1148a0ff

Revert "app-containers/waydroid: added python3.12 support"

This reverts commit 4d3ef84881cb7705770020ff2a2634fa318f6823.

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-containers/waydroid/waydroid-1.4.2-r1.ebuild | 89 ------------------------
 1 file changed, 89 deletions(-)

diff --git a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
deleted file mode 100644
index 9a495dd85c..0000000000
--- a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit linux-info xdg-utils python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="systemd apparmor"
-
-DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?,apparmor?,seccomp]
-	$(python_gen_cond_dep '
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	')
-	net-firewall/nftables
-	net-dns/dnsmasq
-	>=dev-libs/libglibutil-1.0.67
-	>=dev-libs/gbinder-1.1.21
-	${PYTHON_DEPS}
-"
-
-CONFIG_CHECK="
-	~ANDROID_BINDER_IPC
-	~ANDROID_BINDERFS
-	~MEMFD_CREATE
-"
-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"
-
-src_compile(){
-	:;
-}
-
-src_install() {
-	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-	if ! use systemd; then
-		elog "Installing waydroid OpenRC daemon"
-		doinitd "${FILESDIR}"/waydroid
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! 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 "After package installation run ether 'emerge --config app-containers/waydroid'"
-	einfo "or 'waydroid init' from root shell to install android container runtime"
-	einfo "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	einfo "2. start wayland channel (from user shell) 'waydroid session start'"
-	einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	einfo "(does not cover Gentoo-specific things sadly)"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_config() {
-	"${ROOT}"/usr/bin/waydroid init
-}

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

[Julien Roy]

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

app-containers/waydroid: Add patch for -apparmor

Instead of having convoluted instructions, have the ebuild do this.

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

 app-containers/waydroid/waydroid-1.4.2-r1.ebuild | 86 ++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
new file mode 100644
index 0000000000..3537a4add7
--- /dev/null
+++ b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit linux-info xdg python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="systemd apparmor"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	app-containers/lxc[systemd?,apparmor?,seccomp]
+	$(python_gen_cond_dep '
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	')
+	net-firewall/nftables
+	net-dns/dnsmasq
+	>=dev-libs/libglibutil-1.0.67
+	>=dev-libs/gbinder-1.1.21
+	${PYTHON_DEPS}
+"
+
+CONFIG_CHECK="
+	~ANDROID_BINDER_IPC
+	~ANDROID_BINDERFS
+	~MEMFD_CREATE
+"
+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"
+
+src_prepare() {
+	if ! use apparmor; then
+		# https://github.com/waydroid/waydroid/issues/652
+		sed -e '/^lxc\.apparmor\.profile =/d' \
+			-i data/configs/config_3 || die
+	fi
+	default
+}
+
+src_install() {
+	python_fix_shebang waydroid.py
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+	if ! use systemd; then
+		elog "Installing waydroid OpenRC daemon"
+		doinitd "${FILESDIR}"/waydroid
+	fi
+}
+
+pkg_postinst() {
+	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"
+	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	elog "2. start wayland channel (from user shell) 'waydroid session start'"
+	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	elog "(does not cover Gentoo-specific things sadly)"
+	elog
+
+	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+	ewarn
+
+	if use apparmor; then
+		ewarn "Apparmor support has not been tested by package maintainer yet"
+	fi
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/waydroid init
+}

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

[Julien Roy]

commit:     5acfecdbcbf67e284a318fed880852d0aaaf4dc1
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Mar 21 18:15:04 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=5acfecdb

app-containers/waydroid: Minor style fixes

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

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

diff --git a/app-containers/waydroid/waydroid-1.4.0.ebuild b/app-containers/waydroid/waydroid-1.4.0.ebuild
index 25f3025a5d..a15188ca37 100644
--- a/app-containers/waydroid/waydroid-1.4.0.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.0.ebuild
@@ -43,8 +43,8 @@ ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-s
 ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
 	therefore it's vital for android-specific memory management"
 
-src_compile(){
-	:;
+src_compile() {
+	:
 }
 
 src_install() {

diff --git a/app-containers/waydroid/waydroid-1.4.2.ebuild b/app-containers/waydroid/waydroid-1.4.2.ebuild
index 9a495dd85c..cf421efb8e 100644
--- a/app-containers/waydroid/waydroid-1.4.2.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2.ebuild
@@ -43,8 +43,8 @@ ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-s
 ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers,
 	therefore it's vital for android-specific memory management"
 
-src_compile(){
-	:;
+src_compile() {
+	:
 }
 
 src_install() {

[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
 }

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

[Julien Roy]

commit:     76976d30748507e71191dff7f4eb19ebc04a039d
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Mar 21 18:28:46 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=76976d30

app-containers/waydroid: Make important messages more visible

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

 app-containers/waydroid/waydroid-1.4.0.ebuild | 20 ++++++++++++--------
 app-containers/waydroid/waydroid-1.4.2.ebuild | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app-containers/waydroid/waydroid-1.4.0.ebuild b/app-containers/waydroid/waydroid-1.4.0.ebuild
index a15188ca37..17e3547703 100644
--- a/app-containers/waydroid/waydroid-1.4.0.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.0.ebuild
@@ -60,6 +60,18 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 
+	elog "After package installation run either 'emerge --config app-containers/waydroid'"
+	elog "or 'waydroid init' from root shell to install android container runtime"
+	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	elog "2. start wayland channel (from user shell) 'waydroid session start'"
+	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	elog "(does not cover Gentoo-specific things sadly)"
+	elog
+
+	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+	ewarn
+
 	if ! 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:"
@@ -69,14 +81,6 @@ pkg_postinst() {
 	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 "After package installation run ether 'emerge --config app-containers/waydroid'"
-	einfo "or 'waydroid init' from root shell to install android container runtime"
-	einfo "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	einfo "2. start wayland channel (from user shell) 'waydroid session start'"
-	einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	einfo "(does not cover Gentoo-specific things sadly)"
 }
 
 pkg_postrm() {

diff --git a/app-containers/waydroid/waydroid-1.4.2.ebuild b/app-containers/waydroid/waydroid-1.4.2.ebuild
index cf421efb8e..5d5b8a91f8 100644
--- a/app-containers/waydroid/waydroid-1.4.2.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2.ebuild
@@ -60,6 +60,18 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 
+	elog "After package installation run either 'emerge --config app-containers/waydroid'"
+	elog "or 'waydroid init' from root shell to install android container runtime"
+	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	elog "2. start wayland channel (from user shell) 'waydroid session start'"
+	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	elog "(does not cover Gentoo-specific things sadly)"
+	elog
+
+	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+	ewarn
+
 	if ! 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:"
@@ -69,14 +81,6 @@ pkg_postinst() {
 	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 "After package installation run ether 'emerge --config app-containers/waydroid'"
-	einfo "or 'waydroid init' from root shell to install android container runtime"
-	einfo "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	einfo "2. start wayland channel (from user shell) 'waydroid session start'"
-	einfo "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	einfo "(does not cover Gentoo-specific things sadly)"
 }
 
 pkg_postrm() {

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

[Julien Roy]

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

app-containers/waydroid: Require anbox-modules

This program cannot function without ashmem_linux

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

 app-containers/waydroid/waydroid-1.4.2-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
index fc6157ad25..243c183326 100644
--- a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
@@ -19,6 +19,7 @@ IUSE="apparmor +clipboard systemd"
 DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
 RDEPEND="
 	systemd? ( sys-apps/systemd )
+	app-containers/anbox-modules
 	app-containers/lxc[systemd?,apparmor?,seccomp]
 	$(python_gen_cond_dep '
 		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )

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

[Julien Roy]

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

app-containers/waydroid: Make dev-python/pyclip optional

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

 app-containers/waydroid/metadata.xml             | 3 +++
 app-containers/waydroid/waydroid-1.4.2-r1.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-containers/waydroid/metadata.xml b/app-containers/waydroid/metadata.xml
index 306c7ad83a..5f133fca2b 100644
--- a/app-containers/waydroid/metadata.xml
+++ b/app-containers/waydroid/metadata.xml
@@ -13,6 +13,9 @@
 
 		The Android runtime environment ships with a minimal customized Android system image based on LineageOS. The image is currently based on Android 11.
 	</longdescription>
+	<use>
+		<flag name="clipboard">Enable clipboard manager service using dev-python/pyclip</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">waydroid/waydroid</remote-id>
 	</upstream>

diff --git a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
index 3537a4add7..fc6157ad25 100644
--- a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
@@ -14,16 +14,16 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="systemd apparmor"
+IUSE="apparmor +clipboard systemd"
 
 DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
 RDEPEND="
 	systemd? ( sys-apps/systemd )
 	app-containers/lxc[systemd?,apparmor?,seccomp]
 	$(python_gen_cond_dep '
+		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
 		dev-python/pygobject[${PYTHON_USEDEP}]
 		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 	')
 	net-firewall/nftables

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

[Julien Roy]

commit:     ee88ffd54065b23603609c68d84a171440d99d43
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 18:53:15 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Fri Mar 22 18:54:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ee88ffd5

Revert "app-containers/waydroid: Require anbox-modules"

This reverts commit fc74f63151bcda8d58d32812b31f2ed639bf8f0b.

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

 app-containers/waydroid/waydroid-1.4.2-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
index 243c183326..fc6157ad25 100644
--- a/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
+++ b/app-containers/waydroid/waydroid-1.4.2-r1.ebuild
@@ -19,7 +19,6 @@ IUSE="apparmor +clipboard systemd"
 DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
 RDEPEND="
 	systemd? ( sys-apps/systemd )
-	app-containers/anbox-modules
 	app-containers/lxc[systemd?,apparmor?,seccomp]
 	$(python_gen_cond_dep '
 		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )

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

[Julien Roy]

commit:     581635644d8ca35fcf8b3e1ea6f77158e7c963f6
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Wed May 15 16:38:44 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Wed May 15 16:55:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=58163564

app-containers/waydroid: drop 1.4.0

Closes: https://bugs.gentoo.org/931351
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 app-containers/waydroid/Manifest              |  1 -
 app-containers/waydroid/waydroid-1.4.0.ebuild | 87 ---------------------------
 2 files changed, 88 deletions(-)

diff --git a/app-containers/waydroid/Manifest b/app-containers/waydroid/Manifest
index 59ad458dab..bae9771709 100644
--- a/app-containers/waydroid/Manifest
+++ b/app-containers/waydroid/Manifest
@@ -1,2 +1 @@
-DIST waydroid-1.4.0.tar.gz 237562 BLAKE2B 28f711bf0fe8b5254739d1a6769f466bcc593f3c61df1bef9e2a3fab80a97fe44b9509907c100e3178e343fd264955894b38ee1be5b6ce0c6ea5d473b6958a7f SHA512 2f1e4c112dbe68ad15d69441a37ba631d148c95810f0ca1e6e1c45461089d5f5e0990a58c2324449b69199b6b24d32c110063c4dfaf89b537779915ec3f3b69d
 DIST waydroid-1.4.2.tar.gz 242536 BLAKE2B 77a6ba3a00bc2c95f767bec9ec93d1e4dcd3e20cf39d8c3ce0dea00f6c1c2a1eb6399f2ef0d8017958584205d067646d0e50d0f865c954284b7384f4a492a084 SHA512 0d3eba799895c853545b7087e3c07160d593d4a3166822039973669bc0ee93a8a6b9c394a7d982e57cfbbfbd8df1ba7991dd33b1b1517d79fcbe191d8a86890a

diff --git a/app-containers/waydroid/waydroid-1.4.0.ebuild b/app-containers/waydroid/waydroid-1.4.0.ebuild
deleted file mode 100644
index 64f69da5d3..0000000000
--- a/app-containers/waydroid/waydroid-1.4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit linux-info xdg python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="systemd apparmor"
-
-DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	app-containers/lxc[systemd?,apparmor?,seccomp]
-	$(python_gen_cond_dep '
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	')
-	net-firewall/nftables
-	net-dns/dnsmasq
-	>=dev-libs/libglibutil-1.0.67
-	>=dev-libs/gbinder-1.1.21
-	${PYTHON_DEPS}
-"
-
-CONFIG_CHECK="
-	~ANDROID_BINDER_IPC
-	~ANDROID_BINDERFS
-	~MEMFD_CREATE
-"
-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"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	python_fix_shebang waydroid.py
-	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
-	if ! use systemd; then
-		elog "Installing waydroid OpenRC daemon"
-		doinitd "${FILESDIR}"/waydroid
-	fi
-}
-
-pkg_postinst() {
-	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"
-	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
-	elog "2. start wayland channel (from user shell) 'waydroid session start'"
-	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
-	elog "(does not cover Gentoo-specific things sadly)"
-	elog
-
-	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
-	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
-	ewarn
-
-	if ! 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
-}
-
-pkg_config() {
-	"${EROOT}"/usr/bin/waydroid init
-}

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

[Lucio Sauer]

commit:     c267d4087ebd2ed3c4b2986d5ae64e58abeceeab
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Tue Aug  6 14:22:00 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Tue Aug  6 14:22:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c267d408

app-containers/waydroid: Added more kernel checks

* CONFIG_NETFILTER_XT_TARGET_MASQUERADE
* CONFIG_NETFILTER_XT_NAT

Closes: https://bugs.gentoo.org/937106
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

 app-containers/waydroid/waydroid-1.4.2-r2.ebuild | 96 ++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/app-containers/waydroid/waydroid-1.4.2-r2.ebuild b/app-containers/waydroid/waydroid-1.4.2-r2.ebuild
new file mode 100644
index 000000000..89c34aaa8
--- /dev/null
+++ b/app-containers/waydroid/waydroid-1.4.2-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit linux-info xdg python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="apparmor +clipboard systemd"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+	systemd? ( sys-apps/systemd )
+	app-containers/lxc[systemd?,apparmor?,seccomp]
+	$(python_gen_cond_dep '
+		clipboard? ( >=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		>=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	')
+	net-firewall/nftables
+	net-dns/dnsmasq
+	>=dev-libs/libglibutil-1.0.67
+	>=dev-libs/gbinder-1.1.21
+	${PYTHON_DEPS}
+"
+
+CONFIG_CHECK="
+	~ANDROID_BINDER_IPC
+	~ANDROID_BINDERFS
+	~MEMFD_CREATE
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NETFILTER_XT_NAT
+"
+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_NETFILTER_XT_NAT="CONFIG_NETFILTER_XT_NAT: see bug #937106"
+ERROR_NETFILTER_XT_TARGET_MASQUERADE="CONFIG_NETFILTER_XT_TARGET_MASQUERADE: see bug #937106"
+
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use apparmor; then
+		# https://github.com/waydroid/waydroid/issues/652
+		sed -e '/^lxc\.apparmor\.profile =/d' \
+			-i data/configs/config_3 || die
+	fi
+	default
+}
+
+src_install() {
+	python_fix_shebang waydroid.py
+	emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+	if ! use systemd; then
+		elog "Installing waydroid OpenRC daemon"
+		doinitd "${FILESDIR}"/waydroid
+	fi
+}
+
+pkg_postinst() {
+	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"
+	elog "To run waydroid, 1. Start container: 'rc-service waydroid start'"
+	elog "2. start wayland channel (from user shell) 'waydroid session start'"
+	elog "Contact https://docs.waydro.id/usage/install-on-desktops for how-to guides"
+	elog "(does not cover Gentoo-specific things sadly)"
+	elog
+
+	ewarn "Make sure you have NFTABLES up and running in your kernel. See"
+	ewarn "https://wiki.gentoo.org/wiki/Nftables for how-to details"
+	ewarn
+
+	if use apparmor; then
+		ewarn "Apparmor support has not been tested by package maintainer yet"
+	fi
+}
+
+pkg_config() {
+	"${EROOT}"/usr/bin/waydroid init
+}