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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3093138334 for ; Tue, 3 Dec 2019 19:52:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CB4BE077A; Tue, 3 Dec 2019 19:52:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB6D0E077A for ; Tue, 3 Dec 2019 19:52:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A5FB34D760 for ; Tue, 3 Dec 2019 19:52:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B37108C4 for ; Tue, 3 Dec 2019 19:52:09 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1575402702.927bacbab020e1fac03ef9cfdb8c313bb5be0fb3.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild X-VCS-Directories: net-dns/dnscrypt-proxy/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 927bacbab020e1fac03ef9cfdb8c313bb5be0fb3 X-VCS-Branch: master Date: Tue, 3 Dec 2019 19:52:09 +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: 6774e114-fc76-4586-b72a-46418f42ac48 X-Archives-Hash: 0a0eae47c5f13aa8b45b36456ebcf360 commit: 927bacbab020e1fac03ef9cfdb8c313bb5be0fb3 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Dec 3 19:50:03 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Dec 3 19:51:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927bacba net-dns/dnscrypt-proxy: sync live ebuild Package-Manager: Portage-2.3.79, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild | 32 +++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild index 215c07210b2..e3266982fa2 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 EGO_PN="github.com/jedisct1/${PN}" -inherit fcaps golang-build systemd +inherit fcaps go-module systemd if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -22,7 +22,7 @@ LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" SLOT="0" IUSE="pie" -DEPEND=">=dev-lang/go-1.12" +BDEPEND=">=dev-lang/go-1.13" RDEPEND=" acct-group/dnscrypt-proxy @@ -32,33 +32,30 @@ RDEPEND=" FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch ) -src_prepare() { - default - # Create directory structure suitable for building - mkdir -p "src/${EGO_PN%/*}" || die - # fixes $GOPATH/go.mod exists but should not - rm go.mod || die - mv "${PN}" "src/${EGO_PN}" || die - mv "vendor" "src/${EGO_PN}" || die -} - -src_configure() { - EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)" +src_compile() { + pushd "${PN}" >/dev/null || die + go build -buildmode="$(usex pie pie default)" || die + popd >/dev/null || die } src_install() { + pushd "${PN}" >/dev/null || die + dobin dnscrypt-proxy insinto /etc/dnscrypt-proxy - newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml - doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt} - doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt} + newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml + doins example-{blacklist.txt,whitelist.txt} + doins example-{cloaking-rules.txt,forwarding-rules.txt} + + popd >/dev/null || die insinto /usr/share/dnscrypt-proxy doins -r "utils/generate-domains-blacklists/." newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r1 dnscrypt-proxy newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket @@ -70,6 +67,7 @@ src_install() { pkg_postinst() { fcaps_pkg_postinst + go-module_pkg_postinst if ! use filecaps; then ewarn "'filecaps' USE flag is disabled"