From d9c38ee6a80541ca8b7afbe240db0d71c97173e3 Mon Sep 17 00:00:00 2001 From: Puqns67 Date: Sat, 4 May 2024 20:21:08 +0800 Subject: [PATCH] net-proxy/v2ray: add 5.16.1, drop 5.15.1 * Add latest version * Using vendor tarball instead dependency tarball to reduce download size * Move app-alternatives/v2ray-geo{ip,site} to DEPEND * Remove unneeded files --- net-proxy/v2ray/Manifest | 8 ++-- net-proxy/v2ray/files/v2ray.initd | 44 ---------------------- net-proxy/v2ray/v2ray-5.15.3.ebuild | 7 ++-- .../{v2ray-5.15.1.ebuild => v2ray-5.16.1.ebuild} | 7 ++-- 4 files changed, 12 insertions(+), 54 deletions(-) rewrite net-proxy/v2ray/Manifest (75%) delete mode 100644 net-proxy/v2ray/files/v2ray.initd rename net-proxy/v2ray/{v2ray-5.15.1.ebuild => v2ray-5.16.1.ebuild} (92%) diff --git a/net-proxy/v2ray/Manifest b/net-proxy/v2ray/Manifest dissimilarity index 75% index 3445bddd6..2f0f2a550 100644 --- a/net-proxy/v2ray/Manifest +++ b/net-proxy/v2ray/Manifest @@ -1,4 +1,4 @@ -DIST v2ray-5.15.1-deps.tar.xz 206163972 BLAKE2B a78d1d79a9373ac45ff863f5dde1607d118e1f94b1dd2f181043f71c3032ac9c868b4697bc567bc4434461c5263940b4d160cb9243aaaa8000d9280e278b8dd2 SHA512 5fe157d8e344e7ec22efacfd0b3e0012d69b253d41126a12bbe03afcdf2835bc53322cc8d5f5e3a06a2e5939bc7cd1337c9f97335c03bc38de440e13abc884dc -DIST v2ray-5.15.1.tar.gz 1036277 BLAKE2B 7f5c2140cc20bf578a3cd98130116eb8b7e8844d320338cc0fb2ba5458782f6a9a2fec3140e5916e555c296d08eeef1c0f0178902f23ff3c59f69694e2143583 SHA512 a9dab3e0c9d96bd60a36c59730a2bceb6593150ba61455fe8ec4e7425a385565ccc9da80e3c7588caa33ef077b658146df67d0bbd9373557f9b1c12dbbf96311 -DIST v2ray-5.15.3-deps.tar.xz 209811940 BLAKE2B 5712e3390a4895d9a708661e846722d321d44040585cf3737e00d2c24b254dc1d5c460061a92a6d32e352466d232e6f0fac46a6e698f2f29ece902584ce4f1b4 SHA512 ad2ad84eb649bdecb5baf288adf049d9e4335d92e7baeae809f42421f146492f0c368fcc935a8d00c82eb07916afdf1eef33d407997b8435f0285c21df65dbe2 -DIST v2ray-5.15.3.tar.gz 1036301 BLAKE2B 61263ca6f4b6c99fd384f89bd710255dd1b9ec84587fdd24c4f0aaff1ec4e5bdfc7d513a467ca712642404b2c98fa9e8d4ea38b331182acac6b402b72128c3f9 SHA512 4e7f6b44e431c04d44f9b38b44af8a79df93d774e11a0c80b2bd07522e9e9bbf7dedd0049d05fcd70b38758534ef5fe1d4b5325872d5848e52344e0939e1362d +DIST v2ray-5.15.3-vendor.tar.xz 5020668 BLAKE2B bbe13085f150fcd6ceec9e465637ef208931533eaa737c26f48d6224288ee3b3e82ac3e38c5a8a8fb633835169a0da380799a25ca0f003830548e3e0c627934a SHA512 fc077d1d7919e8463c46cbb18bb82d65d5e909a6489b2d8d82fddeecd122f35e4a3fad578ff2f40637e65b4c315342d5796f465b44026c7e6fd72985293b6117 +DIST v2ray-5.15.3.tar.gz 1036301 BLAKE2B 61263ca6f4b6c99fd384f89bd710255dd1b9ec84587fdd24c4f0aaff1ec4e5bdfc7d513a467ca712642404b2c98fa9e8d4ea38b331182acac6b402b72128c3f9 SHA512 4e7f6b44e431c04d44f9b38b44af8a79df93d774e11a0c80b2bd07522e9e9bbf7dedd0049d05fcd70b38758534ef5fe1d4b5325872d5848e52344e0939e1362d +DIST v2ray-5.16.1-vendor.tar.xz 5033000 BLAKE2B 121ec07dc7088e3ad74fdb995bdc23dbf206669fecc4aa6cd56953891b8a58857fa7594c0abee99df7d726fdcc83e7f9edef2e7b4bfce3c84cdb54b89c6b5ac9 SHA512 a55ed34baf255d3d97fd9a348861b05cf5b25ae42f0a2c772484b83031799e2f6492751425cc6a96aebf4ca00871600b769fbb68d9ba71d5cb955795c20b90ab +DIST v2ray-5.16.1.tar.gz 1036374 BLAKE2B 120fecf63b62404bb40376cdef178e671846ac8b78eea42d4972fd779ded820a12c614392a1a7ae7701125d6030950da1ceef24d6c417bbdc2d9cf59865fd513 SHA512 ce935b156ee62dba712ff31fee8422d3ba32c596a9a55c0ae3d31917c9b4ed2a47260bf5ed241e8e32d4f85ed5d2b6bd8229e0928f6bfe636e25565ae58d3f61 diff --git a/net-proxy/v2ray/files/v2ray.initd b/net-proxy/v2ray/files/v2ray.initd deleted file mode 100644 index 0fcd1bf3c..000000000 --- a/net-proxy/v2ray/files/v2ray.initd +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ "${RC_SVCNAME}" != "v2ray" ] ; then - V2_CFGNAME="${RC_SVCNAME#*.}." - fi - - V2_CONFIG="/etc/v2ray/config.${V2_CFGNAME}json" - V2_PIDFILE="/run/v2ray.${V2_CFGNAME}pid" - V2_LOG="/var/log/v2ray.${V2_CFGNAME}log" - - if [ ! -f ${V2_CONFIG} ]; then - ewarn "${V2_CONFIG} does not exist." - return 1 - fi - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting V2ray" - ebegin "Log File : ${V2_LOG}" - start-stop-daemon --start \ - -b -1 ${V2_LOG} -2 ${V2_LOG} \ - -m -p ${V2_PIDFILE} \ - --exec /usr/bin/v2ray -- -config ${V2_CONFIG} - eend $? - -} - -stop() { - checkconfig || return 1 - ebegin "Stopping V2ray" - start-stop-daemon --stop -p ${V2_PIDFILE} - eend $? -} diff --git a/net-proxy/v2ray/v2ray-5.15.3.ebuild b/net-proxy/v2ray/v2ray-5.15.3.ebuild index 67be98f88..29bb093b5 100644 --- a/net-proxy/v2ray/v2ray-5.15.3.ebuild +++ b/net-proxy/v2ray/v2ray-5.15.3.ebuild @@ -8,7 +8,7 @@ inherit systemd go-module DESCRIPTION="A platform for building proxies to bypass network restrictions." HOMEPAGE="https://www.v2fly.org/" SRC_URI="https://github.com/v2fly/v2ray-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/liuyujielol/gentoo-go-deps/releases/download/${P}/${P}-deps.tar.xz" + https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-vendor.tar.xz" S="${WORKDIR}/${PN}-core-${PV}" @@ -18,9 +18,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" RESTRICT="mirror" -RDEPEND="!net-proxy/v2ray-bin - app-alternatives/v2ray-geoip +DEPEND="app-alternatives/v2ray-geoip app-alternatives/v2ray-geosite" +RDEPEND="${DEPEND} + !net-proxy/v2ray-bin" BDEPEND=">=dev-lang/go-1.21.4" src_prepare() { diff --git a/net-proxy/v2ray/v2ray-5.15.1.ebuild b/net-proxy/v2ray/v2ray-5.16.1.ebuild similarity index 92% rename from net-proxy/v2ray/v2ray-5.15.1.ebuild rename to net-proxy/v2ray/v2ray-5.16.1.ebuild index 6fe56c671..29bb093b5 100644 --- a/net-proxy/v2ray/v2ray-5.15.1.ebuild +++ b/net-proxy/v2ray/v2ray-5.16.1.ebuild @@ -8,7 +8,7 @@ inherit systemd go-module DESCRIPTION="A platform for building proxies to bypass network restrictions." HOMEPAGE="https://www.v2fly.org/" SRC_URI="https://github.com/v2fly/v2ray-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-deps.tar.xz" + https://github.com/Puqns67/gentoo-deps/releases/download/${P}/${P}-vendor.tar.xz" S="${WORKDIR}/${PN}-core-${PV}" @@ -18,9 +18,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" RESTRICT="mirror" -RDEPEND="!net-proxy/v2ray-bin - app-alternatives/v2ray-geoip +DEPEND="app-alternatives/v2ray-geoip app-alternatives/v2ray-geosite" +RDEPEND="${DEPEND} + !net-proxy/v2ray-bin" BDEPEND=">=dev-lang/go-1.21.4" src_prepare() { -- 2.11.4.GIT