From 455904602ff19483b35d2d2eb63cd9143622c347 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Sat, 5 Jul 2025 21:05:47 +0500
Subject: [PATCH] net-proxy/byedpi: sync live

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 net-proxy/byedpi/byedpi-9999.ebuild | 21 ++++++++++++++-------
 net-proxy/byedpi/files/byedpi.initd | 19 -------------------
 2 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 net-proxy/byedpi/files/byedpi.initd

diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild
index a6a5b90451..134cf57553 100644
--- a/net-proxy/byedpi/byedpi-9999.ebuild
+++ b/net-proxy/byedpi/byedpi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,14 +6,21 @@ EAPI=8
 inherit systemd toolchain-funcs
 
 DESCRIPTION="Bypass DPI SOCKS proxy"
-HOMEPAGE="https://github.com/hufrea/byedpi/"
+HOMEPAGE="https://github.com/hufrea/byedpi"
 
-inherit git-r3
-EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hufrea/byedpi.git"
+else
+	SRC_URI="https://github.com/hufrea/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="MIT"
 SLOT="0"
 
+RDEPEND="acct-user/byedpi"
+
 src_prepare() {
 	default
 
@@ -29,10 +36,10 @@ src_install() {
 	dobin ciadpi
 	einstalldocs
 
-	newinitd "${FILESDIR}"/byedpi.initd byedpi
+	newinitd "${FILESDIR}"/byedpi.initd-r2 byedpi
 	newconfd "${FILESDIR}"/byedpi.confd byedpi
-	systemd_dounit "dist/linux/${PN}.service"
+	systemd_dounit dist/linux/byedpi.service
 
 	insinto /etc
-	newins "dist/linux/${PN}.conf" "${PN}.conf"
+	doins dist/linux/byedpi.conf
 }
diff --git a/net-proxy/byedpi/files/byedpi.initd b/net-proxy/byedpi/files/byedpi.initd
deleted file mode 100644
index 58c86a4cb4..0000000000
--- a/net-proxy/byedpi/files/byedpi.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# shellcheck shell=sh
-#
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: "${BYEDPI_BIND_IP:=0.0.0.0}"
-: "${BYEDPI_BIND_PORT:=1080}"
-: "${BYEDPI_OPTS:=--disorder 5 --auto=torst --tlsrec 6+s}"
-
-command="/usr/bin/ciadpi"
-command_args="--ip ${BYEDPI_BIND_IP} --port ${BYEDPI_BIND_PORT} ${BYEDPI_OPTS}"
-command_user="nobody:nobody"
-command_background=1
-pidfile="/run/${RC_SVCNAME}.pid"
-
-depend() {
-		need net
-}