[gentoo-commits] repo/proj/guru:master commit in: net-p2p/yggdrasil-go/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     93cfd952aceadb153940160f01c56888fb5b59cd
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Tue Aug  9 20:25:18 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 20:25:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=93cfd952

net-p2p/yggdrasil-go: install docs, set file capabilities

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>

 net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild | 18 +++++++++++++-----
 net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild  | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
index 726c54483..f8bfdf265 100644
--- a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
+++ b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module linux-info systemd
+inherit go-module linux-info systemd fcaps
 
 DESCRIPTION="An experiment in scalable routing as an encrypted IPv6 overlay network"
 HOMEPAGE="https://yggdrasil-network.github.io/"
@@ -24,6 +24,10 @@ DEPEND="
 
 BDEPEND=">=dev-lang/go-1.17.0"
 
+FILECAPS=(
+	cap_net_admin,cap_net_bind_service "usr/bin/yggdrasil"
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 	if ! linux_config_exists; then
@@ -35,15 +39,19 @@ pkg_setup() {
 }
 
 src_compile() {
-	PKGNAME="${PN}" PKGVER="${PV}" \
-	GOFLAGS="-trimpath -buildmode=pie -mod=readonly" \
-	./build -l "-linkmode external -extldflags \"${LDFLAGS}\""
+	local package="github.com/yggdrasil-network/yggdrasil-go/src/version"
+
+	for CMD in yggdrasil yggdrasilctl ; do
+		ego build -buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}' -X ${package}.buildName=${PN} -X ${package}.buildVersion=v${PV}" -trimpath ./cmd/$CMD
+	done
+
 }
 
 src_install() {
 	dobin {yggdrasil,yggdrasilctl}
+	dodoc README.md
+	dodoc CHANGELOG.md
 	systemd_dounit "contrib/systemd/yggdrasil.service"
 	systemd_dounit "contrib/systemd/yggdrasil-default-config.service"
 	doinitd "contrib/openrc/yggdrasil"
-	einstalldocs
 }

diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild
index d803f16d4..20419a673 100644
--- a/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild
+++ b/net-p2p/yggdrasil-go/yggdrasil-go-9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=8
 
-inherit go-module linux-info systemd git-r3
+inherit go-module linux-info systemd git-r3 fcaps
 
 EGIT_REPO_URI="https://github.com/yggdrasil-network/yggdrasil-go"
 
 DESCRIPTION="An experiment in scalable routing as an encrypted IPv6 overlay network"
 HOMEPAGE="https://yggdrasil-network.github.io/"
-DOCS=( README.md )
 
 LICENSE="LGPL-3 MIT Apache-2.0 BSD ZLIB"
 SLOT="0"
@@ -20,7 +19,11 @@ DEPEND="
 	acct-group/yggdrasil
 "
 
-BDEPEND=">=dev-lang/go-1.16.0"
+BDEPEND=">=dev-lang/go-1.17.0"
+
+FILECAPS=(
+	cap_net_admin,cap_net_bind_service "usr/bin/yggdrasil"
+)
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -38,12 +41,17 @@ src_unpack() {
 }
 
 src_compile() {
-	GOFLAGS="-trimpath -buildmode=pie -mod=readonly" \
-	./build -l "-linkmode external -extldflags \"${LDFLAGS}\""
+	local package="github.com/yggdrasil-network/yggdrasil-go/src/version"
+
+	for CMD in yggdrasil yggdrasilctl ; do
+		ego build -buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}' -X ${package}.buildName=${PN} -X ${package}.buildVersion=v${PV}" -trimpath ./cmd/$CMD
+	done
 }
 
 src_install() {
 	dobin {yggdrasil,yggdrasilctl}
+	dodoc README.md
+	dodoc CHANGELOG.md
 	systemd_dounit "contrib/systemd/yggdrasil.service"
 	systemd_dounit "contrib/systemd/yggdrasil-default-config.service"
 	doinitd "contrib/openrc/yggdrasil"