public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gonçalo Negrier Duarte" <gonegrier.duarte@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/eww/
Date: Sun, 25 Feb 2024 13:32:14 +0000 (UTC)	[thread overview]
Message-ID: <1708867919.e677aba9653d7a6ea8fb283605f75590ca6ec019.gonegrier.duarte@gentoo> (raw)

commit:     e677aba9653d7a6ea8fb283605f75590ca6ec019
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sun Feb 25 13:25:15 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Sun Feb 25 13:31:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e677aba9

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

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 <AT> gmail.com>

 .../eww/{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(-)

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() {


             reply	other threads:[~2024-02-25 13:32 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-25 13:32 Gonçalo Negrier Duarte [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-05 19:55 [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/eww/ Gonçalo Negrier Duarte
2024-09-05 19:50 Gonçalo Negrier Duarte
2024-05-09 13:46 Lucio Sauer
2024-05-09 13:46 Lucio Sauer
2024-05-08 17:56 Lucio Sauer
2024-05-08 17:56 Lucio Sauer
2024-05-08 17:56 Lucio Sauer
2024-05-08 17:56 Lucio Sauer
2024-04-13 15:10 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-04-13 15:06 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-04-13 15:06 Julien Roy
2024-02-25 20:10 Jonas Frei
2024-02-25 17:05 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2024-02-25 16:56 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2024-02-22 17:42 Julien Roy
2024-02-21 16:00 Gonçalo Negrier Duarte
2024-02-19 12:39 Gonçalo Negrier Duarte
2023-11-08 11:50 Gonçalo Negrier Duarte
2023-10-31 18:33 Gonçalo Negrier Duarte
2023-10-29 20:24 Gonçalo Negrier Duarte
2023-10-29 20:24 Gonçalo Negrier Duarte
2023-07-26 13:03 Gonçalo Negrier Duarte
2023-07-19 15:19 Gonçalo Negrier Duarte
2023-07-19 14:46 Gonçalo Negrier Duarte
2022-12-06  3:57 Julien Roy
2022-12-02  4:29 Julien Roy
2022-10-16 11:29 Luciano Degni
2022-07-30 23:09 Pascal Jäger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708867919.e677aba9653d7a6ea8fb283605f75590ca6ec019.gonegrier.duarte@gentoo \
    --to=gonegrier.duarte@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox