From b81032cc9e24550308d9b3bee94708ec6d07b5fe Mon Sep 17 00:00:00 2001
From: liuyujielol <2073201758GD@gmail.com>
Date: Fri, 18 Oct 2024 09:47:02 +0800
Subject: [PATCH] net-proxy/v2rayA: add 2.2.6, drop 2.2.5.7

Signed-off-by: liuyujielol <2073201758GD@gmail.com>
---
 net-proxy/v2rayA/Manifest                                 |  6 +++---
 .../v2rayA/{v2rayA-2.2.5.7.ebuild => v2rayA-2.2.6.ebuild} | 15 ++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)
 rewrite net-proxy/v2rayA/Manifest (100%)
 rename net-proxy/v2rayA/{v2rayA-2.2.5.7.ebuild => v2rayA-2.2.6.ebuild} (91%)

diff --git a/net-proxy/v2rayA/Manifest b/net-proxy/v2rayA/Manifest
dissimilarity index 100%
index 5c1976bb3..024aae3b1 100644
--- a/net-proxy/v2rayA/Manifest
+++ b/net-proxy/v2rayA/Manifest
@@ -1,3 +1,3 @@
-DIST v2rayA-2.2.5.7-vendor.tar.xz 6965212 BLAKE2B 3761b0ff96de4d32889bdd73f3e9e32172795983934e89d38e6fa9f56e9fc86aa5452699ad5b4e39f3fd3adbc984e3a7289a172d13fe499f870e2788481036d2 SHA512 d69c0874bca1507798cb806b6c9a71ecb3396c826f38cdc9ab11fe54da3523374d0973070a35e73f45917230fe53e30d1a9bcdf5dbb86e2141445aed0bd86ce1
-DIST v2rayA-2.2.5.7-web.tar.gz 2817806 BLAKE2B 1ad7807548177b8184070b4e116234d7330685b8e032029a1c72b6a43e7192ae34539b087ab9acae126152aa11299307156c038fccd47f697e2dfb73f07f295d SHA512 2323a676d1577fab6986bf64eea0d5dedd5e537025b4618f538acc8dc75a7274c50539cb9b431100e9ae67c8799503a85f2aa450c5b28bfcbbbbb1ae833296e7
-DIST v2rayA-2.2.5.7.tar.gz 1057639 BLAKE2B 4ea178a5220d283ee0a71728a23e8c2e8b131eae4e4c8a3649cee247a05f27e25c8028e11b05daa036210b9d9e1fdf3ac49d879e232a4084f64b560fc05a7be3 SHA512 41bff647a20a6f80d793e66faed10a09d327834b94d75555bbbf4cfd117ecf936c8062258144ca2b7330b5b5362daac95a4aec8b9c14eea9214bcc272e77186c
+DIST v2rayA-2.2.6-deps.tar.xz 117136132 BLAKE2B 3e22a0e8faa2db2ca41e8c17246933b4f0cf2a674b21859463c7021db82c0240501ecd453cb1522883827acfd4973d7eb067d74f4480da81f619a1e0897000e6 SHA512 37f6269a31cd7504d65609d2e443696477612e08ac1399223dd1acf978ac8c358ad54847e5a07ce444d46d38f2a972fd74dca51cb7b1bbe8c3e3efc20788912e
+DIST v2rayA-2.2.6-web.tar.gz 2818421 BLAKE2B 03e7f7404429b751f3a321db4fa4f86190c4f4c96e033e490fb219e943bc55095c098645b785897a61f2a8be9e61f78d2fe3885d4684f8fee3eaaa485f7cf2dc SHA512 71cbcda9c2abf7418e38840ebf36bc715214ff1d41a86baa978104dbaab0118dee55a8a3d89747aeab2b925e868189fc5c5abbcb4381216ed569809f5c1015dd
+DIST v2rayA-2.2.6.tar.gz 1058700 BLAKE2B e785e41f1752b77b9255cde24a97a9333b748fb21cc94d70ab19921eb158484957db705428ec0ec119300337de0aaacc7edd5f39b15e974bc7ebe3299f636f8d SHA512 fb625c88c6f4be87f11915920b191a640ad1d0337005fb1303c20cbdff3a9cadeceb2f07da40d59619a5aa5f133f9a7694d784bd0e981957acd2dbcc8253d7ae
diff --git a/net-proxy/v2rayA/v2rayA-2.2.5.7.ebuild b/net-proxy/v2rayA/v2rayA-2.2.6.ebuild
similarity index 91%
rename from net-proxy/v2rayA/v2rayA-2.2.5.7.ebuild
rename to net-proxy/v2rayA/v2rayA-2.2.6.ebuild
index ed9bb5116..7bffa040c 100644
--- a/net-proxy/v2rayA/v2rayA-2.2.5.7.ebuild
+++ b/net-proxy/v2rayA/v2rayA-2.2.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-
+NONFATAL_VERIFY=1
 inherit systemd go-module desktop xdg
 
 DESCRIPTION="web GUI of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel"
@@ -12,10 +12,10 @@ SRC_URI="
 	https://github.com/v2rayA/v2rayA/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/v2rayA/v2rayA/releases/download/v${PV}/web.tar.gz -> ${P}-web.tar.gz
 "
-# maintainer generated vendor
+# maintainer generated deps pack
 # generated with liuyujielol/gentoo-go-deps/.github/workflows/generator.yml
 SRC_URI+="
-	https://github.com/liuyujielol/gentoo-go-deps/releases/download/${P}/${P}-vendor.tar.xz
+	https://github.com/liuyujielol/gentoo-go-deps/releases/download/${P}/${P}-deps.tar.xz
 "
 
 LICENSE="AGPL-3"
@@ -34,18 +34,11 @@ BDEPEND="
 	>=dev-lang/go-1.21:*
 "
 
-src_unpack() {
-	default
-
-	# go vendor
-	mv -v "${WORKDIR}/vendor" "${S}/service" || die
-}
-
 src_compile() {
 	mv -v "${WORKDIR}/web" "${S}/service/server/router/web" || die
 
 	cd "${S}/service" || die
-	ego build -mod vendor -tags "with_gvisor" \
+	ego build -tags "with_gvisor" \
 		-ldflags "-X github.com/v2rayA/v2rayA/conf.Version=${PV} -s -w" \
 		-o v2raya -trimpath
 }
-- 
2.11.4.GIT