From e677aba9653d7a6ea8fb283605f75590ca6ec019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
 <gonegrier.duarte@gmail.com>
Date: Sun, 25 Feb 2024 13:25:15 +0000
Subject: [PATCH] gui-apps/eww: drop 0.5.0, add 0.5.0-r1 * improve how features
 are enable using cargo.eclass * fix SRC_URI 0.5.0 * improving src_unpack (not
 sure is really need but just to be safe) * closing old bug of 0.4.0 since was
 drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/925317
Closes: https://bugs.gentoo.org/925426
Closes: https://bugs.gentoo.org/884457
Closes: https://bugs.gentoo.org/884455
Closes: https://bugs.gentoo.org/877675
Closes: https://bugs.gentoo.org/863095
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
---
 .../{eww-0.5.0.ebuild => eww-0.5.0-r1.ebuild} | 35 +++++++++++--------
 gui-apps/eww/eww-9999.ebuild                  | 35 +++++++++++--------
 2 files changed, 42 insertions(+), 28 deletions(-)
 rename gui-apps/eww/{eww-0.5.0.ebuild => eww-0.5.0-r1.ebuild} (93%)

diff --git a/gui-apps/eww/eww-0.5.0.ebuild b/gui-apps/eww/eww-0.5.0-r1.ebuild
similarity index 93%
rename from gui-apps/eww/eww-0.5.0.ebuild
rename to gui-apps/eww/eww-0.5.0-r1.ebuild
index b6019b0dbe..581a66992d 100644
--- a/gui-apps/eww/eww-0.5.0.ebuild
+++ b/gui-apps/eww/eww-0.5.0-r1.ebuild
@@ -305,24 +305,16 @@ if [[ "${PV}" == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/elkowar/${PN}.git"
 else
 	SRC_URI="
-		https://github.com/elkowar/${PV}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/elkowar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="
-	Apache-2.0
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 BSL-1.1 )
-	|| ( Artistic-2 CC0-1.0 )
-	BSD
-	CC0-1.0
-	ISC
 	MIT
-	|| ( MIT Unlicense )
 "
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="X wayland"
 REQUIRED_USE="|| ( X wayland )"
 
@@ -346,11 +338,26 @@ RDEPEND="
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+    local myfeatures=(
+		$(usev X x11)
+		$(usev wayland wayland)
+    )
+    cargo_src_configure
+}
+
 src_compile() {
-	use X && features="--no-default-features --features=x11"
-	use wayland && features="--no-default-features --features=wayland"
-	use X && use wayland && features="--no-default-features --features=wayland,x11"
-	cargo_src_compile ${features}
+	cargo_gen_config
+	cargo_src_compile
 }
 
 src_install() {
diff --git a/gui-apps/eww/eww-9999.ebuild b/gui-apps/eww/eww-9999.ebuild
index a9aad5e71a..581a66992d 100644
--- a/gui-apps/eww/eww-9999.ebuild
+++ b/gui-apps/eww/eww-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -305,22 +305,14 @@ if [[ "${PV}" == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/elkowar/${PN}.git"
 else
 	SRC_URI="
-		https://github.com/elkowar/${PV}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/elkowar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
 	KEYWORDS="~amd64"
 fi
 
 LICENSE="
-	Apache-2.0
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 BSL-1.1 )
-	|| ( Artistic-2 CC0-1.0 )
-	BSD
-	CC0-1.0
-	ISC
 	MIT
-	|| ( MIT Unlicense )
 "
 SLOT="0"
 IUSE="X wayland"
@@ -346,11 +338,26 @@ RDEPEND="
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+    local myfeatures=(
+		$(usev X x11)
+		$(usev wayland wayland)
+    )
+    cargo_src_configure
+}
+
 src_compile() {
-	use X && features="--no-default-features --features=x11"
-	use wayland && features="--no-default-features --features=wayland"
-	use X && use wayland && features="--no-default-features --features=wayland,x11"
-	cargo_src_compile ${features}
+	cargo_gen_config
+	cargo_src_compile
 }
 
 src_install() {