commit:     c3313780867fee582811916810de78649b54a5ab
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Wed May  8 17:38:01 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed May  8 17:55:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3313780

gui-apps/eww: sync live package

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 gui-apps/eww/Manifest        |   1 +
 gui-apps/eww/eww-9999.ebuild | 358 ++++++++++++++++++++++++++-----------------
 2 files changed, 220 insertions(+), 139 deletions(-)

diff --git a/gui-apps/eww/Manifest b/gui-apps/eww/Manifest
index f5826c5f2f..23044a26c0 100644
--- a/gui-apps/eww/Manifest
+++ b/gui-apps/eww/Manifest
@@ -67,6 +67,7 @@ DIST encode_unicode-0.3.6.crate 45741 BLAKE2B 
e1e3792bc2bf9db7df33a516d0d755eef5
 DIST env_logger-0.10.2.crate 36402 BLAKE2B 
34ef02d0f53fea474e7284fd7021ed3b44b11be2c0d0c9a66ace8792bac74d1a6b43997e0e7d043ef89e14903f6ab6d42c169bbb164f05cfe4e1688611639edb
 SHA512 
c44131efb703eed984d8f4edcf18c77ef14036edf013e8bf445703c74a4386e4c3f4b55a272490da1ccb47a692ccde4670772c74d35c5723601c870416144b69
 DIST equivalent-1.0.1.crate 6615 BLAKE2B 
302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a
 SHA512 
b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
 DIST eww-0.5.0.tar.gz 331173 BLAKE2B 
b11f1166f8deb3a2a6c20deced4c1a016a058679c2ce5ba8499db4c5f07553c1886d15e074f1d96ca224448bc811bfa783864500a4a75e185c50302285aa2829
 SHA512 
68f75353d4a76a61c881956a6c9e0820d1b93f2db7503a8e37753b194effa250e0ce3d04f9cdcaee8b99417c4412c37203c1c5bcdc0950ccb1ad1bde057fdb1b
+DIST eww-9999-shellcomp.tar.xz 5112 BLAKE2B 
e15c8989c1aa3b53bbf80d0a288cf5e4ba4e430f7dbd9a5d6b56fa6eb50dd8dab97e25b945b33cd71531695347d004676ea0df90c3bbff991ae24d10417039ed
 SHA512 
dafac1d4d8122b1f1631a3b51e857e03c8936a565af856deabdcf7711550b681038260b424a957a030313572074420c97c4370d93271d4ba408bffbde09f49f1
 DIST extend-1.2.0.crate 10581 BLAKE2B 
89d9281b1c89ff03a08bfa58d669cff6eacaf9bfa2b514d11115f9686052ceae4ae77eba1f1e00d82cba47f439467090beb8b9231c3b842e2f47876ac5049338
 SHA512 
e6f4d8d11cdb742510e6c06d06b08f546ad01eacb0037b9c162abd19e55b327df1ab93563c173bdad42bbe57e3a9190c3195e093bb8f17998ae25fe80ae1493a
 DIST field-offset-0.3.6.crate 10032 BLAKE2B 
b4b43d35f793c55e8c521de7bc1648501cfe46494fc17d0b6135ba3456c8d72a11b422a16735c681c7c6542084652c119661372628096d61197f6e387b66143a
 SHA512 
3ec99bf5e860dc68f3fcd0abd2b0de2ae0b3174eb177458506aabeee9dc7b0b8b58b925e2c6108a8f18ab95f2e1952dd9474650a639e1c1d50ec3f72bbd30077
 DIST filetime-0.2.23.crate 14942 BLAKE2B 
e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c
 SHA512 
8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3

diff --git a/gui-apps/eww/eww-9999.ebuild b/gui-apps/eww/eww-9999.ebuild
index e12833ab28..99ce3c36f6 100644
--- a/gui-apps/eww/eww-9999.ebuild
+++ b/gui-apps/eww/eww-9999.ebuild
@@ -1,46 +1,59 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES="
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
@@ -50,173 +63,213 @@ CRATES="
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]+deprecated
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
@@ -224,116 +277,144 @@ CRATES="
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]+wasi-snapshot-preview1
        [email protected]+wasi-snapshot-preview1
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
-       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
        [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
        [email protected]
        [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
 "
 
-inherit cargo
+inherit cargo shell-completion
 
 DESCRIPTION="Elkowars Wacky Widgets is a standalone widget system made in Rust"
-HOMEPAGE="https://github.com/elkowar/eww";
+HOMEPAGE="https://github.com/elkowar/eww/";
+SRC_URI="https://git.sr.ht/~antecrescent/gentoo-files/blob/main/gui-apps/eww/${P}-shellcomp.tar.xz";
 
 if [[ "${PV}" == 9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="https://github.com/elkowar/${PN}.git";
+       EGIT_REPO_URI="https://github.com/elkowar/eww.git";
 else
-       SRC_URI="
-               
https://github.com/elkowar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+       SRC_URI+="
+               https://github.com/elkowar/eww/archive/v${PV}.tar.gz -> 
${P}.tar.gz
                ${CARGO_CRATE_URIS}
        "
        KEYWORDS="~amd64"
 fi
 
-LICENSE="
-       MIT
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+       Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC LGPL-3
+       Unicode-DFS-2016
 "
 SLOT="0"
 IUSE="X wayland"
 REQUIRED_USE="|| ( X wayland )"
 
-DEPEND="
-       X? ( x11-libs/gtk+:3[X] )
-       wayland? ( x11-libs/gtk+:3[wayland] )
+RDEPEND="
+       dev-libs/glib:2
+       dev-libs/libdbusmenu[gtk3]
+       x11-libs/cairo[glib]
+       x11-libs/gdk-pixbuf:2
+       x11-libs/gtk+:3[X?,wayland?]
        x11-libs/pango
-       x11-libs/gdk-pixbuf
-       x11-libs/cairo
-       >=dev-libs/glib-2.0
-       sys-devel/gcc
-       gui-libs/gtk-layer-shell
+       wayland? ( gui-libs/gtk-layer-shell )
 "
-BDEPEND="
-       $DEPEND
-       dev-lang/rust[nightly]
+# transitively hard-depend on xorg-proto due to gdk-3.0.pc
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto
 "
-RDEPEND="
-       $DEPEND
+BDEPEND="
+       virtual/pkgconfig
+       >=virtual/rust-1.74.0
 "
 
 QA_FLAGS_IGNORED="usr/bin/.*"
@@ -342,6 +423,7 @@ src_unpack() {
        if [[ "${PV}" == 9999 ]]; then
                git-r3_src_unpack
                cargo_live_src_unpack
+               unpack ${P}-shellcomp.tar.xz
        else
                cargo_src_unpack
        fi
@@ -355,15 +437,13 @@ src_configure() {
        cargo_src_configure --no-default-features
 }
 
-src_compile() {
-       cargo_gen_config
-       cargo_src_compile
-}
-
 src_install() {
+       dobashcomp "${WORKDIR}"/eww
+       dofishcomp "${WORKDIR}"/eww.fish
+       dozshcomp "${WORKDIR}"/_eww
+
        dodoc README.md CHANGELOG.md
-       cd target/release || die
-       dobin eww
+       cargo_src_install --path crates/eww
        elog "Eww wont run without a config file (usually in ~/.config/eww)."
        elog "For example configs visit https://github.com/elkowar/eww#examples";
 }

Reply via email to