commit:     d29838f38ab72ff6979f4b4496fe2ef90d534a98
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Sat Nov  9 11:48:27 2024 +0000
Commit:     Jonas Frei <freijon <AT> pm <DOT> me>
CommitDate: Sat Nov  9 11:49:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d29838f3

*/*: update for slotted Rust

Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 ...ldeer-1.6.1.ebuild => tealdeer-1.6.1-r1.ebuild} |   1 -
 gui-apps/eww/eww-0.6.0-r2.ebuild                   | 436 --------------------
 gui-apps/eww/eww-0.6.0-r3.ebuild                   | 437 +++++++++++++++++++++
 gui-apps/eww/eww-9999.ebuild                       |   2 +
 4 files changed, 439 insertions(+), 437 deletions(-)

diff --git a/app-misc/tealdeer/tealdeer-1.6.1.ebuild 
b/app-misc/tealdeer/tealdeer-1.6.1-r1.ebuild
similarity index 99%
rename from app-misc/tealdeer/tealdeer-1.6.1.ebuild
rename to app-misc/tealdeer/tealdeer-1.6.1-r1.ebuild
index 07f68991c..c267f0a81 100644
--- a/app-misc/tealdeer/tealdeer-1.6.1.ebuild
+++ b/app-misc/tealdeer/tealdeer-1.6.1-r1.ebuild
@@ -196,7 +196,6 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="!app-text/tldr"
-BDEPEND=">=virtual/rust-1.54.0"
 
 QA_FLAGS_IGNORED="usr/bin/tldr"
 

diff --git a/gui-apps/eww/eww-0.6.0-r2.ebuild b/gui-apps/eww/eww-0.6.0-r2.ebuild
deleted file mode 100644
index 087f1b2a2..000000000
--- a/gui-apps/eww/eww-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# 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]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [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]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [email protected]
-        [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 shell-completion
-
-DESCRIPTION="Elkowars Wacky Widgets is a standalone widget system made in Rust"
-HOMEPAGE="https://elkowar.github.io/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/eww.git";
-else
-       SRC_URI+="
-               https://github.com/elkowar/eww/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-               ${CARGO_CRATE_URIS}
-       "
-       KEYWORDS="~amd64"
-
-       PATCHES="${FILESDIR}/eww-0.6.0-update-crates.patch"
-fi
-
-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 )"
-
-RDEPEND="
-       dev-libs/glib:2
-       dev-libs/libdbusmenu[gtk3]
-       x11-libs/cairo[glib]
-       x11-libs/gdk-pixbuf:2[jpeg]
-       x11-libs/gtk+:3[X?,wayland?]
-       x11-libs/pango
-       wayland? ( gui-libs/gtk-layer-shell )
-"
-# transitively hard-depend on xorg-proto due to gdk-3.0.pc
-DEPEND="${RDEPEND}
-       x11-base/xorg-proto
-"
-BDEPEND="
-       virtual/pkgconfig
-       >=virtual/rust-1.74.0
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-src_unpack() {
-       if [[ "${PV}" == 9999 ]]; then
-               git-r3_src_unpack
-               cargo_live_src_unpack
-               unpack ${P}-shellcomp.tar.xz
-       else
-               cargo_src_unpack
-       fi
-}
-
-src_configure() {
-       local myfeatures=(
-               $(usev X x11)
-               $(usev wayland wayland)
-       )
-       cargo_src_configure --no-default-features
-}
-
-src_install() {
-       dobashcomp "${WORKDIR}"/eww
-       dofishcomp "${WORKDIR}"/eww.fish
-       dozshcomp "${WORKDIR}"/_eww
-
-       dodoc README.md CHANGELOG.md
-       cargo_src_install --path crates/eww
-}
-
-pkg_postinst() {
-       elog "Eww wont run without a config file (usually in ~/.config/eww)."
-       elog "For example configs visit https://github.com/elkowar/eww#examples";
-}

diff --git a/gui-apps/eww/eww-0.6.0-r3.ebuild b/gui-apps/eww/eww-0.6.0-r3.ebuild
new file mode 100644
index 000000000..14d6ea564
--- /dev/null
+++ b/gui-apps/eww/eww-0.6.0-r3.ebuild
@@ -0,0 +1,437 @@
+# 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]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [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]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+       [email protected]
+"
+
+RUST_MIN_VER="1.74.0"
+
+inherit cargo shell-completion
+
+DESCRIPTION="Elkowars Wacky Widgets is a standalone widget system made in Rust"
+HOMEPAGE="https://elkowar.github.io/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/eww.git";
+else
+       SRC_URI+="
+               https://github.com/elkowar/eww/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+               ${CARGO_CRATE_URIS}
+       "
+       KEYWORDS="~amd64"
+
+       PATCHES="${FILESDIR}/eww-0.6.0-update-crates.patch"
+fi
+
+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 )"
+
+RDEPEND="
+       dev-libs/glib:2
+       dev-libs/libdbusmenu[gtk3]
+       x11-libs/cairo[glib]
+       x11-libs/gdk-pixbuf:2[jpeg]
+       x11-libs/gtk+:3[X?,wayland?]
+       x11-libs/pango
+       wayland? ( gui-libs/gtk-layer-shell )
+"
+# transitively hard-depend on xorg-proto due to gdk-3.0.pc
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto
+"
+BDEPEND="
+       virtual/pkgconfig
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_unpack() {
+       if [[ "${PV}" == 9999 ]]; then
+               git-r3_src_unpack
+               cargo_live_src_unpack
+               unpack ${P}-shellcomp.tar.xz
+       else
+               cargo_src_unpack
+       fi
+}
+
+src_configure() {
+       local myfeatures=(
+               $(usev X x11)
+               $(usev wayland wayland)
+       )
+       cargo_src_configure --no-default-features
+}
+
+src_install() {
+       dobashcomp "${WORKDIR}"/eww
+       dofishcomp "${WORKDIR}"/eww.fish
+       dozshcomp "${WORKDIR}"/_eww
+
+       dodoc README.md CHANGELOG.md
+       cargo_src_install --path crates/eww
+}
+
+pkg_postinst() {
+       elog "Eww wont run without a config file (usually in ~/.config/eww)."
+       elog "For example configs visit https://github.com/elkowar/eww#examples";
+}

diff --git a/gui-apps/eww/eww-9999.ebuild b/gui-apps/eww/eww-9999.ebuild
index 281ec4d4a..f126adbca 100644
--- a/gui-apps/eww/eww-9999.ebuild
+++ b/gui-apps/eww/eww-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+RUST_MIN_VER="1.74.0"
+
 inherit cargo shell-completion
 
 DESCRIPTION="Elkowars Wacky Widgets is a standalone widget system made in Rust"

Reply via email to