From 3a75aeabe68ccc080d6749c658d8378223bc6e65 Mon Sep 17 00:00:00 2001
From: blackteahamburger <blackteahamburger@outlook.com>
Date: Thu, 2 May 2024 13:20:23 +0800
Subject: [PATCH] net-proxy/v2ray-bin: improve dependencies

---
 ...ray-bin-4.45.0-r1.ebuild => v2ray-bin-4.45.0-r2.ebuild} | 10 +++++-----
 ...{v2ray-bin-5.12.1.ebuild => v2ray-bin-5.12.1-r1.ebuild} | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename net-proxy/v2ray-bin/{v2ray-bin-4.45.0-r1.ebuild => v2ray-bin-4.45.0-r2.ebuild} (92%)
 rename net-proxy/v2ray-bin/{v2ray-bin-5.12.1.ebuild => v2ray-bin-5.12.1-r1.ebuild} (92%)

diff --git a/net-proxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild b/net-proxy/v2ray-bin/v2ray-bin-4.45.0-r2.ebuild
similarity index 92%
rename from net-proxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild
rename to net-proxy/v2ray-bin/v2ray-bin-4.45.0-r2.ebuild
index b8c4d9437..a6823ab57 100644
--- a/net-proxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild
+++ b/net-proxy/v2ray-bin/v2ray-bin-4.45.0-r2.ebuild
@@ -25,10 +25,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RESTRICT="mirror"
 
+DEPEND="
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
+"
 RDEPEND="
 	!net-proxy/v2ray
-	!app-alternatives/v2ray-geoip
-	!app-alternatives/v2ray-geosite
+	${DEPEND}
 "
 BDEPEND="app-arch/unzip"
 QA_PREBUILT="
@@ -47,9 +50,6 @@ src_install() {
 	dobin v2ray
 	dobin v2ctl
 
-	insinto /usr/share/v2ray
-	doins *.dat
-
 	insinto /etc/v2ray
 	doins *.json
 
diff --git a/net-proxy/v2ray-bin/v2ray-bin-5.12.1.ebuild b/net-proxy/v2ray-bin/v2ray-bin-5.12.1-r1.ebuild
similarity index 92%
rename from net-proxy/v2ray-bin/v2ray-bin-5.12.1.ebuild
rename to net-proxy/v2ray-bin/v2ray-bin-5.12.1-r1.ebuild
index 861c210f7..62d16ed01 100644
--- a/net-proxy/v2ray-bin/v2ray-bin-5.12.1.ebuild
+++ b/net-proxy/v2ray-bin/v2ray-bin-5.12.1-r1.ebuild
@@ -20,30 +20,30 @@ SRC_URI="
 	)
 "
 
+S=${WORKDIR}
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
 
 RESTRICT="mirror"
 
+DEPEND="
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
+"
 RDEPEND="
 	!net-proxy/v2ray
-	!app-alternatives/v2ray-geoip
-	!app-alternatives/v2ray-geosite
+	${DEPEND}
 "
 BDEPEND="app-arch/unzip"
 QA_PREBUILT="
 	/usr/bin/v2ray
 "
 
-S=${WORKDIR}
-
 src_install() {
 	dobin v2ray
 
-	insinto /usr/share/v2ray
-	doins *.dat
-
 	insinto /etc/v2ray
 	doins *.json
 
-- 
2.11.4.GIT