*/*: migrate to app-alternatives

Signed-off-by: ston <[email protected]>
microcai · Jun 23, 2023 · 6f56561 · 6f56561
1 parent fe15fc5
commit 6f56561
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 41 deletions.
diff --git a/app-alternatives/v2ray-geoip/metadata.xml b/app-alternatives/v2ray-geoip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>ston</name>
+    <email>[email protected]</email>
+  </maintainer>
+  <use>
+    <flag name="v2fly">use dev-libs/v2ray-geoip-bin</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-alternatives/v2ray-geoip/v2ray-geoip-0.ebuild b/app-alternatives/v2ray-geoip/v2ray-geoip-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ALTERNATIVES=(
+		v2fly:dev-libs/v2ray-geoip-bin
+)
+
+inherit app-alternatives
+
+DESCRIPTION="symlink for v2ray-geoip"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+src_install() {
+	dosym -r "/usr/share/geoip/$(get_alternative).dat" /usr/share/v2ray/geoip.dat
+}
diff --git a/app-alternatives/v2ray-geosite/metadata.xml b/app-alternatives/v2ray-geosite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>ston</name>
+    <email>[email protected]</email>
+  </maintainer>
+  <use>
+    <flag name="v2fly">use dev-libs/v2ray-domain-list-community-bin</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-alternatives/v2ray-geosite/v2ray-geosite-0.ebuild b/app-alternatives/v2ray-geosite/v2ray-geosite-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ALTERNATIVES=(
+		v2fly:dev-libs/v2ray-domain-list-community-bin
+)
+
+inherit app-alternatives
+
+DESCRIPTION="symlink for v2ray-geosite"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+src_install() {
+	dosym -r "/usr/share/geosite/$(get_alternative).dat" /usr/share/v2ray/geosite.dat
+}
diff --git a/...-list-community-bin-20230601044045.ebuild → ...st-community-bin-20230601044045-r1.ebuild b/...-list-community-bin-20230601044045.ebuild → ...st-community-bin-20230601044045-r1.ebuild
@@ -21,6 +21,6 @@ BDEPEND=""
 S="${WORKDIR}"
 
 src_install() {
-	insinto /usr/share/v2ray
-	newins "${P}.dat" geosite.dat
+	insinto /usr/share/geosite/
+	newins "${P}.dat" v2fly.dat
 }
diff --git a/...t-community-4.39.2_p20210621183458.ebuild → ...ommunity-4.39.2_p20210621183458-r1.ebuild b/...t-community-4.39.2_p20210621183458.ebuild → ...ommunity-4.39.2_p20210621183458-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -598,8 +598,8 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/share/v2ray
-	newins dlc.dat geosite.dat
+	insinto /usr/share/geosite/
+	newins dlc.dat v2fly.dat
 }
 
 pkg_postinst() {

diff --git a/dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-9999.ebuild b/dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,8 +47,8 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/share/v2ray
-	newins dlc.dat geosite.dat
+	insinto /usr/share/geosite/
+	newins dlc.dat v2fly.dat
 }
 
 pkg_postinst() {

diff --git a/...p-bin/v2ray-geoip-bin-202306010100.ebuild → ...in/v2ray-geoip-bin-202306010100-r1.ebuild b/...p-bin/v2ray-geoip-bin-202306010100.ebuild → ...in/v2ray-geoip-bin-202306010100-r1.ebuild
@@ -20,6 +20,6 @@ BDEPEND=""
 S="${WORKDIR}"
 
 src_install() {
-	insinto /usr/share/v2ray
-	newins "${DISTDIR}/${P}.dat" geoip.dat
+	insinto /usr/share/geoip/
+	newins "${DISTDIR}/${P}.dat" v2fly.dat
 }
diff --git a/net-proxy/Xray/Xray-1.6.1.ebuild → net-proxy/Xray/Xray-1.6.0-r1.ebuild b/net-proxy/Xray/Xray-1.6.1.ebuild → net-proxy/Xray/Xray-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 BDEPEND=">=dev-lang/go-1.16.2 app-arch/unzip"
-RDEPEND="app-misc/ca-certificates dev-libs/v2ray-domain-list-community-bin dev-libs/v2ray-geoip-bin"
+RDEPEND="app-misc/ca-certificates app-alternatives/v2ray-geoip app-alternatives/v2ray-geosite"
 
 S="${WORKDIR}/${PN}-core-${PV}"
 PATCHES=("${FILESDIR}/Xray-1.5.5-add-v2ray-asset.patch")

diff --git a/net-proxy/Xray/Xray-1.6.0.ebuild → net-proxy/Xray/Xray-1.6.1-r1.ebuild b/net-proxy/Xray/Xray-1.6.0.ebuild → net-proxy/Xray/Xray-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 BDEPEND=">=dev-lang/go-1.16.2 app-arch/unzip"
-RDEPEND="app-misc/ca-certificates dev-libs/v2ray-domain-list-community-bin dev-libs/v2ray-geoip-bin"
+RDEPEND="app-misc/ca-certificates app-alternatives/v2ray-geoip app-alternatives/v2ray-geosite"
 
 S="${WORKDIR}/${PN}-core-${PV}"
 PATCHES=("${FILESDIR}/Xray-1.5.5-add-v2ray-asset.patch")

diff --git a/net-proxy/dae/dae-0.1.10_p1.ebuild → net-proxy/dae/dae-0.1.10_p1-r1.ebuild b/net-proxy/dae/dae-0.1.10_p1.ebuild → net-proxy/dae/dae-0.1.10_p1-r1.ebuild
@@ -20,8 +20,8 @@ SRC_URI="
 RESTRICT="mirror"
 
 DEPEND="
-	dev-libs/v2ray-domain-list-community-bin
-	dev-libs/v2ray-geoip-bin
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
 	app-arch/p7zip
 "
 RDEPEND="$DEPEND"

diff --git a/net-proxy/dae/dae-0.2.0_rc2.ebuild → net-proxy/dae/dae-0.2.0_rc2-r1.ebuild b/net-proxy/dae/dae-0.2.0_rc2.ebuild → net-proxy/dae/dae-0.2.0_rc2-r1.ebuild
@@ -20,8 +20,8 @@ SRC_URI="
 RESTRICT="mirror"
 
 DEPEND="
-	dev-libs/v2ray-domain-list-community-bin
-	dev-libs/v2ray-geoip-bin
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
 	app-arch/p7zip
 "
 RDEPEND="$DEPEND"

diff --git a/net-proxy/dae/dae-9999.ebuild b/net-proxy/dae/dae-9999.ebuild
@@ -16,8 +16,8 @@ MINKV="5.8"
 EGIT_REPO_URI="https://github.com/daeuniverse/dae.git"
 
 DEPEND="
-	dev-libs/v2ray-domain-list-community-bin
-	dev-libs/v2ray-geoip-bin
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
 "
 RDEPEND="$DEPEND"
 BDEPEND="sys-devel/clang"

diff --git a/net-proxy/daed/daed-0.1.0_rc1.ebuild → net-proxy/daed/daed-0.1.0_rc1-r1.ebuild b/net-proxy/daed/daed-0.1.0_rc1.ebuild → net-proxy/daed/daed-0.1.0_rc1-r1.ebuild
@@ -19,8 +19,8 @@ KEYWORDS="~amd64"
 RESTRICT="strip"
 
 DEPEND="
-	dev-libs/v2ray-domain-list-community-bin
-	dev-libs/v2ray-geoip-bin
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
 "
 RDEPEND="${DEPEND}"
 BDEPEND="

diff --git a/net-proxy/daed/daed-9999.ebuild b/net-proxy/daed/daed-9999.ebuild
@@ -16,8 +16,8 @@ KEYWORDS=""
 RESTRICT="strip"
 
 DEPEND="
-	dev-libs/v2ray-domain-list-community-bin
-	dev-libs/v2ray-geoip-bin
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
 "
 RDEPEND="${DEPEND}"
 BDEPEND="

diff --git a/net-proxy/v2ray-bin/v2ray-bin-4.45.0.ebuild → ...roxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild b/net-proxy/v2ray-bin/v2ray-bin-4.45.0.ebuild → ...roxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,9 +24,8 @@ RESRICT="mirror"
 
 DEPEND="
 	!net-proxy/v2ray
-	!dev-libs/v2ray-geoip-bin
-	!dev-libs/v2ray-domain-list-community-bin
-	!dev-libs/v2ray-domain-list-community
+	!app-alternatives/v2ray-geoip
+	!app-alternatives/v2ray-geosite
 "
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"

diff --git a/net-proxy/v2ray-bin/v2ray-bin-5.1.0-r1.ebuild b/net-proxy/v2ray-bin/v2ray-bin-5.1.0-r1.ebuild
@@ -24,9 +24,8 @@ RESRICT="mirror"
 
 DEPEND="
 	!net-proxy/v2ray
-	!dev-libs/v2ray-geoip-bin
-	!dev-libs/v2ray-domain-list-community-bin
-	!dev-libs/v2ray-domain-list-community
+	!app-alternatives/v2ray-geoip
+	!app-alternatives/v2ray-geosite
 "
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"

diff --git a/net-proxy/v2ray/v2ray-4.45.2.ebuild → net-proxy/v2ray/v2ray-4.45.2-r1.ebuild b/net-proxy/v2ray/v2ray-4.45.2.ebuild → net-proxy/v2ray/v2ray-4.45.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,11 +23,8 @@ BDEPEND="
 DEPEND=""
 RDEPEND="
 	!net-proxy/v2ray-bin
-	dev-libs/v2ray-geoip-bin
-	|| (
-		dev-libs/v2ray-domain-list-community-bin
-		dev-libs/v2ray-domain-list-community
-	)
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite
 "
 
 S="${WORKDIR}/${PN}-core-${PV}"

diff --git a/net-proxy/v2ray/v2ray-5.6.0.ebuild → net-proxy/v2ray/v2ray-5.6.0-r1.ebuild b/net-proxy/v2ray/v2ray-5.6.0.ebuild → net-proxy/v2ray/v2ray-5.6.0-r1.ebuild
@@ -19,8 +19,8 @@ RESTRICT="mirror"
 DEPEND=""
 RDEPEND="${DEPEND}
 	!net-proxy/v2ray-bin
-	dev-libs/v2ray-geoip-bin
-	dev-libs/v2ray-domain-list-community-bin"
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite"
 BDEPEND="dev-lang/go"
 
 S="${WORKDIR}/${PN}-core-${PV}"

diff --git a/net-proxy/v2ray/v2ray-5.7.0.ebuild → net-proxy/v2ray/v2ray-5.7.0-r1.ebuild b/net-proxy/v2ray/v2ray-5.7.0.ebuild → net-proxy/v2ray/v2ray-5.7.0-r1.ebuild
@@ -19,8 +19,8 @@ RESTRICT="mirror"
 DEPEND=""
 RDEPEND="${DEPEND}
 	!net-proxy/v2ray-bin
-	dev-libs/v2ray-geoip-bin
-	dev-libs/v2ray-domain-list-community-bin"
+	app-alternatives/v2ray-geoip
+	app-alternatives/v2ray-geosite"
 BDEPEND="dev-lang/go"
 
 S="${WORKDIR}/${PN}-core-${PV}"