[gentoo-commits] repo/proj/guru:master commit in: profiles/, net-vpn/cloudflare-warp/

[gentoo-commits] repo/proj/guru:master commit in: profiles/, net-vpn/cloudflare-warp/

[David Roman]

commit:     a609dbba650bac279f90d90df5c23445190fb88d
Author:     John-Henry Lim <johnhenrylim12 <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 09:13:14 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Feb 19 09:13:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a609dbba

net-vpn/cloudflare-warp: add and mask dex use flag for warp-dex bin

Signed-off-by: John-Henry Lim <johnhenrylim12 <AT> gmail.com>

 ...24.2.62-r1.ebuild => cloudflare-warp-2024.2.62-r2.ebuild} | 12 +++++++++---
 net-vpn/cloudflare-warp/metadata.xml                         |  1 +
 profiles/package.use.mask                                    |  4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r1.ebuild b/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild
similarity index 86%
rename from net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r1.ebuild
rename to net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild
index 6f844d9f4a..049e2cdce2 100644
--- a/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r1.ebuild
+++ b/net-vpn/cloudflare-warp/cloudflare-warp-2024.2.62-r2.ebuild
@@ -13,8 +13,10 @@ LICENSE="all-rights-reserved"
 RESTRICT="bindist mirror"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="systemd +systray"
-RDEPEND="net-firewall/nftables"
+IUSE="systemd +systray dex"
+RDEPEND="net-firewall/nftables
+	dex? ( net-libs/libpcap )
+"
 
 QA_PREBUILT="/bin/warp-cli /bin/warp-dex /bin/warp-diag /bin/warp-svc /bin/warp-taskbar"
 
@@ -27,12 +29,16 @@ src_unpack() {
 src_install() {
 	into /
 	dobin bin/warp-cli
-	dobin bin/warp-dex
 	dobin bin/warp-diag
 	dobin bin/warp-svc
 	doinitd "${FILESDIR}/warp-svc"
 	systemd_dounit lib/systemd/system/warp-svc.service
 
+	# warp-dex relies on "libpcap.so.0.8" which is not in tree.
+	if use dex; then
+		dobin bin/warp-dex
+	fi
+
 	if use systray; then
 		dobin bin/warp-taskbar
 		systemd_douserunit usr/lib/systemd/user/warp-taskbar.service

diff --git a/net-vpn/cloudflare-warp/metadata.xml b/net-vpn/cloudflare-warp/metadata.xml
index d05fc2a28b..231aa6e1f0 100644
--- a/net-vpn/cloudflare-warp/metadata.xml
+++ b/net-vpn/cloudflare-warp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="systray">Enable systray indicator of whether WARP is active</flag>
+		<flag name="dex">Install warp-dex for Digital Experience Monitoring tests</flag>
 	</use>
 </pkgmetadata>

diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 6329d2d591..a2f684d119 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -3,6 +3,10 @@
 
 # New entries go on top.
 
+# John-Henry Lim <johnhenrylim12@gmail.com> (2024-02-19)
+# warp-dex relies on libpcap.so.0.8 which is not in tree.
+net-vpn/cloudflare-warp dex
+
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-11-21)
 # Build failure.
 # https://gitlab.com/famedly/conduit/-/issues/385