From 11b54b0130252b516706a146dbcb36ffa7de329d Mon Sep 17 00:00:00 2001 From: ston Date: Sat, 1 Jul 2023 00:49:57 +0800 Subject: [PATCH] net-proxy/daed: add wing useflag Signed-off-by: ston --- ...daed-0.1.0.ebuild => daed-0.1.0-r1.ebuild} | 18 +++++++++++--- net-proxy/daed/daed-9999.ebuild | 24 +++++++++++++++---- net-proxy/daed/metadata.xml | 3 +++ 3 files changed, 37 insertions(+), 8 deletions(-) rename net-proxy/daed/{daed-0.1.0.ebuild => daed-0.1.0-r1.ebuild} (77%) diff --git a/net-proxy/daed/daed-0.1.0.ebuild b/net-proxy/daed/daed-0.1.0-r1.ebuild similarity index 77% rename from net-proxy/daed/daed-0.1.0.ebuild rename to net-proxy/daed/daed-0.1.0-r1.ebuild index 377f4047a84..176d8aa098e 100644 --- a/net-proxy/daed/daed-0.1.0.ebuild +++ b/net-proxy/daed/daed-0.1.0-r1.ebuild @@ -24,20 +24,32 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-apps/pnpm + !wing? ( sys-apps/pnpm ) sys-devel/clang app-arch/unzip " S="${WORKDIR}" +IUSE="wing" + src_compile(){ sed -i '/git submodule update/d' wing/Makefile || die + if use wing; then + cd wing || die + fi GO_ROOT="${S}" emake CC=clang CFLAGS="$CFLAGS -fno-stack-protector" APPNAME="${PN}" VERSION="${PV}" } src_install(){ - dobin daed - systemd_dounit install/daed.service + local service=install/daed.service + if use wing; then + dobin wing/dae-wing + sed -i "s!/usr/bin/daed!/usr/bin/dae-wing!" $service || die + systemd_newunit $service dae-wing.service + else + dobin daed + systemd_dounit $service + fi keepdir /etc/daed/ dosym -r "/usr/share/v2ray/geosite.dat" /usr/share/daed/geosite.dat dosym -r "/usr/share/v2ray/geoip.dat" /usr/share/daed/geoip.dat diff --git a/net-proxy/daed/daed-9999.ebuild b/net-proxy/daed/daed-9999.ebuild index 0f1ff3c4172..9d5214c6fe3 100644 --- a/net-proxy/daed/daed-9999.ebuild +++ b/net-proxy/daed/daed-9999.ebuild @@ -21,14 +21,18 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-apps/pnpm + !wing? ( sys-apps/pnpm ) sys-devel/clang " +IUSE="wing" + src_unpack(){ git-r3_src_unpack cd ${P} || die - pnpm install || die + if ! use wing; then + pnpm install || die + fi cd wing || die ego mod download -modcacherw cd dae-core || die @@ -36,12 +40,22 @@ src_unpack(){ } src_compile(){ - GO_ROOT="${S}" emake CC=clang CFLAGS="$CFLAGS -fno-stack-protector" + if use wing; then + cd wing || die + fi + GO_ROOT="${S}" emake CC=clang CFLAGS="$CFLAGS -fno-stack-protector" APPNAME="${PN}" VERSION="${PV}" } src_install(){ - dobin daed - systemd_dounit install/daed.service + local service=install/daed.service + if use wing; then + dobin wing/dae-wing + sed -i "s!/usr/bin/daed!/usr/bin/dae-wing!" $service || die + systemd_newunit $service dae-wing.service + else + dobin daed + systemd_dounit $service + fi keepdir /etc/daed/ dosym -r "/usr/share/v2ray/geosite.dat" /usr/share/daed/geosite.dat dosym -r "/usr/share/v2ray/geoip.dat" /usr/share/daed/geoip.dat diff --git a/net-proxy/daed/metadata.xml b/net-proxy/daed/metadata.xml index 1d35143a4fb..3c29c8ffe08 100644 --- a/net-proxy/daed/metadata.xml +++ b/net-proxy/daed/metadata.xml @@ -5,6 +5,9 @@ ston ston.jia@qq.com + + Only build and install dae-wing + daeuniverse/daed