diff --git a/net-proxy/daed/daed-0.1.0.ebuild b/net-proxy/daed/daed-0.1.0-r1.ebuild
similarity index 68%
rename from net-proxy/daed/daed-0.1.0.ebuild
rename to net-proxy/daed/daed-0.1.0-r1.ebuild
index 377f4047a84..cfbe71c50c2 100644
--- a/net-proxy/daed/daed-0.1.0.ebuild
+++ b/net-proxy/daed/daed-0.1.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Modern Dashboard For dae"
HOMEPAGE="https://github.com/daeuniverse/daed"
SRC_URI="
https://github.com/daeuniverse/daed/releases/download/v${PV/_rc1/rc}/daed-full-src.zip -> ${P}.zip
- https://github.com/st0nie/gentoo-go-deps/releases/download/${P}/${P}-node_modules-pnpm.tar.xz
+ webui? ( https://github.com/st0nie/gentoo-go-deps/releases/download/${P}/${P}-node_modules-pnpm.tar.xz )
"
# EGIT_REPO_URI="https://github.com/daeuniverse/daed.git"
@@ -24,20 +24,33 @@ DEPEND="
"
RDEPEND="${DEPEND}"
BDEPEND="
- sys-apps/pnpm
+ webui? ( sys-apps/pnpm )
sys-devel/clang
app-arch/unzip
+ >=dev-lang/go-1.18
"
S="${WORKDIR}"
+IUSE="+webui"
+
src_compile(){
sed -i '/git submodule update/d' wing/Makefile || die
+ if ! use webui; 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 webui; then
+ dobin daed
+ systemd_dounit $service
+ else
+ dobin wing/dae-wing
+ sed -i "s!/usr/bin/daed!/usr/bin/dae-wing!" $service || die
+ systemd_newunit $service dae-wing.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..8f236dc13a1 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
+ webui? ( sys-apps/pnpm )
sys-devel/clang
"
+IUSE="+webui"
+
src_unpack(){
git-r3_src_unpack
cd ${P} || die
- pnpm install || die
+ if use webui; 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 webui; 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 webui; then
+ dobin daed
+ systemd_dounit $service
+ else
+ dobin wing/dae-wing
+ sed -i "s!/usr/bin/daed!/usr/bin/dae-wing!" $service || die
+ systemd_newunit $service dae-wing.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..ebb31f6fb81 100644
--- a/net-proxy/daed/metadata.xml
+++ b/net-proxy/daed/metadata.xml
@@ -5,6 +5,9 @@
ston
ston.jia@qq.com
+
daeuniverse/daed