commit:     898d2e35edcc34241b239caa4358d83fb6477f82
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Tue Jun 24 16:49:40 2025 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Tue Jun 24 16:49:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=898d2e35

1.5.4: fixed regression for 1.5.3

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

 app-containers/waydroid/Manifest                           |  2 +-
 .../{waydroid-1.5.3.ebuild => waydroid-1.5.4.ebuild}       | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app-containers/waydroid/Manifest b/app-containers/waydroid/Manifest
index 7a31ab31b5..4d581d1384 100644
--- a/app-containers/waydroid/Manifest
+++ b/app-containers/waydroid/Manifest
@@ -1,4 +1,4 @@
 DIST waydroid-1.4.3.tar.gz 240785 BLAKE2B 
e654f2ed74f8d22810417ee5d6f6134ee5050b4e105dd2c643fa39df660e8c325a80f8e75176dd65e052deba187890f8afd94c384d707e0287027d3454a533ea
 SHA512 
e94edeca7097cb1572296d0b6e308483b1bd21e1bd50d9e6d2bd54d4ba75ffeb8bd4e1d1f8143fbcf49dddd30155da2e3c5a58240a85b159dae4e71985e547aa
 DIST waydroid-1.5.1.tar.gz 241421 BLAKE2B 
0368304d2088f8920d3dd65cd7fcb9d9517097146b543d838219f337f55444e32d10e2dfc4d0ec2570268959f005686cc3a756c8a44cb89bd87a473cf40a05d1
 SHA512 
fde8c699fdd67d49ee355c96dbba5c94ce2061c280bb28533035982cd460335f93cd9350de90b525d286f72bd3e4bad73a341fca31909e9623553e9280fe7463
 DIST waydroid-1.5.2.tar.gz 241865 BLAKE2B 
39ba1f759a9420fa92d02ea289cedfb8342e680ff57b304df3b94772991564d8385b8b722f2061dd1e0e9a40e0aa6aab52b6de5d3fc60e69a93d75b387693549
 SHA512 
80be97409d73c3dc649482ff9b8a9b3c316f7cfa7560c87e26a2b68a0efdcaa34c070825334789b6830e3ee0a88eb0967e9101575e4eadc4a39bda099c0f7651
-DIST waydroid-1.5.3.tar.gz 242090 BLAKE2B 
f90eef963c604a19dc5bbe837aa304b283e604d063fe1c3ca2a2da002a47a4a99761fa92ec0972582f76fe7f94e85d0a2cbc2270f090cf3ab695a0c8966c3317
 SHA512 
58d5a9384aa9755368a79992f69a863805b231f1f2f85c35eb46cc4a07b283b666a8d75cdc7651d28eee97001b81a4dc5353e7c3f32e301b19eab532083b9a29
+DIST waydroid-1.5.4.tar.gz 242228 BLAKE2B 
4df700f312b4c290fb3622bf8b0e1013b6c24d48f3c004c154bda562bb650b733b8670209a888c3a0de21db62631be2cd736be89080cc421d6381926a73302f0
 SHA512 
c6fc3860ed059676bf770b672be3df14b8e47b2a2b4a44e4d5672fedd3651959d7cb2b75fc34a7a037f3a770b3b82b78e12d0f3c9f3979ae821474eef4fad90c

diff --git a/app-containers/waydroid/waydroid-1.5.3.ebuild 
b/app-containers/waydroid/waydroid-1.5.4.ebuild
similarity index 91%
rename from app-containers/waydroid/waydroid-1.5.3.ebuild
rename to app-containers/waydroid/waydroid-1.5.4.ebuild
index fb15f99c5e..61dc1fd948 100644
--- a/app-containers/waydroid/waydroid-1.5.3.ebuild
+++ b/app-containers/waydroid/waydroid-1.5.4.ebuild
@@ -14,12 +14,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="apparmor +clipboard systemd"
+IUSE="apparmor +clipboard"
 
 DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
 RDEPEND="
-       systemd? ( sys-apps/systemd )
-       app-containers/lxc[systemd?,apparmor?,seccomp]
+       app-containers/lxc[apparmor?,seccomp]
        $(python_gen_cond_dep '
                clipboard? ( 
>=dev-python/pyclip-0.7.0[wayland,${PYTHON_USEDEP}] )
                dev-python/pygobject[${PYTHON_USEDEP}]
@@ -30,6 +29,7 @@ RDEPEND="
        net-dns/dnsmasq
        >=dev-libs/libglibutil-1.0.79
        >=dev-libs/gbinder-1.1.41
+       x11-themes/hicolor-icon-theme
        ${PYTHON_DEPS}
 "
 CONFIG_CHECK="
@@ -79,11 +79,9 @@ src_prepare() {
 
 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
+       emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=1
+       elog "Installing waydroid OpenRC daemon"
+       doinitd "${FILESDIR}"/waydroid
 }
 
 pkg_postinst() {

Reply via email to