From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B80B158094 for ; Wed, 17 Aug 2022 14:18:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17F63E0817; Wed, 17 Aug 2022 14:18:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5D93E0817 for ; Wed, 17 Aug 2022 14:18:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41F6D340F3C for ; Wed, 17 Aug 2022 14:18:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 858E5D4 for ; Wed, 17 Aug 2022 14:18:46 +0000 (UTC) From: "Eric Joldasov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eric Joldasov" Message-ID: <1660745906.21e61a7e5a617c5ef1434d967aa6a2b79da02889.bratishkaerik@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/popura/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-p2p/popura/popura-0.4.3.ebuild net-p2p/popura/popura-9999.ebuild X-VCS-Directories: net-p2p/popura/ X-VCS-Committer: bratishkaerik X-VCS-Committer-Name: Eric Joldasov X-VCS-Revision: 21e61a7e5a617c5ef1434d967aa6a2b79da02889 X-VCS-Branch: dev Date: Wed, 17 Aug 2022 14:18:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b0530b9-1490-48a9-b0aa-64e60d33c36d X-Archives-Hash: 293716f33680990f15ed173dc2c8cb9a commit: 21e61a7e5a617c5ef1434d967aa6a2b79da02889 Author: Eric Joldasov getgoogleoff me> AuthorDate: Wed Aug 17 14:18:26 2022 +0000 Commit: Eric Joldasov getgoogleoff me> CommitDate: Wed Aug 17 14:18:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=21e61a7e net-p2p/popura: install docs, set file capabilities Signed-off-by: Eric Joldasov getgoogleoff.me> net-p2p/popura/popura-0.4.3.ebuild | 26 +++++++++++++++----------- net-p2p/popura/popura-9999.ebuild | 18 +++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/net-p2p/popura/popura-0.4.3.ebuild b/net-p2p/popura/popura-0.4.3.ebuild index 28d1a02a3..719ec1948 100644 --- a/net-p2p/popura/popura-0.4.3.ebuild +++ b/net-p2p/popura/popura-0.4.3.ebuild @@ -3,31 +3,32 @@ EAPI=8 -inherit go-module linux-info systemd +inherit go-module linux-info systemd fcaps DESCRIPTION="Popura: alternative Yggdrasil network client" HOMEPAGE="https://github.com/popura-network/Popura/" -DOCS=( README.md ) - -KEYWORDS="~amd64" SRC_URI=" https://github.com/popura-network/Popura/archive/v${PV}+popura1.tar.gz -> ${P}+popura1.tar.gz https://codeberg.org/BratishkaErik/distfiles/media/branch/master/${P}+popura1-deps.tar.bz2 " -S="${WORKDIR}/Popura-${PV}-popura1" - LICENSE="LGPL-3 MPL-2.0 MIT Apache-2.0 BSD ZLIB" SLOT="0" +KEYWORDS="~amd64" DEPEND=" acct-user/yggdrasil acct-group/yggdrasil " -RDEPEND="!!net-p2p/yggdrasil-go" - BDEPEND=">=dev-lang/go-1.16.0" +RDEPEND="!net-p2p/yggdrasil-go" + +S="${WORKDIR}/Popura-${PV}-popura1" + +FILECAPS=( + cap_net_admin,cap_net_bind_service "usr/bin/yggdrasil" +) pkg_setup() { linux-info_pkg_setup @@ -40,13 +41,16 @@ pkg_setup() { } src_compile() { - PKGNAME="${PN}" PKGVER="${PV}+popura1" \ - 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}+popura1" -trimpath ./cmd/$CMD + done } src_install() { dobin {yggdrasil,yggdrasilctl} + dodoc README.md systemd_dounit "contrib/systemd/yggdrasil.service" systemd_dounit "contrib/systemd/yggdrasil-default-config.service" doinitd "contrib/openrc/yggdrasil" diff --git a/net-p2p/popura/popura-9999.ebuild b/net-p2p/popura/popura-9999.ebuild index 5b58d7b27..26e19a2b1 100644 --- a/net-p2p/popura/popura-9999.ebuild +++ b/net-p2p/popura/popura-9999.ebuild @@ -3,26 +3,22 @@ EAPI=8 -inherit go-module linux-info systemd git-r3 - -EGIT_REPO_URI="https://github.com/popura-network/Popura" +inherit go-module linux-info systemd git-r3 fcaps DESCRIPTION="Popura: alternative Yggdrasil network client" HOMEPAGE="https://github.com/popura-network/Popura" -DOCS=( README.md ) +EGIT_REPO_URI="https://github.com/popura-network/Popura" LICENSE="LGPL-3 MPL-2.0 MIT Apache-2.0 BSD ZLIB" SLOT="0" -KEYWORDS="" DEPEND=" acct-user/yggdrasil acct-group/yggdrasil " -RDEPEND="!!net-p2p/yggdrasil-go" - BDEPEND=">=dev-lang/go-1.16.0" +RDEPEND="!net-p2p/yggdrasil-go" pkg_setup() { linux-info_pkg_setup @@ -40,12 +36,16 @@ 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}+popura1" -trimpath ./cmd/$CMD + done } src_install() { dobin {yggdrasil,yggdrasilctl} + dodoc README.md systemd_dounit "contrib/systemd/yggdrasil.service" systemd_dounit "contrib/systemd/yggdrasil-default-config.service" doinitd "contrib/openrc/yggdrasil"