diff --git a/app-alternatives/v2ray-geoip/metadata.xml b/app-alternatives/v2ray-geoip/metadata.xml new file mode 100644 index 00000000000..353ffe0e772 --- /dev/null +++ b/app-alternatives/v2ray-geoip/metadata.xml @@ -0,0 +1,11 @@ + + + + + ston + ston.jia@qq.com + + + use dev-libs/v2ray-geoip-bin + + diff --git a/app-alternatives/v2ray-geoip/v2ray-geoip-0.ebuild b/app-alternatives/v2ray-geoip/v2ray-geoip-0.ebuild new file mode 100644 index 00000000000..06a5cc5e4f7 --- /dev/null +++ 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 new file mode 100644 index 00000000000..88c443ddb5a --- /dev/null +++ b/app-alternatives/v2ray-geosite/metadata.xml @@ -0,0 +1,11 @@ + + + + + ston + ston.jia@qq.com + + + use dev-libs/v2ray-domain-list-community-bin + + diff --git a/app-alternatives/v2ray-geosite/v2ray-geosite-0.ebuild b/app-alternatives/v2ray-geosite/v2ray-geosite-0.ebuild new file mode 100644 index 00000000000..d90a2f8f8aa --- /dev/null +++ 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/dev-libs/v2ray-domain-list-community-bin/v2ray-domain-list-community-bin-20230601044045.ebuild b/dev-libs/v2ray-domain-list-community-bin/v2ray-domain-list-community-bin-20230601044045-r1.ebuild similarity index 90% rename from dev-libs/v2ray-domain-list-community-bin/v2ray-domain-list-community-bin-20230601044045.ebuild rename to dev-libs/v2ray-domain-list-community-bin/v2ray-domain-list-community-bin-20230601044045-r1.ebuild index 37540455c73..9725089f58c 100644 --- a/dev-libs/v2ray-domain-list-community-bin/v2ray-domain-list-community-bin-20230601044045.ebuild +++ b/dev-libs/v2ray-domain-list-community-bin/v2ray-domain-list-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/dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-4.39.2_p20210621183458.ebuild b/dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-4.39.2_p20210621183458-r1.ebuild similarity index 99% rename from dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-4.39.2_p20210621183458.ebuild rename to dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-4.39.2_p20210621183458-r1.ebuild index 17ca714eb0a..128a16919ce 100644 --- a/dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-4.39.2_p20210621183458.ebuild +++ b/dev-libs/v2ray-domain-list-community/v2ray-domain-list-community-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 index e644fa40262..c53a2b4d145 100644 --- 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/dev-libs/v2ray-geoip-bin/v2ray-geoip-bin-202306010100.ebuild b/dev-libs/v2ray-geoip-bin/v2ray-geoip-bin-202306010100-r1.ebuild similarity index 86% rename from dev-libs/v2ray-geoip-bin/v2ray-geoip-bin-202306010100.ebuild rename to dev-libs/v2ray-geoip-bin/v2ray-geoip-bin-202306010100-r1.ebuild index d9ec24d75e3..2fcee5dcbdd 100644 --- a/dev-libs/v2ray-geoip-bin/v2ray-geoip-bin-202306010100.ebuild +++ b/dev-libs/v2ray-geoip-bin/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 b/net-proxy/Xray/Xray-1.6.0-r1.ebuild similarity index 86% rename from net-proxy/Xray/Xray-1.6.1.ebuild rename to net-proxy/Xray/Xray-1.6.0-r1.ebuild index f63ba2aed08..d029d2f330f 100644 --- a/net-proxy/Xray/Xray-1.6.1.ebuild +++ b/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 b/net-proxy/Xray/Xray-1.6.1-r1.ebuild similarity index 86% rename from net-proxy/Xray/Xray-1.6.0.ebuild rename to net-proxy/Xray/Xray-1.6.1-r1.ebuild index f63ba2aed08..d029d2f330f 100644 --- a/net-proxy/Xray/Xray-1.6.0.ebuild +++ b/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 b/net-proxy/dae/dae-0.1.10_p1-r1.ebuild similarity index 95% rename from net-proxy/dae/dae-0.1.10_p1.ebuild rename to net-proxy/dae/dae-0.1.10_p1-r1.ebuild index 13969155e4d..1c98039ab27 100644 --- a/net-proxy/dae/dae-0.1.10_p1.ebuild +++ b/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 b/net-proxy/dae/dae-0.2.0_rc2-r1.ebuild similarity index 95% rename from net-proxy/dae/dae-0.2.0_rc2.ebuild rename to net-proxy/dae/dae-0.2.0_rc2-r1.ebuild index 602142aefb2..390c098dbd1 100644 --- a/net-proxy/dae/dae-0.2.0_rc2.ebuild +++ b/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 index 524ba8b2610..68530ab7836 100644 --- 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 b/net-proxy/daed/daed-0.1.0_rc1-r1.ebuild similarity index 93% rename from net-proxy/daed/daed-0.1.0_rc1.ebuild rename to net-proxy/daed/daed-0.1.0_rc1-r1.ebuild index 6c6f3faf30f..377f4047a84 100644 --- a/net-proxy/daed/daed-0.1.0_rc1.ebuild +++ b/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 index 36fa9dbaa0e..0f1ff3c4172 100644 --- 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 b/net-proxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild similarity index 89% rename from net-proxy/v2ray-bin/v2ray-bin-4.45.0.ebuild rename to net-proxy/v2ray-bin/v2ray-bin-4.45.0-r1.ebuild index e0154623a6b..d30d5584c58 100644 --- a/net-proxy/v2ray-bin/v2ray-bin-4.45.0.ebuild +++ b/net-proxy/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 index eff2a518743..db26d569ae4 100644 --- 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 b/net-proxy/v2ray/v2ray-4.45.2-r1.ebuild similarity index 91% rename from net-proxy/v2ray/v2ray-4.45.2.ebuild rename to net-proxy/v2ray/v2ray-4.45.2-r1.ebuild index 340f57a01ee..4123a8082fc 100644 --- a/net-proxy/v2ray/v2ray-4.45.2.ebuild +++ b/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 b/net-proxy/v2ray/v2ray-5.6.0-r1.ebuild similarity index 94% rename from net-proxy/v2ray/v2ray-5.6.0.ebuild rename to net-proxy/v2ray/v2ray-5.6.0-r1.ebuild index d678a9f1ca3..5d2d99647fb 100644 --- a/net-proxy/v2ray/v2ray-5.6.0.ebuild +++ b/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 b/net-proxy/v2ray/v2ray-5.7.0-r1.ebuild similarity index 94% rename from net-proxy/v2ray/v2ray-5.7.0.ebuild rename to net-proxy/v2ray/v2ray-5.7.0-r1.ebuild index d678a9f1ca3..5d2d99647fb 100644 --- a/net-proxy/v2ray/v2ray-5.7.0.ebuild +++ b/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}"