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 5272015808B for ; Sun, 6 Mar 2022 16:10:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D2E1E0971; Sun, 6 Mar 2022 16:10:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 874E1E0971 for ; Sun, 6 Mar 2022 16:10:42 +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 C52F2342DE0 for ; Sun, 6 Mar 2022 16:10:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 556942EA for ; Sun, 6 Mar 2022 16:10:40 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1646583033.721c5b6eb1f07871c4d00f5f30bcf2590c5b5906.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/aerc/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/aerc/aerc-9999.ebuild X-VCS-Directories: mail-client/aerc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 721c5b6eb1f07871c4d00f5f30bcf2590c5b5906 X-VCS-Branch: master Date: Sun, 6 Mar 2022 16:10:40 +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: b08140a1-8057-4775-8fbc-0cd459b3c293 X-Archives-Hash: 0f7be52145136f908290a76b0db3e5e9 commit: 721c5b6eb1f07871c4d00f5f30bcf2590c5b5906 Author: William Hubbs gentoo org> AuthorDate: Sun Mar 6 16:07:47 2022 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Mar 6 16:10:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721c5b6e mail-client/aerc: sync live Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: William Hubbs gentoo.org> mail-client/aerc/aerc-9999.ebuild | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/mail-client/aerc/aerc-9999.ebuild b/mail-client/aerc/aerc-9999.ebuild index fd14227f806c..44c0b5357581 100644 --- a/mail-client/aerc/aerc-9999.ebuild +++ b/mail-client/aerc/aerc-9999.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 - -inherit go-module +inherit go-module xdg DESCRIPTION="Email client for your terminal" HOMEPAGE="https://aerc-mail.org" @@ -12,12 +11,8 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~rjarry/aerc" else - EGO_SUM=( - # to be filled on bumps - ) - go-module_set_globals - SRC_URI="https://git.sr.ht/~sircmpwn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" + SRC_URI="https://git.sr.ht/~rjarry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.gz" KEYWORDS="~amd64 ~ppc64" fi @@ -25,14 +20,13 @@ LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" IUSE="notmuch" +DEPEND="notmuch? ( net-mail/notmuch:= )" +RDEPEND="${DEPEND}" BDEPEND=" >=app-text/scdoc-1.9.7 >=dev-lang/go-1.13 " -DEPEND="notmuch? ( net-mail/notmuch:= )" -RDEPEND="${DEPEND}" - src_unpack() { if [[ ${PV} == *9999 ]]; then git-r3_src_unpack @@ -43,8 +37,9 @@ src_unpack() { } src_compile() { - use notmuch && export GOFLAGS="-tags=notmuch" - emake PREFIX="${EPREFIX}/usr" all + LDFLAGS= \ + emake GOFLAGS="-mod=vendor $(usex notmuch "-tags=notmuch" "")" \ + PREFIX="${EPREFIX}/usr"VERSION=${PV} all } src_install() { @@ -68,4 +63,5 @@ pkg_postinst() { elog "need to use them." fi done + xdg_pkg_postinst }